You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cr...@apache.org on 2006/10/04 07:55:55 UTC
svn commit: r452747 - in /beehive/trunk: ./ netui/ netui/ant/
netui/src/webapp-template/default/ netui/src/webapp-template/default/WEB-INF/
netui/src/webapp-template/default/resources/
netui/src/webapp-template/default/src/ netui/src/webapp-template/de...
Author: crogers
Date: Tue Oct 3 22:55:53 2006
New Revision: 452747
URL: http://svn.apache.org/viewvc?view=rev&rev=452747
Log:
Reorganized the directory structure of NetUI webapp-template so that it has the typical src / web split and update all ant build scripts dependent on the structure.
Tests: NetUI BVT, controlsWeb, jsfWeb, urlTemplates (WinXP pass)
Ant target tests: build.dist.full, build.test.dist, run.test.dist
Added:
beehive/trunk/netui/src/webapp-template/default/build.properties
- copied unchanged from r449116, beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.properties
beehive/trunk/netui/src/webapp-template/default/build.xml
- copied unchanged from r449116, beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.xml
beehive/trunk/netui/src/webapp-template/default/src/
- copied from r449116, beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/
beehive/trunk/netui/src/webapp-template/default/src/Controller.java
- copied unchanged from r449116, beehive/trunk/netui/src/webapp-template/default/Controller.java
beehive/trunk/netui/src/webapp-template/default/src/log4j.xml
- copied unchanged from r452742, beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/log4j.xml
beehive/trunk/netui/src/webapp-template/default/src/shared/
- copied from r452742, beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/shared/
beehive/trunk/netui/src/webapp-template/default/web/
beehive/trunk/netui/src/webapp-template/default/web/WEB-INF/
- copied from r449116, beehive/trunk/netui/src/webapp-template/default/WEB-INF/
beehive/trunk/netui/src/webapp-template/default/web/WEB-INF/beehive-netui-config.xml
- copied unchanged from r452742, beehive/trunk/netui/src/webapp-template/default/WEB-INF/beehive-netui-config.xml
beehive/trunk/netui/src/webapp-template/default/web/WEB-INF/beehive-netui-validator-rules.xml
- copied unchanged from r452742, beehive/trunk/netui/src/webapp-template/default/WEB-INF/beehive-netui-validator-rules.xml
beehive/trunk/netui/src/webapp-template/default/web/WEB-INF/validator-rules.xml
- copied unchanged from r452742, beehive/trunk/netui/src/webapp-template/default/WEB-INF/validator-rules.xml
beehive/trunk/netui/src/webapp-template/default/web/WEB-INF/web.xml
- copied unchanged from r452742, beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml
beehive/trunk/netui/src/webapp-template/default/web/index.jsp
- copied unchanged from r449116, beehive/trunk/netui/src/webapp-template/default/index.jsp
beehive/trunk/netui/src/webapp-template/default/web/resources/
- copied from r449116, beehive/trunk/netui/src/webapp-template/default/resources/
beehive/trunk/netui/src/webapp-template/default/web/resources/beehive/
- copied from r452742, beehive/trunk/netui/src/webapp-template/default/resources/beehive/
beehive/trunk/netui/test/webapps/tomcat/src/log4j.xml
- copied unchanged from r452178, beehive/trunk/netui/test/webapps/tomcat/web/WEB-INF/src/log4j.xml
Removed:
beehive/trunk/netui/src/webapp-template/default/Controller.java
beehive/trunk/netui/src/webapp-template/default/WEB-INF/
beehive/trunk/netui/src/webapp-template/default/index.jsp
beehive/trunk/netui/src/webapp-template/default/resources/
beehive/trunk/netui/src/webapp-template/default/src/build.properties
beehive/trunk/netui/src/webapp-template/default/src/build.xml
beehive/trunk/netui/test/webapps/tomcat/web/WEB-INF/src/
Modified:
beehive/trunk/distribution.xml
beehive/trunk/netui/ant/netui.properties
beehive/trunk/netui/ant/webappTemplate.xml
beehive/trunk/netui/build.xml
beehive/trunk/netui/netui-imports.xml
beehive/trunk/netui/test/webapps/tomcat/build.xml
Modified: beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/distribution.xml?view=diff&rev=452747&r1=452746&r2=452747
==============================================================================
--- beehive/trunk/distribution.xml (original)
+++ beehive/trunk/distribution.xml Tue Oct 3 22:55:53 2006
@@ -126,22 +126,21 @@
<include name="*.jar"/>
</fileset>
<fileset dir="${beehive.home}/netui/build/dist/webapp">
- <include name="WEB-INF/lib/*.jar"/>
- <exclude name="WEB-INF/lib/commons-codec-2.3.jar"/>
- <exclude name="WEB-INF/lib/commons-discovery-0.2.jar"/>
- <exclude name="WEB-INF/lib/commons-logging.jar"/>
- <exclude name="WEB-INF/lib/beehive-controls.jar"/>
- <exclude name="WEB-INF/lib/beehive-jdbc-control.jar"/>
- <exclude name="WEB-INF/lib/beehive-ejb-control.jar"/>
- <exclude name="WEB-INF/lib/beehive-jms-control.jar"/>
- <exclude name="WEB-INF/lib/log4j*.jar"/>
- <include name="WEB-INF/*.tld"/>
+ <include name="web/WEB-INF/lib/*.jar"/>
+ <exclude name="web/WEB-INF/lib/commons-codec-2.3.jar"/>
+ <exclude name="web/WEB-INF/lib/commons-discovery-0.2.jar"/>
+ <exclude name="web/WEB-INF/lib/commons-logging.jar"/>
+ <exclude name="web/WEB-INF/lib/beehive-controls.jar"/>
+ <exclude name="web/WEB-INF/lib/beehive-jdbc-control.jar"/>
+ <exclude name="web/WEB-INF/lib/beehive-ejb-control.jar"/>
+ <exclude name="web/WEB-INF/lib/beehive-jms-control.jar"/>
+ <exclude name="web/WEB-INF/lib/log4j*.jar"/>
</fileset>
</copy>
<!-- this directory structure can't be flattened -->
<copy todir="${lib.dir}/netui/resources" failOnError="true">
- <fileset dir="${beehive.home}/netui/build/dist/webapp/resources">
+ <fileset dir="${beehive.home}/netui/build/dist/webapp/web/resources">
<include name="**/*"/>
</fileset>
</copy>
@@ -312,10 +311,7 @@
<target name="create.netui-blank">
<copy todir="${dist.dir}/samples/netui-blank/src">
- <fileset dir="${beehive.home}/netui/build/dist/webapp/WEB-INF/src" includes="**">
- <exclude name="build.xml"/>
- <exclude name="build.properties"/>
- </fileset>
+ <fileset dir="${beehive.home}/netui/build/dist/webapp/src" includes="**"/>
</copy>
<copy todir="${dist.dir}/samples/netui-blank/">
@@ -323,8 +319,7 @@
</copy>
<copy todir="${dist.dir}/samples/netui-blank/web">
- <fileset dir="${beehive.home}/netui/build/dist/webapp" includes="**">
- <exclude name="WEB-INF/src/"/>
+ <fileset dir="${beehive.home}/netui/build/dist/webapp/web" includes="**">
<exclude name="WEB-INF/classes/"/>
<exclude name="WEB-INF/lib/"/>
</fileset>
Modified: beehive/trunk/netui/ant/netui.properties
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/ant/netui.properties?view=diff&rev=452747&r1=452746&r2=452747
==============================================================================
--- beehive/trunk/netui/ant/netui.properties (original)
+++ beehive/trunk/netui/ant/netui.properties Tue Oct 3 22:55:53 2006
@@ -78,14 +78,14 @@
netuiconfig.xml.name=beehive-netui-config.xml
# NetUI config file references
-netuiconfig.xml=${src.dir}/webapp-template/default/WEB-INF/beehive-netui-config.xml
+netuiconfig.xml=${src.dir}/webapp-template/default/web/WEB-INF/beehive-netui-config.xml
# Default web.xml file reference
-default.web.xml=${src.dir}/webapp-template/default/WEB-INF/web.xml
+default.web.xml=${src.dir}/webapp-template/default/web/WEB-INF/web.xml
# Validator rules file references
-beehive-netui-validator-rules.xml=${src.dir}/webapp-template/default/WEB-INF/beehive-netui-validator-rules.xml
-validator-rules.xml=${src.dir}/webapp-template/default/WEB-INF/validator-rules.xml
+beehive-netui-validator-rules.xml=${src.dir}/webapp-template/default/web/WEB-INF/beehive-netui-validator-rules.xml
+validator-rules.xml=${src.dir}/webapp-template/default/web/WEB-INF/validator-rules.xml
#compile options
compile.debug=true
Modified: beehive/trunk/netui/ant/webappTemplate.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/ant/webappTemplate.xml?view=diff&rev=452747&r1=452746&r2=452747
==============================================================================
--- beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ beehive/trunk/netui/ant/webappTemplate.xml Tue Oct 3 22:55:53 2006
@@ -43,18 +43,25 @@
<target name="create.netui.webapp" description="Create a NetUI webapp">
<echo>Create NetUI Webapp in: ${webapp.dir}</echo>
- <property name="webinf.dir" location="${webapp.dir}/WEB-INF"/>
- <property name="webinf.lib" location="${webapp.dir}/WEB-INF/lib"/>
- <property name="javascript.dir" location="${webapp.dir}/${resource.dir.name}/javascript"/>
+ <property name="web.dir" location="${webapp.dir}/web"/>
+ <property name="webinf.dir" location="${web.dir}/WEB-INF"/>
+ <property name="webinf.lib" location="${webinf.dir}/lib"/>
+ <property name="javascript.dir" location="${web.dir}/${resource.dir.name}/javascript"/>
<mkdir dir="${webapp.dir}"/>
+ <mkdir dir="${web.dir}"/>
<mkdir dir="${webinf.dir}"/>
- <mkdir dir="${webinf.dir}/lib"/>
+ <mkdir dir="${webinf.lib}"/>
<mkdir dir="${webinf.dir}/classes"/>
<mkdir dir="${javascript.dir}"/>
- <antcall target="deploy.struts"/>
- <antcall target="deploy.netui"/>
+ <!-- need to reset the webapp.dir property for these targets -->
+ <antcall target="deploy.struts">
+ <param name="webapp.dir" value="${web.dir}"/>
+ </antcall>
+ <antcall target="deploy.netui">
+ <param name="webapp.dir" value="${web.dir}"/>
+ </antcall>
<copy todir="${webinf.lib}">
<fileset refid="jstl.fileset"/>
@@ -72,8 +79,8 @@
<copy todir="${webapp.dir}">
<fileset dir="${template.root.dir}/default">
<include name="**/*"/>
- <exclude name="WEB-INF/src/global/Global.app"/>
- <exclude name="WEB-INF/beehive-netui-config.xml"/>
+ <exclude name="src/global/Global.app"/>
+ <exclude name="web/WEB-INF/beehive-netui-config.xml"/>
</fileset>
</copy>
</target>
@@ -94,14 +101,14 @@
<antcall target="deploy.netui"/>
<copy todir="${webapp.dir}/WEB-INF/lib">
- <fileset dir="${webapp.dist.dir}/WEB-INF/lib">
+ <fileset dir="${webapp.dist.dir}/web/WEB-INF/lib">
<patternset refid="beehive.jars"/>
</fileset>
</copy>
<!-- Beehive/NetUI assumes ownership of the resources/beehive/version1 directory -->
<copy todir="${webapp.dir}/${resource.dir.name}" overwrite="true">
- <fileset dir="${webapp.dist.dir}/${resource.dir.name}">
+ <fileset dir="${webapp.dist.dir}/web/${resource.dir.name}">
<include name="**/*"/>
</fileset>
</copy>
@@ -112,7 +119,7 @@
<fileset dir="${jars.dir}">
<patternset refid="netui.webinf"/>
</fileset>
- <fileset dir="${template.root.dir}/default/WEB-INF">
+ <fileset dir="${template.root.dir}/default/web/WEB-INF">
<patternset refid="netui.webinf"/>
</fileset>
</copy>
Modified: beehive/trunk/netui/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/build.xml?view=diff&rev=452747&r1=452746&r2=452747
==============================================================================
--- beehive/trunk/netui/build.xml (original)
+++ beehive/trunk/netui/build.xml Tue Oct 3 22:55:53 2006
@@ -182,8 +182,6 @@
<copy todir="${webapp.dir}" overwrite="true">
<fileset dir="${beehive.home}/netui/build/dist/webapp"/>
</copy>
-
- <mkdir dir="${webapp.dir}/WEB-INF/src"/>
</target>
<target name="do.subant">
Modified: beehive/trunk/netui/netui-imports.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/netui-imports.xml?view=diff&rev=452747&r1=452746&r2=452747
==============================================================================
--- beehive/trunk/netui/netui-imports.xml (original)
+++ beehive/trunk/netui/netui-imports.xml Tue Oct 3 22:55:53 2006
@@ -92,7 +92,7 @@
</path>
<path id="webapp.dependency.path">
- <fileset dir="${beehive.home}/netui/build/dist/webapp/WEB-INF/lib">
+ <fileset dir="${webapp.dist.dir}/web/WEB-INF/lib">
<include name="*.jar"/>
</fileset>
</path>
Modified: beehive/trunk/netui/test/webapps/tomcat/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/tomcat/build.xml?view=diff&rev=452747&r1=452746&r2=452747
==============================================================================
--- beehive/trunk/netui/test/webapps/tomcat/build.xml (original)
+++ beehive/trunk/netui/test/webapps/tomcat/build.xml Tue Oct 3 22:55:53 2006
@@ -68,9 +68,19 @@
<antcall target="update.runtime"/>
+ <!-- copy web content -->
<copy todir="${webapp.build.dir}">
<fileset dir="${web.dir}">
<exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+
+ <!-- copy resources -->
+ <echo>Copying all .properties and .xml files to ${classes.dir}</echo>
+ <copy todir="${classes.dir}">
+ <fileset dir="${src.dir}/">
+ <include name="**/*.properties"/>
+ <include name="**/*.xml"/>
</fileset>
</copy>