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/12/12 18:37:04 UTC
svn commit: r356297 - in /beehive/trunk/system-controls: ./ test/ant/
test/jdbc/ test/jdbc/controls/ test/jdbc/jdbc-container/
test/jdbc/junitTests/ test/src/jdbc/ test/src/webservice/ test/webservice/
test/webservice/jcxgen-tests/
Author: ekoneil
Date: Mon Dec 12 09:36:40 2005
New Revision: 356297
URL: http://svn.apache.org/viewcvs?rev=356297&view=rev
Log:
Move some system-controls tests from:
test/src/jdbc
test/src/webservice
to:
test/jdbc
test/webservice
BB: self
Test: jdbc / webservice pass
Added:
beehive/trunk/system-controls/test/jdbc/
- copied from r356287, beehive/trunk/system-controls/test/src/jdbc/
beehive/trunk/system-controls/test/webservice/
- copied from r356287, beehive/trunk/system-controls/test/src/webservice/
Removed:
beehive/trunk/system-controls/test/src/jdbc/
beehive/trunk/system-controls/test/src/webservice/
Modified:
beehive/trunk/system-controls/build.xml
beehive/trunk/system-controls/test/ant/test-imports.xml
beehive/trunk/system-controls/test/jdbc/controls/build.xml
beehive/trunk/system-controls/test/jdbc/jdbc-container/build.xml
beehive/trunk/system-controls/test/jdbc/junitTests/build.xml
beehive/trunk/system-controls/test/webservice/build.xml
beehive/trunk/system-controls/test/webservice/jcxgen-tests/build.xml
Modified: beehive/trunk/system-controls/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/build.xml?rev=356297&r1=356296&r2=356297&view=diff
==============================================================================
--- beehive/trunk/system-controls/build.xml (original)
+++ beehive/trunk/system-controls/build.xml Mon Dec 12 09:36:40 2005
@@ -57,7 +57,7 @@
</target>
<target name="ws.drt" description="Runs the Web Service Control DRT">
- <ant dir="${basedir}/test/src/webservice" target="drt" inheritAll="false"/>
+ <ant dir="${basedir}/test/webservice" target="drt" inheritAll="false"/>
</target>
<target name="ejb.drt" description="Runs the EJB Control DRT">
Modified: beehive/trunk/system-controls/test/ant/test-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/ant/test-imports.xml?rev=356297&r1=356296&r2=356297&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/ant/test-imports.xml (original)
+++ beehive/trunk/system-controls/test/ant/test-imports.xml Mon Dec 12 09:36:40 2005
@@ -7,7 +7,7 @@
<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.src.dir" location="${test.dir}"/>
<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"/>
Modified: beehive/trunk/system-controls/test/jdbc/controls/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/jdbc/controls/build.xml?rev=356297&r1=356287&r2=356297&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/jdbc/controls/build.xml (original)
+++ beehive/trunk/system-controls/test/jdbc/controls/build.xml Mon Dec 12 09:36:40 2005
@@ -2,7 +2,7 @@
<project name="Beehive/SystemControls/TestControls" default="build" basedir=".">
- <import file="../../../ant/test-imports.xml"/>
+ <import file="../../ant/test-imports.xml"/>
<taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
classpathref="controls.dependency.path" onerror="report"/>
Modified: beehive/trunk/system-controls/test/jdbc/jdbc-container/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/jdbc/jdbc-container/build.xml?rev=356297&r1=356287&r2=356297&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/jdbc/jdbc-container/build.xml (original)
+++ beehive/trunk/system-controls/test/jdbc/jdbc-container/build.xml Mon Dec 12 09:36:40 2005
@@ -21,7 +21,7 @@
<property name="jdbcc.home" location="${my.home}/../.."/>
<import file="${jdbcc.home}/jdbccontrol-imports.xml"/>
-->
- <import file="../../../ant/test-imports.xml"/>
+ <import file="../../ant/test-imports.xml"/>
<property environment="os"/>
<property name="cactus.home" location="${os.CACTUS_HOME}"/>
Modified: beehive/trunk/system-controls/test/jdbc/junitTests/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/jdbc/junitTests/build.xml?rev=356297&r1=356287&r2=356297&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/jdbc/junitTests/build.xml (original)
+++ beehive/trunk/system-controls/test/jdbc/junitTests/build.xml Mon Dec 12 09:36:40 2005
@@ -1,11 +1,27 @@
<?xml version="1.0"?>
+<!--
+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.
+-->
+
<project name="Beehive/SystemControls/JUnitTests" default="build" basedir=".">
- <import file="../../../ant/test-imports.xml"/>
+ <import file="../../ant/test-imports.xml"/>
<taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpathref="controls.dependency.path" onerror="report"/>
+ classpathref="controls.dependency.path" onerror="report"/>
<property name="module.name" value="junitTests"/>
<property name="module.dir" location="${test.src.dir}/jdbc/${module.name}"/>
<property name="module.gensrc.dir" location="${test.classes.dir}/${module.name}-generated-src"/>
Modified: beehive/trunk/system-controls/test/webservice/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/build.xml?rev=356297&r1=356287&r2=356297&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/build.xml (original)
+++ beehive/trunk/system-controls/test/webservice/build.xml Mon Dec 12 09:36:40 2005
@@ -20,7 +20,7 @@
<project name="Beehive/ServiceControlDRT" default="drt" basedir=".">
<property environment="os"/>
- <import file="../../../systemcontrols-imports.xml"/>
+ <import file="../../systemcontrols-imports.xml"/>
<!-- client properties -->
<property name="junit-source.dir" location="tests"/>
Modified: beehive/trunk/system-controls/test/webservice/jcxgen-tests/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/test/webservice/jcxgen-tests/build.xml?rev=356297&r1=356287&r2=356297&view=diff
==============================================================================
--- beehive/trunk/system-controls/test/webservice/jcxgen-tests/build.xml (original)
+++ beehive/trunk/system-controls/test/webservice/jcxgen-tests/build.xml Mon Dec 12 09:36:40 2005
@@ -20,7 +20,7 @@
<project name="Beehive/ServiceControl DRT For JCX Generation" default="drt" basedir=".">
<property environment="os"/>
- <import file="../../../../systemcontrols-imports.xml"/>
+ <import file="../../../systemcontrols-imports.xml"/>
<property name="junit-source.dir" location="tests"/>
<property name="wsdls.dir" location="wsdls"/>