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 18:04:08 UTC
svn commit: r170046 - in /incubator/beehive/trunk/samples/petstoreWeb:
build-dist.xml build.xml src/PetstoreInventoryManager.jws ws/
ws/PetstoreInventoryManager.java
Author: ekoneil
Date: Fri May 13 09:04:06 2005
New Revision: 170046
URL: http://svn.apache.org/viewcvs?rev=170046&view=rev
Log:
Move the web service in the petstore from src/ to ws/ and rename from .jws to .java. This improves the Eclipse editing experience and decouples the web service from the main webapp sources.
BB: self
DRT: Beehive pass / build.dist pass
Added:
incubator/beehive/trunk/samples/petstoreWeb/ws/
incubator/beehive/trunk/samples/petstoreWeb/ws/PetstoreInventoryManager.java
- copied unchanged from r169854, incubator/beehive/trunk/samples/petstoreWeb/src/PetstoreInventoryManager.jws
Removed:
incubator/beehive/trunk/samples/petstoreWeb/src/PetstoreInventoryManager.jws
Modified:
incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml
incubator/beehive/trunk/samples/petstoreWeb/build.xml
Modified: incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml?rev=170046&r1=170045&r2=170046&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml Fri May 13 09:04:06 2005
@@ -18,7 +18,7 @@
$Header:$
-->
-<project name="Beehive petstoreWeb sample" default="build" basedir=".">
+<project name="Beehive/Samples/PetstoreWeb" default="build" basedir=".">
<property environment="os"/>
<property file="build.properties"/>
@@ -26,11 +26,11 @@
<import file="${beehive.home}/ant/beehive-tools.xml"/>
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
- <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
<property name="build.dir" location="build"/>
<property name="web.dir" location="web"/>
<property name="src.dir" location="src"/>
+ <property name="ws.dir" location="ws"/>
<property name="testclasses.dir" location="classes/test"/>
<property name="testsrc.dir" location="test-src"/>
@@ -87,25 +87,28 @@
</fileset>
</copy>
- <!-- compile XSDs -->
<echo>Building XML Schemas</echo>
<build-schemas srcdir="${basedir}/schemas"
destDir="${build.dir}/WEB-INF/classes"/>
- <!-- compile controls -->
<echo>Building Controls</echo>
<build-controls srcdir="${basedir}/src"
destdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathRef="webapp.classpath"/>
- <!-- compile JPFs -->
<echo>Building Page Flows</echo>
<build-pageflows srcdir="${web.dir}"
webcontentdir="${web.dir}"
weboutputdir="${build.dir}"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>
+
+ <echo>Building Web Services</echo>
+ <build-webservices srcdir="${ws.dir}"
+ destdir="${build.dir}/WEB-INF/classes"
+ tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ classpathref="webapp.classpath"/>
</target>
<target name="copy.jsps"
Modified: incubator/beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build.xml?rev=170046&r1=170045&r2=170046&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build.xml Fri May 13 09:04:06 2005
@@ -18,19 +18,18 @@
$Header:$
-->
-<project name="Beehive petstoreWeb sample" default="build" basedir=".">
+<project name="Beehive/Samples/PetstoreWeb" default="build" basedir=".">
<import file="../../beehive-imports.xml"/>
<import file="${beehive.home}/ant/beehive-tools.xml"/>
<property file="build.properties"/>
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
- <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
<property name="build.dir" location="build"/>
<property name="web.dir" location="web"/>
<property name="src.dir" location="src"/>
- <property name="lib.dir" location="lib"/>
+ <property name="ws.dir" location="ws"/>
<property name="testclasses.dir" location="classes/test"/>
<property name="testsrc.dir" location="test-src"/>
@@ -90,25 +89,28 @@
</fileset>
</copy>
- <!-- compile XSDs -->
<echo>Building XML Schemas</echo>
<build-schemas srcdir="${basedir}/schemas"
destDir="${build.dir}/WEB-INF/classes"/>
- <!-- compile controls -->
<echo>Building Controls</echo>
<build-controls srcdir="${basedir}/src"
destdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathRef="webapp.classpath"/>
- <!-- compile JPFs -->
<echo>Building Page Flows</echo>
<build-pageflows srcdir="${web.dir}"
webcontentdir="${web.dir}"
weboutputdir="${build.dir}"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>
+
+ <echo>Building Web Services</echo>
+ <build-webservices srcdir="${ws.dir}"
+ destdir="${build.dir}/WEB-INF/classes"
+ tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ classpathref="webapp.classpath"/>
</target>
<target name="copy.jsps"