Mercurial > hg > release > thermostat-0.7
changeset 729:e80304692688
Remove jetty/javax.servlet packages from osgi-exports
Again a continuation of earlier patches. We are getting there :) I've changed
this to version-less jar names in the code in order to make it easier for
downstream consumers to use whatever jar filename they want and then symlink to
it from $THERMOSTAT_HOME/libs This keeps patches small for distributions
consuming thermostat.
Reviewed-by: neugens
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-October/003855.html
| author | Severin Gehwolf <sgehwolf@redhat.com> |
|---|---|
| date | Tue, 23 Oct 2012 18:07:05 +0200 |
| parents | 1931cf09c5bc |
| children | 8b73b939568c |
| files | distribution/config/commands/service.properties distribution/config/osgi-export.properties distribution/pom.xml |
| diffstat | 3 files changed, 33 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/distribution/config/commands/service.properties Tue Oct 23 16:54:51 2012 -0400 +++ b/distribution/config/commands/service.properties Tue Oct 23 18:07:05 2012 +0200 @@ -1,5 +1,4 @@ bundles = thermostat-agent-core-@project.version@.jar, \ - gson-2.2.2.jar, \ thermostat-web-common-@project.version@.jar, \ thermostat-web-server-@project.version@.jar, \ thermostat-web-client-@project.version@.jar, \ @@ -9,15 +8,17 @@ thermostat-agent-command-@project.version@.jar, \ thermostat-agent-cli-@project.version@.jar, \ thermostat-thread-collector-@project.version@.jar, \ - jetty-continuation-8.1.5.v20120716.jar, \ - jetty-http-8.1.5.v20120716.jar, \ - jetty-io-8.1.5.v20120716.jar, \ - jetty-security-8.1.5.v20120716.jar, \ - jetty-server-8.1.5.v20120716.jar, \ - jetty-servlet-8.1.5.v20120716.jar, \ - jetty-util-8.1.5.v20120716.jar, \ - jetty-webapp-8.1.5.v20120716.jar, \ - jetty-xml-8.1.5.v20120716.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, \ + javax-servlet.jar, \ netty.jar description = starts and stops the thermostat storage and agent
--- a/distribution/config/osgi-export.properties Tue Oct 23 16:54:51 2012 -0400 +++ b/distribution/config/osgi-export.properties Tue Oct 23 18:07:05 2012 +0200 @@ -59,18 +59,3 @@ sun.jvmstat sun.jvmstat.monitor sun.jvmstat.monitor.event - -org.eclipse.jetty.server=8.1.0 -org.eclipse.jetty.server.handler=8.1.0 -org.eclipse.jetty.webapp=8.1.0 -org.eclipse.jetty.servlet=8.1.0 -org.eclipse.jetty.servlet.descriptor=8.1.0 -org.eclipse.jetty.continuation=8.1.0 -org.eclipse.jetty.http=8.1.0 -org.eclipse.jetty.io=8.1.0 -org.eclipse.jetty.security=8.1.0 -org.eclipse.jetty.util=8.1.0 -org.eclipse.jetty.xml=8.1.0 -javax.servlet=2.6.0 -javax.servlet.descriptor=2.6.0 -javax.servlet.http=2.6.0
--- a/distribution/pom.xml Tue Oct 23 16:54:51 2012 -0400 +++ b/distribution/pom.xml Tue Oct 23 18:07:05 2012 +0200 @@ -209,6 +209,28 @@ resource="${project.build.directory}/libs/com.springsource.org.apache.commons.logging-1.1.1.jar" /> <symlink link="${project.build.directory}/libs/lucene.jar" resource="${project.build.directory}/libs/org.apache.servicemix.bundles.lucene-3.6.0_1.jar" /> + <symlink link="${project.build.directory}/libs/gson.jar" + resource="${project.build.directory}/libs/gson-2.2.2.jar" /> + <symlink link="${project.build.directory}/libs/jetty-continuation.jar" + resource="${project.build.directory}/libs/jetty-continuation-8.1.5.v20120716.jar" /> + <symlink link="${project.build.directory}/libs/jetty-http.jar" + resource="${project.build.directory}/libs/jetty-http-8.1.5.v20120716.jar" /> + <symlink link="${project.build.directory}/libs/jetty-io.jar" + resource="${project.build.directory}/libs/jetty-io-8.1.5.v20120716.jar" /> + <symlink link="${project.build.directory}/libs/jetty-security.jar" + resource="${project.build.directory}/libs/jetty-security-8.1.5.v20120716.jar" /> + <symlink link="${project.build.directory}/libs/jetty-server.jar" + resource="${project.build.directory}/libs/jetty-server-8.1.5.v20120716.jar" /> + <symlink link="${project.build.directory}/libs/jetty-servlet.jar" + resource="${project.build.directory}/libs/jetty-servlet-8.1.5.v20120716.jar" /> + <symlink link="${project.build.directory}/libs/jetty-util.jar" + resource="${project.build.directory}/libs/jetty-util-8.1.5.v20120716.jar" /> + <symlink link="${project.build.directory}/libs/jetty-webapp.jar" + resource="${project.build.directory}/libs/jetty-webapp-8.1.5.v20120716.jar" /> + <symlink link="${project.build.directory}/libs/jetty-xml.jar" + resource="${project.build.directory}/libs/jetty-xml-8.1.5.v20120716.jar" /> + <symlink link="${project.build.directory}/libs/javax-servlet.jar" + resource="${project.build.directory}/libs/javax.servlet-3.0.0.v201112011016.jar" /> </target> </configuration> <goals>