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/25 17:05:18 UTC
svn commit: r388777 - in /beehive/trunk/samples: netui-jsf/
netui-jsf/src/jsf/ netui-jsf/src/jsf/physiciansFlow/ netui-jsf/web/jsf/
netui-jsf/web/jsf/physiciansFlow/ netui-samples/
netui-samples/src/advanced/ netui-samples/src/advanced/actionintercepto...
Author: ekoneil
Date: Sat Mar 25 08:05:12 2006
New Revision: 388777
URL: http://svn.apache.org/viewcvs?rev=388777&view=rev
Log:
Reorganize the NetUI webapp samples so that all of the .java files are in the src/ directory rather than split across the src/ and web/ directories.
BB: self
Test: distribution build pass
Added:
beehive/trunk/samples/netui-jsf/src/jsf/
beehive/trunk/samples/netui-jsf/src/jsf/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-jsf/web/jsf/Controller.java
beehive/trunk/samples/netui-jsf/src/jsf/home.java
- copied unchanged from r388773, beehive/trunk/samples/netui-jsf/web/jsf/home.java
beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/
beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/Controller.java
beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/physicianDetail.java
- copied unchanged from r388773, beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/physicianDetail.java
beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/physicianResultsWithDetail.java
- copied unchanged from r388773, beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/physicianResultsWithDetail.java
beehive/trunk/samples/netui-jsf/src/jsf/physiciansFlow/search.java
- copied unchanged from r388773, beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/search.java
beehive/trunk/samples/netui-samples/src/advanced/
beehive/trunk/samples/netui-samples/src/advanced/actioninterceptors/
beehive/trunk/samples/netui-samples/src/advanced/actioninterceptors/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/Controller.java
beehive/trunk/samples/netui-samples/src/advanced/actioninterceptors/interceptme/
beehive/trunk/samples/netui-samples/src/advanced/actioninterceptors/interceptme/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/interceptme/Controller.java
beehive/trunk/samples/netui-samples/src/advanced/actioninterceptors/nested/
beehive/trunk/samples/netui-samples/src/advanced/actioninterceptors/nested/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/nested/Controller.java
beehive/trunk/samples/netui-samples/src/advanced/clientsidevalidation/
beehive/trunk/samples/netui-samples/src/advanced/clientsidevalidation/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/Controller.java
beehive/trunk/samples/netui-samples/src/advanced/customvalidator/
beehive/trunk/samples/netui-samples/src/advanced/customvalidator/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/advanced/customvalidator/Controller.java
beehive/trunk/samples/netui-samples/src/advanced/dynaforms/
beehive/trunk/samples/netui-samples/src/advanced/dynaforms/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/advanced/dynaforms/Controller.java
beehive/trunk/samples/netui-samples/src/basicnesting/
beehive/trunk/samples/netui-samples/src/basicnesting/main/
beehive/trunk/samples/netui-samples/src/basicnesting/main/MainFlow.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/basicnesting/main/MainFlow.java
beehive/trunk/samples/netui-samples/src/basicnesting/nested/
beehive/trunk/samples/netui-samples/src/basicnesting/nested/NestedFlow.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/basicnesting/nested/NestedFlow.java
beehive/trunk/samples/netui-samples/src/exceptions/
beehive/trunk/samples/netui-samples/src/exceptions/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/exceptions/Controller.java
beehive/trunk/samples/netui-samples/src/fileupload/
beehive/trunk/samples/netui-samples/src/fileupload/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/fileupload/Controller.java
beehive/trunk/samples/netui-samples/src/lifecycle/
beehive/trunk/samples/netui-samples/src/lifecycle/base/
beehive/trunk/samples/netui-samples/src/lifecycle/base/BasePageFlow.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/lifecycle/base/BasePageFlow.java
beehive/trunk/samples/netui-samples/src/lifecycle/longlived/
beehive/trunk/samples/netui-samples/src/lifecycle/longlived/LongLivedPageFlow.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/lifecycle/longlived/LongLivedPageFlow.java
beehive/trunk/samples/netui-samples/src/lifecycle/normal/
beehive/trunk/samples/netui-samples/src/lifecycle/normal/NormalPageFlow.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/lifecycle/normal/NormalPageFlow.java
beehive/trunk/samples/netui-samples/src/loginexample/
beehive/trunk/samples/netui-samples/src/loginexample/BaseFlow.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/loginexample/BaseFlow.java
beehive/trunk/samples/netui-samples/src/loginexample/loginflow/
beehive/trunk/samples/netui-samples/src/loginexample/loginflow/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/loginexample/loginflow/Controller.java
beehive/trunk/samples/netui-samples/src/loginexample/protectedflow/
beehive/trunk/samples/netui-samples/src/loginexample/protectedflow/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/loginexample/protectedflow/Controller.java
beehive/trunk/samples/netui-samples/src/loginexample/start/
beehive/trunk/samples/netui-samples/src/loginexample/start/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/loginexample/start/Controller.java
beehive/trunk/samples/netui-samples/src/nesting/
beehive/trunk/samples/netui-samples/src/nesting/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/nesting/Controller.java
beehive/trunk/samples/netui-samples/src/nesting/chooseairport/
beehive/trunk/samples/netui-samples/src/nesting/chooseairport/ChooseAirport.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/nesting/chooseairport/ChooseAirport.java
beehive/trunk/samples/netui-samples/src/templateactions/
beehive/trunk/samples/netui-samples/src/templateactions/MainFlow.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/templateactions/MainFlow.java
beehive/trunk/samples/netui-samples/src/templateactions/flow1/
beehive/trunk/samples/netui-samples/src/templateactions/flow1/Flow1.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/templateactions/flow1/Flow1.java
beehive/trunk/samples/netui-samples/src/templateactions/flow2/
beehive/trunk/samples/netui-samples/src/templateactions/flow2/Flow2.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/templateactions/flow2/Flow2.java
beehive/trunk/samples/netui-samples/src/templateactions/shared/
beehive/trunk/samples/netui-samples/src/templateactions/shared/SharedFlow.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/templateactions/shared/SharedFlow.java
beehive/trunk/samples/netui-samples/src/tiles/
beehive/trunk/samples/netui-samples/src/tiles/MainFlow.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/tiles/MainFlow.java
beehive/trunk/samples/netui-samples/src/tiles/flow1/
beehive/trunk/samples/netui-samples/src/tiles/flow1/Flow1.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/tiles/flow1/Flow1.java
beehive/trunk/samples/netui-samples/src/tiles/flow2/
beehive/trunk/samples/netui-samples/src/tiles/flow2/Flow2.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/tiles/flow2/Flow2.java
beehive/trunk/samples/netui-samples/src/tiles/shared/
beehive/trunk/samples/netui-samples/src/tiles/shared/SharedFlow.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/tiles/shared/SharedFlow.java
beehive/trunk/samples/netui-samples/src/ui/
beehive/trunk/samples/netui-samples/src/ui/datagrid/
beehive/trunk/samples/netui-samples/src/ui/datagrid/masterdetail/
beehive/trunk/samples/netui-samples/src/ui/datagrid/masterdetail/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/datagrid/masterdetail/Controller.java
beehive/trunk/samples/netui-samples/src/ui/datagrid/sortandfilter/
beehive/trunk/samples/netui-samples/src/ui/datagrid/sortandfilter/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/datagrid/sortandfilter/Controller.java
beehive/trunk/samples/netui-samples/src/ui/formintagfile/
beehive/trunk/samples/netui-samples/src/ui/formintagfile/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/formintagfile/Controller.java
beehive/trunk/samples/netui-samples/src/ui/formposting/
beehive/trunk/samples/netui-samples/src/ui/formposting/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/formposting/Controller.java
beehive/trunk/samples/netui-samples/src/ui/pageinput/
beehive/trunk/samples/netui-samples/src/ui/pageinput/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/pageinput/Controller.java
beehive/trunk/samples/netui-samples/src/ui/popup/
beehive/trunk/samples/netui-samples/src/ui/popup/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/popup/Controller.java
beehive/trunk/samples/netui-samples/src/ui/popup/getcolor/
beehive/trunk/samples/netui-samples/src/ui/popup/getcolor/GetColorController.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/popup/getcolor/GetColorController.java
beehive/trunk/samples/netui-samples/src/ui/repeaterediting/
beehive/trunk/samples/netui-samples/src/ui/repeaterediting/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/repeaterediting/Controller.java
beehive/trunk/samples/netui-samples/src/ui/resourcebinding/
beehive/trunk/samples/netui-samples/src/ui/resourcebinding/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/resourcebinding/Controller.java
beehive/trunk/samples/netui-samples/src/ui/select/
beehive/trunk/samples/netui-samples/src/ui/select/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/select/Controller.java
beehive/trunk/samples/netui-samples/src/ui/tree/
beehive/trunk/samples/netui-samples/src/ui/tree/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/ui/tree/Controller.java
beehive/trunk/samples/netui-samples/src/validation/
beehive/trunk/samples/netui-samples/src/validation/Controller.java
- copied unchanged from r388773, beehive/trunk/samples/netui-samples/web/validation/Controller.java
Removed:
beehive/trunk/samples/netui-jsf/web/jsf/Controller.java
beehive/trunk/samples/netui-jsf/web/jsf/home.java
beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/Controller.java
beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/physicianDetail.java
beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/physicianResultsWithDetail.java
beehive/trunk/samples/netui-jsf/web/jsf/physiciansFlow/search.java
beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/Controller.java
beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/interceptme/Controller.java
beehive/trunk/samples/netui-samples/web/advanced/actioninterceptors/nested/Controller.java
beehive/trunk/samples/netui-samples/web/advanced/clientsidevalidation/Controller.java
beehive/trunk/samples/netui-samples/web/advanced/customvalidator/Controller.java
beehive/trunk/samples/netui-samples/web/advanced/dynaforms/Controller.java
beehive/trunk/samples/netui-samples/web/basicnesting/main/MainFlow.java
beehive/trunk/samples/netui-samples/web/basicnesting/nested/NestedFlow.java
beehive/trunk/samples/netui-samples/web/exceptions/Controller.java
beehive/trunk/samples/netui-samples/web/fileupload/Controller.java
beehive/trunk/samples/netui-samples/web/lifecycle/base/BasePageFlow.java
beehive/trunk/samples/netui-samples/web/lifecycle/longlived/LongLivedPageFlow.java
beehive/trunk/samples/netui-samples/web/lifecycle/normal/NormalPageFlow.java
beehive/trunk/samples/netui-samples/web/loginexample/BaseFlow.java
beehive/trunk/samples/netui-samples/web/loginexample/loginflow/Controller.java
beehive/trunk/samples/netui-samples/web/loginexample/protectedflow/Controller.java
beehive/trunk/samples/netui-samples/web/loginexample/start/Controller.java
beehive/trunk/samples/netui-samples/web/nesting/Controller.java
beehive/trunk/samples/netui-samples/web/nesting/chooseairport/ChooseAirport.java
beehive/trunk/samples/netui-samples/web/templateactions/MainFlow.java
beehive/trunk/samples/netui-samples/web/templateactions/flow1/Flow1.java
beehive/trunk/samples/netui-samples/web/templateactions/flow2/Flow2.java
beehive/trunk/samples/netui-samples/web/templateactions/shared/SharedFlow.java
beehive/trunk/samples/netui-samples/web/tiles/MainFlow.java
beehive/trunk/samples/netui-samples/web/tiles/flow1/Flow1.java
beehive/trunk/samples/netui-samples/web/tiles/flow2/Flow2.java
beehive/trunk/samples/netui-samples/web/tiles/shared/SharedFlow.java
beehive/trunk/samples/netui-samples/web/ui/datagrid/masterdetail/Controller.java
beehive/trunk/samples/netui-samples/web/ui/datagrid/sortandfilter/Controller.java
beehive/trunk/samples/netui-samples/web/ui/formintagfile/Controller.java
beehive/trunk/samples/netui-samples/web/ui/formposting/Controller.java
beehive/trunk/samples/netui-samples/web/ui/pageinput/Controller.java
beehive/trunk/samples/netui-samples/web/ui/popup/Controller.java
beehive/trunk/samples/netui-samples/web/ui/popup/getcolor/GetColorController.java
beehive/trunk/samples/netui-samples/web/ui/repeaterediting/Controller.java
beehive/trunk/samples/netui-samples/web/ui/resourcebinding/Controller.java
beehive/trunk/samples/netui-samples/web/ui/select/Controller.java
beehive/trunk/samples/netui-samples/web/ui/tree/Controller.java
beehive/trunk/samples/netui-samples/web/validation/Controller.java
Modified:
beehive/trunk/samples/netui-jsf/build.xml
beehive/trunk/samples/netui-samples/build.xml
Modified: beehive/trunk/samples/netui-jsf/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-jsf/build.xml?rev=388777&r1=388776&r2=388777&view=diff
==============================================================================
--- beehive/trunk/samples/netui-jsf/build.xml (original)
+++ beehive/trunk/samples/netui-jsf/build.xml Sat Mar 25 08:05:12 2006
@@ -26,17 +26,16 @@
<property file="build.properties"/>
<import file="${beehive.home}/beehive-imports.xml"/>
- <import file="${beehive.home}/ant/beehive-tools.xml"/>
<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="tmp.sourcegen.dir" value=".tmpbeansrc"/>
<!-- Define the classpath used to build the webapp -->
<path id="webapp.classpath">
+ <path refid="velocity.dependency.path"/>
+ <path refid="netui-compiler.dependency.path"/>
+
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${jsp-api.jar}"/>
<pathelement location="${build.dir}/WEB-INF/classes"/>
@@ -50,9 +49,7 @@
<deploy-netui webappDir="${build.dir}"/>
<copy todir="${build.dir}/" includeEmptyDirs="false">
- <fileset dir="${web.dir}">
- <exclude name="**/*.java"/>
- </fileset>
+ <fileset dir="${web.dir}"/>
</copy>
<copy todir="${build.dir}/WEB-INF/classes">
@@ -64,17 +61,19 @@
</target>
<target name="build-internal">
- <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}"
- 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/.tmpbeansrc"
+ classpathref="webapp.classpath"
+ srcExtensions="*.java"
+ debug="true"
+ processorOptions="web.content.root=${web.dir}"
+ nocompile="false"/>
</target>
<target name="init-myfaces" depends="init"
@@ -86,14 +85,17 @@
<copy file="${web.dir}/WEB-INF/web.xml.myfaces" tofile="${build.dir}/WEB-INF/web.xml"/>
</target>
- <target name="init-jsf-ri" depends="init"
+ <target name="init-jsf-ri"
+ depends="init"
description="Build the netui-jsf webapp, for use with the JSF Reference Implementation">
<property name="jsf-ri-api.jar" value="${jsf-ri.dir}/jsf-api.jar"/>
- <property name="jsf-ri-impl.jar" value="${jsf-ri.dir}/jsf-impl.jar"/>
<available property="jsf-ri-api.jar.available" file="${jsf-ri-api.jar}" type="file"/>
- <available property="jsf-ri-impl.jar.available" file="${jsf-ri-impl.jar}" type="file"/>
<fail unless="jsf-ri-api.jar.available" message="Can't find the JSF API JAR ${jsf-ri-api.jar}"/>
+
+ <property name="jsf-ri-impl.jar" value="${jsf-ri.dir}/jsf-impl.jar"/>
+ <available property="jsf-ri-impl.jar.available" file="${jsf-ri-impl.jar}" type="file"/>
<fail unless="jsf-ri-impl.jar.available" message="Can't find the JSF implementation JAR ${jsf-ri-impl.jar}"/>
+
<copy file="${jsf-ri-api.jar}" todir="${build.dir}/WEB-INF/lib"/>
<copy file="${jsf-ri-impl.jar}" todir="${build.dir}/WEB-INF/lib"/>
<copy file="${web.dir}/WEB-INF/web.xml.jsf-ri" tofile="${build.dir}/WEB-INF/web.xml"/>
Modified: beehive/trunk/samples/netui-samples/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/netui-samples/build.xml?rev=388777&r1=388776&r2=388777&view=diff
==============================================================================
--- beehive/trunk/samples/netui-samples/build.xml (original)
+++ beehive/trunk/samples/netui-samples/build.xml Sat Mar 25 08:05:12 2006
@@ -26,17 +26,16 @@
<property file="build.properties"/>
<import file="${beehive.home}/beehive-imports.xml"/>
- <import file="${beehive.home}/ant/beehive-tools.xml"/>
<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="tmp.sourcegen.dir" value=".tmpbeansrc"/>
<!-- Define the classpath used to build the webapp -->
<path id="webapp.classpath">
+ <path refid="velocity.dependency.path"/>
+ <path refid="netui-compiler.dependency.path"/>
+
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${jsp-api.jar}"/>
<pathelement location="${build.dir}/WEB-INF/classes"/>
@@ -50,9 +49,7 @@
<deploy-netui webappDir="${build.dir}"/>
<copy todir="${build.dir}/" includeEmptyDirs="false">
- <fileset dir="${web.dir}">
- <exclude name="**/*.java"/>
- </fileset>
+ <fileset dir="${web.dir}"/>
</copy>
<copy todir="${build.dir}/WEB-INF/classes">
@@ -62,18 +59,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/.tmpbeansrc"
+ classpathref="webapp.classpath"
+ srcExtensions="*.java"
+ debug="true"
+ processorOptions="web.content.root=${web.dir}"
+ nocompile="false"/>
</target>
<target name="clean" description="Clean the netui-samples webapp">