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/06/14 23:14:49 UTC
svn commit: r190657 [18/23] - in /incubator/beehive/trunk/system-controls:
./ ant/ samples/ejb/
samples/ejb/client/org/apache/beehive/controls/system/ejb/sample/client/
samples/ejb/control/org/apache/beehive/controls/system/ejb/sample/control/
samples/ejb/ejb/META-INF/
samples/ejb/ejb/org/apache/beehive/controls/system/ejb/sample/bean/
samples/jdbc/jdbcControlSample/ samples/jdbc/jdbcControlSample/META-INF/
samples/jdbc/jdbcControlSample/WEB-INF/
samples/jdbc/jdbcControlSample/WEB-INF/src/
samples/jdbc/jdbcControlSample/WEB-INF/src/controls/
samples/jdbc/jdbcControlSample/WEB-INF/src/servlet/
samples/jdbc/jdbcControlSample/WEB-INF/src/shared/ samples/jms/
samples/jms/src/org/apache/beehive/controls/system/jms/samples/
samples/webservice/amazon/ samples/webservice/amazon/junit/
samples/webservice/amazon/schemas/ samples/webservice/common/src/test/
samples/webservice/google/ samples/webservice/google/junit/model/
samples/webservice/google/rpc_schemas/ samples/webservice/google/servlet/
samples/webservice/wsm_samples_client/
samples/webservice/wsm_samples_client/junit/
samples/webservice/wsm_samples_client/junit/org/wsm/samples/client/header/
samples/webservice/wsm_samples_client/junit/org/wsm/samples/client/webparam/
samples/webservice/xmlbeans/ samples/webservice/xmlbeans/junit/ src/ejb/
src/ejb/org/apache/beehive/controls/system/ejb/ src/ejb/schema/ src/jdbc/
src/jdbc/org/apache/beehive/controls/system/jdbc/
src/jdbc/org/apache/beehive/controls/system/jdbc/parser/ src/jms/
src/jms/org/apache/beehive/controls/system/jms/
src/jms/org/apache/beehive/controls/system/jms/impl/
src/jms/org/apache/beehive/controls/system/jndi/
src/jms/org/apache/beehive/controls/system/jndi/impl/ src/webservice/
src/webservice/org/apache/beehive/controls/system/webservice/
src/webservice/org/apache/beehive/controls/system/webservice/generator/
src/webservice/org/apache/beehive/controls/system/webservice/jaxrpc/
src/webservice/org/apache/beehive/controls/system/webservice/utils/
test/ant/ test/conf/ test/src/jdbc/controls/
test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/
test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/errors/
test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/results/
test/src/jdbc/controls/schemas/badusers/
test/src/jdbc/controls/schemas/users/ test/src/jdbc/jdbc-container/
test/src/jdbc/jdbc-container/application/
test/src/jdbc/jdbc-container/src/org/apache/beehive/controls/system/jdbc/containertest/
test/src/jdbc/jdbc-container/webapp/WEB-INF/
test/src/jdbc/jdbc-container/webapp/conf/Catalina/localhost/
test/src/jdbc/junitTests/
test/src/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/dbconnection/
test/src/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/errors/
test/src/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/results/
test/src/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/sqlparser/
test/src/jdbc/junitTests/org/apache/beehive/controls/system/jdbc/units/utils/
test/src/webservice/ test/src/webservice/jcxgen-tests/
test/src/webservice/jcxgen-tests/tests/org/apache/beehive/controls/system/webservice/units/jcxgen/
test/src/webservice/schemas/ test/src/webservice/servers/webapp/WEB-INF/
test/src/webservice/servers/webapp/WEB-INF/src/org/apache/beehive/doclitwrap/
test/src/webservice/servers/webapp/WEB-INF/src/web/
test/src/webservice/servers/webapp/WEB-INF/webservices/web/complex/
test/src/webservice/tests/org/apache/beehive/controls/system/webservice/units/dlwservice/
Modified: incubator/beehive/trunk/system-controls/systemcontrols-imports.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/systemcontrols-imports.xml?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/systemcontrols-imports.xml (original)
+++ incubator/beehive/trunk/system-controls/systemcontrols-imports.xml Tue Jun 14 14:14:42 2005
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
-
-<!-- ======================================================================== -->
-<!-- -->
-<!-- Common System controls build dependencies -->
-<!-- -->
-<!-- ======================================================================== -->
-<project name="Beehive/SystemControlsBuild">
-
- <import file="../beehive-imports.xml"/>
- <import file="../ant/beehive-tools.xml"/>
-
- <property name="external.dir" location="${beehive.home}/system-controls/external"/>
- <property file="${beehive.home}/system-controls/ant/systemcontrols.properties"/>
-
- <path id="webservices.dependency.path">
- <fileset file="${beehive.home}/wsm/build/jars/beehive-wsm.jar"/>
- <fileset file="${beehive.home}/wsm/build/jars/beehive-wsm-axis.jar"/>
- <fileset file="${beehive.home}/wsm/build/jars/beehive-wsdltypes.jar"/>
- <fileset file="${beehive.home}/wsm/build/jars/jsr181.jar"/>
- <fileset file="${beehive.home}/wsm/external/axis.jar"/>
- <fileset file="${beehive.home}/wsm/external/jaxrpc.jar"/>
- <fileset file="${beehive.home}/wsm/external/wsdl4j.jar"/>
- <fileset file="${external.dir}/commons/commons-cli-1.0.jar"/>
- <path refid="servlet.dependency.path"/>
- </path>
-
- <path id="ejb.dependency.path">
- <fileset file="${external.dir}/commons/commons-collections.jar"/>
- <fileset file="${external.dir}/ejb/geronimo-spec-j2ee-1.4-rc2.jar"/>
- </path>
-
-</project>
+<?xml version="1.0"?>
+
+<!-- ======================================================================== -->
+<!-- -->
+<!-- Common System controls build dependencies -->
+<!-- -->
+<!-- ======================================================================== -->
+<project name="Beehive/SystemControlsBuild">
+
+ <import file="../beehive-imports.xml"/>
+ <import file="../ant/beehive-tools.xml"/>
+
+ <property name="external.dir" location="${beehive.home}/system-controls/external"/>
+ <property file="${beehive.home}/system-controls/ant/systemcontrols.properties"/>
+
+ <path id="webservices.dependency.path">
+ <fileset file="${beehive.home}/wsm/build/jars/beehive-wsm.jar"/>
+ <fileset file="${beehive.home}/wsm/build/jars/beehive-wsm-axis.jar"/>
+ <fileset file="${beehive.home}/wsm/build/jars/beehive-wsdltypes.jar"/>
+ <fileset file="${beehive.home}/wsm/build/jars/jsr181.jar"/>
+ <fileset file="${beehive.home}/wsm/external/axis.jar"/>
+ <fileset file="${beehive.home}/wsm/external/jaxrpc.jar"/>
+ <fileset file="${beehive.home}/wsm/external/wsdl4j.jar"/>
+ <fileset file="${external.dir}/commons/commons-cli-1.0.jar"/>
+ <path refid="servlet.dependency.path"/>
+ </path>
+
+ <path id="ejb.dependency.path">
+ <fileset file="${external.dir}/commons/commons-collections.jar"/>
+ <fileset file="${external.dir}/ejb/geronimo-spec-j2ee-1.4-rc2.jar"/>
+ </path>
+
+</project>
Propchange: incubator/beehive/trunk/system-controls/systemcontrols-imports.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/system-controls/test/ant/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/ant/build.xml?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/ant/build.xml (original)
+++ incubator/beehive/trunk/system-controls/test/ant/build.xml Tue Jun 14 14:14:42 2005
@@ -1,65 +1,65 @@
-<?xml version="1.0"?>
-
-<project name="Beehive/SystemControls/Test" default="drt" basedir=".">
-
- <import file="test-imports.xml"/>
-
- <property name="drt.testResults.dir" location="${beehive.home}/system-controls/build/drt.testResults"/>
- <property name="bvt.testResults.dir" location="${beehive.home}/system-controls/build/bvt.testResults"/>
-
- <target name="prepare">
- <mkdir dir="${test.lib.dir}"/>
- </target>
-
- <!-- ============================================= -->
- <!-- Build Targets -->
- <!-- ============================================= -->
- <target name="test.build" depends="prepare" description="Build the QA modules">
- <antcall target="test.do.subant">
- <param name="target.name" value="build"/>
- </antcall>
- </target>
-
- <target name="test.clean" description="Clean the QA modules">
- <delete dir="${drt.testResults.dir}"/>
- <delete dir="${bvt.testResults.dir}"/>
-<!--
- <antcall target="test.do.subant">
- <param name="target.name" value="clean"/>
- </antcall>
--->
- </target>
-
- <target name="test.do.subant">
- <subant target="${target.name}">
- <filelist dir="${test.src.dir}">
- <file name="jdbc/controls"/>
- <file name="jdbc/junitTests"/>
- </filelist>
- </subant>
- </target>
-
- <!-- ============================================= -->
- <!-- DRT Targets -->
- <!-- ============================================= -->
- <target name="drt" depends="test.clean,test.build,junit.drt" description="Run the System Controls JUnit DRTs"/>
-
- <target name="junit.drt">
- <property name="formatter.type" value="xml"/>
- <property name="testout.dir" value="${drt.testResults.dir}"/>
- <property name="fail" value="true"/>
-
- <antcall target="run.tests"/>
- </target>
-
- <target name="junit.bvt">
- <property name="formatter.type" value="xml"/>
- <property name="testout.dir" value="${bvt.testResults.dir}"/>
- <property name="fail" value="false"/>
-
- <antcall target="run.tests"/>
- </target>
-
- <import file="junitCore.xml"/>
-
-</project>
+<?xml version="1.0"?>
+
+<project name="Beehive/SystemControls/Test" default="drt" basedir=".">
+
+ <import file="test-imports.xml"/>
+
+ <property name="drt.testResults.dir" location="${beehive.home}/system-controls/build/drt.testResults"/>
+ <property name="bvt.testResults.dir" location="${beehive.home}/system-controls/build/bvt.testResults"/>
+
+ <target name="prepare">
+ <mkdir dir="${test.lib.dir}"/>
+ </target>
+
+ <!-- ============================================= -->
+ <!-- Build Targets -->
+ <!-- ============================================= -->
+ <target name="test.build" depends="prepare" description="Build the QA modules">
+ <antcall target="test.do.subant">
+ <param name="target.name" value="build"/>
+ </antcall>
+ </target>
+
+ <target name="test.clean" description="Clean the QA modules">
+ <delete dir="${drt.testResults.dir}"/>
+ <delete dir="${bvt.testResults.dir}"/>
+<!--
+ <antcall target="test.do.subant">
+ <param name="target.name" value="clean"/>
+ </antcall>
+-->
+ </target>
+
+ <target name="test.do.subant">
+ <subant target="${target.name}">
+ <filelist dir="${test.src.dir}">
+ <file name="jdbc/controls"/>
+ <file name="jdbc/junitTests"/>
+ </filelist>
+ </subant>
+ </target>
+
+ <!-- ============================================= -->
+ <!-- DRT Targets -->
+ <!-- ============================================= -->
+ <target name="drt" depends="test.clean,test.build,junit.drt" description="Run the System Controls JUnit DRTs"/>
+
+ <target name="junit.drt">
+ <property name="formatter.type" value="xml"/>
+ <property name="testout.dir" value="${drt.testResults.dir}"/>
+ <property name="fail" value="true"/>
+
+ <antcall target="run.tests"/>
+ </target>
+
+ <target name="junit.bvt">
+ <property name="formatter.type" value="xml"/>
+ <property name="testout.dir" value="${bvt.testResults.dir}"/>
+ <property name="fail" value="false"/>
+
+ <antcall target="run.tests"/>
+ </target>
+
+ <import file="junitCore.xml"/>
+
+</project>
Propchange: incubator/beehive/trunk/system-controls/test/ant/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/system-controls/test/ant/junitCore.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/ant/junitCore.xml?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/ant/junitCore.xml (original)
+++ incubator/beehive/trunk/system-controls/test/ant/junitCore.xml Tue Jun 14 14:14:42 2005
@@ -1,73 +1,73 @@
-<?xml version="1.0"?>
-
-<project name="Beehive/SystemControls/JUnitTests" basedir=".">
-
- <import file="test-imports.xml"/>
-
- <path id="test.classpath">
- <path refid="junit-tests.dependency.path"/>
- <path refid="junit.dependency.path"/>
- <path refid="servlet.dependency.path"/>
- </path>
-
- <target name="run.tests">
- <fail unless="formatter.type" message="Unspecified value for formatter.type"/>
- <fail unless="testout.dir" message="Unspecified value for testout.dir"/>
- <fail unless="fail" message="Unspecified value for fail"/>
-
- <property name="classpath" refid="test.classpath"/>
- <echo>test.classpath: ${classpath}</echo>
-
- <property name="show.output" value="false"/>
-
- <condition property="log4j.config" value="${log4jconfig.verbose.junit}">
- <not><isset property="log4j.quiet"/></not>
- </condition>
- <condition property="log4j.config" value="${log4jconfig.junit}">
- <and><isset property="log4j.quiet"/></and>
- </condition>
-
- <echo>log4j.config: ${log4j.config}</echo>
- <echo>testout.dir: ${testout.dir}</echo>
-
- <mkdir dir="${testout.dir}"/>
-
- <junit printsummary="${fail}" fork="${fail}" haltonfailure="${fail}" haltonerror="${fail}" showOutput="${show.output}">
- <jvmarg value="-ea"/>
- <classpath refid="test.classpath"/>
- <formatter type="${formatter.type}"/>
- <sysproperty key="log4j.configuration" value="file:${log4j.config}"/>
- <sysproperty key="systemcontrolsdrt.logdir" path="${testout.dir}"/>
- <sysproperty key="derby.system.home" value="${testout.dir}"/>
-
- <test name="org.apache.beehive.controls.system.jdbc.units.dbconnection.DBConnectionTest" todir="${testout.dir}"/>
- <test name="org.apache.beehive.controls.system.jdbc.units.sqlparser.SqlParserTest" todir="${testout.dir}"/>
- <test name="org.apache.beehive.controls.system.jdbc.units.results.DBSingleRowResultsTest" todir="${testout.dir}"/>
- <test name="org.apache.beehive.controls.system.jdbc.units.results.DBMultiRowResultsTest" todir="${testout.dir}"/>
- <test name="org.apache.beehive.controls.system.jdbc.units.results.StoredProcsDBResultsTest" todir="${testout.dir}"/>
- <test name="org.apache.beehive.controls.system.jdbc.units.results.TxResultsTest" todir="${testout.dir}"/>
- <test name="org.apache.beehive.controls.system.jdbc.units.results.XmlBeanResultsTest" todir="${testout.dir}"/>
- <test name="org.apache.beehive.controls.system.jdbc.units.results.JdbcTypesTest" todir="${testout.dir}"/>
- <test name="org.apache.beehive.controls.system.jdbc.units.errors.ErrorPathsTest" todir="${testout.dir}"/>
-
- </junit>
-
- <echo>Generating a test report into: ${testout.dir}/html</echo>
-
- <mkdir dir="${testout.dir}/html"/>
-
- <!-- build a report -->
- <junitreport todir="${testout.dir}/">
- <fileset dir="${testout.dir}/">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="noframes" todir="${testout.dir}/html"/>
- </junitreport>
- </target>
-
- <target name="run.test">
- <fail unless="test.name" message="No test specified, set the -Dtest.name=<name> property"/>
- <java classpathref="test.classpath" classname="${test.name}"/>
- </target>
-
-</project>
+<?xml version="1.0"?>
+
+<project name="Beehive/SystemControls/JUnitTests" basedir=".">
+
+ <import file="test-imports.xml"/>
+
+ <path id="test.classpath">
+ <path refid="junit-tests.dependency.path"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
+ </path>
+
+ <target name="run.tests">
+ <fail unless="formatter.type" message="Unspecified value for formatter.type"/>
+ <fail unless="testout.dir" message="Unspecified value for testout.dir"/>
+ <fail unless="fail" message="Unspecified value for fail"/>
+
+ <property name="classpath" refid="test.classpath"/>
+ <echo>test.classpath: ${classpath}</echo>
+
+ <property name="show.output" value="false"/>
+
+ <condition property="log4j.config" value="${log4jconfig.verbose.junit}">
+ <not><isset property="log4j.quiet"/></not>
+ </condition>
+ <condition property="log4j.config" value="${log4jconfig.junit}">
+ <and><isset property="log4j.quiet"/></and>
+ </condition>
+
+ <echo>log4j.config: ${log4j.config}</echo>
+ <echo>testout.dir: ${testout.dir}</echo>
+
+ <mkdir dir="${testout.dir}"/>
+
+ <junit printsummary="${fail}" fork="${fail}" haltonfailure="${fail}" haltonerror="${fail}" showOutput="${show.output}">
+ <jvmarg value="-ea"/>
+ <classpath refid="test.classpath"/>
+ <formatter type="${formatter.type}"/>
+ <sysproperty key="log4j.configuration" value="file:${log4j.config}"/>
+ <sysproperty key="systemcontrolsdrt.logdir" path="${testout.dir}"/>
+ <sysproperty key="derby.system.home" value="${testout.dir}"/>
+
+ <test name="org.apache.beehive.controls.system.jdbc.units.dbconnection.DBConnectionTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.controls.system.jdbc.units.sqlparser.SqlParserTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.controls.system.jdbc.units.results.DBSingleRowResultsTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.controls.system.jdbc.units.results.DBMultiRowResultsTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.controls.system.jdbc.units.results.StoredProcsDBResultsTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.controls.system.jdbc.units.results.TxResultsTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.controls.system.jdbc.units.results.XmlBeanResultsTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.controls.system.jdbc.units.results.JdbcTypesTest" todir="${testout.dir}"/>
+ <test name="org.apache.beehive.controls.system.jdbc.units.errors.ErrorPathsTest" todir="${testout.dir}"/>
+
+ </junit>
+
+ <echo>Generating a test report into: ${testout.dir}/html</echo>
+
+ <mkdir dir="${testout.dir}/html"/>
+
+ <!-- build a report -->
+ <junitreport todir="${testout.dir}/">
+ <fileset dir="${testout.dir}/">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="noframes" todir="${testout.dir}/html"/>
+ </junitreport>
+ </target>
+
+ <target name="run.test">
+ <fail unless="test.name" message="No test specified, set the -Dtest.name=<name> property"/>
+ <java classpathref="test.classpath" classname="${test.name}"/>
+ </target>
+
+</project>
Propchange: incubator/beehive/trunk/system-controls/test/ant/junitCore.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/system-controls/test/ant/test-imports.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/ant/test-imports.xml?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/ant/test-imports.xml (original)
+++ incubator/beehive/trunk/system-controls/test/ant/test-imports.xml Tue Jun 14 14:14:42 2005
@@ -1,41 +1,41 @@
-<?xml version="1.0"?>
-
-<project name="Beehive/SystemControls/TestImports">
-
- <import file="../../systemcontrols-imports.xml"/>
-
- <property name="test.lib.dir" location="${sc.home}/build/test-lib"/>
- <property name="test.classes.dir" location="${sc.home}/build/test-classes"/>
- <property name="test.dir" location="${sc.home}/test"/>
- <property name="test.src.dir" location="${test.dir}/src"/>
- <property name="test.external.dir" location="${test.dir}/external"/>
- <property name="log4jconfig.verbose.junit" location="${test.dir}/conf/junitLogCfgVerbose.xml"/>
- <property name="log4jconfig.junit" location="${test.dir}/conf/junitLogCfg.xml"/>
- <property name="test-controls.jar.name" value="beehive-systemcontrols-testControls.jar"/>
- <property name="test-units.jar.name" value="beehive-systemcontrols-junit-tests.jar"/>
-
- <path id="test-controls.dependency.path">
- <pathelement location="${test.lib.dir}/${test-controls.jar.name}"/>
- </path>
-
- <path id="test-units.dependency.path">
- <pathelement location="${test.lib.dir}/${test-units.jar.name}"/>
- </path>
-
- <path id="jdbc-control.dependency.path">
- <pathelement location="${build.lib.dir}/${jdbccontrol.jar.name}"/>
- </path>
-
- <path id="junit-tests.dependency.path">
- <path refid="test-units.dependency.path"/>
- <path refid="test-controls.dependency.path"/>
- <path refid="jdbc-control.dependency.path"/>
- <path refid="controls.dependency.path"/>
- <path refid="derby.dependency.path"/>
- <path refid="xbean.dependency.path"/>
- <path refid="log4j.dependency.path"/>
- <path refid="commons-discovery.dependency.path"/>
- <path refid="commons-logging.dependency.path"/>
- </path>
-
-</project>
+<?xml version="1.0"?>
+
+<project name="Beehive/SystemControls/TestImports">
+
+ <import file="../../systemcontrols-imports.xml"/>
+
+ <property name="test.lib.dir" location="${sc.home}/build/test-lib"/>
+ <property name="test.classes.dir" location="${sc.home}/build/test-classes"/>
+ <property name="test.dir" location="${sc.home}/test"/>
+ <property name="test.src.dir" location="${test.dir}/src"/>
+ <property name="test.external.dir" location="${test.dir}/external"/>
+ <property name="log4jconfig.verbose.junit" location="${test.dir}/conf/junitLogCfgVerbose.xml"/>
+ <property name="log4jconfig.junit" location="${test.dir}/conf/junitLogCfg.xml"/>
+ <property name="test-controls.jar.name" value="beehive-systemcontrols-testControls.jar"/>
+ <property name="test-units.jar.name" value="beehive-systemcontrols-junit-tests.jar"/>
+
+ <path id="test-controls.dependency.path">
+ <pathelement location="${test.lib.dir}/${test-controls.jar.name}"/>
+ </path>
+
+ <path id="test-units.dependency.path">
+ <pathelement location="${test.lib.dir}/${test-units.jar.name}"/>
+ </path>
+
+ <path id="jdbc-control.dependency.path">
+ <pathelement location="${build.lib.dir}/${jdbccontrol.jar.name}"/>
+ </path>
+
+ <path id="junit-tests.dependency.path">
+ <path refid="test-units.dependency.path"/>
+ <path refid="test-controls.dependency.path"/>
+ <path refid="jdbc-control.dependency.path"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="derby.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="log4j.dependency.path"/>
+ <path refid="commons-discovery.dependency.path"/>
+ <path refid="commons-logging.dependency.path"/>
+ </path>
+
+</project>
Propchange: incubator/beehive/trunk/system-controls/test/ant/test-imports.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/conf/junitLogCfg.xml (original)
+++ incubator/beehive/trunk/system-controls/test/conf/junitLogCfg.xml Tue Jun 14 14:14:42 2005
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
- <!--Netui logfile -->
- <appender name="SYSCTRLS_SYSLOGFILE" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="${systemcontrolsdrt.logdir}/systemcontrols.log"/>
- <param name="Append" value="true"/>
- <param name="MaxFileSize" value="500000KB"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{DATE} %-5p %-15c{1} [%x]: %m%n"/>
- </layout>
- </appender>
-
- <!-- base for all netui server components -->
- <category name="org.apache.beehive.controls.system">
- <priority value="warn" />
- <appender-ref ref="SYSCTRLS_SYSLOGFILE" />
- </category>
-
-</log4j:configuration>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <!--Netui logfile -->
+ <appender name="SYSCTRLS_SYSLOGFILE" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="${systemcontrolsdrt.logdir}/systemcontrols.log"/>
+ <param name="Append" value="true"/>
+ <param name="MaxFileSize" value="500000KB"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{DATE} %-5p %-15c{1} [%x]: %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- base for all netui server components -->
+ <category name="org.apache.beehive.controls.system">
+ <priority value="warn" />
+ <appender-ref ref="SYSCTRLS_SYSLOGFILE" />
+ </category>
+
+</log4j:configuration>
Propchange: incubator/beehive/trunk/system-controls/test/conf/junitLogCfg.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/conf/junitLogCfgVerbose.xml (original)
+++ incubator/beehive/trunk/system-controls/test/conf/junitLogCfgVerbose.xml Tue Jun 14 14:14:42 2005
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
- <!--System Controls logfile -->
- <appender name="SYSCTRLS_SYSLOGFILE" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="${systemcontrolsdrt.logdir}/systemcontrols.log"/>
- <param name="Append" value="true"/>
- <param name="MaxFileSize" value="500000KB"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{DATE} %-5p %-15c{1} [%x]: %m%n"/>
- </layout>
- </appender>
-
- <category name="org.apache.beehive.controls.system">
- <priority value="debug" />
- <appender-ref ref="SYSCTRLS_SYSLOGFILE" />
- </category>
-
-</log4j:configuration>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <!--System Controls logfile -->
+ <appender name="SYSCTRLS_SYSLOGFILE" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="${systemcontrolsdrt.logdir}/systemcontrols.log"/>
+ <param name="Append" value="true"/>
+ <param name="MaxFileSize" value="500000KB"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{DATE} %-5p %-15c{1} [%x]: %m%n"/>
+ </layout>
+ </appender>
+
+ <category name="org.apache.beehive.controls.system">
+ <priority value="debug" />
+ <appender-ref ref="SYSCTRLS_SYSLOGFILE" />
+ </category>
+
+</log4j:configuration>
Propchange: incubator/beehive/trunk/system-controls/test/conf/junitLogCfgVerbose.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/jdbc/controls/build.xml?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/jdbc/controls/build.xml (original)
+++ incubator/beehive/trunk/system-controls/test/src/jdbc/controls/build.xml Tue Jun 14 14:14:42 2005
@@ -1,65 +1,65 @@
-<?xml version="1.0"?>
-
-<project name="Beehive/SystemControls/TestControls" default="build" basedir=".">
-
- <import file="../../../ant/test-imports.xml"/>
-
- <taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpathref="controls.dependency.path" onerror="report"/>
- <property name="module.name" value="controls"/>
- <property name="module.dir" location="${test.src.dir}/jdbc/${module.name}"/>
- <property name="module.classes.dir" location="${test.classes.dir}/${module.name}"/>
- <property name="module.gensrc.dir" location="${test.classes.dir}/${module.name}-generated-src"/>
- <property name="module.jar" location="${test.lib.dir}/${test-controls.jar.name}"/>
-
- <path id="testcontrols.classpath">
- <path refid="jdbc-control.dependency.path"/>
- <path refid="controls.dependency.path"/>
- <path refid="xbean.dependency.path"/>
- <path refid="junit.dependency.path"/>
- <path refid="servlet.dependency.path"/>
- <path refid="velocity.dependency.path"/>
- </path>
-
- <target name="build">
- <echo>compile module: ${module.name}</echo>
- <echo>output directory: ${test.lib.dir}</echo>
- <echo>debug: ${compile.debug}</echo>
-
- <mkdir dir="${test.lib.dir}"/>
- <mkdir dir="${module.classes.dir}"/>
- <mkdir dir="${module.gensrc.dir}"/>
-
- <echo message="** Generating test Xml Beans **"/>
-
- <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean"
- classpathref="xbean.dependency.path" onerror="report"/>
-
- <xmlbean classgendir="${module.classes.dir}"
- classpathref="testcontrols.classpath"
- schema="${module.dir}/schemas"
- includeJavaRuntime="yes">
- </xmlbean>
-
- <echo message="** Phase One **"/>
-
- <apt srcdir="${module.dir}"
- gendir="${module.gensrc.dir}"
- destdir="${module.classes.dir}"
- classpathref="testcontrols.classpath"
- compileByExtension="true"
- debug="${compiler.debug}"
- nowarn="${compiler.nowarn}"
- srcExtensions="*.jcx,*.jcs,*.java">
- </apt>
-
- <control-jar destfile="${module.jar}" basedir="${module.classes.dir}"/>
- </target>
-
- <target name="clean">
- <delete dir="${module.classes.dir}"/>
- <delete file="${module.jar}"/>
- </target>
-
-</project>
-
+<?xml version="1.0"?>
+
+<project name="Beehive/SystemControls/TestControls" default="build" basedir=".">
+
+ <import file="../../../ant/test-imports.xml"/>
+
+ <taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="controls.dependency.path" onerror="report"/>
+ <property name="module.name" value="controls"/>
+ <property name="module.dir" location="${test.src.dir}/jdbc/${module.name}"/>
+ <property name="module.classes.dir" location="${test.classes.dir}/${module.name}"/>
+ <property name="module.gensrc.dir" location="${test.classes.dir}/${module.name}-generated-src"/>
+ <property name="module.jar" location="${test.lib.dir}/${test-controls.jar.name}"/>
+
+ <path id="testcontrols.classpath">
+ <path refid="jdbc-control.dependency.path"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="junit.dependency.path"/>
+ <path refid="servlet.dependency.path"/>
+ <path refid="velocity.dependency.path"/>
+ </path>
+
+ <target name="build">
+ <echo>compile module: ${module.name}</echo>
+ <echo>output directory: ${test.lib.dir}</echo>
+ <echo>debug: ${compile.debug}</echo>
+
+ <mkdir dir="${test.lib.dir}"/>
+ <mkdir dir="${module.classes.dir}"/>
+ <mkdir dir="${module.gensrc.dir}"/>
+
+ <echo message="** Generating test Xml Beans **"/>
+
+ <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean"
+ classpathref="xbean.dependency.path" onerror="report"/>
+
+ <xmlbean classgendir="${module.classes.dir}"
+ classpathref="testcontrols.classpath"
+ schema="${module.dir}/schemas"
+ includeJavaRuntime="yes">
+ </xmlbean>
+
+ <echo message="** Phase One **"/>
+
+ <apt srcdir="${module.dir}"
+ gendir="${module.gensrc.dir}"
+ destdir="${module.classes.dir}"
+ classpathref="testcontrols.classpath"
+ compileByExtension="true"
+ debug="${compiler.debug}"
+ nowarn="${compiler.nowarn}"
+ srcExtensions="*.jcx,*.jcs,*.java">
+ </apt>
+
+ <control-jar destfile="${module.jar}" basedir="${module.classes.dir}"/>
+ </target>
+
+ <target name="clean">
+ <delete dir="${module.classes.dir}"/>
+ <delete file="${module.jar}"/>
+ </target>
+
+</project>
+
Propchange: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DataSourceConnectionCtrl.jcx
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DataSourceConnectionCtrl.jcx?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DataSourceConnectionCtrl.jcx (original)
+++ incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DataSourceConnectionCtrl.jcx Tue Jun 14 14:14:42 2005
@@ -1,36 +1,36 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.system.jdbc.test.dbconnection;
-
-import java.sql.SQLException;
-
-import org.apache.beehive.controls.system.jdbc.JdbcControl;
-
-/**
- * Test a datasource connection to the database.
- */
-@org.apache.beehive.controls.api.bean.ControlExtension
-@JdbcControl.ConnectionDataSource(jndiName="java:/comp/env/jdbc/TestDB")
-@JdbcControl.ConnectionOptions(readOnly=false)
-public interface DataSourceConnectionCtrl extends JdbcControl {
-
- @JdbcControl.SQL(statement = "CREATE TABLE FOO1 (BAR VARCHAR(3))")
- public void createTable() throws SQLException;
-}
-
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.system.jdbc.test.dbconnection;
+
+import java.sql.SQLException;
+
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
+
+/**
+ * Test a datasource connection to the database.
+ */
+@org.apache.beehive.controls.api.bean.ControlExtension
+@JdbcControl.ConnectionDataSource(jndiName="java:/comp/env/jdbc/TestDB")
+@JdbcControl.ConnectionOptions(readOnly=false)
+public interface DataSourceConnectionCtrl extends JdbcControl {
+
+ @JdbcControl.SQL(statement = "CREATE TABLE FOO1 (BAR VARCHAR(3))")
+ public void createTable() throws SQLException;
+}
+
Propchange: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DataSourceConnectionCtrl.jcx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrl.jcx
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrl.jcx?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrl.jcx (original)
+++ incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrl.jcx Tue Jun 14 14:14:42 2005
@@ -1,37 +1,37 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.system.jdbc.test.dbconnection;
-
-import java.sql.SQLException;
-
-import org.apache.beehive.controls.system.jdbc.JdbcControl;
-
-/**
- * Test a simple connection to the database.
- */
-@org.apache.beehive.controls.api.bean.ControlExtension
-@JdbcControl.ConnectionDriver(databaseDriverClass="org.apache.derby.jdbc.EmbeddedDriver",
- databaseURL="jdbc:derby:MyDB;create=true")
-@JdbcControl.ConnectionOptions(readOnly=false)
-public interface DriverManagerConnectionCtrl extends JdbcControl {
-
- @SQL(statement = "CREATE TABLE FOO1 (BAR VARCHAR(3))")
- public void createTable() throws SQLException;
-}
-
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.system.jdbc.test.dbconnection;
+
+import java.sql.SQLException;
+
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
+
+/**
+ * Test a simple connection to the database.
+ */
+@org.apache.beehive.controls.api.bean.ControlExtension
+@JdbcControl.ConnectionDriver(databaseDriverClass="org.apache.derby.jdbc.EmbeddedDriver",
+ databaseURL="jdbc:derby:MyDB;create=true")
+@JdbcControl.ConnectionOptions(readOnly=false)
+public interface DriverManagerConnectionCtrl extends JdbcControl {
+
+ @SQL(statement = "CREATE TABLE FOO1 (BAR VARCHAR(3))")
+ public void createTable() throws SQLException;
+}
+
Propchange: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrl.jcx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrlAuth.jcx
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrlAuth.jcx?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrlAuth.jcx (original)
+++ incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrlAuth.jcx Tue Jun 14 14:14:42 2005
@@ -1,38 +1,38 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.system.jdbc.test.dbconnection;
-
-import java.sql.SQLException;
-
-import org.apache.beehive.controls.system.jdbc.JdbcControl;
-
-/**
- * For testing username and password params on a connection.
- */
-@org.apache.beehive.controls.api.bean.ControlExtension
-@JdbcControl.ConnectionDriver(databaseDriverClass="org.apache.derby.jdbc.EmbeddedDriver",
- databaseURL="jdbc:derby:MyDBAuth",
- userName="foo",
- password="bar")
-public interface DriverManagerConnectionCtrlAuth extends JdbcControl {
-
- @SQL(statement = "CREATE TABLE FOO2 (BAR VARCHAR(3))")
- public void createTable() throws SQLException;
-}
-
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.system.jdbc.test.dbconnection;
+
+import java.sql.SQLException;
+
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
+
+/**
+ * For testing username and password params on a connection.
+ */
+@org.apache.beehive.controls.api.bean.ControlExtension
+@JdbcControl.ConnectionDriver(databaseDriverClass="org.apache.derby.jdbc.EmbeddedDriver",
+ databaseURL="jdbc:derby:MyDBAuth",
+ userName="foo",
+ password="bar")
+public interface DriverManagerConnectionCtrlAuth extends JdbcControl {
+
+ @SQL(statement = "CREATE TABLE FOO2 (BAR VARCHAR(3))")
+ public void createTable() throws SQLException;
+}
+
Propchange: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrlAuth.jcx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrlProps.jcx
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrlProps.jcx?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrlProps.jcx (original)
+++ incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrlProps.jcx Tue Jun 14 14:14:42 2005
@@ -1,37 +1,37 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.system.jdbc.test.dbconnection;
-
-import java.sql.SQLException;
-
-import org.apache.beehive.controls.system.jdbc.JdbcControl;
-
-/**
- * For testing a db connction with properties specified.
- */
-@org.apache.beehive.controls.api.bean.ControlExtension
-@JdbcControl.ConnectionDriver(databaseDriverClass="org.apache.derby.jdbc.EmbeddedDriver",
- databaseURL="jdbc:derby:MyDBAuth",
- properties="user=foo;password=bar")
-public interface DriverManagerConnectionCtrlProps extends JdbcControl {
-
- @SQL(statement = "CREATE TABLE FOO3 (BAR VARCHAR(3))")
- public void createTable() throws SQLException;
-}
-
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.system.jdbc.test.dbconnection;
+
+import java.sql.SQLException;
+
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
+
+/**
+ * For testing a db connction with properties specified.
+ */
+@org.apache.beehive.controls.api.bean.ControlExtension
+@JdbcControl.ConnectionDriver(databaseDriverClass="org.apache.derby.jdbc.EmbeddedDriver",
+ databaseURL="jdbc:derby:MyDBAuth",
+ properties="user=foo;password=bar")
+public interface DriverManagerConnectionCtrlProps extends JdbcControl {
+
+ @SQL(statement = "CREATE TABLE FOO3 (BAR VARCHAR(3))")
+ public void createTable() throws SQLException;
+}
+
Propchange: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/DriverManagerConnectionCtrlProps.jcx
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/TestTypeMapper.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/TestTypeMapper.java?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/TestTypeMapper.java (original)
+++ incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/TestTypeMapper.java Tue Jun 14 14:14:42 2005
@@ -1,97 +1,97 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.system.jdbc.test.dbconnection;
-
-import java.sql.SQLData;
-import java.sql.SQLException;
-import java.sql.SQLInput;
-import java.sql.SQLOutput;
-
-/**
- * Test type mapper class.
- */
-public class TestTypeMapper implements SQLData {
-
- /**
- * Returns the fully-qualified
- * name of the SQL user-defined type that this object represents.
- * This method is called by the JDBC driver to get the name of the
- * UDT instance that is being mapped to this instance of
- * <code>SQLData</code>.
- *
- * @return the type name that was passed to the method <code>readSql</code>
- * when this object was constructed and populated
- * @throws java.sql.SQLException if there is a database access error
- * @since 1.2
- */
- public String getSQLTypeName() throws SQLException {
- return null;
- }
-
- /**
- * Populates this object with data read from the database.
- * The implementation of the method must follow this protocol:
- * <UL>
- * <LI>It must read each of the attributes or elements of the SQL
- * type from the given input stream. This is done
- * by calling a method of the input stream to read each
- * item, in the order that they appear in the SQL definition
- * of the type.
- * <LI>The method <code>readSQL</code> then
- * assigns the data to appropriate fields or
- * elements (of this or other objects).
- * Specifically, it must call the appropriate <i>reader</i> method
- * (<code>SQLInput.readString</code>, <code>SQLInput.readBigDecimal</code>,
- * and so on) method(s) to do the following:
- * for a distinct type, read its single data element;
- * for a structured type, read a value for each attribute of the SQL type.
- * </UL>
- * The JDBC driver initializes the input stream with a type map
- * before calling this method, which is used by the appropriate
- * <code>SQLInput</code> reader method on the stream.
- *
- * @param stream the <code>SQLInput</code> object from which to read the data for
- * the value that is being custom mapped
- * @param typeName the SQL type name of the value on the data stream
- * @throws java.sql.SQLException if there is a database access error
- * @see java.sql.SQLInput
- */
- public void readSQL(SQLInput stream, String typeName) throws SQLException { }
-
- /**
- * Writes this object to the given SQL data stream, converting it back to
- * its SQL value in the data source.
- * The implementation of the method must follow this protocol:<BR>
- * It must write each of the attributes of the SQL type
- * to the given output stream. This is done by calling a
- * method of the output stream to write each item, in the order that
- * they appear in the SQL definition of the type.
- * Specifically, it must call the appropriate <code>SQLOutput</code> writer
- * method(s) (<code>writeInt</code>, <code>writeString</code>, and so on)
- * to do the following: for a Distinct Type, write its single data element;
- * for a Structured Type, write a value for each attribute of the SQL type.
- *
- * @param stream the <code>SQLOutput</code> object to which to write the data for
- * the value that was custom mapped
- * @throws java.sql.SQLException if there is a database access error
- * @see java.sql.SQLOutput
- * @since 1.2
- */
- public void writeSQL(SQLOutput stream) throws SQLException { }
-}
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.system.jdbc.test.dbconnection;
+
+import java.sql.SQLData;
+import java.sql.SQLException;
+import java.sql.SQLInput;
+import java.sql.SQLOutput;
+
+/**
+ * Test type mapper class.
+ */
+public class TestTypeMapper implements SQLData {
+
+ /**
+ * Returns the fully-qualified
+ * name of the SQL user-defined type that this object represents.
+ * This method is called by the JDBC driver to get the name of the
+ * UDT instance that is being mapped to this instance of
+ * <code>SQLData</code>.
+ *
+ * @return the type name that was passed to the method <code>readSql</code>
+ * when this object was constructed and populated
+ * @throws java.sql.SQLException if there is a database access error
+ * @since 1.2
+ */
+ public String getSQLTypeName() throws SQLException {
+ return null;
+ }
+
+ /**
+ * Populates this object with data read from the database.
+ * The implementation of the method must follow this protocol:
+ * <UL>
+ * <LI>It must read each of the attributes or elements of the SQL
+ * type from the given input stream. This is done
+ * by calling a method of the input stream to read each
+ * item, in the order that they appear in the SQL definition
+ * of the type.
+ * <LI>The method <code>readSQL</code> then
+ * assigns the data to appropriate fields or
+ * elements (of this or other objects).
+ * Specifically, it must call the appropriate <i>reader</i> method
+ * (<code>SQLInput.readString</code>, <code>SQLInput.readBigDecimal</code>,
+ * and so on) method(s) to do the following:
+ * for a distinct type, read its single data element;
+ * for a structured type, read a value for each attribute of the SQL type.
+ * </UL>
+ * The JDBC driver initializes the input stream with a type map
+ * before calling this method, which is used by the appropriate
+ * <code>SQLInput</code> reader method on the stream.
+ *
+ * @param stream the <code>SQLInput</code> object from which to read the data for
+ * the value that is being custom mapped
+ * @param typeName the SQL type name of the value on the data stream
+ * @throws java.sql.SQLException if there is a database access error
+ * @see java.sql.SQLInput
+ */
+ public void readSQL(SQLInput stream, String typeName) throws SQLException { }
+
+ /**
+ * Writes this object to the given SQL data stream, converting it back to
+ * its SQL value in the data source.
+ * The implementation of the method must follow this protocol:<BR>
+ * It must write each of the attributes of the SQL type
+ * to the given output stream. This is done by calling a
+ * method of the output stream to write each item, in the order that
+ * they appear in the SQL definition of the type.
+ * Specifically, it must call the appropriate <code>SQLOutput</code> writer
+ * method(s) (<code>writeInt</code>, <code>writeString</code>, and so on)
+ * to do the following: for a Distinct Type, write its single data element;
+ * for a Structured Type, write a value for each attribute of the SQL type.
+ *
+ * @param stream the <code>SQLOutput</code> object to which to write the data for
+ * the value that was custom mapped
+ * @throws java.sql.SQLException if there is a database access error
+ * @see java.sql.SQLOutput
+ * @since 1.2
+ */
+ public void writeSQL(SQLOutput stream) throws SQLException { }
+}
Propchange: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/dbconnection/TestTypeMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/errors/ErrorsTestCtrl.jcx
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/errors/ErrorsTestCtrl.jcx?rev=190657&r1=190656&r2=190657&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/errors/ErrorsTestCtrl.jcx (original)
+++ incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/errors/ErrorsTestCtrl.jcx Tue Jun 14 14:14:42 2005
@@ -1,81 +1,81 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-
-package org.apache.beehive.controls.system.jdbc.test.errors;
-
-import org.apache.beehive.controls.system.jdbc.JdbcControl;
-import testBad.customerDb.XCustomerRowBadDocument;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-/**
- * This control is used for checking error reporting / recovery from the db control.
- */
-@org.apache.beehive.controls.api.bean.ControlExtension
-@JdbcControl.ConnectionDriver(databaseDriverClass = "org.apache.derby.jdbc.EmbeddedDriver", databaseURL = "jdbc:derby:MyDB")
-public interface ErrorsTestCtrl extends JdbcControl {
-
- public static class BadCustomer {
- private String fnam;
- public int serid;
-
- public void setFname(String fname) { this.fnam = fname; }
-
- public String getFname() { return fnam; }
- }
-
- public static class BadCustomer2 {
- private int fname;
- public int serid;
-
- public void setFname(int fname) { this.fname = fname; }
-
- public int getFname() { return fname; }
- }
-
- //
- // Missing @SQL annotation
- //
- public ResultSet getAllUsersBad1() throws SQLException;
-
- //
- // BadCustomer contains improper field / method names for mapping the result
- //
- @SQL(statement = "SELECT * FROM USERS WHERE FNAME = {name}")
- public BadCustomer getAUserBad1(String name) throws SQLException;
-
- //
- // fname in BadCustomer2 is an int when it should be a String
- //
- @SQL(statement = "SELECT * FROM USERS WHERE FNAME = {fname}")
- public BadCustomer2 getAUserBad3(String fname) throws SQLException;
-
- //
- // query returning an XmlObject
- //
- @SQL(statement = "SELECT * FROM USERS WHERE fname={someUser}")
- public XCustomerRowBadDocument.XCustomerRowBad getAUserBad4(String someUser) throws SQLException;
-
- //
- // null sql param substitution
- //
- @SQL(statement = "SELECT * FROM USERS {sql: where}")
- public ResultSet getAUserBad5(String where) throws SQLException;
-}
-
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+
+package org.apache.beehive.controls.system.jdbc.test.errors;
+
+import org.apache.beehive.controls.system.jdbc.JdbcControl;
+import testBad.customerDb.XCustomerRowBadDocument;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * This control is used for checking error reporting / recovery from the db control.
+ */
+@org.apache.beehive.controls.api.bean.ControlExtension
+@JdbcControl.ConnectionDriver(databaseDriverClass = "org.apache.derby.jdbc.EmbeddedDriver", databaseURL = "jdbc:derby:MyDB")
+public interface ErrorsTestCtrl extends JdbcControl {
+
+ public static class BadCustomer {
+ private String fnam;
+ public int serid;
+
+ public void setFname(String fname) { this.fnam = fname; }
+
+ public String getFname() { return fnam; }
+ }
+
+ public static class BadCustomer2 {
+ private int fname;
+ public int serid;
+
+ public void setFname(int fname) { this.fname = fname; }
+
+ public int getFname() { return fname; }
+ }
+
+ //
+ // Missing @SQL annotation
+ //
+ public ResultSet getAllUsersBad1() throws SQLException;
+
+ //
+ // BadCustomer contains improper field / method names for mapping the result
+ //
+ @SQL(statement = "SELECT * FROM USERS WHERE FNAME = {name}")
+ public BadCustomer getAUserBad1(String name) throws SQLException;
+
+ //
+ // fname in BadCustomer2 is an int when it should be a String
+ //
+ @SQL(statement = "SELECT * FROM USERS WHERE FNAME = {fname}")
+ public BadCustomer2 getAUserBad3(String fname) throws SQLException;
+
+ //
+ // query returning an XmlObject
+ //
+ @SQL(statement = "SELECT * FROM USERS WHERE fname={someUser}")
+ public XCustomerRowBadDocument.XCustomerRowBad getAUserBad4(String someUser) throws SQLException;
+
+ //
+ // null sql param substitution
+ //
+ @SQL(statement = "SELECT * FROM USERS {sql: where}")
+ public ResultSet getAUserBad5(String where) throws SQLException;
+}
+
Propchange: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/org/apache/beehive/controls/system/jdbc/test/errors/ErrorsTestCtrl.jcx
------------------------------------------------------------------------------
svn:eol-style = native