ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1556760 [1/3] - in /ace/trunk: build/ cnf/localrepo/ cnf/localrepo/org.apache.felix.deployment.rp.autoconf/ cnf/localrepo/org.apache.felix.deploymentadmin/ org.apache.ace.agent/ org.apache.ace.deployment.rp.autoconf/
Date Thu, 09 Jan 2014 08:34:10 GMT
Author: marrs
Date: Thu Jan  9 08:34:09 2014
New Revision: 1556760

URL: http://svn.apache.org/r1556760
Log:
Updated deploymentadmin and autoconf to the latest Felix releases. Small updates in build
script for that.

Added:
    ace/trunk/cnf/localrepo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.5.jar
  (with props)
    ace/trunk/cnf/localrepo/org.apache.felix.deploymentadmin/org.apache.felix.deploymentadmin-0.9.5.jar
  (with props)
Removed:
    ace/trunk/cnf/localrepo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.4.jar
    ace/trunk/cnf/localrepo/org.apache.felix.deploymentadmin/org.apache.felix.deploymentadmin-0.9.4.jar
Modified:
    ace/trunk/build/build.xml
    ace/trunk/cnf/localrepo/index.xml
    ace/trunk/org.apache.ace.agent/bnd.bnd
    ace/trunk/org.apache.ace.deployment.rp.autoconf/bnd.bnd

Modified: ace/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/ace/trunk/build/build.xml?rev=1556760&r1=1556759&r2=1556760&view=diff
==============================================================================
--- ace/trunk/build/build.xml (original)
+++ ace/trunk/build/build.xml Thu Jan  9 08:34:09 2014
@@ -102,8 +102,8 @@
 		<mkdir dir="${target.target.dir}" />
 
 		<resources id="devserver-store">
-			<file file="../org.apache.ace.deployment.rp.autoconf/generated/org.apache.ace.deployment.rp.autoconf.jar"
/>
-			<file file="../org.apache.ace.launcher/generated/org.apache.ace.launcher.jar" />
+			<file file="../cnf/localrepo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.5.jar"
/>
+			<file file="../org.apache.ace.agent.launcher/generated/org.apache.ace.agent.launcher.felix.jar"
/>
 		</resources>
 
 		<!-- copy the configuration files -->
@@ -124,12 +124,12 @@
 		<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"/>
+		<move file="${target.server.dir}/store/org.apache.ace.agent.launcher.felix.jar" toFile="${target.server.dir}/store/ace-launcher.jar"/>
 
 		<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"/>
+		<move file="${target.server-allinone.dir}/store/org.apache.ace.agent.launcher.felix.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"
/>



Mime
View raw message