ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r794270 - in /incubator/ace/trunk/core: conf/dev-server/platform.properties conf/dev-server/platform.setup lib/pax-runner-1.1.1.jar target-dev-server.xml
Date Wed, 15 Jul 2009 13:46:43 GMT
Author: marrs
Date: Wed Jul 15 13:46:43 2009
New Revision: 794270

URL: http://svn.apache.org/viewvc?rev=794270&view=rev
Log:
ACE-32 applied ace32-2.patch with a slight update because I changed the configurator bundle
in the mean time (added a "." in a property name).

Added:
    incubator/ace/trunk/core/conf/dev-server/platform.properties   (with props)
    incubator/ace/trunk/core/conf/dev-server/platform.setup
    incubator/ace/trunk/core/lib/pax-runner-1.1.1.jar   (with props)
Modified:
    incubator/ace/trunk/core/target-dev-server.xml

Added: 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=794270&view=auto
==============================================================================
--- incubator/ace/trunk/core/conf/dev-server/platform.properties (added)
+++ incubator/ace/trunk/core/conf/dev-server/platform.properties Wed Jul 15 13:46:43 2009
@@ -0,0 +1,13 @@
+-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-server/platform.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: 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=794270&view=auto
==============================================================================
--- incubator/ace/trunk/core/conf/dev-server/platform.setup (added)
+++ incubator/ace/trunk/core/conf/dev-server/platform.setup Wed Jul 15 13:46:43 2009
@@ -0,0 +1,6 @@
+#Exchange with felix,knopflerfish, equinox
+--platform=felix
+#--platform=equinox
+
+#Exchange with any valid version of you selected platform
+--version=1.8.1
\ No newline at end of file

Added: incubator/ace/trunk/core/lib/pax-runner-1.1.1.jar
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/lib/pax-runner-1.1.1.jar?rev=794270&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/ace/trunk/core/lib/pax-runner-1.1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/ace/trunk/core/target-dev-server.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/target-dev-server.xml?rev=794270&r1=794269&r2=794270&view=diff
==============================================================================
--- incubator/ace/trunk/core/target-dev-server.xml (original)
+++ incubator/ace/trunk/core/target-dev-server.xml Wed Jul 15 13:46:43 2009
@@ -168,5 +168,44 @@
         <echo file="${deploy-dir}/run_secure.sh">#!/bin/sh
 ${runSecureCommand}
         </echo>
+	    <!-- Include new targets from ACE-32 -->
+		 <antcall target="standalone" />
+		 <antcall target="paxrunner" />
     </target>
+
+	<!-- 
+		The following targets are standalone - proof of concept - examples for Jira ACE-32 
+		Those targets can, once "accepted" be integrated into the generic dev-* build loop.
+		
+		See Comments at https://issues.apache.org/jira/browse/ACE-32 for description.
+	-->
+
+	<property name="workdir" value="deploy/target/dev-server" />
+
+	<!-- Creates a dynamic deployment for Pax Runner. (1a Option in my mail) -->
+	<target name="paxrunner">
+		<mkdir dir="${workdir}/paxrunner" />
+
+		<echo file="${workdir}/paxrunner/run.sh">java -jar ../../../../lib/pax-runner-1.1.1.jar
--vmo='-Dorg.apache.ace.configurator.CONFIG_DIR=../../conf' --clean --log=debug --args=file:../../../../conf/dev-server/platform.setup
scan-file:file:../../../../conf/dev-server/platform.properties ../bundle</echo>
+			<echo file="${workdir}/paxrunner/run.bat">java -jar ../../../../lib/pax-runner-1.1.1.jar
--vmo='-Dorg.apache.ace.configurator.CONFIG_DIR=../../conf' --clean --log=debug --args=file:../../../../conf/dev-server/platform.setup
scan-file:file:../../../../conf/dev-server/platform.properties ../bundle</echo>
+	</target>
+
+	<!-- Creates a static deployment using Pax Runner. (1b Option in my mail) -->
+	<!-- This is routly the "same" output as the current setup but giving framework indepenence
at build time -->
+	 <target name="standalone">
+		<mkdir dir="${workdir}/standalone" />
+
+		<java dir="." classname="org.ops4j.pax.runner.Run" fork="true" taskname="paxrunner"
timeout="99999" failonerror="true">
+	        <arg value="--args=file:conf/dev-server/platform.setup"/>
+	 		<arg value="--executor=script"/>
+			<arg value="--vmo='-Dorg.apache.ace.configurator.CONFIG_DIR=../conf'"/>
+	 		<arg value="--clean"/>
+			<arg value="--workingDirectory=${workdir}/standalone"/>
+			<arg value="scan-file:file:conf/dev-server/platform.properties"/>
+			<arg value="${workdir}/bundle"/>
+			<classpath>
+	          <pathelement location="lib/pax-runner-1.1.1.jar"/>
+	        </classpath>
+	      </java>
+	  </target>
 </project>



Mime
View raw message