You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cs...@apache.org on 2007/02/21 18:20:26 UTC

svn commit: r510106 - in /beehive/trunk/samples: build.xml system-controls-jdbc/README.txt system-controls-jdbc/build-dist.properties system-controls-jdbc/build.properties system-controls-jdbc/build.xml

Author: cschoett
Date: Wed Feb 21 09:20:26 2007
New Revision: 510106

URL: http://svn.apache.org/viewvc?view=rev&rev=510106
Log:
Added buid-dist.properties which specifies the necessary runtime libraries in the Beehive dist for this sample.
Also a bit of cleanup on the README file.

Added:
    beehive/trunk/samples/system-controls-jdbc/build-dist.properties   (with props)
Modified:
    beehive/trunk/samples/build.xml
    beehive/trunk/samples/system-controls-jdbc/README.txt
    beehive/trunk/samples/system-controls-jdbc/build.properties
    beehive/trunk/samples/system-controls-jdbc/build.xml

Modified: beehive/trunk/samples/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/build.xml?view=diff&rev=510106&r1=510105&r2=510106
==============================================================================
--- beehive/trunk/samples/build.xml (original)
+++ beehive/trunk/samples/build.xml Wed Feb 21 09:20:26 2007
@@ -33,7 +33,7 @@
 
         <ant dir="controls-blank" antfile="build.xml" target="clean" inheritAll="false"/>
         <ant dir="controls-spring" antfile="build.xml" target="clean" inheritAll="false"/>
-<!--        <ant dir="controls-webservices-blank" antfile="build.xml" target="clean" inheritAll="false"/> -->
+        <ant dir="system-controls-jdbc" antfile="build.xml" target="clean" inheritAll="false"/>
 
         <ant dir="petstoreWeb" antfile="build.xml" target="scrub" inheritAll="false"/>
     </target>
@@ -53,7 +53,7 @@
 
         <ant dir="controls-blank" antfile="build.xml" target="build" inheritAll="false"/>
         <ant dir="controls-spring" antfile="build.xml" target="build" inheritAll="false"/>
-<!--        <ant dir="controls-webservices-blank" antfile="build-svn.xml" target="build" inheritAll="false"/> -->
+        <ant dir="system-controls-jdbc" antfile="build.xml" target="build" inheritAll="false"/>
 
         <ant dir="petstoreWeb" antfile="build.xml" target="build" inheritAll="false"/>
     </target>

Modified: beehive/trunk/samples/system-controls-jdbc/README.txt
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/system-controls-jdbc/README.txt?view=diff&rev=510106&r1=510105&r2=510106
==============================================================================
--- beehive/trunk/samples/system-controls-jdbc/README.txt (original)
+++ beehive/trunk/samples/system-controls-jdbc/README.txt Wed Feb 21 09:20:26 2007
@@ -4,6 +4,7 @@
 This sample directory contains examples of:
 
   * Using JUnit to test a Beehive control out-of-container
+  * Use of the setConnection() Jdbc system control API
   * Invoking stored procedures from the Jdbc system control
   * Using a custom ResultSetMapper with the Jdbc system control
 
@@ -16,6 +17,6 @@
 (2) Download the latest version of derby and update the build.properties file in this sample
     with the location of the derby jar.
 
-(3) cd to /system-controls-jdbc and run: ant clean build test
+(3) cd to /system-controls-jdbc and run: ant build test
 
 (4) The JUnit log can be found in the build/logs folder of this sample.

Added: beehive/trunk/samples/system-controls-jdbc/build-dist.properties
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/system-controls-jdbc/build-dist.properties?view=auto&rev=510106
==============================================================================
--- beehive/trunk/samples/system-controls-jdbc/build-dist.properties (added)
+++ beehive/trunk/samples/system-controls-jdbc/build-dist.properties Wed Feb 21 09:20:26 2007
@@ -0,0 +1,8 @@
+#
+#
+#
+beehive.home=../..
+jdbc-control.jar=${beehive.home}/lib/controls/beehive-jdbc-control.jar
+commons-discovery.jar=${beehive.home}/lib/common/commons-discovery-0.2.jar
+commons-logging.jar=${beehive.home}/lib/common/commons-logging-1.0.4.jar
+derby.jar=<location of derby jar file>

Propchange: beehive/trunk/samples/system-controls-jdbc/build-dist.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/samples/system-controls-jdbc/build.properties
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/system-controls-jdbc/build.properties?view=diff&rev=510106&r1=510105&r2=510106
==============================================================================
--- beehive/trunk/samples/system-controls-jdbc/build.properties (original)
+++ beehive/trunk/samples/system-controls-jdbc/build.properties Wed Feb 21 09:20:26 2007
@@ -2,4 +2,7 @@
 #
 #
 beehive.home=../..
+jdbc-control.jar=${beehive.home}/system-controls/build/jars/beehive-jdbc-control.jar
+commons-discovery.jar=${beehive.home}/external/commons-discovery-0.2.jar
+commons-logging.jar=${beehive.home}/external/commons-logging-1.0.4.jar
 derby.jar=<location of derby jar file>

Modified: beehive/trunk/samples/system-controls-jdbc/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/system-controls-jdbc/build.xml?view=diff&rev=510106&r1=510105&r2=510106
==============================================================================
--- beehive/trunk/samples/system-controls-jdbc/build.xml (original)
+++ beehive/trunk/samples/system-controls-jdbc/build.xml Wed Feb 21 09:20:26 2007
@@ -30,16 +30,12 @@
     <property name="build.classes" location="${build.dir}/classes"/>
     <property name="build.beansrc" location="${build.dir}/beansrc"/>
     <property name="log.dir" location="${build.dir}/logs"/>
-    <property name="build.jar" value="mycontrols.jar"/>
 
     <path id="build.classpath">
         <pathelement path="${build.classes}"/>
-        <pathelement path="${beehive.home}/lib/controls/beehive-jdbc-control.jar"/>
+        <pathelement path="${jdbc-control.jar}"/>
         <path refid="controls.dependency.path"/>
-        <pathelement path="${derby.jar}"/>
-        <fileset dir="${beehive.home}/lib/common">
-            <include name="*.jar"/>
-        </fileset>
+        <path refid="velocity.dependency.path"/>
     </path>
 
     <target name="clean" description="Delete all generated files">
@@ -57,8 +53,6 @@
                         destdir="${build.classes}"
                         tempdir="${build.beansrc}"
                         classpathref="build.classpath"/>
-
-        <control-jar destfile="${build.dir}/${build.jar}" basedir="${build.classes}" />
     </target>
 
     <target name="test" description="Run JUnit tests">
@@ -69,6 +63,9 @@
             <classpath>
                 <path refid="build.classpath"/>
                 <pathelement location="${build.classes}"/>
+                <pathelement path="${derby.jar}"/>
+                <pathelement path="${commons-discovery.jar}"/>
+                <pathelement path="${commons-logging.jar}"/>
             </classpath>
             <formatter type="plain"/>
             <batchtest filtertrace="off" todir="${log.dir}">
@@ -83,7 +80,7 @@
     <target name="usage" description="Print the usage for this build.xml">
         <echo message=""/>
         <echo message=""/>
-        <echo message="Controls Project Build file"/>
+        <echo message="Jdbc Control Sample Project Build file"/>
         <echo message=""/>
         <echo message=""/>
         <echo message="----------------------------------------------------------------"/>