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 2004/10/20 16:45:19 UTC
svn commit: rev 55154 - in incubator/beehive/trunk/netui: ant src/webapp-template/antfiles src/webapp-template/config src/webapp-template/dd src/webapp-template/default src/webapp-template/default/WEB-INF src/webapp-template/default/WEB-INF/src src/webapp-template/default/WEB-INF/src/global src/webapp-template/default/resources src/webapp-template/default/resources/beehive src/webapp-template/default/resources/beehive/version1 src/webapp-template/default/resources/beehive/version1/images src/webapp-template/logging src/webapp-template/validator
Author: ekoneil
Date: Wed Oct 20 07:45:18 2004
New Revision: 55154
Added:
incubator/beehive/trunk/netui/src/webapp-template/antfiles/
incubator/beehive/trunk/netui/src/webapp-template/antfiles/build-dev.xml
- copied unchanged from rev 55068, incubator/beehive/trunk/netui/src/webapp-template/default/build-dev.xml
incubator/beehive/trunk/netui/src/webapp-template/antfiles/build.xml
- copied unchanged from rev 55068, incubator/beehive/trunk/netui/src/webapp-template/default/build.xml
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-config.xml
- copied unchanged from rev 55068, incubator/beehive/trunk/netui/src/webapp-template/config/netui-config.xml
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/netui-validator-rules.xml
- copied unchanged from rev 55068, incubator/beehive/trunk/netui/src/webapp-template/validator/netui-validator-rules.xml
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/global/
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/global/Global.app
- copied unchanged from rev 55068, incubator/beehive/trunk/netui/src/webapp-template/default/Global.app
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/log4j.xml
- copied unchanged from rev 55068, incubator/beehive/trunk/netui/src/webapp-template/logging/log4j.xml
incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/web.xml
- copied unchanged from rev 55068, incubator/beehive/trunk/netui/src/webapp-template/dd/generic/web.xml
incubator/beehive/trunk/netui/src/webapp-template/default/resources/
incubator/beehive/trunk/netui/src/webapp-template/default/resources/beehive/
incubator/beehive/trunk/netui/src/webapp-template/default/resources/beehive/version1/
incubator/beehive/trunk/netui/src/webapp-template/default/resources/beehive/version1/images/
incubator/beehive/trunk/netui/src/webapp-template/default/resources/beehive/version1/images/error-header.jpg
- copied unchanged from rev 55068, incubator/beehive/trunk/netui/src/webapp-template/default/error-header.jpg
Removed:
incubator/beehive/trunk/netui/src/webapp-template/config/netui-config.xml
incubator/beehive/trunk/netui/src/webapp-template/dd/
incubator/beehive/trunk/netui/src/webapp-template/default/Global.app
incubator/beehive/trunk/netui/src/webapp-template/default/build-dev.xml
incubator/beehive/trunk/netui/src/webapp-template/default/build.xml
incubator/beehive/trunk/netui/src/webapp-template/default/error-header.jpg
incubator/beehive/trunk/netui/src/webapp-template/logging/
incubator/beehive/trunk/netui/src/webapp-template/validator/
Modified:
incubator/beehive/trunk/netui/ant/common.properties
incubator/beehive/trunk/netui/ant/webappTemplate.xml
Log:
Rework the layout of the files used to build the netui webapp template.
This makes it much simpler to see where the non JAR / TLD files come from and structures them as they end up in the webapp template.
BB: self
DRT: Beehive pass
BVT: NetUI pass
Tests:
- Ran tests with the NetUI deploy.netui / undeploy.netui targets to make sure that the right files are copied and deleted.
- build.dist runs successfully
Modified: incubator/beehive/trunk/netui/ant/common.properties
==============================================================================
--- incubator/beehive/trunk/netui/ant/common.properties (original)
+++ incubator/beehive/trunk/netui/ant/common.properties Wed Oct 20 07:45:18 2004
@@ -130,8 +130,7 @@
scoping.jar=${build.lib.dir}/${scoping.jar.name}
defaultnetuiconfig.xml=${src.dir}/webapp-template/config/netui-config-default.xml
-netuiconfig.xml=${src.dir}/webapp-template/config/netui-config.xml
-netuiconfig-812.xml=${src.dir}/webapp-template/config/netui-config-812.xml
+netuiconfig.xml=${src.dir}/webapp-template/default/WEB-INF/netui-config.xml
# NetUI dist TLD(x)
netui-tags-html.tld=${build.lib.dir}/${netui-tags-html.tld.name}
Modified: incubator/beehive/trunk/netui/ant/webappTemplate.xml
==============================================================================
--- incubator/beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/trunk/netui/ant/webappTemplate.xml Wed Oct 20 07:45:18 2004
@@ -8,45 +8,31 @@
<property file="common.properties"/>
<property name="template.root.dir" location="${src.dir}/webapp-template/"/>
-
<property name="resource.dir.name" value="resources/beehive/version1"/>
<target name="all.templates">
- <echo>webapp.dist.dir: ${webapp.dist.dir}</echo>
<antcall target="generic"/>
</target>
<target name="generic" description="Deploy the NetUI / generic webapp template">
- <property name="webapp.dir" value="${webapp.dist.dir}"/>
- <property name="webinf.dir" value="${webapp.dir}/WEB-INF"/>
- <property name="webinf.lib" value="${webapp.dir}/WEB-INF/lib"/>
-
- <antcall target="_deploy.common"/>
-
- <copy todir="${webinf.dir}" file="${template.root.dir}/dd/generic/web.xml"/>
- </target>
+ <echo>Build NetUI Webapp Template to Directory: ${webapp.dist.dir}</echo>
- <target name="_deploy.common">
+ <property name="webapp.dir" location="${webapp.dist.dir}"/>
+ <property name="webinf.dir" location="${webapp.dir}/WEB-INF"/>
+ <property name="webinf.lib" location="${webapp.dir}/WEB-INF/lib"/>
- <!-- define the javascript directory -->
- <property name="resource.dir" value="${webapp.dir}/${resource.dir.name}"/>
- <property name="javascript.dir" value="${resource.dir}/javascript"/>
- <property name="src.javascript" value="${src.dir}/javascript/tagshtml"/>
- <property name="globalapp.source.dir" value="${webinf.dir}/src/global/"/>
+ <property name="javascript.dir" location="${webapp.dir}/${resource.dir.name}/javascript"/>
<mkdir dir="${webapp.dist.dir}"/>
<mkdir dir="${webapp.dir}"/>
-
<mkdir dir="${webinf.dir}"/>
<mkdir dir="${webinf.dir}/lib"/>
<mkdir dir="${webinf.dir}/classes"/>
- <mkdir dir="${globalapp.source.dir}"/>
<!-- create the javascript directories -->
- <mkdir dir="${resource.dir}"/>
<mkdir dir="${javascript.dir}"/>
- <!-- copy the JARs -->
+ <!-- copy the Struts JARs -->
<copy todir="${webinf.lib}" file="${struts.dir}/struts.jar"/>
<copy todir="${webinf.lib}" file="${struts.dir}/commons-beanutils.jar"/>
<copy todir="${webinf.lib}" file="${struts.dir}/commons-digester.jar"/>
@@ -55,118 +41,51 @@
<copy todir="${webinf.lib}" file="${struts.dir}/commons-validator.jar"/>
<copy todir="${webinf.lib}" file="${struts.dir}/commons-fileupload.jar"/>
<copy todir="${webinf.lib}" file="${struts.dir}/jakarta-oro.jar"/>
-
- <!-- copy commons-el.jar -->
<copy todir="${webinf.lib}" file="${commons-el.jar}"/>
- <!-- copy the JSTL support JARs -->
+ <!-- copy the 3rd party JARs -->
<copy todir="${webinf.lib}" file="${jstl.jar}"/>
<copy todir="${webinf.lib}" file="${standard.jar}"/>
-
- <!-- copy the XMLBeans JARs -->
<copy todir="${webinf.lib}" file="${xbean.jar}"/>
<copy todir="${webinf.lib}" file="${jsr173.jar}"/>
-
- <!-- copy log4j -->
<copy todir="${webinf.lib}" file="${log4j.jar}"/>
- <!-- copy control support -->
+ <!-- copy the Beehive JARs -->
<copy todir="${webinf.lib}" file="${controls.jar}"/>
-
- <!-- copy the validation files -->
- <copy todir="${webinf.dir}" file="${template.root.dir}/validator/netui-validator-rules.xml"/>
- <!-- scoping -->
+ <!-- copy the NetUI JARs -->
<copy todir="${webinf.lib}" file="${scoping.jar}"/>
-
- <!-- util -->
<copy todir="${webinf.lib}" file="${util.jar}"/>
-
- <!-- pageflow -->
<copy todir="${webinf.lib}" file="${pageflow.jar}"/>
+ <copy todir="${webinf.lib}" file="${tags.html.jar}"/>
+ <copy todir="${webinf.lib}" file="${tags.template.jar}"/>
+ <copy todir="${webinf.lib}" file="${tags.databinding.jar}"/>
- <!-- netui-tags-html -->
+ <!-- copy the NetUI TLDs -->
<copy todir="${webinf.dir}" file="${netui-tags-html.tld}"/>
<copy todir="${webinf.dir}" file="${netui-tags-html.tldx}"/>
- <copy todir="${webinf.lib}" file="${tags.html.jar}"/>
-
- <!-- netui-tags-template -->
<copy todir="${webinf.dir}" file="${netui-tags-template.tld}"/>
<copy todir="${webinf.dir}" file="${netui-tags-template.tldx}"/>
- <copy todir="${webinf.lib}" file="${tags.template.jar}"/>
-
- <!-- netui-tags-databinding -->
- <copy todir="${webinf.lib}" file="${tags.databinding.jar}"/>
<copy todir="${webinf.dir}" file="${netui-tags-databinding.tld}"/>
<copy todir="${webinf.dir}" file="${netui-tags-databinding.tldx}"/>
- <!-- deploy the default NetUI server config file -->
- <copy todir="${webinf.dir}" file="${template.root.dir}/config/netui-config.xml" overwrite="false"/>
+ <copy todir="${webapp.dir}">
+ <fileset dir="${template.root.dir}/default">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
- <!-- deploy the default Global.app -->
- <copy file="${template.root.dir}/default/Global.app" todir="${globalapp.source.dir}"/>
- <copy file="${template.root.dir}/default/Controller.jpf" todir="${webapp.dir}"/>
- <copy file="${template.root.dir}/default/index.jsp" todir="${webapp.dir}"/>
- <copy file="${template.root.dir}/default/error.jsp" todir="${webapp.dir}"/>
- <copy file="${template.root.dir}/default/error-header.jpg" todir="${webapp.dir}/${resource.dir.name}/images"/>
- <copy file="${template.root.dir}/default/build.xml" todir="${webapp.dir}/WEB-INF/src"/>
+ <!-- include the default build files -->
+ <copy file="${template.root.dir}/antfiles/build.xml" todir="${webapp.dir}/WEB-INF/src"/>
<!-- copy the javascript files to the javavscript directory -->
- <copy file="${src.javascript}/netui-tree.js" todir="${javascript.dir}"/>
+ <copy file="${src.dir}/javascript/tagshtml/netui-tree.js" todir="${javascript.dir}"/>
<!-- copy the NetUI compiler -->
<mkdir dir="${compiler.dist.dir}"/>
<copy todir="${compiler.dist.dir}" file="${compiler.jar}"/>
</target>
- <patternset id="jsf.runtime">
- <include name="WEB-INF/jsf_core.tld"/>
- <include name="WEB-INF/jsf_core.tldx"/>
- <include name="WEB-INF/html_basic.tld"/>
- <include name="WEB-INF/html_basic.tldx"/>
- <include name="WEB-INF/lib/jsf-api.jar"/>
- <include name="WEB-INF/lib/jsf-impl.jar"/>
- <include name="WEB-INF/lib/jstl.jar"/>
- <include name="WEB-INF/lib/standard.jar"/>
- <include name="WEB-INF/web.xml.faces"/>
- <include name="WEB-INF/faces-config.xml"/>
- </patternset>
-
- <patternset id="netui.runtime">
- <include name="WEB-INF/lib/${tags-html.jar.name}"/>
- <include name="WEB-INF/${netui-tags-html.tld.name}"/>
- <include name="WEB-INF/${netui-tags-html.tldx.name}"/>
-
- <include name="WEB-INF/lib/${tags-template.jar.name}"/>
- <include name="WEB-INF/${netui-tags-template.tld.name}"/>
- <include name="WEB-INF/${netui-tags-template.tldx.name}"/>
-
- <include name="WEB-INF/lib/${tags-databinding.jar.name}"/>
- <include name="WEB-INF/${netui-tags-databinding.tld.name}"/>
- <include name="WEB-INF/${netui-tags-databinding.tldx.name}"/>
-
- <include name="WEB-INF/lib/${util.jar.name}"/>
- <include name="WEB-INF/lib/${pageflow.jar.name}"/>
- <include name="WEB-INF/lib/${scoping.jar.name}"/>
-
- <include name="WEB-INF/lib/commons-el.jar"/>
-
- <!-- JSTL support JARs -->
- <include name="WEB-INF/lib/jstl.jar"/>
- <include name="WEB-INF/lib/standard.jar"/>
- </patternset>
-
- <patternset id="struts.runtime">
- <include name="WEB-INF/lib/struts.jar"/>
- <include name="WEB-INF/lib/commons-beanutils.jar"/>
- <include name="WEB-INF/lib/commons-digester.jar"/>
- <include name="WEB-INF/lib/commons-logging.jar"/>
- <include name="WEB-INF/lib/commons-collections.jar"/>
- <include name="WEB-INF/lib/commons-validator.jar"/>
- <include name="WEB-INF/lib/commons-fileupload.jar"/>
- <include name="WEB-INF/lib/jakarta-oro.jar"/>
- </patternset>
-
<target name="deploy.netui.runtime" description="Deploy the NetUI server runtime to a webapp root directory.">
<available property="webapp.dir.available" file="${webapp.dir}" type="dir"/>
<fail unless="webapp.dir.available" message="Can't deploy the NetUI runtime to a ${webapp.dir} that does not exist."/>
@@ -177,19 +96,14 @@
<mkdir dir="${webapp.dir}/WEB-INF/src"/>
<mkdir dir="${webapp.dir}/${resource.dir.name}"/>
- <antcall target="deploy-struts">
- <param name="webapp.dir" value="${webapp.dir}"/>
- </antcall>
-
<echo>Deploy the NetUI runtime to webapp rooted at: ${webapp.dir}</echo>
<copy todir="${webapp.dir}">
<fileset dir="${webapp.dist.dir}">
<patternset refid="netui.runtime"/>
+ <patternset refid="struts.runtime"/>
</fileset>
</copy>
- <copy todir="${webapp.dir}/WEB-INF/" file="${deployed.netuiconfig.xml}"/>
-
<!-- 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}">
@@ -197,7 +111,7 @@
</fileset>
</copy>
- <antcall target="deploy-grid-resources"/>
+ <copy todir="${webapp.dir}/WEB-INF/" file="${deployed.netuiconfig.xml}"/>
<!--
@todo: it's as yet undecided how these should get into Tomcat classpath; for now,
@@ -209,93 +123,65 @@
<copy todir="${webapp.dir}/WEB-INF/lib" file="${xbean.jar}"/>
</target>
- <target name="deploy-struts" description="Deploy only the Struts runtime to a webapp root directory.">
- <echo>Deploy Struts to webapp rooted at: ${webapp.dir}</echo>
- <copy todir="${webapp.dir}">
- <fileset dir="${webapp.dist.dir}">
- <patternset refid="struts.runtime"/>
- </fileset>
- </copy>
- </target>
-
- <target name="deploy-grid-resources">
- <!-- This is an empty call until the grid is further wired up -->
- </target>
-
-
- <target name="clean-grid-resources">
- <!-- This is an empty call until the grid is further wired up -->
- </target>
-
<target name="undeploy.netui.runtime" description="Clean the NetUI runtime from a webapp root directory.">
<echo>Clean NetUI from: ${webapp.dir}</echo>
- <property name="webinf.dir" value="${webapp.dir}/WEB-INF"/>
-
- <delete>
- <fileset dir="${webapp.dir}">
- <patternset refid="netui.runtime"/>
- </fileset>
- </delete>
-
- <echo>Clean struts from: ${webapp.dir}</echo>
- <delete>
- <fileset dir="${webapp.dir}">
- <patternset refid="struts.runtime"/>
- </fileset>
- </delete>
-
- <delete quiet="true">
- <fileset dir="${webapp.dir}/WEB-INF">
- <include name="**/jpf-struts-config-*.xml"/>
- <exclude name="**/jpf-struts-config--global.xml"/>
- </fileset>
- </delete>
+ <property name="webinf.dir" location="${webapp.dir}/WEB-INF"/>
<delete dir="${resource.dir.name}" quiet="true"/>
+ <delete file="${webinf.dir}/netui-config.xml" quiet="true"/>
- <!-- @todo: need to whack only the netui / struts / JSF filesets -->
<delete quiet="true">
- <fileset dir="${webinf.dir}/lib">
+ <fileset dir="${webapp.dir}">
+ <include name="${resource.dir.name}/javascript/netui-*.js"/>
+ <include name="WEB-INF/**/jpf-struts-config-*.xml"/>
+ <include name="WEB-INF/classes/**/*.class"/>
+ <include name="WEB-INF/classes/**/*.java"/>
+ <include name="WEB-INF/classes/**/*.properties"/>
+ <include name="WEB-INF/classes/**/*.xml"/>
+ <include name="WEB-INF/classes/**/*.xsd"/>
+ <include name="WEB-INF/lib/apache-xbean.jar"/>
+ <include name="WEB-INF/lib/log4j-1.2.8.jar"/>
+ <include name="WEB-INF/lib/controls.jar"/>
+ <include name="WEB-INF/lib/jsr173_1.0_api.jar"/>
<patternset refid="struts.runtime"/>
<patternset refid="netui.runtime"/>
<patternset refid="jsf.runtime"/>
</fileset>
-<!--
- <fileset dir="${webinf.dir}/lib">
- <include name="**/*.jar"/>
- </fileset>
--->
- </delete>
+ </delete>
+ </target>
- <delete failOnError="false">
- <fileset dir="${webapp.dir}/WEB-INF/lib">
- <include name="apache-xbean.jar"/>
- <include name="log4j-1.2.8.jar"/>
- <include name="controls.jar"/>
- <include name="jsr173_1.0_api.jar"/>
- </fileset>
- </delete>
+ <patternset id="jsf.runtime">
+ <include name="WEB-INF/jsf_core.tld"/>
+ <include name="WEB-INF/jsf_core.tldx"/>
+ <include name="WEB-INF/html_basic.tld"/>
+ <include name="WEB-INF/html_basic.tldx"/>
+ <include name="WEB-INF/lib/jsf-api.jar"/>
+ <include name="WEB-INF/lib/jsf-impl.jar"/>
+ <include name="WEB-INF/faces-config.xml"/>
+ </patternset>
- <!-- clean .class files -->
- <delete quiet="true" includeEmptyDirs="true">
- <fileset dir="${webinf.dir}/classes/">
- <include name="**/*.class"/>
- <include name="**/*.java"/>
- <include name="**/*.properties"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsd"/>
- </fileset>
- </delete>
+ <patternset id="netui.runtime">
+ <include name="WEB-INF/lib/beehive-netui*.jar"/>
+ <include name="WEB-INF/beehive-netui*.tld"/>
+ <include name="WEB-INF/beehive-netui*.tldx"/>
- <delete file="${webinf.dir}/netui-config.xml" quiet="true"/>
- <delete quiet="true">
- <fileset dir="${webapp.dir}/resources/javascript">
- <include name="*.js"/>
- </fileset>
- </delete>
+ <include name="WEB-INF/lib/commons-el.jar"/>
- <antcall target="clean-grid-resources"/>
- </target>
+ <!-- JSTL support JARs -->
+ <include name="WEB-INF/lib/jstl.jar"/>
+ <include name="WEB-INF/lib/standard.jar"/>
+ </patternset>
+
+ <patternset id="struts.runtime">
+ <include name="WEB-INF/lib/struts.jar"/>
+ <include name="WEB-INF/lib/commons-beanutils.jar"/>
+ <include name="WEB-INF/lib/commons-digester.jar"/>
+ <include name="WEB-INF/lib/commons-logging.jar"/>
+ <include name="WEB-INF/lib/commons-collections.jar"/>
+ <include name="WEB-INF/lib/commons-validator.jar"/>
+ <include name="WEB-INF/lib/commons-fileupload.jar"/>
+ <include name="WEB-INF/lib/jakarta-oro.jar"/>
+ </patternset>
</project>