Author: mmerz
Date: Thu Mar 10 17:33:06 2005
New Revision: 157023
URL: http://svn.apache.org/viewcvs?view=rev&rev=157023
Log:
Minor fixes for samples in distro.
Removed:
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/client-build.xml
Modified:
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/web.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-dist.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/web.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/web.xml
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/web.xml
incubator/beehive/trunk/wsm/build.xml
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=157022&r2=157023
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Thu Mar 10 17:33:06 2005
@@ -320,8 +320,10 @@
</target>
<target name="build.dist.samples">
+ <!--
+ [EMAIL PROTECTED] (3/4/04): took petstore dashboard sample out of
distribution; there are some issues around Axis that need to be resolved first.
+ -->
<!-- Build the petstore dashboard distro
- [EMAIL PROTECTED] (3/4/04): took petstore dashboard sample out of
distribution; there are some issues around Axis that need to be resolved first.
<copy todir="${dist.dir}/samples/wsm-petstore-dashboard"
failOnError="true">
<fileset dir="samples/wsm-petstore-dashboard"/>
</copy>
@@ -353,37 +355,58 @@
<fileset dir="samples/controls-db"/>
</copy>
- <!-- Build the WSM/template -->
+ <!-- Build the sample: wsm-blank -->
<copy todir="${dist.dir}/samples/wsm-blank" failOnError="true">
<fileset dir="samples/wsm-blank">
<exclude name="WEB-INF/build*svn.xml"/>
</fileset>
</copy>
- <!-- Build the WSM/EnhancedAddressBookWS sample -->
- <copy todir="${dist.dir}/samples/EnhancedAddressBookWS"
failOnError="true">
+ <!-- Build the sample: wsm-addressbook -->
+ <copy todir="${dist.dir}/samples/wsm-addressbook" failOnError="true">
+ <fileset dir="samples/wsm-addressbook">
+ <exclude name="WEB-INF/build*svn.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- Build the sample: wsm-addressbook-enhanced -->
+ <copy todir="${dist.dir}/samples/wsm-addressbook-enhanced"
failOnError="true">
<fileset dir="samples/wsm-addressbook-enhanced">
<exclude name="WEB-INF/build*svn.xml"/>
</fileset>
</copy>
- <!-- Build the WSM/AddressBookWS sample -->
- <copy todir="${dist.dir}/samples/AddressBookWS" failOnError="true">
- <fileset dir="samples/wsm-addressbook">
+ <!-- Build the sample: wsm-addressbook-fromWSDL -->
+ <!--
+ [EMAIL PROTECTED] (3/9/04): needs to be more stable.
+ -->
+ <!--
+ <copy todir="${dist.dir}/samples/wsm-addressbook-fromWSDL"
failOnError="true">
+ <fileset dir="samples/wsm-addressbook-fromWSDL">
<exclude name="WEB-INF/build*svn.xml"/>
</fileset>
</copy>
-
- <!-- Build the WSM/EmployeeWS sample -->
- <!-- todo: depends on dbControls.jar; controls-db, which produces that
file and copies it into WEB-INF/lib needs be merged back from alpha -->
- <copy todir="${dist.dir}/samples/EmployeeWS" failOnError="true">
+ -->
+
+ <!-- Build the sample: wsm-employee -->
+ <!--
+ [EMAIL PROTECTED] (3/9/04): dependency on database control needs
to be resolved.
+ -->
+ <copy todir="${dist.dir}/samples/wsm-employee" failOnError="true">
<fileset dir="samples/wsm-employee">
<exclude name="WEB-INF/build*svn.xml"/>
</fileset>
</copy>
+
+ <!-- Build the sample: wsm-samples -->
+ <copy todir="${dist.dir}/samples/wsm-samples" failOnError="true">
+ <fileset dir="samples/wsm-samples">
+ <exclude name="WEB-INF/build*svn.xml"/>
+ </fileset>
+ </copy>
<ant dir="${dist.dir}/samples/controls-db" antfile="build.xml"
target="build" inheritall="false"/>
- <copy todir="${dist.dir}/samples/EmployeeWS/WEB-INF/lib"
failOnError="true">
+ <copy todir="${dist.dir}/samples/wsm-employee/WEB-INF/lib"
failOnError="true">
<fileset dir="${dist.dir}/samples/controls-db/build">
<include name="dbControl.jar"/>
</fileset>
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/web.xml?view=diff&r1=157022&r2=157023
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/web.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/web.xml
Thu Mar 10 17:33:06 2005
@@ -5,7 +5,7 @@
<web-app>
- <display-name>Apache-Axis</display-name>
+ <display-name>Beehive Web Services - Enhanced Address Book
Sample</display-name>
<filter>
<filter-name>ControlFilter</filter-name>
Modified:
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-dist.xml?view=diff&r1=157022&r2=157023
==============================================================================
---
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-dist.xml
(original)
+++
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-dist.xml
Thu Mar 10 17:33:06 2005
@@ -104,4 +104,4 @@
</copy>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/web.xml?view=diff&r1=157022&r2=157023
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/web.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/web.xml Thu Mar 10
17:33:06 2005
@@ -5,7 +5,7 @@
<web-app>
- <display-name>Apache-Axis</display-name>
+ <display-name>Beehive Web Services - Address Book Sample</display-name>
<filter>
<filter-name>ControlFilter</filter-name>
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/web.xml?view=diff&r1=157022&r2=157023
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/web.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/web.xml Thu Mar 10
17:33:06 2005
@@ -5,7 +5,7 @@
<web-app>
- <display-name>Apache-Axis</display-name>
+ <display-name>Beehive Web Services - Blank Sample</display-name>
<filter>
<filter-name>ControlFilter</filter-name>
Modified: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/web.xml?view=diff&r1=157022&r2=157023
==============================================================================
--- incubator/beehive/trunk/samples/wsm-samples/WEB-INF/web.xml (original)
+++ incubator/beehive/trunk/samples/wsm-samples/WEB-INF/web.xml Thu Mar 10
17:33:06 2005
@@ -4,7 +4,7 @@
<web-app>
- <display-name>Samples for Beehive Web Services</display-name>
+ <display-name>Beehive Web Services - Samples for JSR-181
Annotations</display-name>
<filter>
<filter-name>ControlFilter</filter-name>
Modified: incubator/beehive/trunk/wsm/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/build.xml?view=diff&r1=157022&r2=157023
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml (original)
+++ incubator/beehive/trunk/wsm/build.xml Thu Mar 10 17:33:06 2005
@@ -290,11 +290,13 @@
<!-- ====================================================================
-->
<!-- deploy.webservice.runtime -->
<!-- ====================================================================
-->
- <target name="deploy.webservice.runtime" depends="build_all"
+ <target
+ name="deploy.webservice.runtime"
+ depends="build_all"
description="Deploy the web services runtime to a fully-quaflified
webapp directory specified with the property 'webapp.dir'">
<available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
<fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
- <echo>Deploy WSM to webapp rooted at: ${webapp.dir}</echo>
+ <echo message="Deploy WSM to webapp rooted at: ${webapp.dir}" />
<!-- copy the required libraries -->
<deploy-webservice-runtime appdir="${webapp.dir}/WEB-INF/lib"/>
<copy todir="${webapp.dir}/WEB-INF/lib/" failOnError="true">
