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/11/04 20:23:25 UTC
svn commit: r330867 - in /beehive/trunk/samples/wsm-employee:
build.properties build.xml
src/org/apache/beehive/sample/EmployeeDBControl.java
src/org/apache/beehive/sample/EmployeeDBControl.jcx
Author: ekoneil
Date: Fri Nov 4 11:23:18 2005
New Revision: 330867
URL: http://svn.apache.org/viewcvs?rev=330867&view=rev
Log:
Switch the wsm-employee sample onto the Beehive JdbcControl.
Changes:
- beehive-jdbc-control.jar is brought in from a property in build.properties
- same with derby.jar
- the .jcx control moved to the .java extension
BB: self
Test: build passes
Added:
beehive/trunk/samples/wsm-employee/src/org/apache/beehive/sample/EmployeeDBControl.java
- copied, changed from r330866, beehive/trunk/samples/wsm-employee/src/org/apache/beehive/sample/EmployeeDBControl.jcx
Removed:
beehive/trunk/samples/wsm-employee/src/org/apache/beehive/sample/EmployeeDBControl.jcx
Modified:
beehive/trunk/samples/wsm-employee/build.properties
beehive/trunk/samples/wsm-employee/build.xml
Modified: beehive/trunk/samples/wsm-employee/build.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-employee/build.properties?rev=330867&r1=330866&r2=330867&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-employee/build.properties (original)
+++ beehive/trunk/samples/wsm-employee/build.properties Fri Nov 4 11:23:18 2005
@@ -2,3 +2,9 @@
# Edit this if you have moved the sample out of <beehive-home>/samples.
#
beehive.home=../../
+
+derby.jar=${beehive.home}/external/derby/derby_46005.jar
+beehive-jdbc-control.jar=${beehive.home}/system-controls/build/jars/beehive-jdbc-control.jar
+
+httpunit.dir=/no/such/dir
+
Modified: beehive/trunk/samples/wsm-employee/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-employee/build.xml?rev=330867&r1=330866&r2=330867&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-employee/build.xml (original)
+++ beehive/trunk/samples/wsm-employee/build.xml Fri Nov 4 11:23:18 2005
@@ -25,33 +25,19 @@
<import file="${beehive.home}/beehive-imports.xml"/>
<import file="${beehive.home}/ant/beehive-tools.xml"/>
- <property name="service.name" value="Employee"/>
-
<property name="build.dir" location="build"/>
<property name="src.dir" location="src"/>
- <property name="ws-src.dir" location="src-ws"/>
+ <property name="src-ws.dir" location="src-ws"/>
<property name="classes.dir" location="${build.dir}/WEB-INF/classes"/>
- <property name="web.inf.dir" location="${webapp.dir}/WEB-INF"/>
- <property name="gen.dir" location="${web.inf.dir}/gen"/>
+ <property name="service.name" value="Employee"/>
<property name="webservice.war.name" location="${service.name}WS.war"/>
<path id="build.classpath">
<pathelement location="${classes.dir}"/>
<fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
</path>
-
- <!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
- <!-- ========================================= -->
- <target name="war">
- <jar jarfile="${webservice.war.name}">
- <fileset dir="${build.dir}">
- <exclude name="WEB-INF/gen/**"/>
- </fileset>
- </jar>
- </target>
-
+
<!-- ========================================= -->
<!-- build - build jar-file -->
<!-- ========================================= -->
@@ -59,18 +45,23 @@
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.dir}/WEB-INF/classes"/>
- <deploy-wsm webappDir="${build.dir}"/>
+ <available file="${derby.jar}" property="derby.present"/>
+ <fail unless="derby.present"
+ message="Unable to locate ${derby.jar}. Please download Derby from http://db.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-jdbc-control.jar}"/>
- <copy todir="${lib.dir}">
- <fileset dir="../../controls-db/build" includes="dbControl.jar"/>
- <fileset dir="${beehive.home}/external/derby" includes="derby_46005.jar"/>
- </copy>
+ <deploy-wsm webappDir="${build.dir}"/>
- <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+ <build-controls srcdir="${basedir}/src"
+ destdir="${build.dir}/WEB-INF/classes"
+ tempdir="${build.dir}/WEB-INF/.tmpbeansrc"
+ classpathRef="build.classpath"/>
- <build-webservices srcdir="${ws-src.dir}"
+ <build-webservices srcdir="${src-ws.dir}"
destdir="${classes.dir}"
- tempdir="${gen.dir}"
+ tempdir="${build.dir}/WEB-INF/.tmpbeansrc"
classpathref="build.classpath"/>
</target>
@@ -82,4 +73,15 @@
<delete file="velocity.log"/>
</target>
+ <!-- ========================================= -->
+ <!-- war - build deployable artifact -->
+ <!-- ========================================= -->
+ <target name="war">
+ <jar jarfile="${webservice.war.name}">
+ <fileset dir="${build.dir}">
+ <exclude name="WEB-INF/.tmpbeansrc/**"/>
+ </fileset>
+ </jar>
+ </target>
+
</project>
Copied: beehive/trunk/samples/wsm-employee/src/org/apache/beehive/sample/EmployeeDBControl.java (from r330866, beehive/trunk/samples/wsm-employee/src/org/apache/beehive/sample/EmployeeDBControl.jcx)
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-employee/src/org/apache/beehive/sample/EmployeeDBControl.java?p2=beehive/trunk/samples/wsm-employee/src/org/apache/beehive/sample/EmployeeDBControl.java&p1=beehive/trunk/samples/wsm-employee/src/org/apache/beehive/sample/EmployeeDBControl.jcx&r1=330866&r2=330867&rev=330867&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-employee/src/org/apache/beehive/sample/EmployeeDBControl.jcx (original)
+++ beehive/trunk/samples/wsm-employee/src/org/apache/beehive/sample/EmployeeDBControl.java Fri Nov 4 11:23:18 2005
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
/*
* Copyright 2004-2005 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package org.apache.beehive.sample;
import java.sql.SQLException;
import java.io.Serializable;
@@ -24,14 +23,15 @@
import java.util.HashMap;
import org.apache.beehive.controls.api.bean.ControlExtension;
-import dbControl.DatabaseControl;
-import dbControl.DatabaseControl.ConnectionDataSource;
-import dbControl.DatabaseControl.SQL;
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
+import org.apache.beehive.controls.system.jdbc.JdbcControl.SQL;
+import org.apache.beehive.controls.system.jdbc.JdbcControl.ConnectionDataSource;
@ControlExtension
@ConnectionDataSource(jndiName="jdbc:derby:build/databaseControlTestDB;create=true")
-public interface EmployeeDBControl extends DatabaseControl
-{
+public interface EmployeeDBControl
+ extends JdbcControl {
+
@SQL(statement="CREATE TABLE EMPLOYEE ( id INT PRIMARY KEY NOT NULL, " +
"fName VARCHAR(20), lName VARCHAR(20), title VARCHAR(15))")
public void createTable() throws SQLException;