ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r791816 - in /incubator/ace/trunk/core: ./ conf/dev-server-filebased/
Date Tue, 07 Jul 2009 12:35:00 GMT
Author: marrs
Date: Tue Jul  7 12:34:59 2009
New Revision: 791816

URL: http://svn.apache.org/viewvc?rev=791816&view=rev
Log:
ACE-22 applied the patch, added a line to also ZIP this new target as a released artifact.

Added:
    incubator/ace/trunk/core/conf/dev-server-filebased/
    incubator/ace/trunk/core/conf/dev-server-filebased/org.apache.ace.deployment.provider.filebased.cfg
    incubator/ace/trunk/core/conf/dev-server-filebased/org.apache.ace.deployment.servlet.cfg
    incubator/ace/trunk/core/target-dev-server-filebased.xml   (with props)
Modified:
    incubator/ace/trunk/core/build.xml

Modified: incubator/ace/trunk/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/build.xml?rev=791816&r1=791815&r2=791816&view=diff
==============================================================================
--- incubator/ace/trunk/core/build.xml (original)
+++ incubator/ace/trunk/core/build.xml Tue Jul  7 12:34:59 2009
@@ -883,6 +883,7 @@
 	<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-obr" />
 	    <ziptarget target="dev-gateway" />
 	    <ziptarget target="dev-client" />

Added: incubator/ace/trunk/core/conf/dev-server-filebased/org.apache.ace.deployment.provider.filebased.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-server-filebased/org.apache.ace.deployment.provider.filebased.cfg?rev=791816&view=auto
==============================================================================
--- incubator/ace/trunk/core/conf/dev-server-filebased/org.apache.ace.deployment.provider.filebased.cfg
(added)
+++ incubator/ace/trunk/core/conf/dev-server-filebased/org.apache.ace.deployment.provider.filebased.cfg
Tue Jul  7 12:34:59 2009
@@ -0,0 +1 @@
+BaseDirectoryName=store

Added: incubator/ace/trunk/core/conf/dev-server-filebased/org.apache.ace.deployment.servlet.cfg
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/dev-server-filebased/org.apache.ace.deployment.servlet.cfg?rev=791816&view=auto
==============================================================================
--- incubator/ace/trunk/core/conf/dev-server-filebased/org.apache.ace.deployment.servlet.cfg
(added)
+++ incubator/ace/trunk/core/conf/dev-server-filebased/org.apache.ace.deployment.servlet.cfg
Tue Jul  7 12:34:59 2009
@@ -0,0 +1 @@
+org.apache.ace.server.servlet.endpoint=/deployment

