You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by jh...@apache.org on 2007/02/08 21:36:30 UTC
svn commit: r505030 - in /webservices/muse/trunk/samples/eclipse-osgi:
wsn-consumer/build.xml wsn-producer/build.xml wsrf/build.xml
Author: jhawkins
Date: Thu Feb 8 12:36:29 2007
New Revision: 505030
URL: http://svn.apache.org/viewvc?view=rev&rev=505030
Log:
[MUSE-191] OSGi Mini SOAP environment should be packaged to work with MuseComplete
Modified:
webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/build.xml
webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/build.xml
webservices/muse/trunk/samples/eclipse-osgi/wsrf/build.xml
Modified: webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/build.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/build.xml?view=diff&rev=505030&r1=505029&r2=505030
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/build.xml (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/wsn-consumer/build.xml Thu Feb 8 12:36:29 2007
@@ -6,6 +6,7 @@
<property name="MUSE_HOME" value="../../.."/>
<property name="MUSE_TEMPLATE" value="${MUSE_HOME}/lib/eclipse-osgi"/>
<property name="AXIS2.1.1_TEMPLATE" value="${MUSE_HOME}/lib/axis2-osgi"/>
+ <property name="MINI_TEMPLATE" value="${MUSE_HOME}/lib/mini-osgi"/>
<property name="BUILD_DIR" value="build"/>
<property name="JAVA_SRC_DIR" value="${BUILD_DIR}/src"/>
<property name="JAVA_DEST_DIR" value="${BUILD_DIR}/bin"/>
@@ -84,6 +85,9 @@
<fileset dir="${AXIS2.1.1_TEMPLATE}">
<include name="**/*"/>
</fileset>
+ <fileset dir="${MUSE_HOME}/modules/osgi/core">
+ <include name="**/muse-osgi-soa-axis2*.jar"/>
+ </fileset>
</copy>
</target>
@@ -95,6 +99,15 @@
</fileset>
</copy>
</target>
+
+ <target name="mini" depends="java">
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${MINI_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
<target name="muse">
<mkdir dir="${PLUGIN_DIR}"/>
@@ -166,12 +179,9 @@
</fileset>
</copy>
<copy todir="${PLUGINS_DIR}" flatten="true">
- <fileset dir="${MUSE_HOME}/modules/osgi/complete">
+ <fileset dir="${MUSE_HOME}/modules/osgi/complete">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${MUSE_HOME}/modules/osgi/core">
- <include name="**/muse-osgi-soa-axis2*.jar"/>
- </fileset>
</copy>
<mkdir dir="${PLUGINS_DIR}/configuration"/>
@@ -202,7 +212,6 @@
</copy>
</target>
-
<target name="plugins" depends="axis2.1.1,muse">
</target>
@@ -210,6 +219,13 @@
<target name="complete" depends="axis2.1.1,muse-complete">
</target>
+
+ <target name="mini-plugins" depends="mini,muse">
+ </target>
+
+ <target name="mini-complete" depends="mini,muse-complete">
+ </target>
+
<target name="run" depends="plugins">
<echo message="Launching OSGi framework..."/>
@@ -219,8 +235,26 @@
</java>
<echo message="OSGi framework has exited"/>
</target>
-
+
<target name="run-complete" depends="complete">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+ <target name="run-mini" depends="mini-plugins">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+ <target name="run-mini-complete" depends="mini-complete">
<echo message="Launching OSGi framework..."/>
<java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
<arg value="-console"/>
Modified: webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/build.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/build.xml?view=diff&rev=505030&r1=505029&r2=505030
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/build.xml (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/wsn-producer/build.xml Thu Feb 8 12:36:29 2007
@@ -6,6 +6,7 @@
<property name="MUSE_HOME" value="../../.."/>
<property name="MUSE_TEMPLATE" value="${MUSE_HOME}/lib/eclipse-osgi"/>
<property name="AXIS2.1.1_TEMPLATE" value="${MUSE_HOME}/lib/axis2-osgi"/>
+ <property name="MINI_TEMPLATE" value="${MUSE_HOME}/lib/mini-osgi"/>
<property name="BUILD_DIR" value="build"/>
<property name="JAVA_SRC_DIR" value="${BUILD_DIR}/src"/>
<property name="JAVA_DEST_DIR" value="${BUILD_DIR}/bin"/>
@@ -88,6 +89,9 @@
<fileset dir="${AXIS2.1.1_TEMPLATE}">
<include name="**/*"/>
</fileset>
+ <fileset dir="${MUSE_HOME}/modules/osgi/core">
+ <include name="**/muse-osgi-soa-axis2*.jar"/>
+ </fileset>
</copy>
</target>
@@ -99,6 +103,15 @@
</fileset>
</copy>
</target>
+
+ <target name="mini" depends="java">
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${MINI_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
<target name="muse">
<mkdir dir="${PLUGIN_DIR}"/>
@@ -170,12 +183,9 @@
</fileset>
</copy>
<copy todir="${PLUGINS_DIR}" flatten="true">
- <fileset dir="${MUSE_HOME}/modules/osgi/complete">
+ <fileset dir="${MUSE_HOME}/modules/osgi/complete">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${MUSE_HOME}/modules/osgi/core">
- <include name="**/muse-osgi-soa-axis2*.jar"/>
- </fileset>
</copy>
<mkdir dir="${PLUGINS_DIR}/configuration"/>
@@ -206,7 +216,6 @@
</copy>
</target>
-
<target name="plugins" depends="axis2.1.1,muse">
</target>
@@ -214,6 +223,13 @@
<target name="complete" depends="axis2.1.1,muse-complete">
</target>
+
+ <target name="mini-plugins" depends="mini,muse">
+ </target>
+
+ <target name="mini-complete" depends="mini,muse-complete">
+ </target>
+
<target name="run" depends="plugins">
<echo message="Launching OSGi framework..."/>
@@ -223,7 +239,7 @@
</java>
<echo message="OSGi framework has exited"/>
</target>
-
+
<target name="run-complete" depends="complete">
<echo message="Launching OSGi framework..."/>
<java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
@@ -232,7 +248,24 @@
</java>
<echo message="OSGi framework has exited"/>
</target>
-
+
+ <target name="run-mini" depends="mini-plugins">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+ <target name="run-mini-complete" depends="mini-complete">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
<target name="clean" depends="init">
<delete dir="${BUILD_DIR}"/>
Modified: webservices/muse/trunk/samples/eclipse-osgi/wsrf/build.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/eclipse-osgi/wsrf/build.xml?view=diff&rev=505030&r1=505029&r2=505030
==============================================================================
--- webservices/muse/trunk/samples/eclipse-osgi/wsrf/build.xml (original)
+++ webservices/muse/trunk/samples/eclipse-osgi/wsrf/build.xml Thu Feb 8 12:36:29 2007
@@ -6,6 +6,7 @@
<property name="MUSE_HOME" value="../../.."/>
<property name="MUSE_TEMPLATE" value="${MUSE_HOME}/lib/eclipse-osgi"/>
<property name="AXIS2.1.1_TEMPLATE" value="${MUSE_HOME}/lib/axis2-osgi"/>
+ <property name="MINI_TEMPLATE" value="${MUSE_HOME}/lib/mini-osgi"/>
<property name="BUILD_DIR" value="build"/>
<property name="JAVA_SRC_DIR" value="${BUILD_DIR}/src"/>
<property name="JAVA_DEST_DIR" value="${BUILD_DIR}/bin"/>
@@ -85,6 +86,9 @@
<fileset dir="${AXIS2.1.1_TEMPLATE}">
<include name="**/*"/>
</fileset>
+ <fileset dir="${MUSE_HOME}/modules/osgi/core">
+ <include name="**/muse-osgi-soa-axis2*.jar"/>
+ </fileset>
</copy>
</target>
@@ -97,6 +101,15 @@
</copy>
</target>
+ <target name="mini" depends="java">
+ <mkdir dir="${PLUGINS_DIR}"/>
+ <copy todir="${PLUGINS_DIR}">
+ <fileset dir="${MINI_TEMPLATE}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="muse">
<mkdir dir="${PLUGIN_DIR}"/>
<copy todir="${PLUGIN_DIR}">
@@ -167,12 +180,9 @@
</fileset>
</copy>
<copy todir="${PLUGINS_DIR}" flatten="true">
- <fileset dir="${MUSE_HOME}/modules/osgi/complete">
+ <fileset dir="${MUSE_HOME}/modules/osgi/complete">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${MUSE_HOME}/modules/osgi/core">
- <include name="**/muse-osgi-soa-axis2*.jar"/>
- </fileset>
</copy>
<mkdir dir="${PLUGINS_DIR}/configuration"/>
@@ -211,6 +221,12 @@
<target name="complete" depends="axis2.1.1,muse-complete">
</target>
+ <target name="mini-plugins" depends="mini,muse">
+ </target>
+
+ <target name="mini-complete" depends="mini,muse-complete">
+ </target>
+
<target name="run" depends="plugins">
<echo message="Launching OSGi framework..."/>
@@ -222,6 +238,24 @@
</target>
<target name="run-complete" depends="complete">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+ <target name="run-mini" depends="mini-plugins">
+ <echo message="Launching OSGi framework..."/>
+ <java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
+ <arg value="-console"/>
+ <arg value="-clean"/>
+ </java>
+ <echo message="OSGi framework has exited"/>
+ </target>
+
+ <target name="run-mini-complete" depends="mini-complete">
<echo message="Launching OSGi framework..."/>
<java fork="true" dir="plugins" jar="plugins/org.eclipse.osgi_3.2.0.v20060601.jar">
<arg value="-console"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org