You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/07/30 22:59:20 UTC
svn commit: r426941 - in /beehive/wsm/trunk: build.xml src/axis/ src/axis1/
src/axis1/META-INF/ src/axis1/org/ src/beehive-wsm-axis.pom
src/beehive-wsm-axis1.pom test/build.xml test/webapp/build.xml
wsm-imports.xml
Author: ekoneil
Date: Sun Jul 30 13:59:19 2006
New Revision: 426941
URL: http://svn.apache.org/viewvc?rev=426941&view=rev
Log:
Rename the Axis 1.x specific code in WSM to beehive-wsm-axis1.jar to distinguish it from the coming Axis2 specific code.
Test: WSM
Added:
beehive/wsm/trunk/src/axis1/
- copied from r424632, beehive/wsm/trunk/src/axis/
beehive/wsm/trunk/src/axis1/META-INF/
- copied from r426940, beehive/wsm/trunk/src/axis/META-INF/
beehive/wsm/trunk/src/axis1/org/
- copied from r426940, beehive/wsm/trunk/src/axis/org/
beehive/wsm/trunk/src/beehive-wsm-axis1.pom
- copied unchanged from r426073, beehive/wsm/trunk/src/beehive-wsm-axis.pom
Removed:
beehive/wsm/trunk/src/axis/
beehive/wsm/trunk/src/beehive-wsm-axis.pom
Modified:
beehive/wsm/trunk/build.xml
beehive/wsm/trunk/test/build.xml
beehive/wsm/trunk/test/webapp/build.xml
beehive/wsm/trunk/wsm-imports.xml
Modified: beehive/wsm/trunk/build.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/build.xml?rev=426941&r1=426940&r2=426941&view=diff
==============================================================================
--- beehive/wsm/trunk/build.xml (original)
+++ beehive/wsm/trunk/build.xml Sun Jul 30 13:59:19 2006
@@ -52,17 +52,11 @@
<property name="api.schema.dir" location="src/api/schemas"/>
<property name="api.classes" location="${classes.dir}/api"/>
-<!--
- <property name="api.annogen.dir" location="${build.dir}/api-annogen"/>
- <property name="api.annogen.classes" location="${classes.dir}/api-annogen"/>
- <property name="jsr181-annogen.jar" location="${build.dir}/jars/beehive-jsr181-annogen.jar"/>
--->
-
<property name="core.dir" location="src/core"/>
<property name="core.classes" location="${classes.dir}/core"/>
- <property name="axis.dir" location="src/axis"/>
- <property name="axis.classes" location="${classes.dir}/axis"/>
+ <property name="axis.dir" location="src/axis1"/>
+ <property name="axis.classes" location="${classes.dir}/axis1"/>
<property name="webservice-utils-core.dir" location="src/webservice-utils/core"/>
<property name="webservice-utils-core.classes" location="${classes.dir}/webservice-utils-core"/>
@@ -74,7 +68,7 @@
<property name="wsdl.classes.dir" location="${build.dir}/temp-wsdltypes"/>
<property name="wsm.jar" location="${jars.dir}/beehive-wsm.jar"/>
- <property name="wsm-axis.jar" location="${jars.dir}/beehive-wsm-axis.jar"/>
+ <property name="wsm-axis1.jar" location="${jars.dir}/beehive-wsm-axis1.jar"/>
<property name="jsr181.jar" location="${build.dir}/jars/beehive-jsr181.jar"/>
<path id="core.classpath">
@@ -211,7 +205,7 @@
<echo message="--------------------------------------------------"/>
<echo message="--------------------------------------------------"/>
- <echo message="| WSM-Axis build starting |"/>
+ <echo message="| WSM-Axis1 build starting |"/>
<echo message="--------------------------------------------------"/>
<mkdir dir="${webservice-utils-xmlbeans.classes}"/>
@@ -228,22 +222,22 @@
<fileset dir="${axis.dir}" includes="META-INF/**"/>
</copy>
- <jar jarfile="${wsm-axis.jar}">
+ <jar jarfile="${wsm-axis1.jar}">
<fileset dir="${axis.classes}"/>
<fileset dir="${webservice-utils-xmlbeans.classes}"/>
<manifest>
- <attribute name="Extension-Name" value="Axis Runtime for Beehive WSM"/>
- <attribute name="Specification-Title" value="Axis Runtime for Beehive WSM"/>
+ <attribute name="Extension-Name" value="Beehive WSM support for Axis 1.x"/>
+ <attribute name="Specification-Title" value="Beehive WSM support for Axis 1.x"/>
<attribute name="Specification-Vendor" value="Apache Software Foundation"/>
<attribute name="Specification-Version" value="${beehive.version}"/>
- <attribute name="Implementation-Title" value="Axis Runtime for Beehive WSM"/>
+ <attribute name="Implementation-Title" value="Beehive WSM support for Axis 1.x"/>
<attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
<attribute name="Implementation-Version" value="${beehive.version}"/>
<attribute name="Beehive-Version" value="${beehive.version}"/>
</manifest>
</jar>
<echo message="--------------------------------------------------"/>
- <echo message="| WSM-Axis build ending |"/>
+ <echo message="| WSM-Axis1 build ending |"/>
<echo message="--------------------------------------------------"/>
</target>
@@ -251,7 +245,7 @@
<m2-install-jar resource="beehive-wsm"/>
<m2-install-jar resource="beehive-wsdltypes"/>
<m2-install-jar resource="beehive-jsr181"/>
- <m2-install-jar resource="beehive-wsm-axis"/>
+ <m2-install-jar resource="beehive-wsm-axis1"/>
</target>
<target name="build.dist" description="Build a WSM distribution">
Modified: beehive/wsm/trunk/test/build.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/test/build.xml?rev=426941&r1=426940&r2=426941&view=diff
==============================================================================
--- beehive/wsm/trunk/test/build.xml (original)
+++ beehive/wsm/trunk/test/build.xml Sun Jul 30 13:59:19 2006
@@ -59,10 +59,9 @@
<path refid="annogen.dependency.path"/>
<pathelement location="../build/jars/beehive-jsr181.jar"/>
-<!-- <pathelement location="../build/jars/beehive-jsr181-annogen.jar"/> -->
<pathelement location="../build/jars/beehive-wsdltypes.jar"/>
<pathelement location="../build/jars/beehive-wsm.jar"/>
- <pathelement location="../build/jars/beehive-wsm-axis.jar"/>
+ <pathelement location="../build/jars/beehive-wsm-axis1.jar"/>
<fileset refid="axis.fileset"/>
<fileset refid="axis-wsdl4j.fileset"/>
Modified: beehive/wsm/trunk/test/webapp/build.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/test/webapp/build.xml?rev=426941&r1=426940&r2=426941&view=diff
==============================================================================
--- beehive/wsm/trunk/test/webapp/build.xml (original)
+++ beehive/wsm/trunk/test/webapp/build.xml Sun Jul 30 13:59:19 2006
@@ -49,10 +49,10 @@
<fileset refid="axis-saaj.fileset"/>
<fileset refid="axis-wsdl4j.fileset"/>
- <fileset refid="wsm-core.fileset"/>
- <fileset refid="wsm-axis.fileset"/>
- <fileset refid="wsm-wsdltypes.fileset"/>
<fileset refid="wsm-jsr181.fileset"/>
+ <fileset refid="wsm-wsdltypes.fileset"/>
+ <fileset refid="wsm-core.fileset"/>
+ <fileset refid="wsm-axis1.fileset"/>
</copy>
<path id="build.classpath">
Modified: beehive/wsm/trunk/wsm-imports.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/wsm-imports.xml?rev=426941&r1=426940&r2=426941&view=diff
==============================================================================
--- beehive/wsm/trunk/wsm-imports.xml (original)
+++ beehive/wsm/trunk/wsm-imports.xml Sun Jul 30 13:59:19 2006
@@ -48,7 +48,7 @@
<fileset id="log4j.fileset" file="${m2.repo}/log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
<fileset id="wsm-core.fileset" file="${m2.repo}/org/apache/beehive/beehive-wsm/1.0-SNAPSHOT/beehive-wsm-1.0-SNAPSHOT.jar"/>
- <fileset id="wsm-axis.fileset" file="${m2.repo}/org/apache/beehive/beehive-wsm-axis/1.0-SNAPSHOT/beehive-wsm-axis-1.0-SNAPSHOT.jar"/>
+ <fileset id="wsm-axis1.fileset" file="${m2.repo}/org/apache/beehive/beehive-wsm-axis1/1.0-SNAPSHOT/beehive-wsm-axis1-1.0-SNAPSHOT.jar"/>
<fileset id="wsm-jsr181.fileset" file="${m2.repo}/org/apache/beehive/beehive-jsr181/1.0-SNAPSHOT/beehive-jsr181-1.0-SNAPSHOT.jar"/>
<fileset id="wsm-wsdltypes.fileset" file="${m2.repo}/org/apache/beehive/beehive-wsdltypes/1.0-SNAPSHOT/beehive-wsdltypes-1.0-SNAPSHOT.jar"/>
<fileset id="annogen.fileset" file="${m2.repo}/annogen/annogen/0.1.0/annogen-0.1.0.jar"/>