Author: mmerz
Date: Wed Feb 2 16:22:15 2005
New Revision: 151088
URL: http://svn.apache.org/viewcvs?view=rev&rev=151088
Log:
Fixed SVN build files for AddressBookWS sample.
Modified:
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml
incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/client-build.xml
Modified: incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml?view=diff&r1=151087&r2=151088
==============================================================================
--- incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/build.xml Wed Feb 2
16:22:15 2005
@@ -22,11 +22,14 @@
<import file="../../../beehive-imports.xml" />
- <property name="attachments.dir" location="attachments" />
- <property name="classes.dir" location="classes" />
- <property name="gen.dir" location="gen" />
- <property name="lib.dir" location="lib" />
-
+ <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="lib.dir" location="${web.inf.dir}/lib" />
+ <property name="webservice.jar" location="${lib.dir}/AddressBookWS.jar" />
+ <property name="webservice.war" location="AddressBookWS.war" />
+
<condition property="isJDK15">
<equals arg1="${ant.java.version}" arg2="1.5" />
</condition>
@@ -37,51 +40,47 @@
</fileset>
</path>
-
+
<!-- ========================================= -->
- <!-- build - build jar-file -->
+ <!-- deploy.war - build deployable artifact -->
<!-- ========================================= -->
-
- <target name="build" depends="dirs">
- <copy-controls todir="${lib.dir}" />
- <deploy-wsm webappDir=".." />
- <build-webapp webappDir=".." />
- <jar jarfile="${lib.dir}/AddressBookWS.jar">
- <fileset dir="${classes.dir}" />
+
+ <target name="deploy.war">
+ <jar jarfile="${to.dir}/AddressBookWS.war">
+ <fileset dir="${webapp.dir}">
+ <exclude name="${web.inf}/src/**" />
+ <exclude name="${web.inf}/.tmpbeansrc/**" />
+ </fileset>
</jar>
+ <antcall target="clean" />
</target>
-
+
<!-- ========================================= -->
- <!-- clean - remove build files -->
+ <!-- build - build all binaries -->
<!-- ========================================= -->
- <target name="clean" >
- <delete dir="${attachments.dir}" />
- <delete file="${lib.dir}/AddressBookWS.jar" />
- <delete file="velocity.log" />
- <clean-webapp webappDir=".." />
+ <target name="build" depends="dirs">
+ <deploy-wsm webappDir="${webapp.dir}" />
+ <build-webapp webappDir="${webapp.dir}" />
+ <jar jarfile="${webservice.jar}">
+ <fileset dir="${classes.dir}" />
+ </jar>
</target>
<!-- ========================================= -->
- <!-- deploy - add webservice to container -->
+ <!-- clean - remove binary files -->
<!-- ========================================= -->
- <target name="deploy" >
- <deploy-webapp webappDir=".." contextPath="AddressBookWS" />
+ <target name="clean">
+ <delete dir="${attachments.dir}" />
+ <delete dir="${lib.dir}" />
+ <delete file="velocity.log" />
+ <clean-webapp webappDir="${webapp.dir}" />
</target>
- <!-- ========================================= -->
- <!-- undeploy - remove webservice from container -->
- <!-- ========================================= -->
-
- <target name="undeploy" >
- <undeploy-webapp contextPath="AddressBookWS" />
- </target>
-
-
<!-- ========================================= -->
<!-- dirs - create dirs required for compile -->
<!-- ========================================= -->
Modified: incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/client-build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/client-build.xml?view=diff&r1=151087&r2=151088
==============================================================================
--- incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/client-build.xml
(original)
+++ incubator/beehive/trunk/samples/AddressBookWS/WEB-INF/client-build.xml Wed
Feb 2 16:22:15 2005
@@ -1,69 +1,96 @@
<?xml version="1.0" ?>
-<project name="AddressBookClient" basedir="." default="all">
-
- <property name="AddressBook.wsdl.url"
- value="http://localhost:8080/AddressBook/web/Service.jws?wsdl";
/>
-
-
- <path id="jars">
- <fileset dir="lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
- loaderref="axis" >
- <classpath refid="jars"/>
- </taskdef>
-
+<!--
+ Copyright 2004 The Apache Software Foundation
- <target name="clean">
- <delete dir="build" />
- <delete dir="./logs" />
-
- </target>
-
- <target name="dirs">
- <mkdir dir="build" />
- <mkdir dir="build/generated" />
- <mkdir dir="build/classes" />
- <mkdir dir="./logs" />
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+ -->
- </target>
- <target name="all" depends="genClient, compile, test"/>
+<project name="AddressBookClient" basedir="." default="test">
- <target name="genClient" depends="dirs">
- <wsdl2java url="${AddressBook.wsdl.url}"
- output="build/generated"
- testcase="yes">
- </wsdl2java>
+ <import file="../../../beehive-imports.xml" />
+
+ <property
+ name="AddressBook.wsdl.url"
+ value="http://localhost:8080/AddressBookWS/web/Service.jws?wsdl"; />
+ <property name="webapp.dir" value=".." />
+ <property name="build.dir" value="build" />
+ <property name="lib.dir" value="lib" />
+ <property name="gen.dir" value="${build.dir}/gen" />
+ <property name="classes.dir" value="${build.dir}/classes" />
+ <property name="log.dir" value="logs" />
+
+ <path id="jars">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <target name="test" depends="dirs,compile">
+ <junit
+ printsummary="yes"
+ haltonfailure="yes"
+ showoutput="yes">
+ <classpath>
+ <pathelement location= "${classes.dir}"/>
+ <path refid="jars"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest fork="yes" todir="${log.dir}">
+ <fileset dir="${classes.dir}">
+ <include name="**/*Test*.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="compile" depends="genClient">
+ <javac
+ srcdir="${gen.dir}"
+ destdir="${classes.dir}"
+ classpathref="jars"
+ failonerror="true"
+ source="1.4" />
+ </target>
+
+ <target name="genClient" depends="dirs">
+ <deploy-wsm webappDir="${webapp.dir}" />
+ <taskdef
+ name="wsdl2java"
+ classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
+ loaderref="axis">
+ <classpath refid="jars"/>
+ </taskdef>
+ <wsdl2java
+ url="${AddressBook.wsdl.url}"
+ output="${gen.dir}"
+ testcase="yes">
+ </wsdl2java>
+ </target>
+
+ <target name="clean">
+ <delete dir="${build.dir}" />
+ <delete dir="${log.dir}" />
+ <delete dir="${lib.dir}" />
+ </target>
+
+ <target name="dirs">
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${gen.dir}" />
+ <mkdir dir="${classes.dir}" />
+ <mkdir dir="${log.dir}" />
+ </target>
- </target>
-
- <target name="compile" depends="genClient">
- <javac srcdir="build/generated"
- destdir="build/classes"
- classpathref="jars"
- failonerror="true"
- source="1.4"
- />
- </target>
-
- <target name="test" depends="compile">
- <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
- <classpath>
- <pathelement location= "build/classes"/>
- <path refid="jars"/>
- </classpath>
- <formatter type="plain"/>
- <batchtest fork="yes" todir="./logs">
- <fileset dir="build/classes">
- <include name="**/*Test*.class"/>
- </fileset>
- </batchtest>
- </junit>
-
- </target>
-
</project>
