Author: mmerz
Date: Tue Feb 8 20:16:32 2005
New Revision: 152992
URL: http://svn.apache.org/viewcvs?view=rev&rev=152992
Log:
More fixes for the distro samples.
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-dist.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-dist.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-dist.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-dist.xml
Modified:
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=diff&r1=152991&r2=152992
==============================================================================
---
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-dist.xml
(original)
+++
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-dist.xml
Tue Feb 8 20:16:32 2005
@@ -22,6 +22,8 @@
<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" />
@@ -29,8 +31,8 @@
<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" />
+ <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
+ <property name="webservice.war" value="${service.name}WS.war" />
<path id="lib.path">
<fileset dir="${lib.dir}">
@@ -44,6 +46,15 @@
</path>
+ <!-- ========================================= -->
+ <!-- deploy - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy">
+ <antcall target="deploy.war" />
+ </target>
+
+
<!-- ========================================= -->
<!-- deploy.war - build deployable artifact -->
<!-- ========================================= -->
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-dist.xml?view=diff&r1=152991&r2=152992
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-dist.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-dist.xml Tue
Feb 8 20:16:32 2005
@@ -1,124 +1,135 @@
-<?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="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" location="${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="${web.inf}/.tmpbeansrc/**" />
- </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>
\ 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="Address Book Sample" default="build" basedir=".">
+
+ <import file="../../../beehive-imports.xml" />
+
+ <property name="service.name" value="AddressBook" />
+
+ <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" location="${lib.dir}/${service.name}WS.jar"
/>
+ <property name="webservice.war" value="${service.name}WS.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 - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy">
+ <antcall target="deploy.war" />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- 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-blank/WEB-INF/build-client-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-dist.xml?view=diff&r1=152991&r2=152992
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-dist.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-dist.xml Tue
Feb 8 20:16:32 2005
@@ -24,7 +24,7 @@
<property
name="wsdl.url"
- value="http://localhost:8080/blankWS/web/Service.jws?wsdl"; />
+ value="http://localhost:8080/blankWS/web/Blank.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" />
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml?view=diff&r1=152991&r2=152992
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml Tue Feb 8
20:16:32 2005
@@ -31,7 +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="webservice.jar" value="${lib.dir}/{service.name}WS.jar" />
+ <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
<property name="webservice.war" value="${service.name}WS.war" />
<path id="lib.path">
@@ -46,6 +46,15 @@
</path>
+ <!-- ========================================= -->
+ <!-- deploy - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy">
+ <antcall target="deploy.war" />
+ </target>
+
+
<!-- ========================================= -->
<!-- deploy.war - build deployable artifact -->
<!-- ========================================= -->
Modified: incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-dist.xml?view=diff&r1=152991&r2=152992
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-dist.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-dist.xml Tue Feb
8 20:16:32 2005
@@ -59,20 +59,46 @@
</jar>
</target>
-
<!-- ========================================= -->
- <!-- build - build all binaries -->
+ <!-- build - build jar-file -->
<!-- ========================================= -->
<target name="build" depends="dirs">
<antcall target="deploy.beehive.webservice.runtime" />
+ <copy todir="${lib.dir}">
+ <fileset dir="../../controls-db/build" includes="dbControl.jar" />
+ <fileset dir="${beehive.home}/external/derby" includes="derby_46005.jar"
/>
+ </copy>
+ <antcall target="compile"/>
<antcall target="build.beehive.webservice" />
<jar jarfile="${webservice.jar}">
- <fileset dir="${classes.dir}" />
+ <fileset dir="${classes.dir}">
+ <exclude name="**/Test.class" />
+ </fileset>
</jar>
</target>
-
+
+ <!-- ========================================= -->
+ <!-- compile - -->
+ <!-- ========================================= -->
+
+ <target name="compile" depends="dirs">
+ <taskdef
+ name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpath="lib/controls.jar"
+ onerror="report" />
+ <apt
+ srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ gendir="${gen.dir}"
+ compileByExtension="true"
+ classpathref="jars"
+ srcExtensions="*.java,*.jcx,*.jcs,*.jws" />
+ </target>
+
+
<!-- ========================================= -->
<!-- clean - remove binary files -->
<!-- ========================================= -->
@@ -97,6 +123,7 @@
<mkdir dir="${lib.dir}" />
</target>
+
<!-- copy all dependencies -->
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
@@ -123,4 +150,4 @@
debug="true" />
</target>
-</project>
+</project>
\ No newline at end of file
