Author: marrs
Date: Tue Apr 16 12:17:29 2013
New Revision: 1468388
URL: http://svn.apache.org/r1468388
Log:
Fixed the Ant task that creates binary packages.
Modified:
ace/trunk/build/bin-build.xml
ace/trunk/run-client/client.bndrun
ace/trunk/run-obr/build.xml
ace/trunk/run-obr/obr.bndrun
ace/trunk/run-server-allinone/server-allinone.bndrun
ace/trunk/run-server/server.bndrun
ace/trunk/run-target/bnd.bnd
ace/trunk/run-target/target.bndrun
Modified: ace/trunk/build/bin-build.xml
URL:
http://svn.apache.org/viewvc/ace/trunk/build/bin-build.xml?rev=1468388&r1=1468387&r2=1468388&view=diff
==============================================================================
--- ace/trunk/build/bin-build.xml (original)
+++ ace/trunk/build/bin-build.xml Tue Apr 16 12:17:29 2013
@@ -1,139 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="bin-build" default="init">
+<project name="bin-build" default="package">
+ <import file="../cnf/build.xml" />
- <property name="version" value="0.8.1-SNAPSHOT" />
+ <property name="version" value="1.0.0" />
- <property name="target.base.dir" value="generated" />
- <property name="target.server.dir"
value="${target.base.dir}/ace-devserver" />
- <property name="target.target.dir"
value="${target.base.dir}/ace-dev-target" />
- <property name="server.zipball"
value="${target.base.dir}/ace-devserver-${version}.zip" />
- <property name="server.tarball"
value="${target.base.dir}/ace-devserver-${version}.tar.gz" />
+ <property name="target.base.dir"
value="generated/apache-ace-${version}" />
+ <property name="target.server-allinone.dir"
value="${target.base.dir}/server-allinone" />
+ <property name="target.server.dir" value="${target.base.dir}/server" />
+ <property name="target.client.dir" value="${target.base.dir}/client" />
+ <property name="target.obr.dir" value="${target.base.dir}/obr" />
+ <property name="target.target.dir" value="${target.base.dir}/target" />
+ <property name="server.zipball"
value="generated/apache-ace-${version}.zip" />
+ <property name="server.tarball"
value="generated/apache-ace-${version}.tar.gz" />
- <target name="init" unless="initialized">
+ <target name="package" description="Packages ACE into a binary
distribution." depends="init">
<mkdir dir="${target.server.dir}" />
+ <mkdir dir="${target.server-allinone.dir}" />
+ <mkdir dir="${target.client.dir}" />
+ <mkdir dir="${target.obr.dir}" />
<mkdir dir="${target.target.dir}" />
- <property name="init" value="set" />
- </target>
-
- <target name="clean">
- <delete dir="${target.server.dir}" />
- <delete dir="${target.target.dir}" />
- <delete file="${server.tarball}" />
- <delete file="${server.zipball}" />
- </target>
-
- <target name="package" description="Packages ACE into a binary
distribution." depends="package-server" />
-
- <target name="package-server">
- <resources id="required-bundles">
- <url
url="http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.configadmin/org.apache.felix.configadmin-1.2.8.jar";
/>
- <url
url="http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.0.jar";
/>
- <url
url="http://bundles.bndtools.org.s3.amazonaws.com/osgi.cmpn/osgi.cmpn-4.2.1.jar";
/>
- <file
file="../cnf/repo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar"
/>
- <file
file="../cnf/repo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-3.0.1.jar"
/>
- <file
file="../cnf/repo/org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.2.14.jar"
/>
- <file
file="../cnf/repo/org.apache.felix.prefs/org.apache.felix.prefs-1.0.4.jar" />
- </resources>
-
- <resources id="ace-bundles">
- <url
url="http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar";
/>
- <url
url="http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.command/org.apache.felix.gogo.command-0.12.0.jar";
/>
- <url
url="http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.10.0.jar";
/>
- <file
file="../cnf/repo/org.apache.felix.useradmin/org.apache.felix.useradmin-1.0.2.jar"
/>
- <file
file="../cnf/repo/org.apache.felix.useradmin.filestore/org.apache.felix.useradmin.filestore-1.0.1.jar"
/>
- <file
file="../cnf/repo/org.apache.felix.log/org.apache.felix.log-1.0.1.jar" />
- <file
file="../cnf/repo/com.vaadin/com.vaadin-6.8.4.jar" />
- <file
file="../org.apache.ace.configurator.useradmin.task/generated/org.apache.ace.configurator.useradmin.task.jar"
/>
-
- <file
file="../org.apache.ace.target.mgmt.ui/generated/org.apache.ace.target.mgmt.ui.jar"
/>
- <file
file="../org.apache.ace.log.servlet/generated/org.apache.ace.log.servlet.jar" />
- <file
file="../org.apache.ace.deployment.streamgenerator/generated/org.apache.ace.deployment.streamgenerator.jar"
/>
- <file
file="../org.apache.ace.authentication.api/generated/org.apache.ace.authentication.api.jar"
/>
- <file
file="../org.apache.ace.client.repository.impl/generated/org.apache.ace.client.repository.impl.jar"
/>
- <file
file="../org.apache.ace.tageditor/generated/org.apache.ace.tageditor.jar" />
- <file
file="../org.apache.ace.client.repository.helper.bundle/generated/org.apache.ace.client.repository.helper.bundle.jar"
/>
- <file
file="../org.apache.ace.discovery.api/generated/org.apache.ace.discovery.api.jar"
/>
- <file
file="../org.apache.ace.client.rest/generated/org.apache.ace.client.rest.jar" />
- <file
file="../org.apache.ace.range.api/generated/org.apache.ace.range.api.jar" />
- <file
file="../org.apache.ace.log/generated/org.apache.ace.log.jar" />
- <file
file="../org.apache.ace.authenticationprocessor.password/generated/org.apache.ace.authenticationprocessor.password.jar"
/>
- <file
file="../org.apache.ace.webui.vaadin/generated/org.apache.ace.webui.vaadin.jar"
/>
- <file
file="../org.apache.ace.resourceprocessor.useradmin/generated/org.apache.ace.resourceprocessor.useradmin.jar"
/>
- <file
file="../org.apache.ace.server.log.ui/generated/org.apache.ace.server.log.ui.jar"
/>
- <file
file="../org.apache.ace.deployment.verifier.ui/generated/org.apache.ace.deployment.verifier.ui.jar"
/>
- <file
file="../org.apache.ace.repository.api/generated/org.apache.ace.repository.api.jar"
/>
- <file
file="../org.apache.ace.server.log.store/generated/org.apache.ace.server.log.store.filelogstore.jar"
/>
- <file
file="../org.apache.ace.server.log.store/generated/org.apache.ace.server.log.store.api.jar"
/>
- <file
file="../org.apache.ace.client.repository.api/generated/org.apache.ace.client.repository.api.jar"
/>
- <file
file="../org.apache.ace.repository.servlet/generated/org.apache.ace.repository.servlet.jar"
/>
- <file
file="../org.apache.ace.obr.storage/generated/org.apache.ace.obr.storage.jar" />
- <file
file="../org.apache.ace.client.repository.helper.configuration/generated/org.apache.ace.client.repository.helper.configuration.jar"
/>
- <file
file="../org.apache.ace.httplistener/generated/org.apache.ace.httplistener.jar"
/>
- <file
file="../org.apache.ace.obr.servlet/generated/org.apache.ace.obr.servlet.jar" />
- <file
file="../org.apache.ace.nodelauncher.api/generated/org.apache.ace.nodelauncher.api.jar"
/>
- <file
file="../org.apache.ace.deployment.provider.api/generated/org.apache.ace.deployment.provider.api.jar"
/>
- <file
file="../org.apache.ace.deployment.servlet/generated/org.apache.ace.deployment.servlet.jar"
/>
- <file
file="../org.apache.ace.scheduler/generated/org.apache.ace.scheduler.jar" />
- <file
file="../org.apache.ace.obr.metadata/generated/org.apache.ace.obr.metadata.jar"
/>
- <file
file="../org.apache.ace.configurator/generated/org.apache.ace.configurator.jar"
/>
- <file
file="../org.apache.ace.connectionfactory/generated/org.apache.ace.connectionfactory.jar"
/>
- <file
file="../org.apache.ace.authentication/generated/org.apache.ace.authentication.jar"
/>
- <file
file="../org.apache.ace.nodelauncher.amazon/generated/org.apache.ace.nodelauncher.amazon.jar"
/>
- <file
file="../org.apache.ace.configurator.serveruseradmin/generated/org.apache.ace.configurator.serveruseradmin.jar"
/>
- <file
file="../org.apache.ace.repository.impl/generated/org.apache.ace.repository.impl.jar"
/>
- <file
file="../org.apache.ace.deployment.provider.repositorybased/generated/org.apache.ace.deployment.provider.repositorybased.jar"
/>
- <file
file="../org.apache.ace.deployment.verifier/generated/org.apache.ace.deployment.verifier.jar"
/>
- <file
file="../org.apache.ace.client.repository.helper.base/generated/org.apache.ace.client.repository.helper.base.jar"
/>
- <file
file="../org.apache.ace.authenticationprocessor.basicauth/generated/org.apache.ace.authenticationprocessor.basicauth.jar"
/>
- <file
file="../org.apache.ace.nodelauncher.ui/generated/org.apache.ace.nodelauncher.ui.jar"
/>
- <file
file="../org.apache.ace.useradmin.ui/generated/org.apache.ace.useradmin.ui.jar"
/>
- </resources>
-
<resources id="devserver-store">
- <file
file="../cnf/repo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.1.jar"
/>
+ <file
file="../cnf/localrepo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.1.jar"
/>
<file
file="../org.apache.ace.launcher/generated/org.apache.ace.launcher.jar" />
</resources>
- <!-- create right directory structure -->
- <mkdir dir="${target.server.dir}/required-bundles" />
- <mkdir dir="${target.server.dir}/ace-bundles" />
- <mkdir dir="${target.server.dir}/conf" />
- <mkdir dir="${target.server.dir}/store" />
-
- <!-- copy the required bundles -->
- <copy todir="${target.server.dir}/required-bundles"
flatten="true">
- <resources refid="required-bundles" />
- </copy>
-
- <!-- copy the ACE bundles -->
- <copy todir="${target.server.dir}/ace-bundles" flatten="true">
- <resources refid="ace-bundles" />
- </copy>
-
<!-- copy the configuration files -->
+ <copy todir="${target.server-allinone.dir}/conf">
+ <fileset dir="../run-server-allinone/conf" />
+ </copy>
<copy todir="${target.server.dir}/conf">
<fileset dir="../run-server/conf" />
</copy>
-
+ <copy todir="${target.client.dir}/conf">
+ <fileset dir="../run-client/conf" />
+ </copy>
+ <copy todir="${target.obr.dir}/conf">
+ <fileset dir="../run-obr/conf" />
+ </copy>
+
<!-- add jar files to store directory -->
<copy todir="${target.server.dir}/store" flatten="true">
<resources refid="devserver-store" />
</copy>
-
<move
file="${target.server.dir}/store/org.apache.ace.launcher.jar"
toFile="${target.server.dir}/store/ace-launcher.jar"/>
- <!-- copy the additional resources -->
- <copy todir="${target.server.dir}">
- <fileset dir="resources" />
- </copy>
- <copy todir="${target.server.dir}">
- <fileset dir="lib" />
- </copy>
- <copy file="NOTICE" todir="${target.server.dir}" />
- <copy file="LICENSE" todir="${target.server.dir}" />
- <!-- ensure all scripts are executable by default -->
- <chmod perm="755" dir="${target.server.dir}" includes="*.sh" />
+ <copy todir="${target.server-allinone.dir}/store"
flatten="true">
+ <resources refid="devserver-store" />
+ </copy>
+ <move
file="${target.server-allinone.dir}/store/org.apache.ace.launcher.jar"
toFile="${target.server-allinone.dir}/store/ace-launcher.jar"/>
+
+ <!-- create the executable jars -->
+ <bndpackage
runfile="../run-server-allinone/server-allinone.bndrun"
output="${target.server-allinone.dir}/server-allinone.jar" />
+ <bndpackage runfile="../run-server/server.bndrun"
output="${target.server.dir}/server.jar" />
+ <bndpackage runfile="../run-client/client.bndrun"
output="${target.client.dir}/client.jar" />
+ <bndpackage runfile="../run-obr/obr.bndrun"
output="${target.obr.dir}/obr.jar" />
+ <bndpackage runfile="../run-target/target.bndrun"
output="${target.target.dir}/target.jar" />
<!-- create one giant TAR.GZ-file with everything in it -->
<tar destfile="${server.tarball}" compression="gzip">
Modified: ace/trunk/run-client/client.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-client/client.bndrun?rev=1468388&r1=1468387&r2=1468388&view=diff
==============================================================================
--- ace/trunk/run-client/client.bndrun (original)
+++ ace/trunk/run-client/client.bndrun Tue Apr 16 12:17:29 2013
@@ -59,4 +59,7 @@
org.apache.ace.client.port=8081,\
org.apache.ace.obr.port=8082,\
org.osgi.service.http.port=8081,\
- org.apache.felix.log.maxSize=1000
\ No newline at end of file
+ org.apache.felix.log.maxSize=1000,\
+ launch.keep=true,\
+ launch.storage.dir=bundle-cache
+
\ No newline at end of file
Modified: ace/trunk/run-obr/build.xml
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/build.xml?rev=1468388&r1=1468387&r2=1468388&view=diff
==============================================================================
--- ace/trunk/run-obr/build.xml (original)
+++ ace/trunk/run-obr/build.xml Tue Apr 16 12:17:29 2013
@@ -4,4 +4,5 @@
<!-- -->
<import file="../cnf/build.xml" />
+
</project>
Modified: ace/trunk/run-obr/obr.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-obr/obr.bndrun?rev=1468388&r1=1468387&r2=1468388&view=diff
==============================================================================
--- ace/trunk/run-obr/obr.bndrun (original)
+++ ace/trunk/run-obr/obr.bndrun Tue Apr 16 12:17:29 2013
@@ -24,4 +24,6 @@
org.apache.felix.eventadmin.Timeout=0,\
org.apache.ace.obr.port=8082,\
org.osgi.service.http.port=8082,\
- org.apache.felix.log.maxSize=1000
\ No newline at end of file
+ org.apache.felix.log.maxSize=1000,\
+ launch.keep=true,\
+ launch.storage.dir=bundle-cache
Modified: ace/trunk/run-server-allinone/server-allinone.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/server-allinone.bndrun?rev=1468388&r1=1468387&r2=1468388&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/server-allinone.bndrun (original)
+++ ace/trunk/run-server-allinone/server-allinone.bndrun Tue Apr 16 12:17:29
2013
@@ -68,4 +68,6 @@
org.apache.felix.eventadmin.Timeout=0,\
org.apache.ace.server.port=8080,\
org.osgi.service.http.port=8080,\
- org.apache.felix.log.maxSize=1000
\ No newline at end of file
+ org.apache.felix.log.maxSize=1000,\
+ launch.keep=true,\
+ launch.storage.dir=bundle-cache
Modified: ace/trunk/run-server/server.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-server/server.bndrun?rev=1468388&r1=1468387&r2=1468388&view=diff
==============================================================================
--- ace/trunk/run-server/server.bndrun (original)
+++ ace/trunk/run-server/server.bndrun Tue Apr 16 12:17:29 2013
@@ -43,4 +43,7 @@
org.apache.felix.eventadmin.Timeout=0,\
org.apache.ace.server.port=8080,\
org.osgi.service.http.port=8080,\
- org.apache.felix.log.maxSize=1000
\ No newline at end of file
+ org.apache.felix.log.maxSize=1000,\
+ launch.keep=true,\
+ launch.storage.dir=bundle-cache
+
\ No newline at end of file
Modified: ace/trunk/run-target/bnd.bnd
URL:
http://svn.apache.org/viewvc/ace/trunk/run-target/bnd.bnd?rev=1468388&r1=1468387&r2=1468388&view=diff
==============================================================================
--- ace/trunk/run-target/bnd.bnd (original)
+++ ace/trunk/run-target/bnd.bnd Tue Apr 16 12:17:29 2013
@@ -0,0 +1 @@
+-nobundles
Modified: ace/trunk/run-target/target.bndrun
URL:
http://svn.apache.org/viewvc/ace/trunk/run-target/target.bndrun?rev=1468388&r1=1468387&r2=1468388&view=diff
==============================================================================
--- ace/trunk/run-target/target.bndrun (original)
+++ ace/trunk/run-target/target.bndrun Tue Apr 16 12:17:29 2013
@@ -5,6 +5,9 @@
org.apache.felix.gogo.shell,\
org.apache.ace.managementagent;version=latest
-runvm: -Dlog=true -Didentification=target-1 -Ddiscovery=http://localhost:8080
--runproperties: org.apache.felix.log.storeDebug=true,\
+-runproperties: \
+ org.apache.felix.log.storeDebug=true,\
org.apache.felix.eventadmin.Timeout=0,\
- org.apache.felix.log.maxSize=1000
+ org.apache.felix.log.maxSize=1000,\
+ launch.keep=true,\
+ launch.storage.dir=bundle-cache
