Author: kentam
Date: Thu Nov 18 17:06:24 2004
New Revision: 95175
Added:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/Employee.java
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/Employee.java
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/TestDBControl.jcx
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/TestDBControl.jcx
incubator/beehive/trunk/samples/controls-db/
- copied from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/
incubator/beehive/trunk/samples/controls-db/build.xml (props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/build.xml
incubator/beehive/trunk/samples/controls-db/src/
- copied from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/
incubator/beehive/trunk/samples/controls-db/src/dbControl/
- copied from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/
incubator/beehive/trunk/samples/controls-db/src/dbControl/DatabaseControl.java
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/DatabaseControl.java
incubator/beehive/trunk/samples/controls-db/src/dbControl/DatabaseControlImpl.jcs
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/DatabaseControlImpl.jcs
incubator/beehive/trunk/samples/controls-db/src/dbControl/ResultSetExtractor.java
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/ResultSetExtractor.java
incubator/beehive/trunk/samples/controls-db/src/dbControl/SQLParameter.java
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/SQLParameter.java
incubator/beehive/trunk/samples/controls-db/src/dbControl/SQLParser.java
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/SQLParser.java
incubator/beehive/trunk/samples/controls-db/src/dbControl/SQLStatement.java
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/SQLStatement.java
incubator/beehive/trunk/samples/controls-db/src/dbControl/util/
- copied from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/util/
incubator/beehive/trunk/samples/controls-db/src/dbControl/util/JavaTypeHelper.java
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/util/JavaTypeHelper.java
incubator/beehive/trunk/samples/controls-db/src/dbControl/util/PreparedStatementHelper.java
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/util/PreparedStatementHelper.java
incubator/beehive/trunk/samples/controls-db/src/dbControl/util/ResultSetHelper.java
(props changed)
- copied unchanged from r55921,
incubator/beehive/branches/v1/alpha/samples/controls-db/src/dbControl/util/ResultSetHelper.java
Removed:
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/DatabaseControl.java
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/DatabaseControlImpl.jcs
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/ResultSetExtractor.java
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/SQLParameter.java
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/SQLParser.java
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/SQLStatement.java
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/test/
incubator/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/database/util/
Modified:
incubator/beehive/trunk/build.xml
incubator/beehive/trunk/controls/test/build.xml
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/database/DriveDatabaseControl.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ParserTest.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ResultSetExtractorTest.java
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/SQLStatementTest.java
incubator/beehive/trunk/controls/test/webapps/build.xml
incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties
incubator/beehive/trunk/controls/test/webapps/controlsWeb/database/Controller.jpf
Log:
Merging v1/alpha DB control changes to trunk
Contributor: Hoi Lam
Modified: incubator/beehive/trunk/build.xml
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Thu Nov 18 17:06:24 2004
@@ -344,6 +344,11 @@
<fileset dir="samples/controls-blank"/>
</copy>
+ <!-- Build the controls database template app distro -->
+ <copy todir="${dist.dir}/samples/controls-db" failOnError="true">
+ <fileset dir="samples/controls-db"/>
+ </copy>
+
<!-- Build the WSM/template -->
<copy todir="${dist.dir}/samples/wsm-blank" failOnError="true">
<fileset dir="samples/wsm-blank">
@@ -365,6 +370,21 @@
<exclude name="WEB-INF/build.xml"/>
</fileset>
</copy>
+ <ant
+ dir="${dist.dir}/samples/controls-db"
+ antfile="build.xml"
+ target="build"
+ inheritall="false"/>
+ <copy todir="${dist.dir}/samples/EmployeeWS/WEB-INF/lib"
failOnError="true">
+ <fileset dir="${dist.dir}/samples/controls-db/build">
+ <include name="dbControl.jar"/>
+ </fileset>
+ </copy>
+ <ant
+ dir="${dist.dir}/samples/controls-db"
+ antfile="build.xml"
+ target="clean"
+ inheritall="false"/>
</target>
Modified: incubator/beehive/trunk/controls/test/build.xml
==============================================================================
--- incubator/beehive/trunk/controls/test/build.xml (original)
+++ incubator/beehive/trunk/controls/test/build.xml Thu Nov 18 17:06:24 2004
@@ -39,6 +39,8 @@
<property name="mantis.cases" location="${basedir}/mantis-cases"/>
<property name="mantis.logs" location="${basedir}/mantis-logs"/>
<property name="derby.data" location="${basedir}/test"/>
+ <property name="db.control.dir" location="../../samples/controls-db"/>
+ <property name="db.control.jar"
location="${db.control.dir}/build/dbControl.jar"/>
<condition property="test.os" value="windows" >
<os family="windows" />
@@ -62,6 +64,7 @@
<pathelement location="${velocitydep14.jar}"/>
<pathelement location="${servlet24.jar}"/>
<pathelement location="${derby.jar}"/>
+ <pathelement location="${db.control.jar}"/>
<pathelement path="../build/jars/controls.jar"/>
<pathelement path="${build.beans}"/>
</path>
@@ -80,6 +83,7 @@
<pathelement location="${velocitydep14.jar}"/>
<pathelement location="${servlet24.jar}"/>
<pathelement location="${derby.jar}"/>
+ <pathelement location="${db.control.jar}"/>
<pathelement location="../build/jars/controls.jar"/>
<pathelement path="${build.beans}"/>
@@ -129,7 +133,7 @@
<!-- build - target to build controls, test drivers and junit tests -->
<!-- ====================================================================
-->
- <target name="build" depends="dirs">
+ <target name="build" depends="dirs, dbControl">
<ant target="build-test-auxilaries"/>
<ant target="build-test-beans" />
<ant target="build-test-drivers" />
@@ -146,6 +150,14 @@
<mkdir dir="${build.testsrc}" />
<mkdir dir="${build.jars}" />
<mkdir dir="${test.logs}" />
+ </target>
+
+ <target name="dbControl">
+ <ant
+ dir="${db.control.dir}"
+ antfile="build.xml"
+ target="build"
+ inheritall="false"/>
</target>
<target name="build-test-beans" depends="dirs,build-test-auxilaries">
Modified:
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/database/DriveDatabaseControl.java
==============================================================================
---
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/database/DriveDatabaseControl.java
(original)
+++
incubator/beehive/trunk/controls/test/src/drivers/org/apache/beehive/controls/test/driver/database/DriveDatabaseControl.java
Thu Nov 18 17:06:24 2004
@@ -1,8 +1,8 @@
package org.apache.beehive.controls.test.driver.database;
import org.apache.beehive.test.tools.milton.common.Report;
-import
org.apache.beehive.controls.test.controls.database.test.TestDBControlBean;
-import org.apache.beehive.controls.test.controls.database.test.Employee;
+import org.apache.beehive.controls.test.controls.database.TestDBControl;
+import org.apache.beehive.controls.test.controls.database.Employee;
import java.util.Iterator;
import java.util.HashMap;
@@ -30,14 +30,14 @@
private static Employee[] emps = { new Employee(1, "John", "Doe",
"CEO"), new Employee(2, "Jane", "Doe", "CFO") };
- private TestDBControlBean testDBControl;
+ private TestDBControl testDBControl;
- public DriveDatabaseControl (TestDBControlBean aControl)
+ public DriveDatabaseControl (TestDBControl aControl)
{
this.testDBControl = aControl;
}
- public void setControl(TestDBControlBean aControl)
+ public void setControl(TestDBControl aControl)
{
this.testDBControl = aControl;
Modified:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ParserTest.java
==============================================================================
---
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ParserTest.java
(original)
+++
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ParserTest.java
Thu Nov 18 17:06:24 2004
@@ -1,8 +1,8 @@
package org.apache.beehive.controls.test.java.database;
-import org.apache.beehive.controls.test.controls.database.SQLParameter;
-import org.apache.beehive.controls.test.controls.database.SQLParser;
-import org.apache.beehive.controls.test.controls.database.SQLStatement;
+import dbControl.SQLParameter;
+import dbControl.SQLParser;
+import dbControl.SQLStatement;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
Modified:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ResultSetExtractorTest.java
==============================================================================
---
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ResultSetExtractorTest.java
(original)
+++
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/ResultSetExtractorTest.java
Thu Nov 18 17:06:24 2004
@@ -2,7 +2,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.beehive.controls.test.controls.database.ResultSetExtractor;
+import dbControl.ResultSetExtractor;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
Modified:
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/SQLStatementTest.java
==============================================================================
---
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/SQLStatementTest.java
(original)
+++
incubator/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/database/SQLStatementTest.java
Thu Nov 18 17:06:24 2004
@@ -1,7 +1,7 @@
package org.apache.beehive.controls.test.java.database;
-import org.apache.beehive.controls.test.controls.database.SQLParameter;
-import org.apache.beehive.controls.test.controls.database.SQLStatement;
+import dbControl.SQLParameter;
+import dbControl.SQLStatement;
import org.apache.beehive.test.tools.mantis.annotations.tch.Freq;
import org.apache.beehive.test.tools.mantis.annotations.tch.Status;
Modified: incubator/beehive/trunk/controls/test/webapps/build.xml
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/webapps/build.xml Thu Nov 18
17:06:24 2004
@@ -19,6 +19,8 @@
<property name="webapp.name" value="controlsWeb"/>
<property name="webapp.waitfor.url"
value="http://localhost:8080/${webapp.name}"/>
+ <property name="dbControl.jar"
location="../../../samples/controls-db/build/dbControl.jar"/>
+
<target name="usage">
<echo message="" />
@@ -61,6 +63,9 @@
<condition property="do.inject.derby">
<istrue value="${app.inject.derby}"/>
</condition>
+ <condition property="do.inject.dbControl">
+ <istrue value="${app.inject.dbControl}"/>
+ </condition>
<condition property="do.inject.test.controls">
<isset property="app.inject.test.controls"/>
</condition>
@@ -100,6 +105,7 @@
<antcall target="-inject.netui"/>
<antcall target="-inject.milton"/>
<antcall target="-inject.derby"/>
+ <antcall target="-inject.dbControl"/>
<antcall target="-inject.test.controls"/>
<antcall target="-inject.test.drivers"/>
<antcall target="-build.webapp"/>
@@ -150,6 +156,13 @@
<echo message="Injecting ${derby.jar} to ${webapp.name}"/>
<copy todir="${webapp.dir}/WEB-INF/lib"
file="${derby.jar}" verbose="true"
+ overwrite="true" failonerror="true"/>
+ </target>
+
+ <target name="-inject.dbControl" if="do.inject.dbControl">
+ <echo message="Injecting ${dbControl.jar} to ${webapp.name}"/>
+ <copy todir="${webapp.dir}/WEB-INF/lib"
+ file="${dbControl.jar}" verbose="true"
overwrite="true" failonerror="true"/>
</target>
Modified:
incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties
(original)
+++ incubator/beehive/trunk/controls/test/webapps/controlsWeb/app.properties
Thu Nov 18 17:06:24 2004
@@ -1,6 +1,7 @@
app.inject.netui: true
app.inject.milton: true
app.inject.derby: true
+app.inject.dbControl: true
### these two can be set to 'jar' or 'src' ###
app.inject.test.drivers: jar
app.inject.test.controls: jar
Modified:
incubator/beehive/trunk/controls/test/webapps/controlsWeb/database/Controller.jpf
==============================================================================
---
incubator/beehive/trunk/controls/test/webapps/controlsWeb/database/Controller.jpf
(original)
+++
incubator/beehive/trunk/controls/test/webapps/controlsWeb/database/Controller.jpf
Thu Nov 18 17:06:24 2004
@@ -24,7 +24,7 @@
import org.apache.beehive.controls.api.bean.Control;
import org.apache.beehive.controls.api.bean.ControlBean;
-import
org.apache.beehive.controls.test.controls.database.test.TestDBControlBean;
+import org.apache.beehive.controls.test.controls.database.TestDBControl;
import org.apache.beehive.controls.test.driver.database.DriveDatabaseControl;
import org.apache.beehive.test.tools.milton.common.Report;
@@ -38,7 +38,7 @@
{
@Control
- private TestDBControlBean testDBControl;
+ private TestDBControl testDBControl;
transient private DriveDatabaseControl driver = new
DriveDatabaseControl(this.testDBControl);
