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/10 03:13:29 UTC
svn commit: r169390 - in /incubator/beehive/trunk: ./
controls/test/dist-test/common/ controls/test/webapps/ docs/
docs/dist-docs/ docs/forrest/ samples/petstoreWeb/
samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/
system-controls/src/jdbc/
system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/
system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/
system-controls/test/conf/
Author: ekoneil
Date: Mon May 9 18:13:27 2005
New Revision: 169390
URL: http://svn.apache.org/viewcvs?rev=169390&view=rev
Log:
Enable the system control build out of Beehive.
The sync from svn.controlhaus.org is now disabled and the local ./controlhaus directory is deleted during an "ant clean" from the top level.
The controls are now put into the distribution under:
<dist-dir>/lib/controls/
beehive-ejb-control.jar
beehive-jms-control.jar
beehive-jdbc-control.jar
beehive-webservice-control.jar
All references haev been changed to the "org.controlhaus" package.
Three steps are left to finish this work:
- checkin the Forrest documentation that was created from the controlhaus.org websites for the four system controls
- checkin the system control samples; these will live in system-controls/samples for the time being until they're "Beehive-ized" and moved into /samples
- fixup the Beehive documentation to fix the *.controlhaus.org links so that they're referencing the Beehive system control documentation
BB: self
DRT: Beehive pass / test.dist pass
Modified:
incubator/beehive/trunk/BUILDING.txt
incubator/beehive/trunk/beehive-imports.xml
incubator/beehive/trunk/build.xml
incubator/beehive/trunk/controls/test/dist-test/common/controls-test-web.xml
incubator/beehive/trunk/controls/test/webapps/build.xml
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/docs/build.xml
incubator/beehive/trunk/docs/dist-docs/rev-readme-trailer.txt
incubator/beehive/trunk/docs/forrest/build.xml
incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml
incubator/beehive/trunk/samples/petstoreWeb/build.xml
incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/AccountDBControl.java
incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/AddressDBControl.java
incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/CatalogDBControl.java
incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/OrderDBControl.java
incubator/beehive/trunk/system-controls/src/jdbc/build.xml
incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ExtensionMaker.java
incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ServiceControlImpl.jcs
incubator/beehive/trunk/system-controls/test/conf/junitLogCfg.xml
incubator/beehive/trunk/system-controls/test/conf/junitLogCfgVerbose.xml
Modified: incubator/beehive/trunk/BUILDING.txt
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/BUILDING.txt?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/BUILDING.txt (original)
+++ incubator/beehive/trunk/BUILDING.txt Mon May 9 18:13:27 2005
@@ -195,7 +195,3 @@
$>ant docs
$>ant build.dist
-
-NOTE: The build.dist target requires 4 controls (EJB, JMS, JDBC and WebService)
-to be synced from http://svn.controlhaus.org/. If you do not have a network
-connection or if the site is down, you can get a build failure in this target.
\ No newline at end of file
Modified: incubator/beehive/trunk/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive-imports.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/beehive-imports.xml (original)
+++ incubator/beehive/trunk/beehive-imports.xml Mon May 9 18:13:27 2005
@@ -41,6 +41,8 @@
<fileset id="controls.fileset" file="${beehive.home}/controls/build/jars/beehive-controls.jar"/>
+ <fileset id="system-controls.fileset" file="${beehive.home}/system-controls/build/jars/*.jar"/>
+
<fileset id="velocity.fileset" dir="${beehive.home}/external/velocity">
<include name="velocity-1.4.jar"/>
<include name="velocity-dep-1.4.jar"/>
@@ -52,6 +54,8 @@
<fileset id="commons-discovery.fileset"
file="${beehive.home}/external/commons/commons-discovery-0.2.jar"/>
+ <fileset id="derby.fileset" file="${beehive.home}/external/derby/derby_46005.jar"/>
+
<!-- create a patternset for commons-logging so we can refer to the filename of the jar -->
<patternset id="commons-logging.patternset">
<include name="commons-logging-1.0.4.jar" />
@@ -90,6 +94,10 @@
<path id="commons-discovery.dependency.path">
<fileset refid="commons-discovery.fileset"/>
+ </path>
+
+ <path id="derby.dependency.path">
+ <fileset refid="derby.fileset"/>
</path>
<path id="commons-logging.dependency.path">
Modified: incubator/beehive/trunk/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Mon May 9 18:13:27 2005
@@ -24,14 +24,24 @@
<ant dir="controls" target="clean" inheritAll="false"/>
<ant dir="netui" target="clean" inheritAll="false"/>
<ant dir="wsm" target="clean" inheritAll="false"/>
+ <ant dir="system-controls" target="clean" inheritAll="false"/>
+ <ant dir="docs" target="clean" inheritAll="false"/>
<delete dir="${beehive.home}/build"/>
+
+ <!-- remove the old controlhaus/ directory used pre Beehive 1.0 to sync
+ the system controls from http://svn.controlhaus.org.
+
+ eventually, we should remove this step.
+ -->
+ <delete dir="${beehive.home}/controlhaus" quiet="true" failonerror="false"/>
</target>
<target name="deploy" description="Deploy Beehive" depends="revision.label">
<ant dir="controls" target="build" inheritAll="false"/>
<ant dir="netui" target="deploy" inheritAll="false"/>
<ant dir="wsm" target="deploy" inheritAll="false"/>
+ <ant dir="system-controls" target="build" inheritAll="false"/>
</target>
<target name="revision.label" description="Creates svn revision label file">
@@ -43,7 +53,6 @@
</target>
<target name="scrub" description="Scrub the Beehive directory of downloaded files">
- <delete dir="controlhaus"/>
<delete dir="installed"/>
</target>
@@ -56,6 +65,7 @@
<antcall target="controls.drt"/>
<antcall target="netui.drt"/>
<antcall target="wsm.drt"/>
+ <antcall target="systemcontrols.drt"/>
</target>
<target name="controls.drt" description="Run the Beehive/Controls DRT suite">
@@ -70,6 +80,10 @@
<ant dir="wsm" target="drt" inheritAll="false"/>
</target>
+ <target name="systemcontrols.drt" description="Run the Beehive/System Controls DRT suite">
+ <ant dir="system-controls" antfile="build.xml" target="drt" inheritAll="false"/>
+ </target>
+
<!-- ============================================= -->
<!-- -->
<!-- Installation targets. These are used to -->
@@ -168,6 +182,7 @@
<ant dir="controls" target="docs" inheritAll="false"/>
<ant dir="netui" target="docs" inheritAll="false"/>
<ant dir="wsm" target="docs" inheritAll="false"/>
+ <ant dir="system-controls" target="docs" inheritAll="false"/>
</target>
<target name="build-site" if="forrest.present">
Modified: incubator/beehive/trunk/controls/test/dist-test/common/controls-test-web.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/dist-test/common/controls-test-web.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/controls/test/dist-test/common/controls-test-web.xml (original)
+++ incubator/beehive/trunk/controls/test/dist-test/common/controls-test-web.xml Mon May 9 18:13:27 2005
@@ -77,8 +77,8 @@
<condition property="do.inject.test.drivers.jar">
<equals arg1="${app.inject.test.drivers}" arg2="jar"/>
</condition>
- <condition property="do.inject.test.controlhaus.jars">
- <istrue value="${app.inject.controlhaus.jars}"/>
+ <condition property="do.inject.test.systemcontrol.jars">
+ <istrue value="${app.inject.systemcontrol.jars}"/>
</condition>
</target>
Modified: incubator/beehive/trunk/controls/test/webapps/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/webapps/build.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/webapps/build.xml Mon May 9 18:13:27 2005
@@ -76,8 +76,8 @@
<condition property="do.inject.test.drivers.jar">
<equals arg1="${app.inject.test.drivers}" arg2="jar"/>
</condition>
- <condition property="do.inject.test.controlhaus.jars">
- <istrue value="${app.inject.controlhaus.jars}"/>
+ <condition property="do.inject.test.systemcontrol.jars">
+ <istrue value="${app.inject.systemcontrol.jars}"/>
</condition>
</target>
@@ -108,7 +108,7 @@
<antcall target="-inject.dbControl"/>
<antcall target="-inject.test.controls"/>
<antcall target="-inject.test.drivers"/>
- <antcall target="-inject.test.controlhaus"/>
+ <antcall target="-inject.test.systemcontrols"/>
<antcall target="-build.webapp"/>
<echo message="----------------------------------------------"/>
@@ -208,8 +208,8 @@
verbose="true" overwrite="true"/>
</target>
- <target name="-inject.test.controlhaus" if="do.inject.test.controlhaus.jars">
- <echo message="Injecting Controlhaus Jars"/>
+ <target name="-inject.test.systemcontrols" if="do.inject.test.systemcontrol.jars">
+ <echo message="Injecting Beehive System Control JARs"/>
<copy todir="${webapp.dir}/WEB-INF/lib" overwrite="true" verbose="true">
<fileset dir="${controlhaus.jars.dir}">
<include name="*.jar"/>
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Mon May 9 18:13:27 2005
@@ -10,9 +10,6 @@
- library distribution (runtime)
- documentation distribution (doc)
- source distribution (source code)
-
-This file also contains targets for obtaining system controls from ControlHaus. These
-remote repositories are pulled from svn.controlhaus.org onto the local disk and built.
-->
<project name="Beehive/Distribution" default="usage" basedir=".">
@@ -37,7 +34,6 @@
<property name="dist.src.readme.template" location="${beehive.home}/README.txt"/>
<property name="dist.readme.rev.trailer" location="${beehive.home}/docs/dist-docs/rev-readme-trailer.txt"/>
<property name="dist.readme.toplvl.trailer" location="${beehive.home}/docs/dist-docs/toplvl-readme-trailer.txt"/>
- <property name="controlhaus.rev.file" location="${dist.dir}/lib/controls/controlhaus.rev"/>
<!-- identify whether the current OS is win32 -->
<condition property="isWindows">
@@ -53,7 +49,6 @@
<mkdir dir="${dist.dir}"/>
<antcall target="build.dist.core"/>
- <antcall target="build.system.controls"/>
<antcall target="build.dist.samples"/>
<antcall target="build.dist.docs"/>
@@ -75,187 +70,6 @@
</sequential>
</macrodef>
- <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 -->
- <!-- ============================================= -->
- <available property="ejb.control.exists" file="controlhaus/ejb/trunk/build.xml"/>
- <antcall target="ejb.svn.update"/>
- <antcall target="ejb.svn.checkout"/>
- <antcall target="ejb.svn.revision.label"/>
-
- <ant dir="controlhaus/ejb/trunk" target="clean" inheritAll="false">
- <property name="beehive.home" value="${dist.dir}"/>
- </ant>
- <ant dir="controlhaus/ejb/trunk" target="build" inheritAll="false">
- <property name="beehive.home" value="${dist.dir}"/>
- </ant>
-
- <copy file="controlhaus/ejb/trunk/build/ejb-control.jar" todir="${dist.dir}/lib/controls"/>
-
- <!-- ============================================= -->
- <!-- JDBC Control -->
- <!-- ============================================= -->
- <available property="jdbc.control.exists" file="controlhaus/jdbc/trunk/build.xml"/>
- <antcall target="jdbc.svn.update"/>
- <antcall target="jdbc.svn.checkout"/>
- <antcall target="jdbc.svn.revision.label"/>
-
- <ant dir="controlhaus/jdbc/trunk" target="download-dependencies" inheritAll="false">
- <property name="beehive.home" value="${dist.dir}"/>
- </ant>
- <ant dir="controlhaus/jdbc/trunk" target="clean" inheritAll="false">
- <property name="beehive.home" value="${dist.dir}"/>
- </ant>
- <ant dir="controlhaus/jdbc/trunk" target="build" inheritAll="false">
- <property name="beehive.home" value="${dist.dir}"/>
- </ant>
-
- <copy file="controlhaus/jdbc/trunk/build/dist/jdbc-control.jar" todir="${dist.dir}/lib/controls"/>
-
- <!-- ============================================= -->
- <!-- JMS Control -->
- <!-- ============================================= -->
- <available property="jms.control.exists" file="controlhaus/jms/trunk/build.xml"/>
- <antcall target="jms.svn.update"/>
- <antcall target="jms.svn.checkout"/>
- <antcall target="jms.svn.revision.label"/>
-
- <ant dir="controlhaus/jms/trunk" target="clean" inheritAll="false">
- <property name="beehive.home" value="${dist.dir}"/>
- </ant>
- <ant dir="controlhaus/jms/trunk" target="build" inheritAll="false">
- <property name="beehive.home" value="${dist.dir}"/>
- </ant>
-
- <copy file="controlhaus/jms/trunk/build/jms-control.jar" todir="${dist.dir}/lib/controls"/>
-
- <!-- ============================================= -->
- <!-- Webservice Control -->
- <!-- ============================================= -->
- <available property="webservice.control.exists" file="controlhaus/webservice/trunk/build.xml"/>
- <antcall target="webservice.svn.update"/>
- <antcall target="webservice.svn.checkout"/>
- <antcall target="webservice.svn.revision.label"/>
-
- <ant dir="controlhaus/webservice/trunk" target="clean" inheritAll="false">
- <property name="beehive.home" value="${dist.dir}"/>
- </ant>
- <ant dir="controlhaus/webservice/trunk" target="jar" inheritAll="false">
- <property name="beehive.home" value="${dist.dir}"/>
- </ant>
-
- <copy file="controlhaus/webservice/trunk/servicecontrol/build/jars/webservice-control.jar"
- todir="${dist.dir}/lib/controls"/>
-
- <!-- Track the svn revs used for this distro build -->
- <concat destfile="${controlhaus.rev.file}" fixlastline="true" eol="crlf">
- <fileset dir="controlhaus">
- <include name="**/svn.rev"/>
- </fileset>
- </concat>
- </target>
-
- <!-- EJB Control svn targets -->
- <target name="ejb.svn.update" if="ejb.control.exists" unless="dont.update.controlhaus" >
- <exec executable="svn" dir="${beehive.home}/controlhaus/ejb/trunk">
- <arg line="update"/>
- </exec>
- </target>
-
- <target name="ejb.svn.checkout" unless="ejb.control.exists">
- <mkdir dir="${beehive.home}/controlhaus/ejb"/>
- <exec executable="svn" dir="${beehive.home}/controlhaus/ejb">
- <arg line="checkout http://svn.controlhaus.org/ejb/trunk"/>
- </exec>
- </target>
-
- <target name="ejb.svn.revision.label">
- <exec executable="svnversion" dir="${beehive.home}/controlhaus/ejb/trunk" failifexecutionfails="false"
- outputproperty="ejb.svn.revision">
- <arg value="."/>
- </exec>
- <echo message="ControlHaus EJB control svn revision #${ejb.svn.revision}" file="${beehive.home}/controlhaus/ejb/trunk/svn.rev"/>
- </target>
-
- <!-- JDBC Control svn targets -->
- <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>
- </target>
-
- <target name="jdbc.svn.checkout" unless="jdbc.exists">
- <mkdir dir="${beehive.home}/controlhaus/jdbc"/>
- <exec executable="svn" dir="${beehive.home}/controlhaus/jdbc">
- <arg line="checkout http://svn.controlhaus.org/jdbc/trunk"/>
- </exec>
- </target>
-
- <target name="jdbc.svn.revision.label">
- <exec executable="svnversion" dir="${beehive.home}/controlhaus/jdbc/trunk" failifexecutionfails="false"
- outputproperty="jdbc.svn.revision">
- <arg value="."/>
- </exec>
- <echo message="ControlHaus JDBC control svn revision #${jdbc.svn.revision}" file="${beehive.home}/controlhaus/jdbc/trunk/svn.rev"/>
- </target>
-
- <!-- JMS Control svn targets -->
- <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>
- </target>
-
- <target name="jms.svn.checkout" unless="jms.exists">
- <mkdir dir="${beehive.home}/controlhaus/jms"/>
- <exec executable="svn" dir="${beehive.home}/controlhaus/jms">
- <arg line="checkout http://svn.controlhaus.org/jms/trunk"/>
- </exec>
- </target>
-
- <target name="jms.svn.revision.label">
- <exec executable="svnversion" dir="${beehive.home}/controlhaus/jms/trunk" failifexecutionfails="false"
- outputproperty="jms.svn.revision">
- <arg value="."/>
- </exec>
- <echo message="ControlHaus JMS control svn revision #${jms.svn.revision}" file="${beehive.home}/controlhaus/jms/trunk/svn.rev"/>
- </target>
-
- <!-- Webservice Control svn targets -->
- <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>
- </target>
-
- <target name="webservice.svn.checkout" unless="webservice.exists">
- <mkdir dir="${beehive.home}/controlhaus/webservice"/>
- <exec executable="svn" dir="${beehive.home}/controlhaus/webservice">
- <arg line="checkout http://svn.controlhaus.org/webservice/trunk"/>
- </exec>
- </target>
-
- <target name="webservice.svn.revision.label">
- <exec executable="svnversion" dir="${beehive.home}/controlhaus/webservice/trunk" failifexecutionfails="false"
- outputproperty="webservice.svn.revision">
- <arg value="."/>
- </exec>
- <echo message="ControlHaus WebService control svn revision #${webservice.svn.revision}" file="${beehive.home}/controlhaus/webservice/trunk/svn.rev"/>
- </target>
-
<!-- target for building libraries -->
<target name="build.lib">
<copy todir="${lib.dir}/common" failOnError="true">
@@ -270,6 +84,7 @@
<copy todir="${lib.dir}/controls" failOnError="true">
<fileset refid="controls.fileset"/>
+ <fileset refid="system-controls.fileset"/>
</copy>
<!-- todo: this needs to be cleaned up; axis shouldn't be in the Beehive distribution -->
@@ -295,6 +110,10 @@
<exclude name="WEB-INF/lib/commons-logging.jar"/>
<exclude name="WEB-INF/lib/apache-xbean.jar"/>
<exclude name="WEB-INF/lib/beehive-controls.jar"/>
+ <exclude name="WEB-INF/lib/jdbc-control.jar"/>
+ <exclude name="WEB-INF/lib/ejb-control.jar"/>
+ <exclude name="WEB-INF/lib/wsm-control.jar"/>
+ <exclude name="WEB-INF/lib/jms-control.jar"/>
<exclude name="WEB-INF/lib/jsr173*.jar"/>
<exclude name="WEB-INF/lib/log4j*.jar"/>
<include name="WEB-INF/*.tld"/>
@@ -310,7 +129,6 @@
</copy>
</target>
- <!-- prereq: You must run build.dist before this to ensure the controlhaus controls are downloaded -->
<target name="build.dist.lib" description="Builds a Beehive library distribution">
<mkdir dir="${dist.lib.dir}"/>
@@ -336,10 +154,8 @@
<!-- Builds a src dist with only src files found in our jar files, no tests, ant scripts, docs, etc.
Intended to allow a user to attach the beehive src to their debugger.
- prereq: You must run build.dist before this to ensure the controlhaus controls are downloaded
-->
<target name="build.dist.src" description="Builds a Beehive source distribution">
- <check-exists file="controlhaus" type="dir"/>
<mkdir dir="${dist.src.dir}"/>
<copy todir="${dist.src.dir}" failOnError="true">
@@ -347,8 +163,7 @@
<include name="controls/src/**"/>
<include name="netui/src/**"/>
<include name="wsm/src/**"/>
- <include name="controlhaus/*/trunk/src/**"/>
- <include name="controlhaus/*/trunk/servicecontrol/**"/>
+ <include name="system-controls/src/*/**"/>
<include name="LICENSE.TXT"/>
<include name="NOTICE.txt"/>
@@ -582,6 +397,7 @@
<fileset dir="controls/build/docs/apidocs"/>
<fileset dir="netui/build/docs/apidocs"/>
<fileset dir="wsm/build/docs/apidocs"/>
+ <fileset dir="system-controls/build/docs/apidocs"/>
</copy>
<copy todir="${dist.dir}/docs" failOnError="true">
@@ -643,7 +459,6 @@
<check-exists file="@{readmedir}/@{readme}"/>
<check-exists file="@{revtrailer}"/>
<check-exists file="build/svn.rev"/>
- <check-exists file="${controlhaus.rev.file}"/>
<!-- load the revision # into a property -->
<loadfile property="beehive.rev" srcFile="build/svn.rev">
@@ -665,14 +480,6 @@
<!-- substitute the beehive svn revision number into the tag in the readme file -->
<replace file="@{readmedir}/@{readme}" token="@BEEHIVE_REV@" value="${beehive.rev}"/>
-
- <!-- append the list of controlhaus revisions to the readme as we build the distribution -->
- <concat destfile="@{readmedir}/@{readme}" append="true">
- <fileset file="${controlhaus.rev.file}"/>
- <filterchain>
- <prefixlines prefix="@{trailerprefix}"/>
- </filterchain>
- </concat>
<!-- make sure we have consistent eol's after the concats, in case we get mixtures from the different files -->
<fixcrlf srcdir="@{readmedir}" includes="@{readme}"/>
Modified: incubator/beehive/trunk/docs/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/build.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/build.xml (original)
+++ incubator/beehive/trunk/docs/build.xml Mon May 9 18:13:27 2005
@@ -12,8 +12,7 @@
</target>
<target name="clean">
- <ant dir="forrest" target="clean"/>
- <delete dir="forrest/build"/>
+ <ant dir="forrest" target="clean" inheritAll="false"/>
</target>
<target name="generate-anno-ref">
Modified: incubator/beehive/trunk/docs/dist-docs/rev-readme-trailer.txt
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/dist-docs/rev-readme-trailer.txt?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/dist-docs/rev-readme-trailer.txt (original)
+++ incubator/beehive/trunk/docs/dist-docs/rev-readme-trailer.txt Mon May 9 18:13:27 2005
@@ -1,6 +1,5 @@
Revisions
---------
-In revision @BEEHIVE_REV@ of Apache Beehive you will also find the following
-svn revisions/versions of system controls from Controlhaus.org:
+This distribution includes Beehive SVN revision @BEEHIVE_REV@.
Modified: incubator/beehive/trunk/docs/forrest/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/docs/forrest/build.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/docs/forrest/build.xml (original)
+++ incubator/beehive/trunk/docs/forrest/build.xml Mon May 9 18:13:27 2005
@@ -1,25 +1,26 @@
-<project name="Forrest Site Build" default="usage" basedir=".">
-
-<!-- ============================================================ -->
-<!-- | |-->
-<!-- | This build file is merely a placeholder for the importation of the forrest.build.xml file. |-->
-<!-- | | -->
-<!-- | 'site', the default target here, is a target imported from forrest.build.xml |-->
-<!-- | | -->
-<!-- ============================================================-->
+<?xml version="1.0"?>
+
+<!--
+ ============================================================
+
+ This build file is merely a placeholder for the importation of the forrest.build.xml file.
+ 'site', the default target here, is a target imported from forrest.build.xml
+ ============================================================
+-->
+<project name="Beehive Forrest Site Build" default="usage" basedir=".">
+
<property environment="os"/>
<property name="forrest.home" value="${os.FORREST_HOME}"/>
<import file="${os.FORREST_HOME}/forrest.build.xml"/>
- <!-- ============================================= -->
- <!-- -->
- <!-- Default usage target -->
- <!-- -->
- <!-- ============================================= -->
+ <target name="clean">
+ <delete dir="build"/>
+ </target>
+
<target name="usage" description="Print the usage for this build.xml">
<java fork="no" classname="org.apache.tools.ant.Main">
<arg line="-f build.xml -projecthelp"/>
</java>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml Mon May 9 18:13:27 2005
@@ -62,7 +62,7 @@
<fail unless="derby.present"
message="Unable to locate ${derby.jar}. Please download Derby from http://incubator.apache.org/derby/derby_downloads.html and set the derby.jar property in build.properties"/>
- <copy todir="${build.dir}/WEB-INF/lib" file="${beehive.home}/lib/controls/jdbc-control.jar"/>
+ <copy todir="${build.dir}/WEB-INF/lib" file="${beehive.home}/system-controls/build/jars/beehive-jdbc-control.jar"/>
<copy todir="${build.dir}/WEB-INF/lib" file="${derby.jar}"/>
<deploy-netui webappDir="${build.dir}"/>
Modified: incubator/beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build.xml Mon May 9 18:13:27 2005
@@ -60,7 +60,7 @@
message="Unable to locate ${derby.jar}. Please download Derby from http://incubator.apache.org/derby/derby_downloads.html"/>
<copy todir="${build.dir}/WEB-INF/lib" file="${derby.jar}"/>
- <copy todir="${build.dir}/WEB-INF/lib" file="${beehive.home}/controlhaus/jdbc/trunk/build/dist/jdbc-control.jar"/>
+ <copy todir="${build.dir}/WEB-INF/lib" file="${beehive.home}/system-controls/build/jars/beehive-jdbc-control.jar"/>
<deploy-netui webappDir="${build.dir}"/>
<deploy-wsm webappDir="${build.dir}"/>
Modified: incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/AccountDBControl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/AccountDBControl.java?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/AccountDBControl.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/AccountDBControl.java Mon May 9 18:13:27 2005
@@ -20,7 +20,7 @@
import java.sql.SQLException;
import org.apache.beehive.samples.petstore.model.Account;
-import org.controlhaus.jdbc.JdbcControl;
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
/**
* This control contains access to the pets database
@@ -63,4 +63,4 @@
"{account.lastName}, {account.status}, {account.favCategory}, {account.langPref}, " +
"'', {account.myListState}, {account.bannerOptState})")
public void insertAccount(Account account) throws SQLException;
-}
\ No newline at end of file
+}
Modified: incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/AddressDBControl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/AddressDBControl.java?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/AddressDBControl.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/AddressDBControl.java Mon May 9 18:13:27 2005
@@ -20,7 +20,7 @@
import java.sql.SQLException;
import org.apache.beehive.samples.petstore.model.Address;
-import org.controlhaus.jdbc.JdbcControl;
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
/**
* This control contains access to the pets database
@@ -68,4 +68,4 @@
@SQL(statement="delete from Addresses where addressId = {addressId} and userId = {userId}")
public void deleteAddress(int addressId, String userId) throws SQLException;
-}
\ No newline at end of file
+}
Modified: incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/CatalogDBControl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/CatalogDBControl.java?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/CatalogDBControl.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/CatalogDBControl.java Mon May 9 18:13:27 2005
@@ -21,7 +21,7 @@
import org.apache.beehive.samples.petstore.model.Category;
import org.apache.beehive.samples.petstore.model.Item;
import org.apache.beehive.samples.petstore.model.Product;
-import org.controlhaus.jdbc.JdbcControl;
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
/**
* This control contains access to the pets database
@@ -80,4 +80,4 @@
// initDB
@SQL(statement="{sql: initString}")
public void initDB(String initString) throws SQLException;
-}
\ No newline at end of file
+}
Modified: incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/OrderDBControl.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/OrderDBControl.java?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/OrderDBControl.java (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/src/org/apache/beehive/samples/petstore/controls/data/OrderDBControl.java Mon May 9 18:13:27 2005
@@ -20,7 +20,7 @@
import java.sql.SQLException;
import org.apache.beehive.samples.petstore.model.Order;
import org.apache.beehive.samples.petstore.model.OrderItem;
-import org.controlhaus.jdbc.JdbcControl;
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
/**
* This control contains access to the pets database
@@ -69,4 +69,4 @@
"supplier, status, attr1, inventoryQuantity as Qty, o.quantity " +
"from OrderItems o, Items i where o.orderId = {orderId} and o.itemId = i.itemId")
public OrderItem[] getOrderItems(int orderId) throws SQLException;
-}
\ No newline at end of file
+}
Modified: incubator/beehive/trunk/system-controls/src/jdbc/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/src/jdbc/build.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/src/jdbc/build.xml (original)
+++ incubator/beehive/trunk/system-controls/src/jdbc/build.xml Mon May 9 18:13:27 2005
@@ -12,8 +12,8 @@
<!-- build locations -->
<property name="module.name" value="jdbc-control"/>
<property name="module.dir" location="${src.dir}/jdbc"/>
- <property name="sqlgrammar.file" value="${module.dir}/org/controlhaus/jdbc/parser/SqlGrammar.jj"/>
- <property name="sqlgrammar.gen.dir" value="${module.dir}/org/controlhaus/jdbc/parser"/>
+ <property name="sqlgrammar.file" value="${module.dir}/org/apache/beehive/controls/system/jdbc/parser/SqlGrammar.jj"/>
+ <property name="sqlgrammar.gen.dir" value="${module.dir}/org/apache/beehive/controls/system/jdbc/parser"/>
<!-- classpath -->
<path id="module.classpath">
Modified: incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ExtensionMaker.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ExtensionMaker.java?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ExtensionMaker.java (original)
+++ incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ExtensionMaker.java Mon May 9 18:13:27 2005
@@ -57,9 +57,9 @@
private static final String[] standardImports = {
"org.apache.beehive.controls.api.bean.ControlExtension",
- "org.controlhaus.webservice.ServiceControl",
- "org.controlhaus.webservice.ServiceControl.Location",
- "org.controlhaus.webservice.ServiceControl.WSDL", };
+ "org.apache.beehive.controls.system.webservice.ServiceControl",
+ "org.apache.beehive.controls.system.webservice.ServiceControl.Location",
+ "org.apache.beehive.controls.system.webservice.ServiceControl.WSDL", };
File mOutputDir;
Modified: incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ServiceControlImpl.jcs
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ServiceControlImpl.jcs?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ServiceControlImpl.jcs (original)
+++ incubator/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/ServiceControlImpl.jcs Mon May 9 18:13:27 2005
@@ -658,7 +658,7 @@
/*
* (non-Javadoc)
*
- * @see org.controlhaus.webservice.ServiceControl#getInputHeaders()
+ * @see org.apache.beehive.controls.system.webservice.ServiceControl#getInputHeaders()
*
* If there are any input header it is stored on my thread's Handler.
*/
@@ -669,7 +669,7 @@
/*
* (non-Javadoc)
*
- * @see org.controlhaus.webservice.ServiceControl#setOutputHeaders(org.w3c.dom.Element[])
+ * @see org.apache.beehive.controls.system.webservice.ServiceControl#setOutputHeaders(org.w3c.dom.Element[])
*/
public void setOutputHeaders(Element[] headers) {
HeaderHandler.setOutHeaders(headers);
Modified: incubator/beehive/trunk/system-controls/test/conf/junitLogCfg.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/conf/junitLogCfg.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/conf/junitLogCfg.xml (original)
+++ incubator/beehive/trunk/system-controls/test/conf/junitLogCfg.xml Mon May 9 18:13:27 2005
@@ -14,7 +14,7 @@
</appender>
<!-- base for all netui server components -->
- <category name="org.controlhaus">
+ <category name="org.apache.beehive.controls.system">
<priority value="warn" />
<appender-ref ref="SYSCTRLS_SYSLOGFILE" />
</category>
Modified: incubator/beehive/trunk/system-controls/test/conf/junitLogCfgVerbose.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/conf/junitLogCfgVerbose.xml?rev=169390&r1=169389&r2=169390&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/conf/junitLogCfgVerbose.xml (original)
+++ incubator/beehive/trunk/system-controls/test/conf/junitLogCfgVerbose.xml Mon May 9 18:13:27 2005
@@ -13,7 +13,7 @@
</layout>
</appender>
- <category name="org.controlhaus">
+ <category name="org.apache.beehive.controls.system">
<priority value="debug" />
<appender-ref ref="SYSCTRLS_SYSLOGFILE" />
</category>