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/03 01:53:14 UTC
svn commit: r167830 - in /incubator/beehive/trunk/netui: ant/build.xml
ant/netui.properties ant/webappTemplate.xml src/pageflow/build.xml
src/scoping/build.xml src/tags-databinding/build.xml
src/tags-html/build.xml src/util/build.xml
Author: ekoneil
Date: Mon May 2 16:53:12 2005
New Revision: 167830
URL: http://svn.apache.org/viewcvs?rev=167830&view=rev
Log:
Compress the six NetUI JARs into two. These are now grouped as:
beehive-netui-core.jar contains the previous util / scoping / pageflow JARs
beehive-netui-tags.jar contains the previous html / template / databinding tag libraries and TLDs.
Note, be sure to update your IDE projects accordingly!
BB: self
DRT: Beehive pass / distribution test pass
Modified:
incubator/beehive/trunk/netui/ant/build.xml
incubator/beehive/trunk/netui/ant/netui.properties
incubator/beehive/trunk/netui/ant/webappTemplate.xml
incubator/beehive/trunk/netui/src/pageflow/build.xml
incubator/beehive/trunk/netui/src/scoping/build.xml
incubator/beehive/trunk/netui/src/tags-databinding/build.xml
incubator/beehive/trunk/netui/src/tags-html/build.xml
incubator/beehive/trunk/netui/src/util/build.xml
Modified: incubator/beehive/trunk/netui/ant/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/build.xml?rev=167830&r1=167829&r2=167830&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/ant/build.xml (original)
+++ incubator/beehive/trunk/netui/ant/build.xml Mon May 2 16:53:12 2005
@@ -5,9 +5,6 @@
<import file="../../beehive-imports.xml"/>
<property file="netui.properties"/>
- <!-- ============================================= -->
- <!-- Dev Build Targets -->
- <!-- ============================================= -->
<target name="clean" description="Clean the NetUI server modules">
<echo message="--------------------------------------------------"/>
<echo message="| NetUI clean starting |"/>
@@ -45,7 +42,6 @@
<ant antfile="webappTemplate.xml" target="deploy.webapp" inheritAll="false"/>
<ant antfile="webappTemplate.xml" target="deploy.compiler" inheritAll="false"/>
- <ant antfile="webappTemplate.xml" target="deploy.tldx" inheritAll="false"/>
<ant antfile="webappTemplate.xml" target="deploy.tld" inheritAll="false"/>
<echo message="--------------------------------------------------"/>
@@ -77,6 +73,7 @@
<file name="tags-html"/>
<file name="tags-databinding"/>
<file name="tags-template"/>
+ <file name="jar-assembly"/>
</filelist>
</subant>
</target>
@@ -96,6 +93,7 @@
<file name="tags-html"/>
<file name="tags-databinding"/>
<file name="tags-template"/>
+ <file name="jar-assembly"/>
<file name="testRecorder"/>
</filelist>
</subant>
Modified: incubator/beehive/trunk/netui/ant/netui.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/netui.properties?rev=167830&r1=167829&r2=167830&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/ant/netui.properties (original)
+++ incubator/beehive/trunk/netui/ant/netui.properties Mon May 2 16:53:12 2005
@@ -54,14 +54,18 @@
# NetUI JAR file names
bootstrap.jar.name=bootstrap.jar
-tags-html.jar.name=beehive-netui-tags-html.jar
-tags-template.jar.name=beehive-netui-tags-template.jar
-tags-databinding.jar.name=beehive-netui-tags-databinding.jar
-util.jar.name=beehive-netui-util.jar
+
compiler.jar.name=beehive-netui-compiler.jar
compiler-xdoclet.jar.name=beehive-netui-compiler-xdoclet.jar
-pageflow.jar.name=beehive-netui-pageflow.jar
-scoping.jar.name=beehive-netui-scoping.jar
+
+#beehive-netui-core.jar.name=beehive-netui-core.jar
+#beehive-netui-tags.jar.name=beehive-netui-tags.jar
+#tags-html.jar.name=beehive-netui-tags-html.jar
+#tags-template.jar.name=beehive-netui-tags-template.jar
+#tags-databinding.jar.name=beehive-netui-tags-databinding.jar
+#util.jar.name=beehive-netui-util.jar
+#pageflow.jar.name=beehive-netui-pageflow.jar
+#scoping.jar.name=beehive-netui-scoping.jar
netui-tomcat-common.5x.jar.name=beehive-netui-tomcat-common-5x.jar
netui-tomcat-server.5x.jar.name=beehive-netui-tomcat-server-5x.jar
Modified: incubator/beehive/trunk/netui/ant/webappTemplate.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/webappTemplate.xml?rev=167830&r1=167829&r2=167830&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/trunk/netui/ant/webappTemplate.xml Mon May 2 16:53:12 2005
@@ -10,7 +10,6 @@
<property name="webapp.dist.dir" location="${beehive.home}/netui/build/dist/webapp"/>
<property name="compiler.dist.dir" location="${beehive.home}/netui/build/dist/compiler"/>
- <property name="tldx.dist.dir" location="${beehive.home}/netui/build/dist/tldx"/>
<property name="tld.dist.dir" location="${beehive.home}/netui/build/dist/tld"/>
<target name="deploy.compiler">
@@ -18,17 +17,7 @@
<copy todir="${compiler.dist.dir}" file="${build.lib.dir}/beehive-netui-compiler.jar"/>
</target>
- <target name="deploy.tldx">
- <!-- copy the NetUI TLDX files into their distribution directory -->
- <copy todir="${tldx.dist.dir}">
- <fileset dir="${build.lib.dir}">
- <patternset refid="netui.tldx"/>
- </fileset>
- </copy>
- </target>
-
<target name="deploy.tld">
- <!-- copy the NetUI TLDX files into their distribution directory -->
<copy todir="${tld.dist.dir}">
<fileset dir="${build.lib.dir}">
<patternset refid="netui.tld"/>
@@ -227,28 +216,18 @@
<patternset id="jsf.webinf">
<include name="jsf_core.tld"/>
- <include name="jsf_core.tldx"/>
<include name="html_basic.tld"/>
- <include name="html_basic.tldx"/>
</patternset>
<patternset id="netui.jars">
- <include name="beehive-netui-pageflow.jar"/>
- <include name="beehive-netui-scoping.jar"/>
- <include name="beehive-netui-tags-databinding.jar"/>
- <include name="beehive-netui-tags-html.jar"/>
- <include name="beehive-netui-tags-template.jar"/>
- <include name="beehive-netui-util.jar"/>
+ <include name="beehive-netui-tags.jar"/>
+ <include name="beehive-netui-core.jar"/>
</patternset>
<patternset id="netui.webinf">
<include name="netui-validator-rules.xml"/>
</patternset>
- <patternset id="netui.tldx">
- <include name="beehive-netui-*.tldx"/>
- </patternset>
-
<patternset id="netui.tld">
<include name="beehive-netui-*.tld"/>
</patternset>
@@ -261,8 +240,8 @@
<include name="standard.jar"/>
<include name="apache-xbean.jar"/>
<include name="log4j-1.2.8.jar"/>
- <include name="beehive-controls.jar"/>
<include name="jsr173_1.0_api.jar"/>
+ <include name="beehive-controls.jar"/>
</patternset>
<patternset id="struts11.webinf">
Modified: incubator/beehive/trunk/netui/src/pageflow/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/build.xml?rev=167830&r1=167829&r2=167830&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/build.xml (original)
+++ incubator/beehive/trunk/netui/src/pageflow/build.xml Mon May 2 16:53:12 2005
@@ -74,6 +74,7 @@
<fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
+<!--
<jar jarfile="${build.lib.dir}/${pageflow.jar.name}">
<fileset dir="${module.classes.dir}">
<include name="**/*.class"/>
@@ -92,6 +93,7 @@
<attribute name="PageFlow-Runtime-Version" value="${pageflow.version.runtime}"/>
</manifest>
</jar>
+-->
</target>
<target name="clean">
Modified: incubator/beehive/trunk/netui/src/scoping/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/scoping/build.xml?rev=167830&r1=167829&r2=167830&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/scoping/build.xml (original)
+++ incubator/beehive/trunk/netui/src/scoping/build.xml Mon May 2 16:53:12 2005
@@ -34,7 +34,7 @@
<copy todir="${classes.dir}/${module.name}">
<fileset dir="${module.dir}" includes="**/*.properties"/>
</copy>
-
+<!--
<jar jarfile="${build.lib.dir}/${scoping.jar.name}">
<fileset dir="${classes.dir}/${module.name}">
<include name="**/*.class"/>
@@ -51,6 +51,7 @@
<attribute name="Beehive-Version" value="${beehive.version}"/>
</manifest>
</jar>
+-->
</target>
<target name="clean">
Modified: incubator/beehive/trunk/netui/src/tags-databinding/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/build.xml?rev=167830&r1=167829&r2=167830&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/build.xml Mon May 2 16:53:12 2005
@@ -71,6 +71,7 @@
/>
</webdoclet>
+<!--
<jar jarfile="${build.lib.dir}/${tags-databinding.jar.name}">
<fileset dir="${classes.dir}/${module.name}"/>
<zipfileset file="${build.lib.dir}/${netui-tags-databinding.tld.name}" prefix="META-INF"/>
@@ -85,6 +86,7 @@
<attribute name="Beehive-Version" value="${beehive.version}"/>
</manifest>
</jar>
+-->
</target>
<target name="clean">
Modified: incubator/beehive/trunk/netui/src/tags-html/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/build.xml?rev=167830&r1=167829&r2=167830&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-html/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-html/build.xml Mon May 2 16:53:12 2005
@@ -67,6 +67,7 @@
/>
</webdoclet>
+<!--
<jar jarfile="${build.lib.dir}/${tags-html.jar.name}">
<fileset dir="${classes.dir}/${module.name}"/>
<zipfileset file="${build.lib.dir}/${netui-tags-html.tld.name}" prefix="META-INF"/>
@@ -81,6 +82,7 @@
<attribute name="Beehive-Version" value="${beehive.version}"/>
</manifest>
</jar>
+-->
</target>
<target name="clean">
Modified: incubator/beehive/trunk/netui/src/util/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/build.xml?rev=167830&r1=167829&r2=167830&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/util/build.xml (original)
+++ incubator/beehive/trunk/netui/src/util/build.xml Mon May 2 16:53:12 2005
@@ -14,7 +14,7 @@
<path refid="log4j.dependency.path"/>
<path refid="commons-codec.dependency.path"/>
<path refid="commons-logging.dependency.path"/>
- <pathelement path="${build.lib.dir}/beehive-netui-scoping.jar"/>
+ <pathelement path="${classes.dir}/scoping"/>
</path>
<target name="build">
@@ -48,6 +48,7 @@
<!-- copy the default config file used when one isn't found in /WEB-INF/beehive-netui-config.xml -->
<copy todir="${classes.dir}/${module.name}/org/apache/beehive/netui/util/config" file="${defaultnetuiconfig.xml}"/>
+<!--
<jar jarfile="${build.lib.dir}/${util.jar.name}" basedir="${classes.dir}/${module.name}">
<manifest>
<attribute name="Extension-Name" value="Beehive NetUI Util"/>
@@ -60,6 +61,7 @@
<attribute name="Beehive-Version" value="${beehive.version}"/>
</manifest>
</jar>
+-->
</target>
<target name="clean">
repackaging NetUI JARs from six to two complete
Posted by Eddie O'Neil <ek...@bea.com>.
All--
Just want to highlight this change -- this compacts the previous six
NetUI JARs into two -- a "core" and "tags" JAR.
Don't forget to update your IDE settings and any local Ant builds.
Let me know if you've got questions.
Eddie
ekoneil@apache.org wrote:
> Author: ekoneil
> Date: Mon May 2 16:53:12 2005
> New Revision: 167830
>
> URL: http://svn.apache.org/viewcvs?rev=167830&view=rev
> Log:
> Compress the six NetUI JARs into two. These are now grouped as:
>
> beehive-netui-core.jar contains the previous util / scoping / pageflow JARs
> beehive-netui-tags.jar contains the previous html / template / databinding tag libraries and TLDs.
>
> Note, be sure to update your IDE projects accordingly!
>
> BB: self
> DRT: Beehive pass / distribution test pass
>
>
> Modified:
> incubator/beehive/trunk/netui/ant/build.xml
> incubator/beehive/trunk/netui/ant/netui.properties
> incubator/beehive/trunk/netui/ant/webappTemplate.xml
> incubator/beehive/trunk/netui/src/pageflow/build.xml
> incubator/beehive/trunk/netui/src/scoping/build.xml
> incubator/beehive/trunk/netui/src/tags-databinding/build.xml
> incubator/beehive/trunk/netui/src/tags-html/build.xml
> incubator/beehive/trunk/netui/src/util/build.xml
>