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 2006/03/19 19:39:57 UTC
svn commit: r387013 - in /beehive/trunk/samples/petstoreWeb: ./ src/
src/account/ src/account/addresses/ src/account/create/ src/account/edit/
src/auth/ src/checkout/ src/search/ src/shop/ src/webappRoot/ web/
web/account/addresses/ web/account/create/...
Author: ekoneil
Date: Sun Mar 19 10:39:54 2006
New Revision: 387013
URL: http://svn.apache.org/viewcvs?rev=387013&view=rev
Log:
Test run that re-organizes the petstoreWeb to have the Page Flow source files live in the web/ directory rather than the src/ directory. This fits more with the style of Eclipse's WTP project model and Maven's.
Feedback welcome...
BB: self
Test: distribution test pass
Added:
beehive/trunk/samples/petstoreWeb/src/Controller.java
- copied unchanged from r386903, beehive/trunk/samples/petstoreWeb/web/Controller.java
beehive/trunk/samples/petstoreWeb/src/account/
beehive/trunk/samples/petstoreWeb/src/account/addresses/
beehive/trunk/samples/petstoreWeb/src/account/addresses/Controller.java
- copied unchanged from r386903, beehive/trunk/samples/petstoreWeb/web/account/addresses/Controller.java
beehive/trunk/samples/petstoreWeb/src/account/create/
beehive/trunk/samples/petstoreWeb/src/account/create/Controller.java
- copied unchanged from r386903, beehive/trunk/samples/petstoreWeb/web/account/create/Controller.java
beehive/trunk/samples/petstoreWeb/src/account/edit/
beehive/trunk/samples/petstoreWeb/src/account/edit/Controller.java
- copied unchanged from r386903, beehive/trunk/samples/petstoreWeb/web/account/edit/Controller.java
beehive/trunk/samples/petstoreWeb/src/auth/
beehive/trunk/samples/petstoreWeb/src/auth/Controller.java
- copied unchanged from r386903, beehive/trunk/samples/petstoreWeb/web/auth/Controller.java
beehive/trunk/samples/petstoreWeb/src/checkout/
beehive/trunk/samples/petstoreWeb/src/checkout/Controller.java
- copied unchanged from r386903, beehive/trunk/samples/petstoreWeb/web/checkout/Controller.java
beehive/trunk/samples/petstoreWeb/src/search/
beehive/trunk/samples/petstoreWeb/src/search/Controller.java
- copied unchanged from r386903, beehive/trunk/samples/petstoreWeb/web/search/Controller.java
beehive/trunk/samples/petstoreWeb/src/shop/
beehive/trunk/samples/petstoreWeb/src/shop/Controller.java
- copied unchanged from r386903, beehive/trunk/samples/petstoreWeb/web/shop/Controller.java
beehive/trunk/samples/petstoreWeb/src/webappRoot/
beehive/trunk/samples/petstoreWeb/src/webappRoot/SharedFlow.java
- copied unchanged from r386903, beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java
Removed:
beehive/trunk/samples/petstoreWeb/web/Controller.java
beehive/trunk/samples/petstoreWeb/web/account/addresses/Controller.java
beehive/trunk/samples/petstoreWeb/web/account/create/Controller.java
beehive/trunk/samples/petstoreWeb/web/account/edit/Controller.java
beehive/trunk/samples/petstoreWeb/web/auth/Controller.java
beehive/trunk/samples/petstoreWeb/web/checkout/Controller.java
beehive/trunk/samples/petstoreWeb/web/search/Controller.java
beehive/trunk/samples/petstoreWeb/web/shop/Controller.java
beehive/trunk/samples/petstoreWeb/web/webappRoot/SharedFlow.java
Modified:
beehive/trunk/samples/petstoreWeb/build-dist.xml
beehive/trunk/samples/petstoreWeb/build.properties
beehive/trunk/samples/petstoreWeb/build.xml
Modified: beehive/trunk/samples/petstoreWeb/build-dist.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build-dist.xml?rev=387013&r1=387012&r2=387013&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build-dist.xml (original)
+++ beehive/trunk/samples/petstoreWeb/build-dist.xml Sun Mar 19 10:39:54 2006
@@ -14,8 +14,6 @@
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="Beehive/Samples/PetstoreWeb" default="build" basedir=".">
@@ -36,11 +34,13 @@
<property name="testsrc.dir" location="test-src"/>
<path id="webapp.classpath">
+ <path refid="velocity.dependency.path"/>
+ <path refid="netui-compiler.dependency.path"/>
+
<pathelement location="${jsp-api.jar}"/>
<pathelement location="${servlet-api.jar}"/>
- <fileset dir="${build.dir}/WEB-INF/lib">
- <include name="*.jar"/>
- </fileset>
+
+ <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
<pathelement location="${build.dir}/WEB-INF/classes"/>
</path>
@@ -55,7 +55,7 @@
<!-- deploy the Beehive runtime JARs into WEB-INF/lib -->
<!-- ================================================ -->
- <target name="deploy-beehive" description="Copy the Beehive rutime into the petstoreWeb webapp">
+ <target name="deploy-beehive" description="Copy the Beehive webapp rutime into the petstoreWeb webapp">
<mkdir dir="${build.dir}"/>
<available file="${derby.jar}" property="derby.present"/>
@@ -74,9 +74,7 @@
<target name="build" depends="deploy-beehive" description="Build the webapp">
<copy todir="${build.dir}/">
- <fileset dir="${web.dir}">
- <exclude name="**/*.java"/>
- </fileset>
+ <fileset dir="${web.dir}"/>
</copy>
<copy todir="${build.dir}/WEB-INF/classes">
@@ -87,6 +85,20 @@
</fileset>
</copy>
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="webapp.classpath"
+ onerror="fail"/>
+
+ <apt srcdir="${src.dir}"
+ destdir="${build.dir}/WEB-INF/classes"
+ gendir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ classpathref="webapp.classpath"
+ srcExtensions="*.java"
+ debug="true"
+ processorOptions="web.content.root=${web.dir}"
+ nocompile="false"/>
+<!--
<echo>Building Controls</echo>
<build-controls srcdir="${src.dir}"
destdir="${build.dir}/WEB-INF/classes"
@@ -99,6 +111,7 @@
destdir="${build.dir}/WEB-INF/classes"
tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
classpathref="webapp.classpath"/>
+-->
</target>
<target name="copy.jsps"
Modified: beehive/trunk/samples/petstoreWeb/build.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build.properties?rev=387013&r1=387012&r2=387013&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build.properties (original)
+++ beehive/trunk/samples/petstoreWeb/build.properties Sun Mar 19 10:39:54 2006
@@ -1,7 +1,12 @@
#
# petstoreWeb properties file for SVN
#
+beehive.home=../../
+
context.path=petstoreWeb
+
+servlet-api.jar=${beehive.home}/external/servlet/servlet-api-2.4.jar
+jsp-api.jar=${beehive.home}/external/servlet/jsp-api-2.0.jar
derby.jar=${beehive.home}/external/derby/derby_46005.jar
Modified: beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/petstoreWeb/build.xml?rev=387013&r1=387012&r2=387013&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ beehive/trunk/samples/petstoreWeb/build.xml Sun Mar 19 10:39:54 2006
@@ -17,9 +17,10 @@
-->
<project name="Beehive/Samples/PetstoreWeb" default="build" basedir=".">
- <import file="../../beehive-imports.xml"/>
- <import file="${beehive.home}/ant/beehive-tools.xml"/>
+ <property environment="os"/>
<property file="build.properties"/>
+ <import file="${beehive.home}/beehive-imports.xml"/>
+ <import file="${beehive.home}/ant/beehive-tools.xml"/>
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
@@ -32,7 +33,11 @@
<property name="testsrc.dir" location="test-src"/>
<path id="webapp.classpath">
- <path refid="servlet.dependency.path"/>
+ <path refid="velocity.dependency.path"/>
+ <path refid="netui-compiler.dependency.path"/>
+
+ <pathelement location="${jsp-api.jar}"/>
+ <pathelement location="${servlet-api.jar}"/>
<fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
<pathelement location="${build.dir}/WEB-INF/classes"/>
</path>
@@ -67,15 +72,7 @@
<target name="build" depends="deploy-beehive" description="Build the webapp">
<copy todir="${build.dir}/">
- <fileset dir="${web.dir}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
-
- <copy todir="${build.dir}/WEB-INF/lib" failOnError="false">
- <fileset dir="${basedir}/lib">
- <include name="*.jar"/>
- </fileset>
+ <fileset dir="${web.dir}"/>
</copy>
<copy todir="${build.dir}/WEB-INF/classes">
@@ -86,18 +83,19 @@
</fileset>
</copy>
- <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"/>
-
- <echo>Building Page Flows</echo>
- <build-pageflows srcdir="${web.dir}"
- webcontentdir="${web.dir}"
- destdir="${build.dir}/WEB-INF/classes"
- tempdir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
- classpathref="webapp.classpath"/>
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="webapp.classpath"
+ onerror="fail"/>
+
+ <apt srcdir="${src.dir}"
+ destdir="${build.dir}/WEB-INF/classes"
+ gendir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ classpathref="webapp.classpath"
+ srcExtensions="*.java"
+ debug="true"
+ processorOptions="web.content.root=${web.dir}"
+ nocompile="false"/>
</target>
<target name="copy.jsps"
@@ -113,7 +111,6 @@
<!-- ========================================= -->
<!-- clean - clean the webapp -->
<!-- ========================================= -->
-
<target name="scrub" description="Scrub the webapp">
<delete dir="${build.dir}"/>
<antcall target="test.clean"/>
@@ -129,7 +126,6 @@
<!-- =========================================== -->
<!-- deploy targets - move the app to the server -->
<!-- =========================================== -->
-
<target name="deploy" description="Deploy the webapp to a running server">
<deploy-webapp webappDir="${build.dir}" contextPath="${context.path}"/>
</target>