Added: incubator/ace/trunk/core/target-dev-server-filebased.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/target-dev-server-filebased.xml?rev=791816&view=auto
==============================================================================
--- incubator/ace/trunk/core/target-dev-server-filebased.xml (added)
+++ incubator/ace/trunk/core/target-dev-server-filebased.xml Tue Jul  7 12:34:59 2009
@@ -0,0 +1,122 @@
+<project name="dev-server-filebased" default="warning">
+    <property name="deploy-dir" value="deploy/target/${ant.project.name}" />
+	<property name="app-name" value="L-iQ PS server" />
+
+    <target name="warning">
+        <echo message="Please run top level build." />
+    </target>
+    
+    <target name="deploy">
+        <mkdir dir="${deploy-dir}" />
+        <mkdir dir="${deploy-dir}/store" />
+        <copy todir="${deploy-dir}">
+            <fileset dir="lib/felix/1.8.1">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/bundle">
+            <fileset dir="deploy/bundle">
+                <include name="org.apache.ace.consolelogger-1.0.0.jar" />
+            	<include name="org.apache.ace.configurator-1.0.0.jar" />
+            	<include name="org.apache.ace.http.listener-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.servlet-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.provider.filebased-1.0.0.jar" />
+            	<include name="org.apache.ace.deployment.streamgenerator-1.0.0.jar" />
+                <!-- for testing -->
+                <!--
+                <include name="org.apache.ace.http.echo.servlet-1.0.0.jar" />
+                -->
+            </fileset>
+            <fileset dir="ext">
+            	<include name="org.osgi.compendium.jar" />
+                <include name="osgi.mobile.jar" />
+                <include name="javax.servlet.jar" />
+                <include name="org.apache.felix.dependencymanager.jar" />
+                <include name="org.apache.felix.dependencymanager.shell.jar" />
+            </fileset>
+            <fileset dir="lib">
+                <include name="org.apache.felix.configadmin.jar" />
+                <include name="org.apache.felix.eventadmin.jar" />
+                <include name="log_all-2.0.0.jar" />
+                <include name="http.jetty.jar" />
+            	<include name="useradmin_all-2.0.0.jar" />
+            	<include name="org.apache.felix.prefs.jar" />
+            </fileset>
+        </copy>
+        <copy todir="${deploy-dir}/conf">
+            <fileset dir="conf/${ant.project.name}">
+                <include name="**/*.cfg" />
+            </fileset>
+        </copy>
+        <copy file="${deploy-dir}/conf/dev-config.properties" overwrite="true" tofile="${deploy-dir}/conf/config.properties"
/>
+        <delete file="${deploy-dir}/conf/test-config.properties" />
+        <property name="bundles-noshell" value="
+            file:bundle/org.apache.ace.consolelogger-1.0.0.jar
+            file:bundle/org.apache.ace.configurator-1.0.0.jar
+        	file:bundle/log_all-2.0.0.jar
+            file:bundle/osgi.mobile.jar 
+            file:bundle/org.osgi.compendium.jar 
+            file:bundle/http.jetty.jar
+            file:bundle/javax.servlet.jar
+        	file:bundle/useradmin_all-2.0.0.jar
+    	    file:bundle/org.apache.felix.eventadmin.jar
+        	file:bundle/org.apache.felix.configadmin.jar 
+            file:bundle/org.apache.felix.dependencymanager.jar 
+            file:bundle/org.apache.felix.prefs.jar
+            file:bundle/org.apache.ace.http.listener-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.servlet-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.streamgenerator-1.0.0.jar
+            file:bundle/org.apache.ace.deployment.provider.filebased-1.0.0.jar
+            " />
+        <property name="bundles-shell" value="${bundles-noshell}
+            file:bundle/org.apache.felix.shell-1.2.0.jar 
+            file:bundle/org.apache.felix.shell.tui-1.2.0.jar
+            file:bundle/org.apache.felix.dependencymanager.shell.jar 
+            " />
+        <replace file="${deploy-dir}/conf/config.properties" token="@bundles@" value="${bundles-shell}"
/>
+        <move file="${deploy-dir}/conf/dev-config.properties" tofile="${deploy-dir}/conf/config-noshell.properties"
/>
+        <replace file="${deploy-dir}/conf/config-noshell.properties" token="@bundles@"
value="${bundles-noshell}" />
+        <replace file="${deploy-dir}/conf/config.properties" token="@properties@">
+            <replacevalue><![CDATA[
+org.apache.felix.http.nio=true
+org.apache.felix.http.enable=true
+org.osgi.service.http.port=8080
+org.apache.felix.https.enable=false
+org.osgi.service.http.port.secure=8443
+org.apache.felix.http.debug=false
+                ]]></replacevalue>
+        </replace>
+        <replace file="${deploy-dir}/conf/config-noshell.properties" token="@properties@">
+            <replacevalue><![CDATA[
+org.apache.felix.http.nio=true
+org.apache.felix.http.enable=true
+org.osgi.service.http.port=8080
+org.apache.felix.https.enable=false
+org.osgi.service.http.port.secure=8443
+org.apache.felix.http.debug=false
+            ]]></replacevalue>
+        </replace>
+
+        <property name="runCommand" value="java -Xms256m -Xmx256m -jar bin/felix.jar"/>
+    	<property name="runNoshellCommand" value="java -Xms256m -Xmx256m -Dfelix.config.properties=file:conf/config-noshell.properties
-jar bin/felix.jar > output-felix.txt 2>&amp;1"/>
+    	<property name="debugCommand" value="java -Xms256m -Xmx256m -jar -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
-Dcom.sun.management.jmxremote.port=6666 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false bin/felix.jar"/>
+    	<echo file="${deploy-dir}/run.sh">#!/bin/sh
+${runCommand}
+        </echo>
+		<echo file="${deploy-dir}/run.bat">${runCommand}
+        </echo>
+    	<echo file="${deploy-dir}/run-noshell.sh">#!/bin/sh
+${runNoshellCommand}
+        </echo>
+		<echo file="${deploy-dir}/run-noshell.bat">${runNoshellCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.sh">#!/bin/sh
+${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/debug.bat">${debugCommand}
+        </echo>
+        <echo file="${deploy-dir}/run_secure.sh">#!/bin/sh
+${runSecureCommand}
+        </echo>
+    </target>
+</project>

Propchange: incubator/ace/trunk/core/target-dev-server-filebased.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message