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 2005/10/02 04:20:29 UTC
svn commit: r293058 - in /beehive/trunk: ant/ controls/test/dist-test/
controls/test/webapps/ samples/controls-webservices-blank/ system-controls/
wsm/ wsm/external/ wsm/external/axis-1.2/ wsm/test/
Author: ekoneil
Date: Sat Oct 1 19:20:23 2005
New Revision: 293058
URL: http://svn.apache.org/viewcvs?rev=293058&view=rev
Log:
Move the Axis JARs from wsm/external to wsm/external/axis-1.2 so that it's easier to find usages of these JARs and to support additional Axis versions.
BB: self
Test: WSM / Beehive dist pass
Added:
beehive/trunk/wsm/external/axis-1.2/
beehive/trunk/wsm/external/axis-1.2/axis-ant.jar
- copied unchanged from r292883, beehive/trunk/wsm/external/axis-ant.jar
beehive/trunk/wsm/external/axis-1.2/axis.jar
- copied unchanged from r292883, beehive/trunk/wsm/external/axis.jar
beehive/trunk/wsm/external/axis-1.2/jaxrpc.jar
- copied unchanged from r292883, beehive/trunk/wsm/external/jaxrpc.jar
beehive/trunk/wsm/external/axis-1.2/saaj.jar
- copied unchanged from r292883, beehive/trunk/wsm/external/saaj.jar
beehive/trunk/wsm/external/axis-1.2/wsdl4j.jar
- copied unchanged from r292883, beehive/trunk/wsm/external/wsdl4j.jar
Removed:
beehive/trunk/wsm/external/axis-ant.jar
beehive/trunk/wsm/external/axis.jar
beehive/trunk/wsm/external/jaxrpc.jar
beehive/trunk/wsm/external/saaj.jar
beehive/trunk/wsm/external/wsdl4j.jar
Modified:
beehive/trunk/ant/axis-import.xml
beehive/trunk/controls/test/dist-test/build.xml
beehive/trunk/controls/test/webapps/build.xml
beehive/trunk/samples/controls-webservices-blank/build-svn.xml
beehive/trunk/system-controls/systemcontrols-imports.xml
beehive/trunk/wsm/build.xml
beehive/trunk/wsm/test/build.xml
Modified: beehive/trunk/ant/axis-import.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/ant/axis-import.xml?rev=293058&r1=293057&r2=293058&view=diff
==============================================================================
--- beehive/trunk/ant/axis-import.xml (original)
+++ beehive/trunk/ant/axis-import.xml Sat Oct 1 19:20:23 2005
@@ -5,7 +5,7 @@
<import file="../beehive-imports.xml"/>
<path id="webservice.classpath">
- <fileset id="webservice.jars" dir="${beehive.home}/wsm/external">
+ <fileset id="webservice.jars" dir="${beehive.home}/wsm/external/axis-1.2">
<include name="wsdl4j.jar"/>
<include name="saaj.jar"/>
<include name="jaxrpc.jar"/>
Modified: beehive/trunk/controls/test/dist-test/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/dist-test/build.xml?rev=293058&r1=293057&r2=293058&view=diff
==============================================================================
--- beehive/trunk/controls/test/dist-test/build.xml (original)
+++ beehive/trunk/controls/test/dist-test/build.xml Sat Oct 1 19:20:23 2005
@@ -24,7 +24,7 @@
</copy>
<copy todir="${test.dist.base.dir}/beehive-test-dist/controls/external/axis">
- <fileset dir="../../../wsm/external" includes="*.jar"/>
+ <fileset dir="../../../wsm/external/axis-1.2" includes="*.jar"/>
</copy>
<!-- Copy internal tools from controls/test/infra to beehive-test-dist/controls/test/infra-->
Modified: beehive/trunk/controls/test/webapps/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/webapps/build.xml?rev=293058&r1=293057&r2=293058&view=diff
==============================================================================
--- beehive/trunk/controls/test/webapps/build.xml (original)
+++ beehive/trunk/controls/test/webapps/build.xml Sat Oct 1 19:20:23 2005
@@ -30,6 +30,7 @@
<project name="Beehive/Controls/Test" default="usage" basedir=".">
<import file="../../../beehive-imports.xml"/>
+ <import file="../../../ant/axis-import.xml"/>
<property file="../common/path.properties"/>
@@ -146,9 +147,7 @@
<mkdir dir="${webapp.dir}/WEB-INF/lib"/>
<copy file="${milton.jar}" todir="${webapp.dir}/WEB-INF/lib" overwrite="true" verbose="true"/>
- <copy todir="${webapp.dir}/WEB-INF/lib" overwrite="true" verbose="true">
- <fileset dir="${beehive.home}/wsm/external/" includes="*.jar"/>
- </copy>
+ <deploy-webservice-runtime appdir="${webapp.dir}/WEB-INF/lib"/>
<copy todir="${webapp.dir}/WEB-INF" verbose="true" overwrite="true">
<fileset dir="${milton.templates}">
Modified: beehive/trunk/samples/controls-webservices-blank/build-svn.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/controls-webservices-blank/build-svn.xml?rev=293058&r1=293057&r2=293058&view=diff
==============================================================================
--- beehive/trunk/samples/controls-webservices-blank/build-svn.xml (original)
+++ beehive/trunk/samples/controls-webservices-blank/build-svn.xml Sat Oct 1 19:20:23 2005
@@ -22,6 +22,7 @@
<property environment="os" />
<import file="../../beehive-imports.xml"/>
<import file="../../ant/beehive-tools.xml"/>
+ <import file="../../ant/axis-import.xml"/>
<property name="junit.source.dir" location="${basedir}/junit" />
<property name="build.dir" location="${basedir}/build" />
@@ -43,10 +44,10 @@
<fileset file="${beehive.home}/wsm/build/jars/beehive-wsm-axis.jar"/>
<fileset file="${beehive.home}/wsm/build/jars/beehive-wsdltypes.jar"/>
<fileset file="${beehive.home}/wsm/build/jars/beehive-jsr181.jar"/>
- <fileset file="${beehive.home}/wsm/external/axis.jar"/>
- <fileset file="${beehive.home}/wsm/external/jaxrpc.jar"/>
- <fileset file="${beehive.home}/wsm/external/wsdl4j.jar"/>
<path refid="servlet.dependency.path"/>
+ <fileset file="${beehive.home}/wsm/external/axis-1.2/axis.jar"/>
+ <fileset file="${beehive.home}/wsm/external/axis-1.2/jaxrpc.jar"/>
+ <fileset file="${beehive.home}/wsm/external/axis-1.2/wsdl4j.jar"/>
</path>
<path id="beehive.classpath">
Modified: beehive/trunk/system-controls/systemcontrols-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/systemcontrols-imports.xml?rev=293058&r1=293057&r2=293058&view=diff
==============================================================================
--- beehive/trunk/system-controls/systemcontrols-imports.xml (original)
+++ beehive/trunk/system-controls/systemcontrols-imports.xml Sat Oct 1 19:20:23 2005
@@ -11,6 +11,7 @@
<import file="../ant/beehive-tools.xml"/>
<property name="external.dir" location="${beehive.home}/system-controls/external"/>
+
<property file="${beehive.home}/system-controls/ant/systemcontrols.properties"/>
<path id="webservices.dependency.path">
@@ -18,11 +19,8 @@
<fileset file="${beehive.home}/wsm/build/jars/beehive-wsm-axis.jar"/>
<fileset file="${beehive.home}/wsm/build/jars/beehive-wsdltypes.jar"/>
<fileset file="${beehive.home}/wsm/build/jars/beehive-jsr181.jar"/>
- <fileset file="${beehive.home}/wsm/external/axis.jar"/>
- <fileset file="${beehive.home}/wsm/external/saaj.jar"/>
- <fileset file="${beehive.home}/wsm/external/jaxrpc.jar"/>
- <fileset file="${beehive.home}/wsm/external/wsdl4j.jar"/>
<path refid="servlet.dependency.path"/>
+ <fileset dir="${beehive.home}/wsm/external/axis-1.2" includes="*.jar"/>
</path>
<path id="ejb.dependency.path">
Modified: beehive/trunk/wsm/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/build.xml?rev=293058&r1=293057&r2=293058&view=diff
==============================================================================
--- beehive/trunk/wsm/build.xml (original)
+++ beehive/trunk/wsm/build.xml Sat Oct 1 19:20:23 2005
@@ -57,7 +57,7 @@
<pathelement location="${jars.dir}/beehive-wsdltypes.jar"/>
<pathelement location="${jsr181.jar}"/>
<pathelement location="${core.classes}"/>
- <pathelement location="external/jaxrpc.jar"/>
+ <pathelement location="external/axis-1.2/jaxrpc.jar"/>
</path>
<path id="axis.classpath">
@@ -219,6 +219,7 @@
<!-- copy the required libraries -->
<deploy-webservice-runtime appdir="${webapp.dir}/WEB-INF/lib"/>
+
<copy todir="${webapp.dir}/WEB-INF/lib/" failOnError="true">
<fileset dir="${jars.dir}" includes="**/*.jar"/>
<fileset refid="log4j.fileset"/>
Modified: beehive/trunk/wsm/test/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/wsm/test/build.xml?rev=293058&r1=293057&r2=293058&view=diff
==============================================================================
--- beehive/trunk/wsm/test/build.xml (original)
+++ beehive/trunk/wsm/test/build.xml Sat Oct 1 19:20:23 2005
@@ -39,7 +39,7 @@
<property name="webapp.dir" location="webapp"/>
- <property name="axis.lib.dir" location="../external"/>
+ <property name="axis.lib.dir" location="../external/axis-1.2"/>
<property name="drt.wsdl.file" location="${junit.src}/org/apache/beehive/wsm/test/jsr181/wsdl/web/wsdl2javatest.wsdl"/>
<property name="server.root.url" value="http://localhost:8080"/>