Author: mmerz
Date: Tue Feb 8 10:35:43 2005
New Revision: 152906
URL: http://svn.apache.org/viewcvs?view=rev&rev=152906
Log:
Fixed enhanced address book sample in distribution and SVN.
Added:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client-dist.xml
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-dist.xml
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client-svn.xml
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-svn.xml
Added:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client-dist.xml?view=auto&rev=152906
==============================================================================
---
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client-dist.xml
(added)
+++
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client-dist.xml
Tue Feb 8 10:35:43 2005
@@ -0,0 +1,107 @@
+<?xml version="1.0" ?>
+
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ 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:$
+ -->
+
+<project name="Enhanced Address Book Sample Client" default="test" basedir=".">
+
+ <import file="../../../beehive-imports.xml" />
+
+ <property
+ name="wsdl.url"
+ value="http://localhost:8080/EnhancedAddressBookWS/web/Service.jws?wsdl";
/>
+ <property name="webapp.dir" value=".." />
+ <property name="web.inf.dir" value="${webapp.dir}/WEB-INF" />
+ <property name="build.dir" value="${web.inf.dir}/build-client" />
+ <property name="lib.dir" value="${web.inf.dir}/lib" />
+ <property name="gen.dir" value="${build.dir}/gen" />
+ <property name="classes.dir" value="${build.dir}/classes" />
+ <property name="log.dir" value="${web.inf.dir}/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="generate.client">
+ <javac
+ srcdir="${gen.dir}"
+ destdir="${classes.dir}"
+ classpathref="jars"
+ failonerror="true"
+ source="1.4" />
+ </target>
+
+ <target name="generate.client" depends="dirs">
+ <antcall target="deploy.beehive.webservice.runtime" />
+ <taskdef
+ name="wsdl2java"
+ classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
+ loaderref="axis">
+ <classpath refid="jars"/>
+ </taskdef>
+ <wsdl2java
+ url="${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>
+
+
+ <!-- copy all dependencies -->
+ <target name="deploy.beehive.webservice.runtime" depends="dirs">
+ <copy todir="${lib.dir}">
+ <fileset file="${beehive.home}/lib/common/*.jar" />
+ <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/wsm/*.jar" />
+ </copy>
+ </target>
+
+</project>
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client-svn.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client-svn.xml?view=diff&r1=152905&r2=152906
==============================================================================
---
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client-svn.xml
(original)
+++
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client-svn.xml
Tue Feb 8 10:35:43 2005
@@ -18,7 +18,7 @@
$Header:$
-->
-<project name="EnhancedAddressBookWS Client" basedir="." default="test">
+<project name="Enhanced Address Book Sample Client" basedir="." default="test">
<import file="../../../beehive-imports.xml" />
@@ -94,4 +94,4 @@
<mkdir dir="${log.dir}" />
</target>
-</project>
\ No newline at end of file
+</project>
Added:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-dist.xml?view=auto&rev=152906
==============================================================================
---
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-dist.xml
(added)
+++
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-dist.xml
Tue Feb 8 10:35:43 2005
@@ -0,0 +1,124 @@
+<?xml version="1.0" ?>
+
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ 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:$
+ -->
+
+<project name="Enhanced Address Book Sample" default="build" basedir=".">
+
+ <import file="../../../beehive-imports.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}/AddressBookWS.jar" />
+ <property name="webservice.war" value="AddressBookWS.war" />
+
+ <path id="lib.path">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar" />
+ </fileset>
+ </path>
+
+ <path id="build.classpath">
+ <path refid="lib.path"/>
+ <pathelement location="${classes.dir}"/>
+ </path>
+
+
+ <!-- ========================================= -->
+ <!-- deploy.war - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy.war">
+ <jar jarfile="${to.dir}/${webservice.war}">
+ <fileset dir="..">
+ <exclude name="${src.dir}/**" />
+ <exclude name="${gen.dir}/**" />
+ </fileset>
+ </jar>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- build - build all binaries -->
+ <!-- ========================================= -->
+
+ <target name="build" depends="dirs">
+ <antcall target="deploy.beehive.webservice.runtime" />
+ <antcall target="build.beehive.webservice" />
+ <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>
+
+ <!-- copy all dependencies -->
+ <target name="deploy.beehive.webservice.runtime" depends="dirs">
+ <copy todir="${lib.dir}">
+ <fileset file="${beehive.home}/lib/common/*.jar" />
+ <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/wsm/*.jar" />
+ </copy>
+ </target>
+
+
+ <!-- build all beehive webservice binaries -->
+ <target name="build.beehive.webservice">
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="lib.path"
+ onerror="report" />
+ <apt
+ srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ gendir="${gen.dir}"
+ classpathref="build.classpath"
+ compileByExtension="true"
+ srcExtensions="*.java,*.jcx,*.jcs,*.jws"
+ debug="true" />
+ </target>
+
+</project>
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-svn.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-svn.xml?view=diff&r1=152905&r2=152906
==============================================================================
---
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-svn.xml
(original)
+++
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-svn.xml
Tue Feb 8 10:35:43 2005
@@ -1,94 +1,105 @@
-<?xml version="1.0" ?>
-
-<!--
- Copyright 2004 The Apache Software Foundation
-
- 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:$
- -->
-
-<project name="EnhancedAddressBookWS" default="build" basedir=".">
-
- <import file="../../../beehive-imports.xml" />
-
- <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="lib.dir" location="${web.inf.dir}/lib" />
- <property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar"
/>
- <property name="webservice.war" location="${service.name}WS.war" />
-
- <condition property="isJDK15">
- <equals arg1="${ant.java.version}" arg2="1.5" />
- </condition>
-
- <path id="jars">
- <fileset dir="${lib.dir}" >
- <include name="**/*.jar" />
- </fileset>
- </path>
-
-
- <!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
- <!-- ========================================= -->
-
- <target name="deploy.war">
- <jar jarfile="${to.dir}/${service.name}WS.war">
- <fileset dir="${webapp.dir}">
- <exclude name="${web.inf}/src/**" />
- <exclude name="${web.inf}/.tmpbeansrc/**" />
- </fileset>
- </jar>
- </target>
-
-
- <!-- ========================================= -->
- <!-- build - build all binaries -->
- <!-- ========================================= -->
-
- <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>
-
-
- <!-- ========================================= -->
- <!-- clean - remove binary files -->
- <!-- ========================================= -->
-
- <target name="clean">
- <delete dir="${attachments.dir}" />
- <delete dir="${lib.dir}" />
- <delete file="velocity.log" />
- <clean-webapp webappDir="${webapp.dir}" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- dirs - create dirs required for compile -->
- <!-- ========================================= -->
-
- <target name="dirs">
- <mkdir dir="${attachments.dir}" />
- <mkdir dir="${classes.dir}" />
- </target>
-
-</project>
\ No newline at end of file
+<?xml version="1.0" ?>
+
+<!--
+ Copyright 2004 The Apache Software Foundation
+
+ 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:$
+ -->
+
+<project name="Enhanced Address Book Sample" default="build" basedir=".">
+
+ <import file="../../../beehive-imports.xml" />
+
+ <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="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
+ <property name="webservice.war" value="${service.name}WS.war" />
+
+ <condition property="isJDK15">
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ </condition>
+
+ <path id="jars">
+ <fileset dir="${lib.dir}" >
+ <include name="**/*.jar" />
+ </fileset>
+ </path>
+
+
+ <!-- ========================================= -->
+ <!-- deploy - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy">
+ <antcall target="deploy.war" />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- deploy.war - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy.war">
+ <jar jarfile="${to.dir}/${service.name}WS.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-webapp webappDir="${webapp.dir}" />
+ <jar jarfile="${webservice.jar}">
+ <fileset dir="${classes.dir}" />
+ </jar>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- clean - remove binary files -->
+ <!-- ========================================= -->
+
+ <target name="clean">
+ <delete dir="${attachments.dir}" />
+ <delete dir="${lib.dir}" />
+ <delete file="velocity.log" />
+ <clean-webapp webappDir="${webapp.dir}" />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+
+ <target name="dirs">
+ <mkdir dir="${attachments.dir}" />
+ <mkdir dir="${classes.dir}" />
+ </target>
+
+</project>
