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/12/12 19:33:31 UTC
svn commit: r356317 - in /beehive/trunk/system-controls: ./
external/webservice/ test/webservice/ test/webservice/external/
Author: ekoneil
Date: Mon Dec 12 10:33:19 2005
New Revision: 356317
URL: http://svn.apache.org/viewcvs?rev=356317&view=rev
Log:
Move the activation / javamail JARs from the top level of system-controls directory into the system-control's test/ directory. Since these JARs aren't used by the runtime, it makes sense to scope them into the test/ directory.
BB: self
Test: web service pass
Added:
beehive/trunk/system-controls/test/webservice/external/
beehive/trunk/system-controls/test/webservice/external/geronimo-spec-activation-1.0.2-rc4.jar
- copied unchanged from r356287, beehive/trunk/system-controls/external/webservice/geronimo-spec-activation-1.0.2-rc4.jar
beehive/trunk/system-controls/test/webservice/external/geronimo-spec-javamail-1.3.1-rc6.jar
- copied unchanged from r356287, beehive/trunk/system-controls/external/webservice/geronimo-spec-javamail-1.3.1-rc6.jar
Removed:
beehive/trunk/system-controls/external/webservice/geronimo-spec-activation-1.0.2-rc4.jar
beehive/trunk/system-controls/external/webservice/geronimo-spec-javamail-1.3.1-rc6.jar
Modified:
beehive/trunk/system-controls/systemcontrols-imports.xml
beehive/trunk/system-controls/test/webservice/build.xml
Modified: beehive/trunk/system-controls/systemcontrols-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/systemcontrols-imports.xml?rev=356317&r1=356316&r2=356317&view=diff
==============================================================================
--- beehive/trunk/system-controls/systemcontrols-imports.xml (original)
+++ beehive/trunk/system-controls/systemcontrols-imports.xml Mon Dec 12 10:33:19 2005
@@ -19,9 +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"/>
- <path refid="servlet.dependency.path"/>
- <fileset dir="${external.dir}/webservice" includes="*.jar"/>
<fileset dir="${beehive.home}/wsm/external/axis-1.2" includes="*.jar"/>
+ <path refid="servlet.dependency.path"/>
</path>
<path id="ejb.dependency.path">
Modified: beehive/trunk/system-controls/test/webservice/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/build.xml?rev=356317&r1=356316&r2=356317&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/build.xml (original)
+++ beehive/trunk/system-controls/test/webservice/build.xml Mon Dec 12 10:33:19 2005
@@ -17,9 +17,10 @@
$Header:$
-->
-<project name="Beehive/ServiceControlDRT" default="drt" basedir=".">
+<project name="Beehive/Controls/System/WebService/Tests" default="drt" basedir=".">
<property environment="os"/>
+
<import file="../../systemcontrols-imports.xml"/>
<!-- client properties -->
@@ -31,7 +32,6 @@
<property name="client.xmlbeangen" location="${client.build}/xmlbeangen"/>
<property name="client.classes" location="${client.build}/classes"/>
<property name="client.wsdls" location="${client.build}/wsdls"/>
-
<property name="wsdls.dir" location="schemas"/>
<property name="rpc.encoded.wsdls.dir" location="${wsdls.dir}/rpcEncoded"/>
<property name="client.jcxgensrc" location="${client.build}/jcxsrc"/>
@@ -68,45 +68,11 @@
<path refid="velocity.dependency.path"/>
<path refid="commons-logging.dependency.path"/>
<path refid="commons-discovery.dependency.path"/>
+ <pathelement location="external/geronimo-spec-activation-1.0.2-rc4.jar"/>
+ <pathelement location="external/geronimo-spec-javamail-1.3.1-rc6.jar"/>
</path>
- <!-- define task for axis bean generator -->
- <taskdef name="axisbeanbuild" classname="org.apache.beehive.wsm.axis.tools.ant.AxisTypeGeneratorTask">
- <classpath>
- <path refid="client.classpath"/>
- </classpath>
- </taskdef>
-
- <target name="drt_debug">
-<!-- <antcall target="build-client"/> -->
- <junit failureproperty="drtfailed"
- printsummary="on"
- tempdir="${client.build}"
- fork="yes">
- <classpath>
- <path refid="client.classpath"/>
- <pathelement location="${client.classes}"/>
- </classpath>
- <formatter type="plain"/>
- <batchtest filtertrace="off" todir="${log.dir}">
- <fileset dir="${junit-source.dir}">
- <include name="**/SoapMarshallingRpcLitArrayTypesTest.java"/>
- </fileset>
- </batchtest>
- </junit>
-
- </target>
-
- <target name="generate_jcx_dbg">
-
- <taskdef name="scgen"
- classname="org.apache.beehive.controls.system.webservice.generator.ServiceControlGeneratorTask"
- classpathref="client.classpath"/>
- <scgen srcdir="/tmp/wsdls" destdir="${client.jcxgensrc}" destPackageName="${client.jcxgen.packageName}"/>
- </target>
-
-
- <target name="build">
+ <target name="build" description="Build the web service control tests">
<ant dir="jcxgen-tests" target="build" inheritAll="false"/>
<antcall target="build-webapp"/>
<antcall target="build-client"/>
@@ -115,7 +81,7 @@
<!-- =================================================================== -->
<!-- drt - run the webservice control DRTs -->
<!-- =================================================================== -->
- <target name="drt" depends="clean" description="Run the web service control drts.">
+ <target name="drt" description="Clean, build, and run the web service control drts.">
<antcall target="clean"/>
<antcall target="build-webapp"/>
@@ -152,7 +118,6 @@
fork="yes">
<classpath>
<path refid="client.classpath"/>
- <pathelement location="${client.classes}"/>
</classpath>
<formatter type="plain"/>
<batchtest filtertrace="off" todir="${log.dir}">
@@ -174,7 +139,6 @@
<fail if="drtfailed" message="One or more tests in the ServiceControl DRT failed."/>
</target>
-
<!-- =================================================================== -->
<!-- build - build the junit tests and webservice controls -->
<!-- =================================================================== -->
@@ -185,7 +149,7 @@
<echo message="--------------------------------------------------"/>
<antcall target="dirs"/>
- <antcall target="generate_jcxs"/>
+ <antcall target="generate_webservicecontrols"/>
<!-- build webservice controls generated from wsdl files -->
<build-controls srcdir="${client.jcxgensrc}"
@@ -211,9 +175,8 @@
</target>
-
<!-- =================================================================== -->
- <!-- build - build the webapp and wsm services for the drts -->
+ <!-- build - build the webapp and web services for the DRTs -->
<!-- =================================================================== -->
<target name="build-webapp" description="Build the webapp for the drts.">
@@ -225,29 +188,23 @@
<!-- copy the webapp template dir -->
<copy todir="${webapp.build.dir}">
- <fileset dir="${webapp.template.dir}">
- <include name="**/*"/>
- </fileset>
+ <fileset dir="${webapp.template.dir}" includes="**/*"/>
</copy>
-
<!-- deploy beehive files to the webapp -->
<mkdir dir="${webapp.lib}"/>
<deploy-wsm webappDir="${webapp.build.dir}"/>
<!-- add the jars necessary for attachment support -->
<copy todir="${webapp.lib}">
- <fileset dir="${external.dir}/webservice">
- <include name="**/*.jar"/>
- </fileset>
+ <fileset dir="external" includes="*.jar"/>
</copy>
- <!-- gen xbeans for webapp -->
<build-schemas srcdir="${webapp.schemas}" destdir="${webapp.classes}"/>
- <!-- build the webapp classes -->
<mkdir dir="${webapp.classes}"/>
<mkdir dir="${webapp.beansrc}"/>
+
<build-controls srcdir="${webapp.src}"
destdir="${webapp.classes}"
tempdir="${webapp.beansrc}"
@@ -272,14 +229,22 @@
</target>
<!-- =================================================================== -->
- <!-- generate_jcxs - Generate webservice controls from wsdls -->
+ <!-- generate_webservicecontrols - Generate webservice controls from wsdls -->
<!-- =================================================================== -->
- <target name="generate_jcxs">
+ <target name="generate_webservicecontrols">
+
+ <taskdef name="axisbeanbuild"
+ classname="org.apache.beehive.wsm.axis.tools.ant.AxisTypeGeneratorTask"
+ classpathref="client.classpath"/>
<taskdef name="xmlbeanbuild"
classname="org.apache.xmlbeans.impl.tool.XMLBean"
classpathref="xbean.dependency.path"/>
+ <taskdef name="scgen"
+ classname="org.apache.beehive.controls.system.webservice.generator.ServiceControlGeneratorTask"
+ classpathref="client.classpath"/>
+
<!-- TODO: add support for ignoreDuplicates to build-schemas macro? -->
<xmlbeanbuild classpathref="xbean.dependency.path"
classgendir="${client.classes}"
@@ -297,21 +262,12 @@
<javac srcdir="${client.axisgen}" destdir="${client.classes}" classpathref="client.classpath" debug="true"/>
- <taskdef name="scgen"
- classname="org.apache.beehive.controls.system.webservice.generator.ServiceControlGeneratorTask"
- classpathref="client.classpath"/>
-
<scgen srcdir="${wsdls.dir}" destdir="${client.jcxgensrc}" destPackageName="${client.jcxgen.packageName}"/>
<scgen srcdir="${rpc.encoded.wsdls.dir}" destdir="${client.jcxgensrc}" destPackageName="${client.jcxgen.packageName}"/>
<copy todir="${client.jcxgensrc}/${client.jcxgen.packageName}">
- <fileset dir="${wsdls.dir}">
- <include name="*.wsdl"/>
- </fileset>
-
- <fileset dir="${rpc.encoded.wsdls.dir}">
- <include name="**/*.wsdl"/>
- </fileset>
+ <fileset dir="${wsdls.dir}" includes="*.wsdl"/>
+ <fileset dir="${rpc.encoded.wsdls.dir}" includes="**/*.wsdl"/>
</copy>
</target>
@@ -320,43 +276,26 @@
<!-- wsdl we keep a copy of. -->
<!-- =================================================================== -->
<target name="check-wsdls" description="Verify that the webservice wsdl matches our DRT wsdl.">
-
- <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitWrapped"
- drtWsdlDir="${wsdls.dir}"/>
- <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitWrappedArrayTypes"
- drtWsdlDir="${wsdls.dir}"/>
- <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitBare"
- drtWsdlDir="${wsdls.dir}"/>
- <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitBareArrayTypes"
- drtWsdlDir="${wsdls.dir}"/>
+ <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitWrapped" drtWsdlDir="${wsdls.dir}"/>
+ <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitWrappedArrayTypes" drtWsdlDir="${wsdls.dir}"/>
+ <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitBare" drtWsdlDir="${wsdls.dir}"/>
+ <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingDocLitBareArrayTypes" drtWsdlDir="${wsdls.dir}"/>
<check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcLit" drtWsdlDir="${wsdls.dir}"/>
- <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcLitArrayTypes"
- drtWsdlDir="${wsdls.dir}"/>
-
+ <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcLitArrayTypes" drtWsdlDir="${wsdls.dir}"/>
<check-wsdl webservicePath="header" webserviceName="HeaderDocLitEndpoint" drtWsdlDir="${wsdls.dir}"/>
<check-wsdl webservicePath="header" webserviceName="HeaderRpcLitEndpoint" drtWsdlDir="${wsdls.dir}"/>
<check-wsdl webservicePath="header" webserviceName="HeaderRpcEncEndpoint" drtWsdlDir="${rpc.encoded.wsdls.dir}"/>
-
<check-wsdl webservicePath="handlers" webserviceName="HandlerDocLitEndpoint" drtWsdlDir="${wsdls.dir}"/>
<check-wsdl webservicePath="handlers" webserviceName="HandlerRpcLitEndpoint" drtWsdlDir="${wsdls.dir}"/>
<check-wsdl webservicePath="handlers" webserviceName="HandlerRpcEncEndpoint" drtWsdlDir="${rpc.encoded.wsdls.dir}"/>
-
<check-wsdl webservicePath="attachments/images" webserviceName="ImagesDocLitWrapped" drtWsdlDir="${wsdls.dir}"/>
<check-wsdl webservicePath="attachments/images" webserviceName="ImagesRpcLit" drtWsdlDir="${wsdls.dir}"/>
<check-wsdl webservicePath="attachments/images" webserviceName="ImagesRpcEnc" drtWsdlDir="${rpc.encoded.wsdls.dir}"/>
-
- <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcEnc"
- drtWsdlDir="${rpc.encoded.wsdls.dir}"/>
- <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcEncArrayTypes"
- drtWsdlDir="${rpc.encoded.wsdls.dir}"/>
-
- <check-wsdl webservicePath="web/complex" webserviceName="DocumentLiteralWrappedSample"
- drtWsdlDir="${wsdls.dir}"/>
+ <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcEnc" drtWsdlDir="${rpc.encoded.wsdls.dir}"/>
+ <check-wsdl webservicePath="soapMarshalling" webserviceName="SoapMarshallingRpcEncArrayTypes" drtWsdlDir="${rpc.encoded.wsdls.dir}"/>
+ <check-wsdl webservicePath="web/complex" webserviceName="DocumentLiteralWrappedSample" drtWsdlDir="${wsdls.dir}"/>
<check-wsdl webservicePath="web/complex3" webserviceName="RpcLiteralSample" drtWsdlDir="${wsdls.dir}"/>
- <check-wsdl webservicePath="web/webparam" webserviceName="WebParamDocumentLiteralSample"
- drtWsdlDir="${wsdls.dir}"/>
-
-
+ <check-wsdl webservicePath="web/webparam" webserviceName="WebParamDocumentLiteralSample" drtWsdlDir="${wsdls.dir}"/>
</target>
<!-- =================================================================== -->