Author: bryanche
Date: Thu Apr 21 13:26:41 2005
New Revision: 164114
URL: http://svn.apache.org/viewcvs?rev=164114&view=rev
Log:
Change controls.jar to beehive-controls.jar for jira
http://issues.apache.org/jira/browse/BEEHIVE-344.
NOTE: Any application referencing controls.jar will need to be updated
to reference beehive-controls.jar instead.
Also, update distribution.xml so that you can build a distribution
without doing an svn update of code from controlhaus. To do this, pass
in a "update.controlhaus=false" property to build.dist. e.g.
ant build.dist -Dupdate.controlhaus=false
This is useful for testing local changes to controlhaus components or
for making sure you package the controls you have on your box.
drt: pass
run.test.dist: pass
Modified:
incubator/beehive/trunk/beehive-imports.xml
incubator/beehive/trunk/controls/build.xml
incubator/beehive/trunk/controls/test/build.xml
incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml
incubator/beehive/trunk/controls/test/webapps/build.xml
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml
incubator/beehive/trunk/netui/ant/webappTemplate.xml
incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml
incubator/beehive/trunk/samples/controls-blank/build.xml
incubator/beehive/trunk/samples/controls-db/build.xml
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client.xml
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-client.xml
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-svn.xml
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client.xml
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-svn.xml
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml
incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml
incubator/beehive/trunk/user/beehive-imports.xml
incubator/beehive/trunk/wsm/drt/negative/WEB-INF/build-dist.xml
Modified: incubator/beehive/trunk/beehive-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive-imports.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/beehive-imports.xml (original)
+++ incubator/beehive/trunk/beehive-imports.xml Thu Apr 21 13:26:41 2005
@@ -39,7 +39,7 @@
<!-- Common Beehive paths
-->
<!--
======================================================================== -->
- <fileset id="controls.fileset"
file="${beehive.home}/controls/build/jars/controls.jar"/>
+ <fileset id="controls.fileset"
file="${beehive.home}/controls/build/jars/beehive-controls.jar"/>
<fileset id="velocity.fileset" dir="${beehive.home}/external/velocity">
<include name="velocity-1.4.jar"/>
@@ -68,7 +68,7 @@
<fileset id="jsr173.fileset"
file="${beehive.home}/installed/jsr173/jsr173_1.0_api.jar"/>
<path id="controls.dependency.path">
- <pathelement
location="${beehive.home}/controls/build/jars/controls.jar"/>
+ <pathelement
location="${beehive.home}/controls/build/jars/beehive-controls.jar"/>
</path>
<path id="netui-compiler.dependency.path">
Modified: incubator/beehive/trunk/controls/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/controls/build.xml (original)
+++ incubator/beehive/trunk/controls/build.xml Thu Apr 21 13:26:41 2005
@@ -28,7 +28,7 @@
<property name="spi.dir" location="src/spi"/>
<property name="runtime.dir" location="src/runtime"/>
<property name="runtime.classes" location="${classes.dir}/runtime"/>
- <property name="controls.jar" location="${jars.dir}/controls.jar"/>
+ <property name="controls.jar" location="${jars.dir}/beehive-controls.jar"/>
<path id="api.classpath">
<path refid="commons-discovery.dependency.path"/>
Modified: incubator/beehive/trunk/controls/test/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/controls/test/build.xml (original)
+++ incubator/beehive/trunk/controls/test/build.xml Thu Apr 21 13:26:41 2005
@@ -36,7 +36,7 @@
<pathelement path="${mantis.jar}"/>
<fileset refid="xbean.fileset"/>
<fileset refid="jsr173.fileset"/>
- <pathelement path="../build/jars/controls.jar"/>
+ <pathelement path="../build/jars/beehive-controls.jar"/>
<pathelement path="${build.beans}"/>
<pathelement path="${build.drivers}"/>
<fileset refid="velocity.fileset"/>
Modified:
incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
---
incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml
(original)
+++
incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml
Thu Apr 21 13:26:41 2005
@@ -21,7 +21,7 @@
</path>
<path id="controls.dependency.path">
- <pathelement location="${dist.home}/lib/controls/controls.jar"/>
+ <pathelement
location="${dist.home}/lib/controls/beehive-controls.jar"/>
</path>
<path id="derby.dependency.path">
Modified: incubator/beehive/trunk/controls/test/webapps/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/webapps/build.xml Thu Apr 21 13:26:41
2005
@@ -213,7 +213,7 @@
<copy todir="${webapp.dir}/WEB-INF/lib" overwrite="true"
verbose="true">
<fileset dir="${controlhaus.jars.dir}">
<include name="*.jar"/>
- <exclude name="controls.jar"/>
+ <exclude name="beehive-controls.jar"/>
</fileset>
</copy>
</target>
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Thu Apr 21 13:26:41 2005
@@ -75,10 +75,19 @@
</sequential>
</macrodef>
- <target name="build.system.controls" description="gets controls from
controlhaus">
+ <target name="build.system.controls" description="gets controls from
controlhaus. Set the property, update.controlhaus, to false if you don't want
to update the controlhaus code from svn">
<!-- this pulls down the most generally useful controls from
controlhaus.org, and builds them into the distribution -->
+ <!-- do we want to update the controlhaus controls from svn? -->
+ <condition property="dont.update.controlhaus" >
+ <and>
+ <isset property="update.controlhaus" />
+ <isfalse value="${update.controlhaus}" />
+ </and>
+ </condition>
+ <echo message="Don't update code from controlhaus:
${dont.update.controlhaus}" />
+
<!-- ============================================= -->
<!-- EJB Control -->
<!-- ============================================= -->
@@ -160,7 +169,8 @@
</target>
<!-- EJB Control svn targets -->
- <target name="ejb.svn.update" if="ejb.control.exists">
+ <target name="ejb.svn.update" if="ejb.control.exists"
unless="dont.update.controlhaus" >
+ <echo message="bryanche in here" />
<exec executable="svn" dir="${beehive.home}/controlhaus/ejb/trunk">
<arg line="update"/>
</exec>
@@ -182,7 +192,7 @@
</target>
<!-- JDBC Control svn targets -->
- <target name="jdbc.svn.update" if="jdbc.exists">
+ <target name="jdbc.svn.update" if="jdbc.exists"
unless="dont.update.controlhaus" >
<exec executable="svn" dir="${beehive.home}/controlhaus/jdbc/trunk">
<arg line="update"/>
</exec>
@@ -204,7 +214,7 @@
</target>
<!-- JMS Control svn targets -->
- <target name="jms.svn.update" if="jms.exists">
+ <target name="jms.svn.update" if="jms.exists"
unless="dont.update.controlhaus">
<exec executable="svn" dir="${beehive.home}/controlhaus/jms/trunk">
<arg line="update"/>
</exec>
@@ -226,7 +236,7 @@
</target>
<!-- Webservice Control svn targets -->
- <target name="webservice.svn.update" if="webservice.exists">
+ <target name="webservice.svn.update" if="webservice.exists"
unless="dont.update.controlhaus" >
<exec executable="svn"
dir="${beehive.home}/controlhaus/webservice/trunk">
<arg line="update"/>
</exec>
@@ -285,7 +295,7 @@
<exclude name="WEB-INF/lib/commons-discovery-0.2.jar"/>
<exclude name="WEB-INF/lib/commons-logging.jar"/>
<exclude name="WEB-INF/lib/apache-xbean.jar"/>
- <exclude name="WEB-INF/lib/controls.jar"/>
+ <exclude name="WEB-INF/lib/beehive-controls.jar"/>
<exclude name="WEB-INF/lib/jsr173*.jar"/>
<exclude name="WEB-INF/lib/log4j*.jar"/>
<include name="WEB-INF/*.tld"/>
Modified:
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
---
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml
(original)
+++
incubator/beehive/trunk/docs/forrest/src/documentation/content/xdocs/pageflow/pageflow_building.xml
Thu Apr 21 13:26:41 2005
@@ -193,7 +193,7 @@
</tr>
<tr>
<td>Beehive Controls</td>
- <td>controls.jar</td>
+ <td>beehive-controls.jar</td>
<td><em>distribution</em></td>
</tr>
<tr>
Modified: incubator/beehive/trunk/netui/ant/webappTemplate.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/webappTemplate.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/trunk/netui/ant/webappTemplate.xml Thu Apr 21 13:26:41
2005
@@ -261,7 +261,7 @@
<include name="standard.jar"/>
<include name="apache-xbean.jar"/>
<include name="log4j-1.2.8.jar"/>
- <include name="controls.jar"/>
+ <include name="beehive-controls.jar"/>
<include name="jsr173_1.0_api.jar"/>
</patternset>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/bvt-jdk14.xml Thu Apr 21
13:26:41 2005
@@ -44,8 +44,8 @@
<property name="required.jdk.version"
value="${required.jdk.version}"/>
</ant>
- <!-- delete controls.jar and beehive-netui-pageflow.jar, and add
beehive-netui-pageflow-jdk14.jar -->
- <delete file="${temp.webapp.dir}/WEB-INF/lib/controls.jar"/>
+ <!-- delete beehive-controls.jar and beehive-netui-pageflow.jar, and
add beehive-netui-pageflow-jdk14.jar -->
+ <delete file="${temp.webapp.dir}/WEB-INF/lib/beehive-controls.jar"/>
<delete file="${temp.webapp.dir}/WEB-INF/lib/${pageflow.jar.name}"/>
<!-- TODO: need a constant for the pageflow-jdk14 jar -->
<copy file="${build.lib.dir}/beehive-netui-pageflow-jdk14.jar"
todir="${temp.webapp.dir}/WEB-INF/lib"/>
Modified: incubator/beehive/trunk/samples/controls-blank/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-blank/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-blank/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-blank/build.xml Thu Apr 21
13:26:41 2005
@@ -11,7 +11,7 @@
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.beansrc" value="${build.dir}/beansrc"/>
<property name="build.jar" value="mycontrols.jar"/>
- <property name="controls.jar" value="controls.jar"/>
+ <property name="controls.jar" value="beehive-controls.jar"/>
<path id="tools.dependency.path">
<pathelement location="${os.JAVA_HOME}/lib/tools.jar"/>
Modified: incubator/beehive/trunk/samples/controls-db/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-db/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-db/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-db/build.xml Thu Apr 21 13:26:41
2005
@@ -11,13 +11,13 @@
<property name="build.jar" value="dbControl.jar"/>
<path id="controls.classpath">
- <pathelement location="../../lib/controls/controls.jar"/>
+ <pathelement location="../../lib/controls/beehive-controls.jar"/>
</path>
<path id="build.classpath">
<path refid="controls.classpath"/>
<pathelement location="../../lib/common/velocity-1.4.jar"/>
<pathelement location="../../lib/common/velocity-dep-1.4.jar"/>
- <pathelement location="../../lib/controls/controls.jar"/>
+ <pathelement location="../../lib/controls/beehive-controls.jar"/>
<pathelement location="${os.JAVA_HOME}/lib/tools.jar"/>
<pathelement path="${build.classes}"/>
</path>
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
---
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client.xml
(original)
+++
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build-client.xml
Thu Apr 21 13:26:41 2005
@@ -101,7 +101,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-enhanced/WEB-INF/build.xml
Thu Apr 21 13:26:41 2005
@@ -118,7 +118,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-client.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-client.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
---
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-client.xml
(original)
+++
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-client.xml
Thu Apr 21 13:26:41 2005
@@ -101,7 +101,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-svn.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-svn.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
---
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-svn.xml
(original)
+++
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build-svn.xml
Thu Apr 21 13:26:41 2005
@@ -27,7 +27,7 @@
<taskdef
name="apt"
classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpath="lib/controls.jar" onerror="report" />
+ classpath="lib/beehive-controls.jar" onerror="report" />
<property name="webapp.dir" location=".." />
<property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
Modified:
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/build.xml
Thu Apr 21 13:26:41 2005
@@ -115,7 +115,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified:
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client.xml
Thu Apr 21 13:26:41 2005
@@ -101,7 +101,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build.xml Thu Apr
21 13:26:41 2005
@@ -118,7 +118,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client.xml Thu Apr
21 13:26:41 2005
@@ -101,7 +101,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build.xml Thu Apr 21
13:26:41 2005
@@ -116,7 +116,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified: incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client.xml Thu
Apr 21 13:26:41 2005
@@ -101,7 +101,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified: incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-svn.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-svn.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-svn.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-svn.xml Thu Apr
21 13:26:41 2005
@@ -89,7 +89,7 @@
<taskdef
name="apt"
classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpath="lib/controls.jar"
+ classpath="lib/beehive-controls.jar"
onerror="report" />
<apt
srcdir="${src.dir}"
Modified: incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build.xml Thu Apr 21
13:26:41 2005
@@ -95,7 +95,7 @@
<taskdef
name="apt"
classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpath="lib/controls.jar"
+ classpath="lib/beehive-controls.jar"
onerror="report" />
<apt
srcdir="${src.dir}"
@@ -136,7 +136,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified: incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-samples/WEB-INF/build.xml Thu Apr 21
13:26:41 2005
@@ -116,7 +116,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
Modified: incubator/beehive/trunk/user/beehive-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/beehive-imports.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/user/beehive-imports.xml (original)
+++ incubator/beehive/trunk/user/beehive-imports.xml Thu Apr 21 13:26:41 2005
@@ -27,7 +27,7 @@
<dirname property="this.dir" file="${ant.file.beehive-imports}"/>
<path id="controls.dependency.path">
- <pathelement location="${this.dir}/lib/controls/controls.jar"/>
+ <pathelement location="${this.dir}/lib/controls/beehive-controls.jar"/>
</path>
<path id="netui-compiler.dependency.path">
Modified: incubator/beehive/trunk/wsm/drt/negative/WEB-INF/build-dist.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/negative/WEB-INF/build-dist.xml?rev=164114&r1=164113&r2=164114&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/negative/WEB-INF/build-dist.xml (original)
+++ incubator/beehive/trunk/wsm/drt/negative/WEB-INF/build-dist.xml Thu Apr 21
13:26:41 2005
@@ -110,7 +110,7 @@
<target name="deploy.beehive.webservice.runtime" depends="dirs">
<copy todir="${lib.dir}">
<fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
<fileset file="${beehive.home}/lib/wsm/*.jar" />
</copy>
</target>
