You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by pa...@apache.org on 2012/08/07 16:03:56 UTC

svn commit: r1370268 - in /ace/sandbox/marrs: build/bin-build.xml cnf/repo/org.apache.felix.deployment.rp.autoconf/ cnf/repo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.1.jar cnf/repo/repository.xml

Author: paulb
Date: Tue Aug  7 14:03:56 2012
New Revision: 1370268

URL: http://svn.apache.org/viewvc?rev=1370268&view=rev
Log:
Added autoconf and ace-launcher.jar to dev-server/store directory.

Added:
    ace/sandbox/marrs/cnf/repo/org.apache.felix.deployment.rp.autoconf/
    ace/sandbox/marrs/cnf/repo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.1.jar   (with props)
Modified:
    ace/sandbox/marrs/build/bin-build.xml
    ace/sandbox/marrs/cnf/repo/repository.xml

Modified: ace/sandbox/marrs/build/bin-build.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/build/bin-build.xml?rev=1370268&r1=1370267&r2=1370268&view=diff
==============================================================================
--- ace/sandbox/marrs/build/bin-build.xml (original)
+++ ace/sandbox/marrs/build/bin-build.xml Tue Aug  7 14:03:56 2012
@@ -85,6 +85,11 @@
 			<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" />
 		</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="../org.apache.ace.launcher/generated/org.apache.ace.launcher.jar" />
+		</resources>
 
 		<!-- create right directory structure -->
 		<mkdir dir="${target.server.dir}/required-bundles" />
@@ -106,6 +111,13 @@
 		<copy todir="${target.server.dir}/conf">
 			<fileset dir="../run-server/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}">

Added: ace/sandbox/marrs/cnf/repo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.1.jar
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/repo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.1.jar?rev=1370268&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/sandbox/marrs/cnf/repo/org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ace/sandbox/marrs/cnf/repo/repository.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/repo/repository.xml?rev=1370268&r1=1370267&r2=1370268&view=diff
==============================================================================
--- ace/sandbox/marrs/cnf/repo/repository.xml (original)
+++ ace/sandbox/marrs/cnf/repo/repository.xml Tue Aug  7 14:03:56 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <?xml-stylesheet type='text/xsl' href='http://www.osgi.org/www/obr2html.xsl'?>
 
-<repository lastmodified='20120807151443.802' name='Local Repository'>
+<repository lastmodified='20120807155010.240' name='Local Repository'>
   <resource id='bcprov/1.46.0' presentationname='bcprov' symbolicname='bcprov' uri='bcprov/bcprov-1.46.0.jar' version='1.46.0'>
     <size>
       1878175
@@ -1636,6 +1636,60 @@
       Import package org.osgi.framework ;version=[1.3.0,2.0.0)
     </require>
   </resource>
+  <resource id='org.apache.felix.deployment.rp.autoconf/0.1.1.SNAPSHOT' presentationname='Apache Felix AutoConf Resource Processor' symbolicname='org.apache.felix.deployment.rp.autoconf' uri='org.apache.felix.deployment.rp.autoconf/org.apache.felix.deployment.rp.autoconf-0.1.1.jar' version='0.1.1.SNAPSHOT'>
+    <description>
+      A customizer bundle that publishes a Resource Processor service
+       that processes configuration resources shipped in a Deployment
+       Package.
+    </description>
+    <size>
+      93008
+    </size>
+    <license>
+      http://www.apache.org/licenses/LICENSE-2.0.txt
+    </license>
+    <documentation>
+      http://www.apache.org/
+    </documentation>
+    <capability name='bundle'>
+      <p n='manifestversion' v='2'/>
+      <p n='presentationname' v='Apache Felix AutoConf Resource Processor'/>
+      <p n='symbolicname' v='org.apache.felix.deployment.rp.autoconf'/>
+      <p n='version' t='version' v='0.1.1.SNAPSHOT'/>
+    </capability>
+    <capability name='package'>
+      <p n='package' v='org.osgi.service.deploymentadmin.spi'/>
+      <p n='uses' v='org.osgi.framework,org.osgi.service.deploymentadmin'/>
+      <p n='version' t='version' v='1.0.0'/>
+    </capability>
+    <require extend='false' filter='(&amp;(package=org.apache.felix.dm)(version&gt;=3.0.0)(!(version&gt;=4.0.0))(managementagent=true)(mandatory:&lt;*managementagent))' multiple='false' name='package' optional='false'>
+      Import package org.apache.felix.dm ;version=[3.0.0,4.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.framework)(version&gt;=1.5.0)(!(version&gt;=2.0.0)))' multiple='false' name='package' optional='false'>
+      Import package org.osgi.framework ;version=[1.5.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.cm)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))' multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.cm ;version=[1.3.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.deploymentadmin)(version&gt;=1.0.0)(!(version&gt;=2.0.0))(managementagent=true)(mandatory:&lt;*managementagent))' multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.deploymentadmin ;version=[1.0.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.deploymentadmin.spi)(version&gt;=1.0.0)(!(version&gt;=2.0.0))(managementagent=true)(mandatory:&lt;*managementagent))' multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.deploymentadmin.spi ;version=[1.0.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.event)(version&gt;=1.2.0)(!(version&gt;=2.0.0))(managementagent=true)(mandatory:&lt;*managementagent))' multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.event ;version=[1.2.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.log)(version&gt;=1.3.0)(!(version&gt;=2.0.0))(managementagent=true)(mandatory:&lt;*managementagent))' multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.log ;version=[1.3.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.metatype)(version&gt;=1.1.0)(!(version&gt;=2.0.0)))' multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.metatype ;version=[1.1.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.util.tracker)(version&gt;=1.4.0)(!(version&gt;=2.0.0)))' multiple='false' name='package' optional='false'>
+      Import package org.osgi.util.tracker ;version=[1.4.0,2.0.0)
+    </require>
+  </resource>
   <resource id='org.apache.felix.deploymentadmin/0.9.1.SNAPSHOT' presentationname='Apache Felix Deployment Admin' symbolicname='org.apache.felix.deploymentadmin' uri='org.apache.felix.deploymentadmin/org.apache.felix.deploymentadmin-0.9.1.jar' version='0.9.1.SNAPSHOT'>
     <description>
       A bundle that implements the Deployment Admin.