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/11/05 17:17:27 UTC
svn commit: r471454 - in /beehive/branches/v1.0.2: controls/
netui/src/compiler-apt/ netui/src/jar-assembly/ system-controls/src/ejb/
system-controls/src/jdbc/ system-controls/src/jms/
system-controls/src/webservice/
Author: crogers
Date: Sun Nov 5 08:17:26 2006
New Revision: 471454
URL: http://svn.apache.org/viewvc?view=rev&rev=471454
Log:
Merging revision 471453 from trunk to add the LICENSE and NOTICE to the beehive jars.
Modified:
beehive/branches/v1.0.2/controls/build.xml
beehive/branches/v1.0.2/netui/src/compiler-apt/build.xml
beehive/branches/v1.0.2/netui/src/jar-assembly/build.xml
beehive/branches/v1.0.2/system-controls/src/ejb/build.xml
beehive/branches/v1.0.2/system-controls/src/jdbc/build.xml
beehive/branches/v1.0.2/system-controls/src/jms/build.xml
beehive/branches/v1.0.2/system-controls/src/webservice/build.xml
Modified: beehive/branches/v1.0.2/controls/build.xml
URL: http://svn.apache.org/viewvc/beehive/branches/v1.0.2/controls/build.xml?view=diff&rev=471454&r1=471453&r2=471454
==============================================================================
--- beehive/branches/v1.0.2/controls/build.xml (original)
+++ beehive/branches/v1.0.2/controls/build.xml Sun Nov 5 08:17:26 2006
@@ -141,6 +141,10 @@
<echo message="| controls build starting |"/>
<echo message="--------------------------------------------------"/>
<jar jarfile="${controls.jar}">
+ <metainf dir="${beehive.home}">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
<fileset dir="${api.classes}"/>
<fileset dir="${runtime.classes}"/>
<fileset dir="${test-container.classes}"/>
Modified: beehive/branches/v1.0.2/netui/src/compiler-apt/build.xml
URL: http://svn.apache.org/viewvc/beehive/branches/v1.0.2/netui/src/compiler-apt/build.xml?view=diff&rev=471454&r1=471453&r2=471454
==============================================================================
--- beehive/branches/v1.0.2/netui/src/compiler-apt/build.xml (original)
+++ beehive/branches/v1.0.2/netui/src/compiler-apt/build.xml Sun Nov 5 08:17:26 2006
@@ -61,6 +61,10 @@
</copy>
<jar jarfile="${jars.dir}/${compiler.jar.name}" basedir="${module.classes.dir}">
+ <metainf dir="${beehive.home}">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
<manifest>
<attribute name="Extension-Name" value="Beehive NetUI Compiler"/>
<attribute name="Specification-Title" value="Beehive NetUI Compiler"/>
Modified: beehive/branches/v1.0.2/netui/src/jar-assembly/build.xml
URL: http://svn.apache.org/viewvc/beehive/branches/v1.0.2/netui/src/jar-assembly/build.xml?view=diff&rev=471454&r1=471453&r2=471454
==============================================================================
--- beehive/branches/v1.0.2/netui/src/jar-assembly/build.xml (original)
+++ beehive/branches/v1.0.2/netui/src/jar-assembly/build.xml Sun Nov 5 08:17:26 2006
@@ -27,12 +27,18 @@
<target name="build">
<jar jarfile="${jars.dir}/beehive-netui-tags.jar">
+ <metainf dir="${beehive.home}">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
+ <metainf dir="${jars.dir}">
+ <include name="${netui-tags-html.tld.name}"/>
+ <include name="${netui-tags-databinding.tld.name}"/>
+ <include name="${netui-tags-template.tld.name}"/>
+ </metainf>
<fileset dir="${classes.dir}/tags-html"/>
<fileset dir="${classes.dir}/tags-databinding"/>
<fileset dir="${classes.dir}/tags-template"/>
- <zipfileset file="${jars.dir}/${netui-tags-html.tld.name}" prefix="META-INF"/>
- <zipfileset file="${jars.dir}/${netui-tags-databinding.tld.name}" prefix="META-INF"/>
- <zipfileset file="${jars.dir}/${netui-tags-template.tld.name}" prefix="META-INF"/>
<manifest>
<attribute name="Extension-Name" value="Beehive NetUI HTML Tag Library"/>
<attribute name="Specification-Title" value="Beehive NetUI HTML Tag Library"/>
@@ -45,6 +51,10 @@
</manifest>
</jar>
<jar jarfile="${jars.dir}/beehive-netui-core.jar">
+ <metainf dir="${beehive.home}">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
<fileset dir="${classes.dir}/pageflow"/>
<fileset dir="${classes.dir}/core"/>
<fileset dir="${classes.dir}/scoping"/>
Modified: beehive/branches/v1.0.2/system-controls/src/ejb/build.xml
URL: http://svn.apache.org/viewvc/beehive/branches/v1.0.2/system-controls/src/ejb/build.xml?view=diff&rev=471454&r1=471453&r2=471454
==============================================================================
--- beehive/branches/v1.0.2/system-controls/src/ejb/build.xml (original)
+++ beehive/branches/v1.0.2/system-controls/src/ejb/build.xml Sun Nov 5 08:17:26 2006
@@ -48,6 +48,10 @@
classpathref="module.classpath"/>
<control-jar destfile="${build.lib.dir}/${ejbcontrol.jar.name}" basedir="${classes.dir}/${module.name}">
+ <metainf dir="${beehive.home}">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
<manifest>
<attribute name="Extension-Name" value="Beehive EJB Control"/>
<attribute name="Specification-Title" value="Beehive EJB Control"/>
Modified: beehive/branches/v1.0.2/system-controls/src/jdbc/build.xml
URL: http://svn.apache.org/viewvc/beehive/branches/v1.0.2/system-controls/src/jdbc/build.xml?view=diff&rev=471454&r1=471453&r2=471454
==============================================================================
--- beehive/branches/v1.0.2/system-controls/src/jdbc/build.xml (original)
+++ beehive/branches/v1.0.2/system-controls/src/jdbc/build.xml Sun Nov 5 08:17:26 2006
@@ -63,6 +63,10 @@
</copy>
<control-jar destfile="${build.lib.dir}/${jdbccontrol.jar.name}" basedir="${classes.dir}/${module.name}">
+ <metainf dir="${beehive.home}">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
<manifest>
<attribute name="Extension-Name" value="Beehive JDBC Control"/>
<attribute name="Specification-Title" value="Beehive JDBC Control"/>
Modified: beehive/branches/v1.0.2/system-controls/src/jms/build.xml
URL: http://svn.apache.org/viewvc/beehive/branches/v1.0.2/system-controls/src/jms/build.xml?view=diff&rev=471454&r1=471453&r2=471454
==============================================================================
--- beehive/branches/v1.0.2/system-controls/src/jms/build.xml (original)
+++ beehive/branches/v1.0.2/system-controls/src/jms/build.xml Sun Nov 5 08:17:26 2006
@@ -43,6 +43,10 @@
classpathref="module.classpath"/>
<control-jar destfile="${build.lib.dir}/${jmscontrol.jar.name}" basedir="${classes.dir}/${module.name}">
+ <metainf dir="${beehive.home}">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
<manifest>
<attribute name="Extension-Name" value="Beehive JMS Control"/>
<attribute name="Specification-Title" value="Beehive JMS Control"/>
Modified: beehive/branches/v1.0.2/system-controls/src/webservice/build.xml
URL: http://svn.apache.org/viewvc/beehive/branches/v1.0.2/system-controls/src/webservice/build.xml?view=diff&rev=471454&r1=471453&r2=471454
==============================================================================
--- beehive/branches/v1.0.2/system-controls/src/webservice/build.xml (original)
+++ beehive/branches/v1.0.2/system-controls/src/webservice/build.xml Sun Nov 5 08:17:26 2006
@@ -35,6 +35,10 @@
<mkdir dir="${build.lib.dir}"/>
<control-jar destfile="${build.lib.dir}/beehive-webservice-control.jar">
+ <metainf dir="${beehive.home}">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </metainf>
<fileset dir="${classes.dir}/${module.name}"/>
<manifest>
<attribute name="Extension-Name" value="Beehive Web Service Control"/>