Mercurial > hg > release > thermostat-0.13
changeset 1226:c63b04153672
Do not create symlinks
Reviewed-by: jerboaa, neugens
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-August/007811.html
| author | Omair Majid <omajid@redhat.com> |
|---|---|
| date | Wed, 28 Aug 2013 13:26:28 -0400 |
| parents | 74a70d3e9877 |
| children | 7d1305f0fef3 |
| files | distribution/config/commands/agent.properties distribution/config/commands/clean-data.properties distribution/config/commands/connect.properties distribution/config/commands/gui.properties distribution/config/commands/list-vms.properties distribution/config/commands/ping.properties distribution/config/commands/service.properties distribution/config/commands/storage.properties distribution/config/commands/vm-info.properties distribution/config/commands/vm-stat.properties distribution/config/commands/webservice.properties distribution/pom.xml main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties pom.xml web/server/pom.xml |
| diffstat | 15 files changed, 102 insertions(+), 166 deletions(-) [+] |
line wrap: on
line diff
--- a/distribution/config/commands/agent.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/agent.properties Wed Aug 28 13:26:28 2013 -0400 @@ -1,9 +1,9 @@ bundles = thermostat-agent-core-@project.version@.jar, \ thermostat-web-common-@project.version@.jar, \ thermostat-web-client-@project.version@.jar, \ - httpcomponents-core.jar, \ - httpcomponents-client.jar, \ - gson.jar, \ + httpcore-osgi-${httpcomponents.version}.jar, \ + httpclient-osgi-${httpcomponents.version}.jar, \ + gson-${gson.version}.jar, \ thermostat-osgi-process-handler-@project.version@.jar, \ thermostat-common-core-@project.version@.jar, \ thermostat-agent-cli-@project.version@.jar, \ @@ -12,12 +12,12 @@ thermostat-killvm-agent-@project.version@.jar, \ thermostat-system-backend-@project.version@.jar, \ thermostat-storage-mongodb-${project.version}.jar, \ - mongo.jar, \ - commons-beanutils.jar, \ - commons-codec.jar, \ - commons-collections.jar, \ - commons-logging.jar, \ - netty.jar + mongo-java-driver-${mongo-driver.version}.jar, \ + commons-beanutils-${commons-beanutils.version}.jar, \ + commons-codec-${commons-codec.version}.jar, \ + commons-collections-${commons-collections.version}.jar, \ + commons-logging-${commons-logging.version}.jar, \ + netty-${netty.version}.jar description = starts and stops the thermostat agent
--- a/distribution/config/commands/clean-data.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/clean-data.properties Wed Aug 28 13:26:28 2013 -0400 @@ -2,14 +2,14 @@ thermostat-storage-mongodb-${project.version}.jar, \ thermostat-web-common-${project.version}.jar, \ thermostat-web-client-${project.version}.jar, \ - httpcomponents-core.jar, \ - httpcomponents-client.jar, \ - gson.jar, \ - mongo.jar, \ - commons-beanutils.jar, \ - commons-codec.jar, \ - commons-collections.jar, \ - commons-logging.jar, \ + httpcore-osgi-${httpcomponents.version}.jar, \ + httpclient-osgi-${httpcomponents.version}.jar, \ + gson-${gson.version}.jar, \ + mongo-java-driver-${mongo-driver.version}.jar, \ + commons-beanutils-${commons-beanutils.version}.jar, \ + commons-codec-${commons-codec.version}.jar, \ + commons-collections-${commons-collections.version}.jar, \ + commons-logging-${commons-logging.version}.jar, \ description = Drop all data related to all of the specified agents
--- a/distribution/config/commands/connect.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/connect.properties Wed Aug 28 13:26:28 2013 -0400 @@ -3,14 +3,14 @@ thermostat-web-common-${project.version}.jar, \ thermostat-web-client-${project.version}.jar, \ thermostat-storage-mongodb-${project.version}.jar, \ - mongo.jar, \ - commons-beanutils.jar, \ - commons-codec.jar, \ - commons-collections.jar, \ - commons-logging.jar, \ - httpcomponents-core.jar, \ - httpcomponents-client.jar, \ - gson.jar + mongo-java-driver-${mongo-driver.version}.jar, \ + commons-beanutils-${commons-beanutils.version}.jar, \ + commons-codec-${commons-codec.version}.jar, \ + commons-collections-${commons-collections.version}.jar, \ + commons-logging-${commons-logging.version}.jar, \ + httpcore-osgi-${httpcomponents.version}.jar, \ + httpclient-osgi-${httpcomponents.version}.jar, \ + gson-${gson.version}.jar description = persistently connect to storage
--- a/distribution/config/commands/gui.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/gui.properties Wed Aug 28 13:26:28 2013 -0400 @@ -1,10 +1,10 @@ bundles = thermostat-storage-mongodb-${project.version}.jar, \ - mongo.jar, \ - commons-beanutils.jar, \ - commons-collections.jar, \ - commons-codec.jar, \ - commons-logging.jar, \ - gson.jar, \ + mongo-java-driver-${mongo-driver.version}.jar, \ + commons-beanutils-${commons-beanutils.version}.jar, \ + commons-collections-${commons-collections.version}.jar, \ + commons-codec-${commons-codec.version}.jar, \ + commons-logging-${commons-logging.version}.jar, \ + gson-${gson.version}.jar, \ thermostat-web-common-@project.version@.jar, \ thermostat-web-client-@project.version@.jar, \ thermostat-common-command-@project.version@.jar, \ @@ -18,9 +18,9 @@ thermostat-osgi-living-vm-filter-core-@project.version@.jar, \ thermostat-osgi-living-vm-filter-swing-@project.version@.jar, \ thermostat-osgi-process-handler-@project.version@.jar, \ - httpcomponents-core.jar, \ - httpcomponents-client.jar, \ - netty.jar + httpcore-osgi-${httpcomponents.version}.jar, \ + httpclient-osgi-${httpcomponents.version}.jar, \ + netty-${netty.version}.jar description = launches the GUI client
--- a/distribution/config/commands/list-vms.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/list-vms.properties Wed Aug 28 13:26:28 2013 -0400 @@ -2,14 +2,14 @@ thermostat-storage-mongodb-${project.version}.jar, \ thermostat-web-common-${project.version}.jar, \ thermostat-web-client-${project.version}.jar, \ - httpcomponents-core.jar, \ - httpcomponents-client.jar, \ - gson.jar, \ - mongo.jar, \ - commons-beanutils.jar, \ - commons-codec.jar, \ - commons-collections.jar, \ - commons-logging.jar, \ + httpcore-osgi-${httpcomponents.version}.jar, \ + httpclient-osgi-${httpcomponents.version}.jar, \ + gson-${gson.version}.jar, \ + mongo-java-driver-${mongo-driver.version}.jar, \ + commons-beanutils-${commons-beanutils.version}.jar, \ + commons-codec-${commons-codec.version}.jar, \ + commons-collections-${commons-collections.version}.jar, \ + commons-logging-${commons-logging.version}.jar, \ description = lists all currently monitored VMs
--- a/distribution/config/commands/ping.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/ping.properties Wed Aug 28 13:26:28 2013 -0400 @@ -3,15 +3,15 @@ thermostat-storage-mongodb-${project.version}.jar, \ thermostat-web-common-${project.version}.jar, \ thermostat-web-client-${project.version}.jar, \ - httpcomponents-core.jar, \ - httpcomponents-client.jar, \ - gson.jar, \ - mongo.jar, \ - commons-beanutils.jar, \ - commons-codec.jar, \ - commons-collections.jar, \ - commons-logging.jar, \ - netty.jar + httpcore-osgi-${httpcomponents.version}.jar, \ + httpclient-osgi-${httpcomponents.version}.jar, \ + gson-${gson.version}.jar, \ + mongo-java-driver-${mongo-driver.version}.jar, \ + commons-beanutils-${commons-beanutils.version}.jar, \ + commons-codec-${commons-codec.version}.jar, \ + commons-collections-${commons-collections.version}.jar, \ + commons-logging-${commons-logging.version}.jar, \ + netty-${netty.version}.jar description = using the Command Channel, send a ping to a running agent
--- a/distribution/config/commands/service.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/service.properties Wed Aug 28 13:26:28 2013 -0400 @@ -1,15 +1,15 @@ bundles = thermostat-agent-core-@project.version@.jar, \ thermostat-storage-mongodb-${project.version}.jar, \ - mongo.jar, \ - commons-beanutils.jar, \ - commons-collections.jar, \ - commons-logging.jar, \ - commons-codec.jar, \ + mongo-java-driver-${mongo-driver.version}.jar, \ + commons-beanutils-${commons-beanutils.version}.jar, \ + commons-collections-${commons-collections.version}.jar, \ + commons-logging-${commons-logging.version}.jar, \ + commons-codec-${commons-codec.version}.jar, \ thermostat-osgi-process-handler-@project.version@.jar, \ thermostat-common-command-@project.version@.jar, \ thermostat-agent-command-@project.version@.jar, \ thermostat-agent-cli-@project.version@.jar, \ - netty.jar + netty-${netty.version}.jar description = starts and stops the thermostat storage and agent
--- a/distribution/config/commands/storage.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/storage.properties Wed Aug 28 13:26:28 2013 -0400 @@ -3,12 +3,12 @@ thermostat-agent-cli-@project.version@.jar, \ thermostat-common-command-@project.version@.jar, \ thermostat-agent-command-@project.version@.jar, \ - commons-codec.jar, \ - netty.jar + commons-codec-${commons-codec.version}.jar, \ + netty-${netty.version}.jar description = starts and stops the thermostat storage -usage = storage <--start|--stop|--status> [--dryRun] [-q] [-l <level>] +usage = storage <-start|--stop|--status> [--dryRun] [-q] [-l <level>] options = dryRun, start|stop|status, quiet, AUTO_LOG_OPTION
--- a/distribution/config/commands/vm-info.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/vm-info.properties Wed Aug 28 13:26:28 2013 -0400 @@ -2,18 +2,18 @@ thermostat-storage-mongodb-${project.version}.jar, \ thermostat-web-common-${project.version}.jar, \ thermostat-web-client-${project.version}.jar, \ - httpcomponents-core.jar, \ - httpcomponents-client.jar, \ - gson.jar, \ - mongo.jar, \ - commons-beanutils.jar, \ - commons-codec.jar, \ - commons-collections.jar, \ - commons-logging.jar + httpcore-osgi-${httpcomponents.version}.jar, \ + httpclient-osgi-${httpcomponents.version}.jar, \ + gson-${gson.version}.jar, \ + mongo-java-driver-${mongo-driver.version}.jar, \ + commons-beanutils-${commons-beanutils.version}.jar, \ + commons-codec-${commons-codec.version}.jar, \ + commons-collections-${commons-collections.version}.jar, \ + commons-logging-${commons-logging.version}.jar description = shows basic information about a VM -usage = vm-info [--vmId <vm>] [--hostId <host>] [-d <url>] [-l <level>] +usage = vm-info [-vmId <vm>] [--hostId <host>] [-d <url>] [-l <level>] options = hostId, vmId, AUTO_DB_OPTIONS, AUTO_LOG_OPTION
--- a/distribution/config/commands/vm-stat.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/vm-stat.properties Wed Aug 28 13:26:28 2013 -0400 @@ -2,18 +2,18 @@ thermostat-storage-mongodb-${project.version}.jar, \ thermostat-web-common-${project.version}.jar, \ thermostat-web-client-${project.version}.jar, \ - httpcomponents-core.jar, \ - httpcomponents-client.jar, \ - gson.jar, \ - mongo.jar, \ - commons-beanutils.jar, \ - commons-codec.jar, \ - commons-collections.jar, \ - commons-logging.jar + httpcore-osgi-${httpcomponents.version}.jar, \ + httpclient-osgi-${httpcomponents.version}.jar, \ + gson-${gson.version}.jar, \ + mongo-java-driver-${mongo-driver.version}.jar, \ + commons-beanutils-${commons-beanutils.version}.jar, \ + commons-codec-${commons-codec.version}.jar, \ + commons-collections-${commons-collections.version}.jar, \ + commons-logging-${commons-logging.version}.jar description = show various statistics about a VM -usage = vm-stat --hostId <host> --vmId <vm> [-d <url>] [-l <level>] +usage = vm-stat -hostId <host> --vmId <vm> [-d <url>] [-l <level>] options = hostId, vmId, continuous, AUTO_DB_OPTIONS, AUTO_LOG_OPTION
--- a/distribution/config/commands/webservice.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/config/commands/webservice.properties Wed Aug 28 13:26:28 2013 -0400 @@ -4,26 +4,25 @@ thermostat-web-server-@project.version@.jar, \ thermostat-web-common-@project.version@.jar, \ thermostat-storage-mongodb-${project.version}.jar, \ - mongo.jar, \ - commons-beanutils.jar, \ - commons-codec.jar, \ - commons-collections.jar, \ - commons-logging.jar, \ - commons-fileupload.jar, \ - commons-io.jar, \ - gson.jar, \ - jetty-continuation.jar, \ - jetty-http.jar, \ - jetty-io.jar, \ - jetty-security.jar, \ - jetty-server.jar, \ - jetty-servlet.jar, \ - jetty-util.jar, \ - jetty-webapp.jar, \ - jetty-xml.jar, \ - jetty-plus.jar, \ - jetty-jndi.jar, \ - javax-servlet.jar + mongo-java-driver-${mongo-driver.version}.jar, \ + commons-beanutils-${commons-beanutils.version}.jar, \ + commons-codec-${commons-codec.version}.jar, \ + commons-collections-${commons-collections.version}.jar, \ + commons-logging-${commons-logging.version}.jar, \ + commons-fileupload-${commons-fileupload.version}.jar, \ + commons-io-${commons-io.version}.jar, \ + gson-${gson.version}.jar, \ + jetty-continuation-${jetty.version}.jar, \ + jetty-http-${jetty.version}.jar, \ + jetty-io-${jetty.version}.jar, \ + jetty-security-${jetty.version}.jar, \ + jetty-server-${jetty.version}.jar, \ + jetty-servlet-${jetty.version}.jar, \ + jetty-util-${jetty.version}.jar, \ + jetty-webapp-${jetty.version}.jar, \ + jetty-xml-${jetty.version}.jar, \ + jetty-plus-${jetty.version}.jar, \ + jetty-jndi-${jetty.version}.jar, \ description = starts and stops the thermostat web service
--- a/distribution/pom.xml Sun Aug 25 18:36:47 2013 -0600 +++ b/distribution/pom.xml Wed Aug 28 13:26:28 2013 -0400 @@ -207,69 +207,6 @@ <goal>run</goal> </goals> </execution> - <execution> - <id>version-less-dep-symlinks</id> - <phase>prepare-package</phase> - <configuration> - <target> - <symlink link="${project.build.directory}/image/libs/commons-codec.jar" - resource="${project.build.directory}/image/libs/commons-codec-1.7.jar" /> - <symlink link="${project.build.directory}/image/libs/netty.jar" - resource="${project.build.directory}/image/libs/netty-3.2.4.Final.jar" /> - <symlink link="${project.build.directory}/image/libs/jline2.jar" - resource="${project.build.directory}/image/libs/jline-2.9.jar" /> - <symlink link="${project.build.directory}/image/libs/mongo.jar" - resource="${project.build.directory}/image/libs/mongo-java-driver-2.7.3.jar" /> - <symlink link="${project.build.directory}/image/libs/commons-cli.jar" - resource="${project.build.directory}/image/libs/commons-cli-1.2.jar" /> - <symlink link="${project.build.directory}/image/libs/commons-beanutils.jar" - resource="${project.build.directory}/image/libs/commons-beanutils-1.8.3.jar" /> - <symlink link="${project.build.directory}/image/libs/commons-collections.jar" - resource="${project.build.directory}/image/libs/commons-collections-3.2.1.jar" /> - <symlink link="${project.build.directory}/image/libs/commons-logging.jar" - resource="${project.build.directory}/image/libs/commons-logging-1.1.3.jar" /> - <symlink link="${project.build.directory}/image/libs/lucene.jar" - resource="${project.build.directory}/image/libs/org.apache.servicemix.bundles.lucene-3.6.0_1.jar" /> - <symlink link="${project.build.directory}/image/libs/gson.jar" - resource="${project.build.directory}/image/libs/gson-2.2.2.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-continuation.jar" - resource="${project.build.directory}/image/libs/jetty-continuation-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-plus.jar" - resource="${project.build.directory}/image/libs/jetty-plus-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-jndi.jar" - resource="${project.build.directory}/image/libs/jetty-jndi-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-http.jar" - resource="${project.build.directory}/image/libs/jetty-http-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-io.jar" - resource="${project.build.directory}/image/libs/jetty-io-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-security.jar" - resource="${project.build.directory}/image/libs/jetty-security-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-server.jar" - resource="${project.build.directory}/image/libs/jetty-server-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-servlet.jar" - resource="${project.build.directory}/image/libs/jetty-servlet-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-util.jar" - resource="${project.build.directory}/image/libs/jetty-util-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-webapp.jar" - resource="${project.build.directory}/image/libs/jetty-webapp-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/jetty-xml.jar" - resource="${project.build.directory}/image/libs/jetty-xml-8.1.5.v20120716.jar" /> - <symlink link="${project.build.directory}/image/libs/javax-servlet.jar" - resource="${project.build.directory}/image/libs/javax.servlet-3.0.0.v201112011016.jar" /> - <symlink link="${project.build.directory}/image/libs/commons-io.jar" - resource="${project.build.directory}/image/libs/commons-io-2.4.jar" /> - <symlink link="${project.build.directory}/image/libs/commons-fileupload.jar" - resource="${project.build.directory}/image/libs/commons-fileupload-1.2.2.jar" /> - <symlink link="${project.build.directory}/image/libs/httpcomponents-core.jar" - resource="${project.build.directory}/image/libs/httpcore-osgi-4.1.2.jar" /> - <symlink link="${project.build.directory}/image/libs/httpcomponents-client.jar" - resource="${project.build.directory}/image/libs/httpclient-osgi-4.1.2.jar" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> </executions> </plugin> </plugins>
--- a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties Sun Aug 25 18:36:47 2013 -0600 +++ b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties Wed Aug 28 13:26:28 2013 -0400 @@ -5,6 +5,6 @@ thermostat-plugin-validator-${project.version}.jar, \ thermostat-launcher-${project.version}.jar, \ thermostat-main-${project.version}.jar, \ - jline2.jar, \ - commons-cli.jar, \ - lucene.jar + jline-${jline.version}.jar, \ + commons-cli-${commons-cli.version}.jar, \ + org.apache.servicemix.bundles.lucene-${lucene.version}.jar
--- a/pom.xml Sun Aug 25 18:36:47 2013 -0600 +++ b/pom.xml Wed Aug 28 13:26:28 2013 -0400 @@ -84,6 +84,7 @@ <commons-logging.version>1.1.3</commons-logging.version> <commons-codec.version>1.7</commons-codec.version> <commons-codec.osgi-version>1.7.0</commons-codec.osgi-version> + <commons-fileupload.version>1.2.2</commons-fileupload.version> <jline.version>2.9</jline.version> <lucene.version>3.6.0_1</lucene.version> @@ -97,7 +98,6 @@ <netty.version>3.2.4.Final</netty.version> <httpcomponents.version>4.1.2</httpcomponents.version> - <fileupload.version>1.2.2</fileupload.version> <gson.version>2.2.2</gson.version> <jetty.version>8.1.5.v20120716</jetty.version> <javax.servlet.version>2.5</javax.servlet.version>
--- a/web/server/pom.xml Sun Aug 25 18:36:47 2013 -0600 +++ b/web/server/pom.xml Wed Aug 28 13:26:28 2013 -0400 @@ -106,7 +106,7 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>${fileupload.version}</version> + <version>${commons-fileupload.version}</version> </dependency> <dependency> <groupId>commons-io</groupId>