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/05/13 23:07:26 UTC
svn commit: r170089 -
/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src
/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src-ws
/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src-ws/web
/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/web
/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src
/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src-ws
/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src-ws/web
/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web
/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src
/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src-ws
/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src-ws/web
/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web
/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src
/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src-ws
/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src-ws/web
/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/web
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/handlerchain
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/header
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/oneway
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/soapmessagehandlers
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webmethod
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webparam
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webresult
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webservice
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/xsdtypes
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/complex
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/handlerchain
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/header
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/oneway
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/soapmessagehandlers
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webmethod
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webparam
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webresult
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webservice
/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/xsdtypes
Author: ekoneil
Date: Fri May 13 14:07:23 2005
New Revision: 170089
URL: http://svn.apache.org/viewcvs?rev=170089&view=rev
Log:
Move WSM web services from .jws to .java.
This change adds WEB-INF/src-ws directories to the WSM samples and changes the builds to <javac> WEB-INF/src and then <build-webservices> on WEB-INF/src-ws.
Chad Schoettger helped with this; thanks!
BB: self
DRT: Beehive pass / build.dist pass
Added:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src-ws/
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src-ws/web/
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src-ws/web/Service.java
- copied unchanged from r170056, incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/web/Service.jws
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src-ws/
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src-ws/web/
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src-ws/web/Service.java
- copied unchanged from r170056, incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src-ws/
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src-ws/web/
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src-ws/web/Blank.java
- copied unchanged from r170056, incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src-ws/
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src-ws/web/
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src-ws/web/Service.java
- copied unchanged from r170056, incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/web/Service.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex/DocumentLiteralBareSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/complex/DocumentLiteralBareSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex/RpcEncodedSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/complex/RpcEncodedSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/complex/RpcLiteralSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/complex/RpcLiteralSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/handlerchain/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/handlerchain/HandlerChainSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/handlerchain/HandlerChainSample.java
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/handlerchain/HandlerConfig.xml
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/handlerchain/HandlerConfig.xml
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/header/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/header/StockQuoteImpl.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/header/StockQuoteImpl.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/oneway/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/oneway/OnewaySample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/oneway/OnewaySample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/soapmessagehandlers/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/soapmessagehandlers/SOAPMessageHandlersSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/soapmessagehandlers/SOAPMessageHandlersSample.java
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webmethod/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webmethod/WebMethodWithAnnotationSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webmethod/WebMethodWithAnnotationSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webmethod/WebMethodWithoutAnnotationSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webmethod/WebMethodWithoutAnnotationSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webparam/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webparam/WebParamDocumentLiteralSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webparam/WebParamDocumentLiteralSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webparam/WebParamRpcLiteralSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webparam/WebParamRpcLiteralSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webresult/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webresult/WebResultDocumentLiteralSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webresult/WebResultDocumentLiteralSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webresult/WebResultRpcLiteralSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webresult/WebResultRpcLiteralSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webservice/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webservice/WebServiceCustomSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webservice/WebServiceCustomSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webservice/WebServiceEndpointInterfaceSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webservice/WebServiceEndpointInterfaceSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webservice/WebServiceImplementationBeanSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webservice/WebServiceImplementationBeanSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webservice/WebServiceSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webservice/WebServiceSample.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webservice/WebServiceWsdlLocation.wsdl
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webservice/WebServiceWsdlLocation.wsdl
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/webservice/WebServiceWsdlLocationSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webservice/WebServiceWsdlLocationSample.java
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/xsdtypes/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src-ws/web/xsdtypes/XsdTypesSample.java
- copied unchanged from r170076, incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/xsdtypes/XsdTypesSample.jws
Removed:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/web/
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/web/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/complex/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/handlerchain/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/header/StockQuoteImpl.jws
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/oneway/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/soapmessagehandlers/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webmethod/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webparam/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webresult/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/webservice/
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/web/xsdtypes/
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml
Modified: incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml?rev=170089&r1=170088&r2=170089&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml Fri May 13 14:07:23 2005
@@ -31,6 +31,7 @@
<property name="gen.dir" location="${web.inf.dir}/gen" />
<property name="lib.dir" location="${web.inf.dir}/lib" />
<property name="src.dir" location="${web.inf.dir}/src" />
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
<property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" location="${service.name}WS.war" />
@@ -47,6 +48,7 @@
<jar jarfile="../../../${service.name}WS.war">
<fileset dir="${webapp.dir}">
<exclude name="${src.dir}/**" />
+ <exclude name="${ws-src.dir}/**" />
<exclude name="${gen.dir}/**" />
</fileset>
</jar>
Modified: incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml?rev=170089&r1=170088&r2=170089&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml Fri May 13 14:07:23 2005
@@ -19,80 +19,84 @@
-->
<project name="Enhanced Address Book Sample" default="build" basedir=".">
-
- <property file="build.properties"/>
- <import file="${beehive.home}/beehive-imports.xml" />
- <import file="${beehive.home}/ant/beehive-tools.xml" />
+ <property file="build.properties"/>
- <property name="service.name" value="EnhancedAddressBook" />
+ <import file="${beehive.home}/beehive-imports.xml"/>
+ <import file="${beehive.home}/ant/beehive-tools.xml"/>
- <property name="webapp.dir" location="../.." />
- <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
- <property name="attachments.dir" location="${web.inf.dir}/attachments" />
- <property name="classes.dir" location="${web.inf.dir}/classes" />
- <property name="gen.dir" location="${web.inf.dir}/gen" />
- <property name="lib.dir" location="${web.inf.dir}/lib" />
- <property name="src.dir" location="${web.inf.dir}/src" />
- <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
- <property name="webservice.war" value="${service.name}WS.war" />
-
- <path id="build.classpath">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- <pathelement location="${classes.dir}"/>
- </path>
-
- <!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
- <!-- ========================================= -->
- <target name="war">
- <jar jarfile="../../../${webservice.war}">
- <fileset dir="${webapp.dir}">
- <exclude name="${src.dir}/**" />
- <exclude name="${gen.dir}/**" />
- </fileset>
- </jar>
- </target>
-
-
- <!-- ========================================= -->
- <!-- build - build all binaries -->
- <!-- ========================================= -->
-
- <target name="build" depends="dirs">
- <deploy-wsm webappDir="${webapp.dir}"/>
-
- <build-webservices srcdir="${src.dir}"
- destdir="${classes.dir}"
- tempdir="${gen.dir}"
- classpathref="build.classpath"/>
-
- <jar jarfile="${webservice.jar}">
- <fileset dir="${classes.dir}" />
- </jar>
- </target>
-
- <!-- ========================================= -->
- <!-- clean - remove binary files -->
- <!-- ========================================= -->
- <target name="clean">
- <delete dir="${attachments.dir}" />
- <delete dir="${classes.dir}" />
- <delete dir="${gen.dir}" />
- <delete dir="${lib.dir}" />
- <delete file="velocity.log" />
- </target>
-
- <!-- ========================================= -->
- <!-- dirs - create dirs required for compile -->
- <!-- ========================================= -->
- <target name="dirs">
- <mkdir dir="${attachments.dir}" />
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${gen.dir}" />
- <mkdir dir="${lib.dir}" />
- </target>
+ <property name="service.name" value="EnhancedAddressBook"/>
+
+ <property name="webapp.dir" location="../.."/>
+ <property name="web.inf.dir" location="${webapp.dir}/WEB-INF"/>
+ <property name="attachments.dir" location="${web.inf.dir}/attachments"/>
+ <property name="classes.dir" location="${web.inf.dir}/classes"/>
+ <property name="gen.dir" location="${web.inf.dir}/gen"/>
+ <property name="lib.dir" location="${web.inf.dir}/lib"/>
+ <property name="src.dir" location="${web.inf.dir}/src"/>
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
+ <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar"/>
+ <property name="webservice.war" value="${service.name}WS.war"/>
+
+ <path id="build.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="${classes.dir}"/>
+ </path>
+
+ <!-- ========================================= -->
+ <!-- deploy.war - build deployable artifact -->
+ <!-- ========================================= -->
+ <target name="war">
+ <jar jarfile="../../../${webservice.war}">
+ <fileset dir="${webapp.dir}">
+ <exclude name="${src.dir}/**"/>
+ <exclude name="${ws-src.dir}/**"/>
+ <exclude name="${gen.dir}/**"/>
+ </fileset>
+ </jar>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- build - build all binaries -->
+ <!-- ========================================= -->
+
+ <target name="build" depends="dirs">
+ <deploy-wsm webappDir="${webapp.dir}"/>
+
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
+
+ <jar jarfile="${webservice.jar}">
+ <fileset dir="${classes.dir}"/>
+ </jar>
+ </target>
+
+ <!-- ========================================= -->
+ <!-- clean - remove binary files -->
+ <!-- ========================================= -->
+ <target name="clean">
+ <delete dir="${attachments.dir}"/>
+ <delete dir="${classes.dir}"/>
+ <delete dir="${gen.dir}"/>
+ <delete dir="${lib.dir}"/>
+ <delete file="velocity.log"/>
+ </target>
+
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+ <target name="dirs">
+ <mkdir dir="${attachments.dir}"/>
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${gen.dir}"/>
+ <mkdir dir="${lib.dir}"/>
+ </target>
</project>
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build-svn.xml?rev=170089&r1=170088&r2=170089&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build-svn.xml Fri May 13 14:07:23 2005
@@ -31,6 +31,7 @@
<property name="gen.dir" value="${web.inf.dir}/.tmpbeansrc" />
<property name="lib.dir" value="${web.inf.dir}/lib" />
<property name="src.dir" value="${web.inf.dir}/src" />
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
<property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
@@ -47,6 +48,7 @@
<jar jarfile="../../../${webservice.war}">
<fileset dir="${webapp.dir}">
<exclude name="${src.dir}/**" />
+ <exclude name="${ws-src.dir}/**" />
<exclude name="${gen.dir}/**" />
</fileset>
</jar>
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml?rev=170089&r1=170088&r2=170089&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/build.xml Fri May 13 14:07:23 2005
@@ -34,6 +34,7 @@
<property name="gen.dir" location="${web.inf.dir}/gen" />
<property name="lib.dir" location="${web.inf.dir}/lib" />
<property name="src.dir" location="${web.inf.dir}/src" />
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
<property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
@@ -51,6 +52,7 @@
<jar jarfile="../../../${webservice.war}">
<fileset dir="${webapp.dir}">
<exclude name="${src.dir}/**" />
+ <exclude name="${ws-src.dir}/**" />
<exclude name="${gen.dir}/**" />
</fileset>
</jar>
@@ -62,7 +64,9 @@
<target name="build" depends="dirs">
<deploy-wsm webappDir="${webapp.dir}"/>
- <build-webservices srcdir="${src.dir}"
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
classpathref="build.classpath"/>
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build-svn.xml?rev=170089&r1=170088&r2=170089&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build-svn.xml Fri May 13 14:07:23 2005
@@ -29,6 +29,7 @@
<property name="web.inf.dir" value="${webapp.dir}/WEB-INF" />
<property name="lib.dir" value="${web.inf.dir}/lib" />
<property name="src.dir" value="${web.inf.dir}/src" />
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
<property name="build.dir" value="${web.inf.dir}/build-server" />
<property name="attachments.dir" value="${web.inf.dir}/attachments" />
<property name="classes.dir" value="${web.inf.dir}/classes" />
@@ -51,6 +52,7 @@
<exclude name="WEB-INF/classes/**" />
<exclude name="WEB-INF/.tmpbeansrc/**" />
<exclude name="WEB-INF/src/**" />
+ <exclude name="WEB-INF/src-ws/**" />
<exclude name="**/*build*.xml" />
</fileset>
</jar>
@@ -61,10 +63,14 @@
<!-- ========================================= -->
<target name="build" depends="dirs">
<deploy-wsm webappDir="${webapp.dir}"/>
- <build-webservices srcdir="${src.dir}"
+
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
classpathref="jars"/>
+
<jar jarfile="${webservice.jar}">
<fileset dir="${classes.dir}" />
</jar>
@@ -77,7 +83,8 @@
<delete dir="${attachments.dir}" />
<delete dir="${build.dir}" />
<delete dir="${lib.dir}" />
- <delete file="velocity.log" />
+ <delete dir="${gen.dir}" />
+ <delete file="velocity.log" />
<clean-webapp webappDir="${webapp.dir}" />
</target>
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml?rev=170089&r1=170088&r2=170089&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/build.xml Fri May 13 14:07:23 2005
@@ -34,6 +34,7 @@
<property name="gen.dir" location="${web.inf.dir}/gen" />
<property name="lib.dir" location="${web.inf.dir}/lib" />
<property name="src.dir" location="${web.inf.dir}/src" />
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
<property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
@@ -51,6 +52,7 @@
<jar jarfile="../../../${webservice.war}">
<fileset dir="${webapp.dir}">
<exclude name="${src.dir}/**" />
+ <exclude name="${ws-src.dir}/**" />
<exclude name="${gen.dir}/**" />
</fileset>
</jar>
@@ -62,7 +64,10 @@
<!-- ========================================= -->
<target name="build" depends="dirs">
<deploy-wsm webappDir="${webapp.dir}"/>
- <build-webservices srcdir="${src.dir}"
+
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
classpathref="build.classpath"/>
@@ -80,6 +85,8 @@
<delete dir="${classes.dir}" />
<delete dir="${gen.dir}" />
<delete dir="${lib.dir}" />
+ <delete dir="${web.inf.dir}/.tmpbeansrc"/>
+ <delete dir="${web.inf.dir}/build-server"/>
<delete file="velocity.log" />
</target>
Modified: incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build-svn.xml?rev=170089&r1=170088&r2=170089&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build-svn.xml Fri May 13 14:07:23 2005
@@ -27,6 +27,7 @@
<property name="webapp.dir" location="../.." />
<property name="lib.dir" location="lib" />
<property name="src.dir" location="src" />
+ <property name="ws-src.dir" location="src-ws"/>
<property name="gen.dir" location="gen" />
<property name="classes.dir" location="classes" />
<property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
@@ -56,6 +57,7 @@
<jar jarfile="../../../${service.name}WS.war">
<fileset dir="..">
<exclude name="${src.dir}/**" />
+ <exclude name="${ws-src.dir}/**" />
<exclude name="${gen.dir}/**" />
</fileset>
</jar>
@@ -91,6 +93,9 @@
classname="org.apache.beehive.controls.runtime.generator.AptTask"
classpath="lib/beehive-controls.jar"
onerror="report" />
+
+ <javac srcdir="${ws-src.dir}" destdir="${classes.dir}" classpathref="jars"/>
+
<apt
srcdir="${src.dir}"
destdir="${classes.dir}"
Modified: incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml?rev=170089&r1=170088&r2=170089&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/src/build.xml Fri May 13 14:07:23 2005
@@ -34,6 +34,7 @@
<property name="gen.dir" location="${web.inf.dir}/gen" />
<property name="lib.dir" location="${web.inf.dir}/lib" />
<property name="src.dir" location="${web.inf.dir}/src" />
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
<property name="webservice.jar" location="${lib.dir}/EmployeeWS.jar" />
<property name="webservice.war" location="EmployeeWS.war" />
@@ -51,6 +52,7 @@
<jar jarfile="../../../${webservice.war}">
<fileset dir="${webapp.dir}">
<exclude name="${src.dir}/**" />
+ <exclude name="${ws-src.dir}/**" />
<exclude name="${gen.dir}/**" />
</fileset>
</jar>
@@ -67,7 +69,9 @@
<fileset dir="${beehive.home}/external/derby" includes="derby_46005.jar" />
</copy>
- <build-webservices srcdir="${src.dir}"
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
classpathref="build.classpath"/>
Modified: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build-svn.xml?rev=170089&r1=170088&r2=170089&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build-svn.xml Fri May 13 14:07:23 2005
@@ -29,6 +29,7 @@
<property name="web.inf.dir" value="${webapp.dir}/WEB-INF" />
<property name="lib.dir" value="${web.inf.dir}/lib" />
<property name="src.dir" value="${web.inf.dir}/src" />
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
<property name="attachments.dir" value="${web.inf.dir}/attachments" />
<property name="classes.dir" value="${web.inf.dir}/classes" />
<property name="gen.dir" value="${web.inf.dir}/.tmpbeansrc" />
@@ -51,6 +52,7 @@
<exclude name="WEB-INF/classes/**" />
<exclude name="WEB-INF/.tmpbeansrc/**" />
<exclude name="WEB-INF/src/**" />
+ <exclude name="WEB-INF/src-ws/**" />
<exclude name="**/*build*.xml" />
</fileset>
</jar>
@@ -61,7 +63,10 @@
<!-- ========================================= -->
<target name="build" depends="dirs">
<deploy-wsm webappDir="${webapp.dir}"/>
- <build-webservices srcdir="${src.dir}"
+
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
classpathref="build.classpath"/>
@@ -78,6 +83,7 @@
<delete file="${webservice.jar}" />
<delete file="velocity.log" />
<delete dir="${lib.dir}" />
+ <delete dir="${gen.dir}" />
<clean-webapp webappDir="${webapp.dir}" />
<delete file="${webservice.jar}" />
<delete file="${webservice.war}" />
Modified: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml?rev=170089&r1=170088&r2=170089&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-samples/WEB-INF/src/build.xml Fri May 13 14:07:23 2005
@@ -34,6 +34,7 @@
<property name="gen.dir" location="${web.inf.dir}/gen" />
<property name="lib.dir" location="${web.inf.dir}/lib" />
<property name="src.dir" location="${web.inf.dir}/src" />
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
<property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
@@ -62,6 +63,7 @@
<jar jarfile="../../../${webservice.war}">
<fileset dir="../..">
<exclude name="${src.dir}/**" />
+ <exclude name="${ws-src.dir}/**" />
<exclude name="${gen.dir}/**" />
</fileset>
</jar>
@@ -72,7 +74,10 @@
<!-- ========================================= -->
<target name="build" depends="dirs">
<deploy-wsm webappDir="${webapp.dir}"/>
- <build-webservices srcdir="${src.dir}"
+
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
classpathref="build.classpath"/>
@@ -89,6 +94,7 @@
<delete dir="${classes.dir}" />
<delete dir="${gen.dir}" />
<delete dir="${lib.dir}" />
+ <delete dir="${web.inf.dir}/.tmpbeansrc"/>
<delete file="velocity.log" />
</target>