You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2009/10/09 12:01:52 UTC
svn commit: r823494 - in /incubator/ace/trunk/core: ./ conf/dev-gateway/
conf/dev-server-filebased/ conf/dev-server-webui/ conf/dev-server/ lib/
Author: marrs
Date: Fri Oct 9 10:01:50 2009
New Revision: 823494
URL: http://svn.apache.org/viewvc?rev=823494&view=rev
Log:
ACE-32 Applied Toni's latest patch, fixed the build so testing and custom targets work again.
Added:
incubator/ace/trunk/core/conf/dev-gateway/platform.properties (with props)
incubator/ace/trunk/core/conf/dev-gateway/platform.setup
incubator/ace/trunk/core/conf/dev-server-filebased/platform.properties (with props)
incubator/ace/trunk/core/conf/dev-server-filebased/platform.setup
incubator/ace/trunk/core/conf/dev-server-webui/platform.properties (with props)
incubator/ace/trunk/core/conf/dev-server-webui/platform.setup
incubator/ace/trunk/core/lib/pax-runner-1.2.1.jar (with props)
Removed:
incubator/ace/trunk/core/lib/pax-runner-1.1.1.jar
incubator/ace/trunk/core/target-dev-client.xml
incubator/ace/trunk/core/target-dev-customlicenseclient.xml
incubator/ace/trunk/core/target-dev-customlicenseserver.xml
incubator/ace/trunk/core/target-dev-gateway-ma.xml
incubator/ace/trunk/core/target-dev-gateway-upnp.xml
incubator/ace/trunk/core/target-dev-gateway.xml
incubator/ace/trunk/core/target-dev-licensedgateway.xml
incubator/ace/trunk/core/target-dev-multigateway.xml
incubator/ace/trunk/core/target-dev-obr.xml
incubator/ace/trunk/core/target-dev-obrdeployed-gateway.xml
incubator/ace/trunk/core/target-dev-obrdeployed-obr.xml
incubator/ace/trunk/core/target-dev-relay.xml
incubator/ace/trunk/core/target-dev-server-filebased.xml
incubator/ace/trunk/core/target-dev-server-upnp.xml
incubator/ace/trunk/core/target-dev-server-webui.xml
incubator/ace/trunk/core/target-dev-server.xml
Modified:
incubator/ace/trunk/core/build.xml
incubator/ace/trunk/core/conf/dev-server/platform.properties
incubator/ace/trunk/core/conf/dev-server/platform.setup
Modified: incubator/ace/trunk/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/build.xml?rev=823494&r1=823493&r2=823494&view=diff
==============================================================================
--- incubator/ace/trunk/core/build.xml (original)
+++ incubator/ace/trunk/core/build.xml Fri Oct 9 10:01:50 2009
@@ -875,27 +875,131 @@
<target name="package" depends="build" description="packages all artifacts">
<mkdir dir="deploy/target" />
+ <antcall target="packageDevelopment">
+ <param name="item" value="dev-server-filebased"/>
+ </antcall>
+ <antcall target="packageDevelopment">
+ <param name="item" value="dev-gateway"/>
+ </antcall>
+ <antcall target="packageDevelopment">
+ <param name="item" value="dev-server-webui"/>
+ </antcall>
+
+ <!-- non standard targets can still provide their own build scripts here -->
<subant target="deploy" inheritall="true">
- <fileset dir="." includes="target-*.xml" />
+ <fileset dir="." includes="target-*.xml" />
</subant>
</target>
+ <target name="packageDevelopment">
+ <property name="workdir" value="deploy/target/${item}" />
+ <mkdir dir="${workdir}" />
+
+ <copy todir="${workdir}/conf">
+ <fileset dir="conf/${item}">
+ <include name="**/*.cfg" />
+ </fileset>
+ </copy>
+
+ <copy todir="${workdir}">
+ <fileset dir="conf/${item}">
+ <include name="platform.*" />
+ </fileset>
+ </copy>
+
+ <replace file="${workdir}/platform.setup" token="@bundles@">
+ <replacevalue>file:../../../deploy/bundle</replacevalue>
+ </replace>
+ <replace file="${workdir}/platform.setup" token="@ext@">
+ <replacevalue>file:../../../ext</replacevalue>
+ </replace>
+ <replace file="${workdir}/platform.setup" token="@lib@">
+ <replacevalue>file:../../../lib</replacevalue>
+ </replace>
+ <replace file="${workdir}/platform.setup" token="@default_platform@">
+ <replacevalue>felix</replacevalue>
+ </replace>
+ <replace file="${workdir}/platform.setup" token="@default_platform_version@">
+ <replacevalue>2.0.0</replacevalue>
+ </replace>
+
+ <property name="cmdline" value="deploy/target/${item}" />
+
+ <echo file="${workdir}/run.sh">java -jar ../../../lib/pax-runner-1.2.1.jar --workingDirectory=. --args=file:platform.setup scan-file:file:platform.properties</echo>
+
+ <echo file="${workdir}/run.bat">java -jar ../../../lib/pax-runner-1.2.1.jar --workingDirectory=. --args=file:platform.setup scan-file:file:platform.properties</echo>
+ </target>
+
+ <target name="cleanTargets">
+ <delete dir="deploy/target"/>
+ </target>
+
+ <target name="packageProduction">
+ <property name="workdir" value="deploy/target/${item}-production" />
+ <mkdir dir="${workdir}" />
+
+ <copy todir="${workdir}/conf">
+ <fileset dir="conf/${item}">
+ <include name="**/*.cfg" />
+ </fileset>
+ </copy>
+
+ <copy todir="${workdir}">
+ <fileset dir="conf/${item}">
+ <include name="platform.*" />
+ </fileset>
+ </copy>
+
+ <replace file="${workdir}/platform.setup" token="@bundles@">
+ <replacevalue>file:deploy/bundle</replacevalue>
+ </replace>
+ <replace file="${workdir}/platform.setup" token="@ext@">
+ <replacevalue>file:ext</replacevalue>
+ </replace>
+ <replace file="${workdir}/platform.setup" token="@lib@">
+ <replacevalue>file:lib</replacevalue>
+ </replace>
+ <replace file="${workdir}/platform.setup" token="@default_platform@">
+ <replacevalue>felix</replacevalue>
+ </replace>
+ <replace file="${workdir}/platform.setup" token="@default_platform_version@">
+ <replacevalue>2.0.0</replacevalue>
+ </replace>
+
+ <property name="cmdline" value="deploy/target/${item}" />
+
+ <java dir="." classname="org.ops4j.pax.runner.Run" fork="true" taskname="paxrunner" timeout="99999" failonerror="true">
+ <arg value="--args=file:${workdir}/platform.setup"/>
+ <arg value="--executor=script"/>
+ <arg value="--workingDirectory=${workdir}"/>
+ <arg value="scan-file:file:${workdir}/platform.properties"/>
+ <classpath>
+ <pathelement location="lib/pax-runner-1.2.1.jar"/>
+ </classpath>
+ </java>
+
+ <delete file="${workdir}/platform.setup" />
+ <delete file="${workdir}/platform.properties" />
+
+ <ziptarget target="${item}-production" />
+ </target>
+
+ <!--
+ Means, package all for production.
+ -->
<target name="zip" depends="package" description="zips all targets">
<mkdir dir="deploy/releases" />
- <ziptarget target="dev-server" />
- <ziptarget target="dev-server-filebased" />
- <ziptarget target="dev-server-webui" />
- <ziptarget target="dev-obr" />
- <ziptarget target="dev-gateway" />
- <ziptarget target="dev-client" />
- <ziptarget target="dev-multigateway" />
- <ziptarget target="dev-relay" />
- <ziptarget target="dev-customlicenseserver" />
- <ziptarget target="dev-customlicenseclient" />
- <ziptarget target="dev-obrdeployed-obr" />
- <ziptarget target="dev-obrdeployed-gateway" />
- <ziptarget target="dev-licensedgateway" />
-
+
+ <antcall target="packageProduction">
+ <param name="item" value="dev-server-filebased"/>
+ </antcall>
+ <antcall target="packageProduction">
+ <param name="item" value="dev-gateway"/>
+ </antcall>
+ <antcall target="packageProduction">
+ <param name="item" value="dev-server-webui"/>
+ </antcall>
+
<zip basedir="deploy/target" includes="dev-tools/**" destfile="deploy/releases/dev-tools.zip" />
</target>
Added: incubator/ace/trunk/core/conf/dev-gateway/platform.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-gateway/platform.properties?rev=823494&view=auto
==============================================================================
--- incubator/ace/trunk/core/conf/dev-gateway/platform.properties (added)
+++ incubator/ace/trunk/core/conf/dev-gateway/platform.properties Fri Oct 9 10:01:50 2009
@@ -0,0 +1,14 @@
+-Dorg.apache.ace.configurator.CONFIG_DIR=conf
+-Dorg.osgi.framework.storage=cache
+-Dorg.apache.felix.http.nio=true
+-Dorg.apache.felix.http.enable=true
+-Dorg.osgi.service.http.port=8080
+-Dorg.apache.felix.https.enable=false
+-Dorg.osgi.service.http.port.secure=8443
+-Dorg.apache.felix.http.debug=false
+-Dorg.apache.felix.https.keystore=/tmp/node1Keystore
+-Dorg.apache.felix.https.keystore.password=secret
+-Dorg.apache.felix.https.keystore.key.password=secret
+-Dorg.apache.felix.https.truststore=/tmp/truststore
+-Dorg.apache.felix.https.truststore.password=secret
+-Dorg.apache.felix.https.clientcertificate=needs
\ No newline at end of file
Propchange: incubator/ace/trunk/core/conf/dev-gateway/platform.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/ace/trunk/core/conf/dev-gateway/platform.setup
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-gateway/platform.setup?rev=823494&view=auto
==============================================================================
--- incubator/ace/trunk/core/conf/dev-gateway/platform.setup (added)
+++ incubator/ace/trunk/core/conf/dev-gateway/platform.setup Fri Oct 9 10:01:50 2009
@@ -0,0 +1,27 @@
+#Exchange with felix,knopflerfish, equinox
+--platform=@default_platform@
+
+#Exchange with any valid version of you selected platform
+--version=@default_platform_version@
+
+@bundles@/org.apache.ace.consolelogger-1.0.0.jar@update
+@bundles@/org.apache.ace.log.listener-1.0.0.jar@update
+@bundles@/org.apache.ace.gateway.log.store-1.0.0.jar@update
+@bundles@/org.apache.ace.gateway.log-1.0.0.jar@update
+@bundles@/org.apache.ace.log-1.0.0.jar@update
+@bundles@/org.apache.ace.configurator-1.0.0.jar@update
+@bundles@/org.apache.ace.scheduler-1.0.0.jar@update
+@bundles@/org.apache.ace.deployment-1.0.0.jar@update
+@bundles@/org.apache.ace.deployment.task-1.0.0.jar@update
+@bundles@/org.apache.ace.identification.property-1.0.0.jar@update
+@bundles@/org.apache.ace.discovery.property-1.0.0.jar@update
+
+@ext@/org.osgi.compendium.jar
+@ext@/osgi.mobile.jar
+@ext@/javax.servlet.jar
+@ext@/org.apache.felix.dependencymanager.jar
+
+@lib@/org.apache.felix.configadmin.jar
+@lib@/log_all-2.0.0.jar
+@lib@/org.apache.felix.eventadmin.jar
+@lib@/org.apache.felix.deploymentadmin-0.9.0-SNAPSHOT.jar
\ No newline at end of file
Added: incubator/ace/trunk/core/conf/dev-server-filebased/platform.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-server-filebased/platform.properties?rev=823494&view=auto
==============================================================================
--- incubator/ace/trunk/core/conf/dev-server-filebased/platform.properties (added)
+++ incubator/ace/trunk/core/conf/dev-server-filebased/platform.properties Fri Oct 9 10:01:50 2009
@@ -0,0 +1,7 @@
+-Dorg.apache.ace.configurator.CONFIG_DIR=conf
+-Dorg.apache.felix.http.nio=true
+-Dorg.apache.felix.http.enable=true
+-Dorg.osgi.service.http.port=8080
+-Dorg.apache.felix.https.enable=false
+-Dorg.osgi.service.http.port.secure=8443
+-Dorg.apache.felix.http.debug=false
\ No newline at end of file
Propchange: incubator/ace/trunk/core/conf/dev-server-filebased/platform.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/ace/trunk/core/conf/dev-server-filebased/platform.setup
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-server-filebased/platform.setup?rev=823494&view=auto
==============================================================================
--- incubator/ace/trunk/core/conf/dev-server-filebased/platform.setup (added)
+++ incubator/ace/trunk/core/conf/dev-server-filebased/platform.setup Fri Oct 9 10:01:50 2009
@@ -0,0 +1,27 @@
+#Exchange with felix,knopflerfish, equinox
+--platform=@default_platform@
+
+#Exchange with any valid version of you selected platform
+--version=@default_platform_version@
+
+@bundles@/org.apache.ace.consolelogger-1.0.0.jar@update
+@bundles@/org.apache.ace.configurator-1.0.0.jar@update
+@bundles@/org.apache.ace.http.listener-1.0.0.jar@update
+@bundles@/org.apache.ace.deployment.servlet-1.0.0.jar@update
+@bundles@/org.apache.ace.deployment.provider.filebased-1.0.0.jar@update
+@bundles@/org.apache.ace.deployment.streamgenerator-1.0.0.jar@update
+
+#@bundles@/org.apache.ace.http.echo.servlet-1.0.0.jar@update
+
+@ext@/org.osgi.compendium.jar
+@ext@/osgi.mobile.jar
+@ext@/javax.servlet.jar
+@ext@/org.apache.felix.dependencymanager.jar
+@ext@/org.apache.felix.dependencymanager.shell.jar
+
+@lib@/org.apache.felix.configadmin.jar
+@lib@/org.apache.felix.eventadmin.jar
+@lib@/log_all-2.0.0.jar
+@lib@/http.jetty.jar
+@lib@/useradmin_all-2.0.0.jar
+@lib@/org.apache.felix.prefs.jar
\ No newline at end of file
Added: incubator/ace/trunk/core/conf/dev-server-webui/platform.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-server-webui/platform.properties?rev=823494&view=auto
==============================================================================
--- incubator/ace/trunk/core/conf/dev-server-webui/platform.properties (added)
+++ incubator/ace/trunk/core/conf/dev-server-webui/platform.properties Fri Oct 9 10:01:50 2009
@@ -0,0 +1,14 @@
+-Dorg.apache.ace.configurator.CONFIG_DIR=conf
+-Dorg.ops4j.pax.web.session.timeout=1
+-Dorg.apache.felix.http.nio=true
+-Dorg.apache.felix.http.enable=true
+-Dorg.osgi.service.http.port=8080
+-Dorg.apache.felix.https.enable=false
+-Dorg.osgi.service.http.port.secure=8443
+-Dorg.apache.felix.http.debug=false
+-Dorg.apache.felix.https.keystore=/tmp/node1Keystore
+-Dorg.apache.felix.https.keystore.password=secret
+-Dorg.apache.felix.https.keystore.key.password=secret
+-Dorg.apache.felix.https.truststore=/tmp/truststore
+-Dorg.apache.felix.https.truststore.password=secret
+-Dorg.apache.felix.https.clientcertificate=needs
\ No newline at end of file
Propchange: incubator/ace/trunk/core/conf/dev-server-webui/platform.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/ace/trunk/core/conf/dev-server-webui/platform.setup
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-server-webui/platform.setup?rev=823494&view=auto
==============================================================================
--- incubator/ace/trunk/core/conf/dev-server-webui/platform.setup (added)
+++ incubator/ace/trunk/core/conf/dev-server-webui/platform.setup Fri Oct 9 10:01:50 2009
@@ -0,0 +1,43 @@
+#Exchange with felix,knopflerfish, equinox
+--platform=@default_platform@
+
+#Exchange with any valid version of you selected platform
+--version=@default_platform_version@
+
+# Provisioning
+@bundles@/org.apache.ace.consolelogger-1.0.0.jar@update
+@bundles@/org.apache.ace.configurator-1.0.0.jar@update
+@bundles@/org.apache.ace.configurator.useradmin.task-1.0.0.jar@update
+@bundles@/org.apache.ace.resourceprocessor.useradmin-1.0.0.jar@update
+@bundles@/org.apache.ace.http.listener-1.0.0.jar@update
+@bundles@/org.apache.ace.deployment.servlet-1.0.0.jar@update
+@bundles@/org.apache.ace.deployment.provider.repositorybased-1.0.0.jar@update
+@bundles@/org.apache.ace.deployment.streamgenerator-1.0.0.jar@update
+@bundles@/org.apache.ace.discovery.property-1.0.0.jar@update
+@bundles@/org.apache.ace.server.log.store-1.0.0.jar@update
+@bundles@/org.apache.ace.server.log-1.0.0.jar@update
+@bundles@/org.apache.ace.scheduler-1.0.0.jar@update
+@bundles@/org.apache.ace.repository-1.0.0.jar@update
+@bundles@/org.apache.ace.repository.servlet-1.0.0.jar@update
+@bundles@/org.apache.ace.client.repository-1.0.0.jar@update
+@bundles@/org.apache.ace.client.repository.helper.base-1.0.0.jar@update
+@bundles@/org.apache.ace.client.repository.helper.bundle-1.0.0.jar@update
+@bundles@/org.apache.ace.obr.servlet-1.0.0.jar@update
+@bundles@/org.apache.ace.obr.storage-1.0.0.jar@update
+@bundles@/org.apache.ace.obr.metadata-1.0.0.jar@update
+@bundles@/org.apache.ace.webui-1.0.0.jar@update
+
+@ext@/org.osgi.compendium.jar
+@ext@/osgi.mobile.jar
+@ext@/javax.servlet.jar
+@ext@/org.apache.felix.dependencymanager.jar
+@ext@/org.apache.felix.dependencymanager.shell.jar
+
+@lib@/org.apache.ace.xstream-1.3.jar
+@lib@/org.apache.felix.configadmin.jar
+@lib@/org.apache.felix.eventadmin.jar
+@lib@/useradmin_all-2.0.0.jar
+@lib@/log_all-2.0.0.jar
+@lib@/org.apache.felix.prefs.jar
+@lib@/pax-web-service-0.6.0.jar
+@lib@/pax-web-extender-war-0.7.0-SNAPSHOT.jar
Modified: incubator/ace/trunk/core/conf/dev-server/platform.properties
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-server/platform.properties?rev=823494&r1=823493&r2=823494&view=diff
==============================================================================
--- incubator/ace/trunk/core/conf/dev-server/platform.properties (original)
+++ incubator/ace/trunk/core/conf/dev-server/platform.properties Fri Oct 9 10:01:50 2009
@@ -1,3 +1,4 @@
+-Dorg.apache.ace.configurator.CONFIG_DIR=conf
-Dorg.osgi.framework.storage=cache
-Dorg.apache.felix.http.nio=true
-Dorg.apache.felix.http.enable=true
Modified: incubator/ace/trunk/core/conf/dev-server/platform.setup
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-server/platform.setup?rev=823494&r1=823493&r2=823494&view=diff
==============================================================================
--- incubator/ace/trunk/core/conf/dev-server/platform.setup (original)
+++ incubator/ace/trunk/core/conf/dev-server/platform.setup Fri Oct 9 10:01:50 2009
@@ -3,4 +3,44 @@
#--platform=equinox
#Exchange with any valid version of you selected platform
---version=1.8.1
\ No newline at end of file
+#--version=1.8.1
+
+#List bundles here. In future, try using maven urls (once we push to maven)
+file:@bundles@/org.apache.ace.consolelogger-1.0.0.jar
+file:@bundles@/org.apache.ace.configurator-1.0.0.jar
+file:@bundles@/org.apache.ace.configurator.useradmin.task-1.0.0.jar
+file:@bundles@/org.apache.ace.resourceprocessor.useradmin-1.0.0.jar
+file:@bundles@/org.apache.ace.http.listener-1.0.0.jar
+file:@bundles@/org.apache.ace.deployment.servlet-1.0.0.jar
+file:@bundles@/org.apache.ace.deployment.provider.repositorybased-1.0.0.jar
+file:@bundles@/org.apache.ace.deployment.streamgenerator-1.0.0.jar
+file:@bundles@/org.apache.ace.discovery.property-1.0.0.jar
+file:@bundles@/org.apache.ace.server.log.store-1.0.0.jar
+file:@bundles@/org.apache.ace.server.log-1.0.0.jar
+file:@bundles@/org.apache.ace.scheduler-1.0.0.jar
+file:@bundles@/org.apache.ace.repository-1.0.0.jar
+file:@bundles@/org.apache.ace.repository.servlet-1.0.0.jar
+#file:@bundles@/org.apache.ace.client.repository.stateful-1.0.0.jar
+file:@bundles@/org.apache.ace.client.repository-1.0.0.jar
+file:@bundles@/org.apache.ace.client.repository.helper.base-1.0.0.jar
+file:@bundles@/org.apache.ace.client.repository.helper.bundle-1.0.0.jar
+#file:@bundles@/org.apache.ace.activation.store-1.0.0.jar
+#file:@bundles@/org.apache.ace.activationinfo.store-1.0.0.jar
+#file:@bundles@/org.apache.ace.activation.matcher-1.0.0.jar
+#file:@bundles@/org.apache.ace.activation.servlet-1.0.0.jar
+#file:@bundles@/org.apache.ace.activation.service-1.0.0.jar
+#file:@bundles@/org.apache.ace.client.repository.helper.license-1.0.0.jar
+
+file:@ext@/org.osgi.compendium.jar
+file:@ext@/osgi.mobile.jar
+file:@ext@/javax.servlet.jar
+file:@ext@/org.apache.felix.dependencymanager.jar
+file:@ext@/org.apache.felix.dependencymanager.shell.jar
+
+file:@lib@/org.apache.ace.xstream-1.3.jar
+file:@lib@/org.apache.felix.configadmin.jar
+file:@lib@/org.apache.felix.eventadmin.jar
+file:@lib@/log_all-2.0.0.jar
+file:@lib@/http.jetty.jar
+file:@lib@/useradmin_all-2.0.0.jar
+file:@lib@/org.apache.felix.prefs.jar
\ No newline at end of file
Added: incubator/ace/trunk/core/lib/pax-runner-1.2.1.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/lib/pax-runner-1.2.1.jar?rev=823494&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/ace/trunk/core/lib/pax-runner-1.2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream