db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r473825 [3/5] - in /db/torque: test/trunk/profile/axion/ test/trunk/profile/db2400/ test/trunk/profile/derby/ test/trunk/profile/firebird/ test/trunk/profile/henning/ test/trunk/profile/hsqldb/ test/trunk/profile/jmcnally/ test/trunk/profil...
Date Sat, 11 Nov 2006 22:44:26 GMT
Modified: db/torque/test/trunk/test-project/profiles.xml
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/profiles.xml?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/profiles.xml (original)
+++ db/torque/test/trunk/test-project/profiles.xml Sat Nov 11 14:44:23 2006
@@ -1,217 +1,235 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<profilesXml>
-  <profiles>
-    <profile>
-      <id>axion</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>axion</torque.test.profileDirectory>
-        <torque.test.idmethod>idbroker</torque.test.idmethod>
-        <torque.test.driver.artifactId>axion</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>axion</torque.test.driver.groupId>
-        <torque.test.driver.version>1.0-M1</torque.test.driver.version>
-        <torque.driver>org.axiondb.jdbc.AxionDriver</torque.driver>
-        <torque.targetDatabase>axion</torque.targetDatabase>
-        <torque.database.url>jdbc:axiondb:sqltest:target/test</torque.database.url>
-        <torque.database.user>sa</torque.database.user>
-        <torque.database.password></torque.database.password>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>db2400</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>db2400</torque.test.profileDirectory>
-        <torque.test.idmethod>idbroker</torque.test.idmethod>
-        <torque.test.driver.artifactId>jtopen</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>jtopen</torque.test.driver.groupId>
-        <torque.test.driver.version>4.8</torque.test.driver.version>
-        <torque.driver>com.ibm.as400.access.AS400JDBCDriver</torque.driver>
-        <torque.targetDatabase>db2400</torque.targetDatabase>
-        <torque.database.url>jdbc:as400://testhost/torquetest</torque.database.url>
-        <torque.database.user>sa</torque.database.user>
-        <torque.database.password></torque.database.password>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>derby</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>derby</torque.test.profileDirectory>
-        <torque.test.idmethod>native</torque.test.idmethod>
-        <torque.test.driver.artifactId>derby</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>org.apache.derby</torque.test.driver.groupId>
-        <torque.test.driver.version>10.1.2.1</torque.test.driver.version>
-        <torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver>
-        <torque.targetDatabase>derby</torque.targetDatabase>
-        <torque.database.url>jdbc:derby:bookstore</torque.database.url>
-        <torque.database.user>test</torque.database.user>
-        <torque.database.password>test</torque.database.password>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>firebird</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>firebird</torque.test.profileDirectory>
-        <torque.test.idmethod>native</torque.test.idmethod>
-        <torque.test.driver.artifactId>firebirdsql</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>firebird</torque.test.driver.groupId>
-        <torque.test.driver.version>1.5.5-full</torque.test.driver.version>
-        <torque.driver>org.firebirdsql.jdbc.FBDriver</torque.driver>
-        <torque.targetDatabase>interbase</torque.targetDatabase>
-        <torque.database.url>jdbc:firebirdsql://192.168.1.101:3050/torquetest.fdb</torque.database.url>
-        <torque.database.user>sysdba</torque.database.user>
-        <torque.database.password>password</torque.database.password>
-      </properties>
-    </profile>
-    
-    <profile>
-      <id>hsqldb</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>hsqldb</torque.test.profileDirectory>
-        <torque.test.idmethod>idbroker</torque.test.idmethod>
-        <torque.test.driver.artifactId>hsqldb</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>hsqldb</torque.test.driver.groupId>
-        <torque.test.driver.version>1.8.0.2</torque.test.driver.version>
-        <torque.driver>org.hsqldb.jdbcDriver</torque.driver>
-        <torque.targetDatabase>hypersonic</torque.targetDatabase>
-        <torque.database.url>jdbc:hsqldb:sqltest;shutdown=true</torque.database.url>
-        <torque.database.user>sa</torque.database.user>
-        <torque.database.password></torque.database.password>
-      </properties>
-    </profile>
-    
-    <profile>
-      <id>mysql</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>mysql</torque.test.profileDirectory>
-        <torque.test.idmethod>idbroker</torque.test.idmethod>
-        <torque.test.driver.artifactId>mysql-connector-java</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>mysql</torque.test.driver.groupId>
-        <torque.test.driver.version>3.1.12</torque.test.driver.version>
-        <torque.driver>org.gjt.mm.mysql.Driver</torque.driver>
-        <torque.targetDatabase>mysql</torque.targetDatabase>
-        <torque.database.url>jdbc:mysql://localhost:3306/bookstore</torque.database.url>
-        <torque.database.user>root</torque.database.user>
-        <torque.database.password></torque.database.password>
-      </properties>
-    </profile>
-    
-    <profile>
-      <id>oracle</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>oracle</torque.test.profileDirectory>
-        <torque.test.idmethod>native</torque.test.idmethod>
-        <torque.test.driver.artifactId>oracle-jdbc</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>oracle</torque.test.driver.groupId>
-        <torque.test.driver.version>9.2.0.6</torque.test.driver.version>
-        <torque.driver>org.oracle.jdbc.driver.OracleDriver</torque.driver>
-        <torque.targetDatabase>oracle</torque.targetDatabase>
-        <torque.database.url>jdbc:oracle:thin:@alpha.tucana.at:1521:oracle</torque.database.url>
-        <torque.database.user>torque</torque.database.user>
-        <torque.database.password>torque</torque.database.password>
-      </properties>
-    </profile>
-    
-    <profile>
-      <id>postgresql</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>postgresql</torque.test.profileDirectory>
-        <torque.test.idmethod>idbroker</torque.test.idmethod>
-        <torque.test.driver.artifactId>postgresql</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>postgresql</torque.test.driver.groupId>
-        <torque.test.driver.version>8.0-312.jdbc3</torque.test.driver.version>
-        <torque.driver>org.postgresql.Driver</torque.driver>
-        <torque.targetDatabase>postgresql</torque.targetDatabase>
-        <torque.database.url>jdbc:postgresql://localhost:5432/bookstore</torque.database.url>
-        <torque.database.user>torque</torque.database.user>
-        <torque.database.password>torque</torque.database.password>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>sybase</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>sybase</torque.test.profileDirectory>
-        <torque.test.idmethod>idbroker</torque.test.idmethod>
-        <torque.test.driver.artifactId>sybase</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>jconnect</torque.test.driver.groupId>
-        <torque.test.driver.version>5.5</torque.test.driver.version>
-        <torque.driver>com.sybase.jdbc2.jdbc.SybDriver</torque.driver>
-        <torque.targetDatabase>sybase</torque.targetDatabase>
-        <torque.database.url>jdbc:sybase:Tds:localhost:5000/bookstore</torque.database.url>
-        <torque.database.user>sa</torque.database.user>
-        <torque.database.password></torque.database.password>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>tv</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.test.profileDirectory>tv</torque.test.profileDirectory>
-        <torque.test.idmethod>idbroker</torque.test.idmethod>
-        <torque.test.driver.artifactId>mysql-connector-java</torque.test.driver.artifactId>
-        <torque.test.driver.groupId>mysql</torque.test.driver.groupId>
-        <torque.test.driver.version>3.1.12</torque.test.driver.version>
-        <torque.driver>org.gjt.mm.mysql.Driver</torque.driver>
-        <torque.targetDatabase>mysql</torque.targetDatabase>
-        <torque.database.url>jdbc:mysql://gatekeeper.home.lan:3306/bookstore</torque.database.url>
-        <torque.database.user>torque</torque.database.user>
-        <torque.database.password>torque</torque.database.password>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>beans</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.generateBeans>true</torque.generateBeans>
-        <torque.test.include.beans>BeanTestConditional.java</torque.test.include.beans>
-      </properties>
-    </profile>
-      
-    <profile>
-      <id>managers</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <properties>
-        <torque.useManagers>true</torque.useManagers>
-        <torque.test.include.managers>ManagerTestConditional.java</torque.test.include.managers>
-      </properties>
-    </profile>
-      
-  </profiles>
-</profilesXml>
\ No newline at end of file
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+-->
+<?xml version="1.0" encoding="UTF-8"?>
+<profilesXml>
+  <profiles>
+    <profile>
+      <id>axion</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>axion</torque.test.profileDirectory>
+        <torque.test.idmethod>idbroker</torque.test.idmethod>
+        <torque.test.driver.artifactId>axion</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>axion</torque.test.driver.groupId>
+        <torque.test.driver.version>1.0-M1</torque.test.driver.version>
+        <torque.driver>org.axiondb.jdbc.AxionDriver</torque.driver>
+        <torque.targetDatabase>axion</torque.targetDatabase>
+        <torque.database.url>jdbc:axiondb:sqltest:target/test</torque.database.url>
+        <torque.database.user>sa</torque.database.user>
+        <torque.database.password></torque.database.password>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>db2400</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>db2400</torque.test.profileDirectory>
+        <torque.test.idmethod>idbroker</torque.test.idmethod>
+        <torque.test.driver.artifactId>jtopen</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>jtopen</torque.test.driver.groupId>
+        <torque.test.driver.version>4.8</torque.test.driver.version>
+        <torque.driver>com.ibm.as400.access.AS400JDBCDriver</torque.driver>
+        <torque.targetDatabase>db2400</torque.targetDatabase>
+        <torque.database.url>jdbc:as400://testhost/torquetest</torque.database.url>
+        <torque.database.user>sa</torque.database.user>
+        <torque.database.password></torque.database.password>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>derby</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>derby</torque.test.profileDirectory>
+        <torque.test.idmethod>native</torque.test.idmethod>
+        <torque.test.driver.artifactId>derby</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>org.apache.derby</torque.test.driver.groupId>
+        <torque.test.driver.version>10.1.2.1</torque.test.driver.version>
+        <torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver>
+        <torque.targetDatabase>derby</torque.targetDatabase>
+        <torque.database.url>jdbc:derby:bookstore</torque.database.url>
+        <torque.database.user>test</torque.database.user>
+        <torque.database.password>test</torque.database.password>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>firebird</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>firebird</torque.test.profileDirectory>
+        <torque.test.idmethod>native</torque.test.idmethod>
+        <torque.test.driver.artifactId>firebirdsql</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>firebird</torque.test.driver.groupId>
+        <torque.test.driver.version>1.5.5-full</torque.test.driver.version>
+        <torque.driver>org.firebirdsql.jdbc.FBDriver</torque.driver>
+        <torque.targetDatabase>interbase</torque.targetDatabase>
+        <torque.database.url>jdbc:firebirdsql://192.168.1.101:3050/torquetest.fdb</torque.database.url>
+        <torque.database.user>sysdba</torque.database.user>
+        <torque.database.password>password</torque.database.password>
+      </properties>
+    </profile>
+    
+    <profile>
+      <id>hsqldb</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>hsqldb</torque.test.profileDirectory>
+        <torque.test.idmethod>idbroker</torque.test.idmethod>
+        <torque.test.driver.artifactId>hsqldb</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>hsqldb</torque.test.driver.groupId>
+        <torque.test.driver.version>1.8.0.2</torque.test.driver.version>
+        <torque.driver>org.hsqldb.jdbcDriver</torque.driver>
+        <torque.targetDatabase>hypersonic</torque.targetDatabase>
+        <torque.database.url>jdbc:hsqldb:sqltest;shutdown=true</torque.database.url>
+        <torque.database.user>sa</torque.database.user>
+        <torque.database.password></torque.database.password>
+      </properties>
+    </profile>
+    
+    <profile>
+      <id>mysql</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>mysql</torque.test.profileDirectory>
+        <torque.test.idmethod>idbroker</torque.test.idmethod>
+        <torque.test.driver.artifactId>mysql-connector-java</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>mysql</torque.test.driver.groupId>
+        <torque.test.driver.version>3.1.12</torque.test.driver.version>
+        <torque.driver>org.gjt.mm.mysql.Driver</torque.driver>
+        <torque.targetDatabase>mysql</torque.targetDatabase>
+        <torque.database.url>jdbc:mysql://localhost:3306/bookstore</torque.database.url>
+        <torque.database.user>root</torque.database.user>
+        <torque.database.password></torque.database.password>
+      </properties>
+    </profile>
+    
+    <profile>
+      <id>oracle</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>oracle</torque.test.profileDirectory>
+        <torque.test.idmethod>native</torque.test.idmethod>
+        <torque.test.driver.artifactId>oracle-jdbc</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>oracle</torque.test.driver.groupId>
+        <torque.test.driver.version>9.2.0.6</torque.test.driver.version>
+        <torque.driver>org.oracle.jdbc.driver.OracleDriver</torque.driver>
+        <torque.targetDatabase>oracle</torque.targetDatabase>
+        <torque.database.url>jdbc:oracle:thin:@alpha.tucana.at:1521:oracle</torque.database.url>
+        <torque.database.user>torque</torque.database.user>
+        <torque.database.password>torque</torque.database.password>
+      </properties>
+    </profile>
+    
+    <profile>
+      <id>postgresql</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>postgresql</torque.test.profileDirectory>
+        <torque.test.idmethod>idbroker</torque.test.idmethod>
+        <torque.test.driver.artifactId>postgresql</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>postgresql</torque.test.driver.groupId>
+        <torque.test.driver.version>8.0-312.jdbc3</torque.test.driver.version>
+        <torque.driver>org.postgresql.Driver</torque.driver>
+        <torque.targetDatabase>postgresql</torque.targetDatabase>
+        <torque.database.url>jdbc:postgresql://localhost:5432/bookstore</torque.database.url>
+        <torque.database.user>torque</torque.database.user>
+        <torque.database.password>torque</torque.database.password>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>sybase</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>sybase</torque.test.profileDirectory>
+        <torque.test.idmethod>idbroker</torque.test.idmethod>
+        <torque.test.driver.artifactId>sybase</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>jconnect</torque.test.driver.groupId>
+        <torque.test.driver.version>5.5</torque.test.driver.version>
+        <torque.driver>com.sybase.jdbc2.jdbc.SybDriver</torque.driver>
+        <torque.targetDatabase>sybase</torque.targetDatabase>
+        <torque.database.url>jdbc:sybase:Tds:localhost:5000/bookstore</torque.database.url>
+        <torque.database.user>sa</torque.database.user>
+        <torque.database.password></torque.database.password>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>tv</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>tv</torque.test.profileDirectory>
+        <torque.test.idmethod>idbroker</torque.test.idmethod>
+        <torque.test.driver.artifactId>mysql-connector-java</torque.test.driver.artifactId>
+        <torque.test.driver.groupId>mysql</torque.test.driver.groupId>
+        <torque.test.driver.version>3.1.12</torque.test.driver.version>
+        <torque.driver>org.gjt.mm.mysql.Driver</torque.driver>
+        <torque.targetDatabase>mysql</torque.targetDatabase>
+        <torque.database.url>jdbc:mysql://gatekeeper.home.lan:3306/bookstore</torque.database.url>
+        <torque.database.user>torque</torque.database.user>
+        <torque.database.password>torque</torque.database.password>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>beans</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.generateBeans>true</torque.generateBeans>
+        <torque.test.include.beans>BeanTestConditional.java</torque.test.include.beans>
+      </properties>
+    </profile>
+      
+    <profile>
+      <id>managers</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.useManagers>true</torque.useManagers>
+        <torque.test.include.managers>ManagerTestConditional.java</torque.test.include.managers>
+      </properties>
+    </profile>
+      
+  </profiles>
+</profilesXml>

Modified: db/torque/test/trunk/test-project/project.properties
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/project.properties?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/project.properties (original)
+++ db/torque/test/trunk/test-project/project.properties Sat Nov 11 14:44:23 2006
@@ -1,62 +1,65 @@
-# 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.
-
-###############################################################################
-#
-# Settings for the test project.
-# If you need to customize the test project, please consider using a 
-# build.properties file instead of editing this file. 
-#
-# $Id$
-#
-##############################################################################
-
-##############################################################################
-# generator settings which are the same for every profile
-##############################################################################
-
-torque.project = bookstore
-torque.targetPackage = org.apache.torque.test
-
-##############################################################################
-# non-standard directories.
-##############################################################################
-
-# The java classes are generated in the target to remove them vith a simple 
-# "maven clean"
-torque.java.dir=target/java
-
-# The generator should read the schema files from the target directory
-# where some tokens have been replaced by the torque-test:prepare task 
-torque.schema.dir=target/schema 
-
-##############################################################################
-# internal settings for the test
-##############################################################################
-
-# Working directory for the SQLToAppDataRuntimeTest
-torque.test.sql2xml.dir=target/sql2xml
-
-# the classes directory to compile the junit test classes and the generated 
-# om classes to  
-torque.test.compile.dir=target/classes
-
-# log directory where test classes can put their log files 
-torque.test.log.dir=target/logs
-
-# base directory for the java sources for the junit tests 
-torque.test.junit.src.dir=src/java
-
-# directory where the junit test put their results
-torque.test.junit.report.dir=target/reports
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
+# ##############################################################################
+#
+# Settings for the test project.
+# If you need to customize the test project, please consider using a 
+# build.properties file instead of editing this file. 
+#
+# $Id$
+#
+# #############################################################################
+
+# #############################################################################
+# generator settings which are the same for every profile
+# #############################################################################
+
+torque.project = bookstore
+torque.targetPackage = org.apache.torque.test
+
+# #############################################################################
+# non-standard directories.
+# #############################################################################
+
+# The java classes are generated in the target to remove them vith a simple 
+# "maven clean"
+torque.java.dir=target/java
+
+# The generator should read the schema files from the target directory
+# where some tokens have been replaced by the torque-test:prepare task 
+torque.schema.dir=target/schema 
+
+# #############################################################################
+# internal settings for the test
+# #############################################################################
+
+# Working directory for the SQLToAppDataRuntimeTest
+torque.test.sql2xml.dir=target/sql2xml
+
+# the classes directory to compile the junit test classes and the generated 
+# om classes to  
+torque.test.compile.dir=target/classes
+
+# log directory where test classes can put their log files 
+torque.test.log.dir=target/logs
+
+# base directory for the java sources for the junit tests 
+torque.test.junit.src.dir=src/java
+
+# directory where the junit test put their results
+torque.test.junit.report.dir=target/reports

Modified: db/torque/test/trunk/test-project/project.xml
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/project.xml?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/project.xml (original)
+++ db/torque/test/trunk/test-project/project.xml Sat Nov 11 14:44:23 2006
@@ -1,64 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright 2001-2004 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 descriptor for the project for testing Torque
- $Id$
- 
- -->
-
-<project>
-  <extend>../profile/${torque.test.profile}/project.xml</extend>
-  <dependencies>
-    <dependency>
-      <artifactId>junit</artifactId>
-      <groupId>junit</groupId>
-      <version>3.8.1</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
-    </dependency>
-    <dependency>
-      <artifactId>torque</artifactId>
-      <groupId>torque</groupId>
-      <version>${pom.currentVersion}</version>
-    </dependency>
-    <dependency>
-      <artifactId>torque-gen</artifactId>
-      <groupId>torque</groupId>
-      <version>${pom.currentVersion}</version>
-    </dependency>
-    <dependency>
-      <artifactId>log4j</artifactId>
-      <groupId>log4j</groupId>
-      <version>1.2.8</version>
-    </dependency>
-    <dependency>
-      <artifactId>naming-common</artifactId>
-      <groupId>tomcat</groupId>
-      <version>5.0.28</version>
-    </dependency>
-    <dependency>
-      <artifactId>naming-java</artifactId>
-      <groupId>tomcat</groupId>
-      <version>5.0.28</version>
-    </dependency>
-    
-  </dependencies>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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>
+  <extend>../profile/${torque.test.profile}/project.xml</extend>
+  <dependencies>
+    <dependency>
+      <artifactId>junit</artifactId>
+      <groupId>junit</groupId>
+      <version>3.8.1</version>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
+    </dependency>
+    <dependency>
+      <artifactId>torque</artifactId>
+      <groupId>torque</groupId>
+      <version>${pom.currentVersion}</version>
+    </dependency>
+    <dependency>
+      <artifactId>torque-gen</artifactId>
+      <groupId>torque</groupId>
+      <version>${pom.currentVersion}</version>
+    </dependency>
+    <dependency>
+      <artifactId>log4j</artifactId>
+      <groupId>log4j</groupId>
+      <version>1.2.8</version>
+    </dependency>
+    <dependency>
+      <artifactId>naming-common</artifactId>
+      <groupId>tomcat</groupId>
+      <version>5.0.28</version>
+    </dependency>
+    <dependency>
+      <artifactId>naming-java</artifactId>
+      <groupId>tomcat</groupId>
+      <version>5.0.28</version>
+    </dependency>
+    
+  </dependencies>
+</project>

Modified: db/torque/test/trunk/test-project/src/java/cache.ccf
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/cache.ccf?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/cache.ccf (original)
+++ db/torque/test/trunk/test-project/src/java/cache.ccf Sat Nov 11 14:44:23 2006
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 # Java Caching System configuration
 
 jcs.default=

Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/BaseRuntimeTestCase.java
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/BaseRuntimeTestCase.java?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/org/apache/torque/BaseRuntimeTestCase.java (original)
+++ db/torque/test/trunk/test-project/src/java/org/apache/torque/BaseRuntimeTestCase.java Sat Nov 11 14:44:23 2006
@@ -1,19 +1,22 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *     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.
+ * 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.
  */
 
 import junit.framework.TestCase;

Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/BeanTestConditional.java
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/BeanTestConditional.java?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/org/apache/torque/BeanTestConditional.java (original)
+++ db/torque/test/trunk/test-project/src/java/org/apache/torque/BeanTestConditional.java Sat Nov 11 14:44:23 2006
@@ -1,19 +1,22 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *     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.
+ * 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.
  */
 
 import java.io.ByteArrayInputStream;

Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/DataTest.java
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/DataTest.java?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/org/apache/torque/DataTest.java (original)
+++ db/torque/test/trunk/test-project/src/java/org/apache/torque/DataTest.java Sat Nov 11 14:44:23 2006
@@ -1,19 +1,22 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *     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.
+ * 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.
  */
 
 import java.sql.Connection;

Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/DocsTest.java
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/DocsTest.java?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/org/apache/torque/DocsTest.java (original)
+++ db/torque/test/trunk/test-project/src/java/org/apache/torque/DocsTest.java Sat Nov 11 14:44:23 2006
@@ -1,19 +1,22 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.List;

Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/JndiConfigurationTest.java
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/JndiConfigurationTest.java?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/org/apache/torque/JndiConfigurationTest.java (original)
+++ db/torque/test/trunk/test-project/src/java/org/apache/torque/JndiConfigurationTest.java Sat Nov 11 14:44:23 2006
@@ -1,496 +1,499 @@
-package org.apache.torque;
-
-/*
- * Copyright 2001-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.
- */
-
-import java.sql.Connection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.torque.dsfactory.AbstractDataSourceFactory;
-import org.apache.torque.dsfactory.DataSourceFactory;
-import org.apache.torque.dsfactory.JndiDataSourceFactory;
-import org.apache.torque.test.BookPeer;
-import org.apache.torque.util.Criteria;
-
-/**
- * Test for configuration using JNDI. The test assumes that we have a 
- * non-jndi configuration, and creates the data source configuration from it.
- * It is tested whether we can bind a data source manually into jndi and
- * retrieve it in Torque, and also it is tested whether we can bind a 
- * data source using Torque. 
- *
- * @author <a href="mailto:fischer@seitenbau.de">Thomas Fischer</a>
- * @version $Id $
- */
-public class JndiConfigurationTest extends BaseRuntimeTestCase
-{
-    /**
-     * The subcontext where the data source is bound.
-     */
-    protected static final String JNDI_SUBCONTEXT = "jdbc";
-    
-    /**
-     * the full jndi path to the data source.
-     */
-    protected static final String JNDI_PATH 
-            = JNDI_SUBCONTEXT + "/" + "jndiTestDataSource";
-    
-    /**
-     * Creates a new instance.
-     */
-    public JndiConfigurationTest(String name)
-    {
-        super(name);
-    }
-
-    public void setUp()
-    {
-        // super.setUp() initializes torque, but here we want to
-        // do that ourselves
-    }
-    
-    /**
-     * Tests whether our home-made Data Source works.
-     * @throws Exception if the test fails.
-     */
-    public void testDataSource() throws Exception
-    {
-        BasicDataSource dataSource = null;
-        try
-        {
-            dataSource = getDataSource();
-            dataSourceConnect(dataSource);
-        }
-        finally
-        {
-            if (dataSource != null)
-            {
-                dataSource.close();
-            }
-        }
-    }
-    
-    /**
-     * Binds a DataSource to the jndi and checks that we have successfully 
-     * bound it. Then Torque is configured to lookup the DataSource in jndi,
-     * and it is checked if Torque can read from the database. Finally,
-     * the DataSource is closed and unbound.
-     * @throws Exception if the test fails
-     */
-    public void testExternalBindTorqueLookup() throws Exception
-    {
-        // compose the correct configuration
-        Configuration torqueConfiguration = getTorqueConfiguraton();
-        String defaultDatabase = getDefaultDatabase(torqueConfiguration);
-        
-        // remove the dsfactory configuration from the configuration
-        {
-            Configuration dsfactoryConfiguration = torqueConfiguration.subset(
-                    Torque.TORQUE_KEY + "."
-                    + DataSourceFactory.DSFACTORY_KEY + "."
-                    + defaultDatabase);
-            dsfactoryConfiguration.clear();
-        }
-        
-        // add the jndi configuration to the configuration
-        torqueConfiguration.setProperty(
-                Torque.TORQUE_KEY + "."
-                + DataSourceFactory.DSFACTORY_KEY + "."
-                + defaultDatabase + "."
-                + DataSourceFactory.FACTORY_KEY,
-                JndiDataSourceFactory.class.getName());
-        torqueConfiguration.setProperty(
-                Torque.TORQUE_KEY + "."
-                + DataSourceFactory.DSFACTORY_KEY + "."
-                + defaultDatabase + "."
-                + JndiDataSourceFactory.JNDI_KEY + "."
-                + JndiDataSourceFactory.PATH_KEY,
-                JNDI_PATH);
-        torqueConfiguration.setProperty(
-                Torque.TORQUE_KEY + "."
-                + DataSourceFactory.DSFACTORY_KEY + "."
-                + defaultDatabase + "."
-                + JndiDataSourceFactory.JNDI_KEY + "."
-                + Context.INITIAL_CONTEXT_FACTORY, 
-                org.apache.naming.java.javaURLContextFactory.class.getName());
-        
-        //System.out.println("Configuration for testExternalBindTorqueLookup:");
-        //debugConfiguration(torqueConfiguration);
-        //System.out.println();
-
-        try
-        {
-            // bind datasource and check bind.
-            bindDataSource();
-            BasicDataSource dataSource = retrieveDataSource();
-            dataSourceConnect(dataSource);
-            
-
-            // initialize torque with the created configuration 
-            // and check that we can connect to the database.
-            try
-            {
-                Torque.init(torqueConfiguration);
-                torqueConnect();
-            }
-            finally
-            {
-                Torque.shutdown();
-            }
-        }
-        finally
-        {
-            unbindDataSource();
-        }
-    }
-    
-    /**
-     * Binds a DataSource to the jndi and checks that we have successfully 
-     * bound it. Then Torque is configured to lookup the DataSource in jndi,
-     * and it is checked if Torque can read from the database. Finally,
-     * the DataSource is closed and unbound.
-     * @throws Exception if the test fails
-     */
-    public void testTorqueBindTorqueLookup() throws Exception
-    {
-        // compose the correct configuration
-        Configuration torqueConfiguration = getTorqueConfiguraton();
-        String defaultDatabase = getDefaultDatabase(torqueConfiguration);
-        
-        // add the jndi configuration to the configuration
-        torqueConfiguration.setProperty(
-                Torque.TORQUE_KEY + "."
-                + DataSourceFactory.DSFACTORY_KEY + "."
-                + defaultDatabase + "."
-                + DataSourceFactory.FACTORY_KEY,
-                JndiDataSourceFactory.class.getName());
-        torqueConfiguration.setProperty(
-                Torque.TORQUE_KEY + "."
-                + DataSourceFactory.DSFACTORY_KEY + "."
-                + defaultDatabase + "."
-                + JndiDataSourceFactory.JNDI_KEY + "."
-                + JndiDataSourceFactory.PATH_KEY,
-                JNDI_PATH);
-        torqueConfiguration.setProperty(
-                Torque.TORQUE_KEY + "."
-                + DataSourceFactory.DSFACTORY_KEY + "."
-                + defaultDatabase + "."
-                + JndiDataSourceFactory.JNDI_KEY + "."
-                + Context.INITIAL_CONTEXT_FACTORY, 
-                org.apache.naming.java.javaURLContextFactory.class.getName());
-        
-        // add the datasource configuration
-        torqueConfiguration.setProperty(
-                Torque.TORQUE_KEY + "."
-                + DataSourceFactory.DSFACTORY_KEY + "."
-                + defaultDatabase + "."
-                + JndiDataSourceFactory.DATASOURCE_KEY + "."
-                + JndiDataSourceFactory.CLASSNAME_KEY, 
-                BasicDataSource.class.getName());
-        {
-            Map tempStore = new HashMap();
-            Configuration connectionConfiguration 
-                    = torqueConfiguration.subset(
-                        Torque.TORQUE_KEY + "."
-                        + DataSourceFactory.DSFACTORY_KEY + "."
-                        + defaultDatabase + "."
-                        + AbstractDataSourceFactory.CONNECTION_KEY);
-            for (Iterator keyIt = connectionConfiguration.getKeys();
-               keyIt.hasNext();)
-            {
-                String key = (String) keyIt.next();
-                String value = connectionConfiguration.getString(key);
-                
-                if ("user".equals(key))
-                {
-                    // setUser() in SharedPoolDataSouce corresponds to
-                    // setUsername() in BasicDataSourceFactory
-                    key = "username";
-                }
-                else if ("driver".equals(key))
-                {
-                    // setDriver() in SharedPoolDataSouce corresponds to
-                    // setDriverClassName() in BasicDataSourceFactory
-                    key = "driverClassName";
-                }
-                tempStore.put(
-                        Torque.TORQUE_KEY + "."
-                        + DataSourceFactory.DSFACTORY_KEY + "."
-                        + defaultDatabase + "."
-                        + JndiDataSourceFactory.DATASOURCE_KEY + "."
-                        + key, 
-                        value);
-            }
-            // add the new keys
-            for (Iterator keyIt = tempStore.keySet().iterator(); 
-                keyIt.hasNext(); )
-            {
-                String key = (String) keyIt.next();
-                String value = (String) tempStore.get(key);
-                torqueConfiguration.setProperty(key, value);
-            }
-            
-            // remove the configuration for the original datasource
-            connectionConfiguration.clear();
-            Configuration poolConfiguration 
-                = torqueConfiguration.subset(
-                        Torque.TORQUE_KEY + "."
-                        + DataSourceFactory.DSFACTORY_KEY + "."
-                        + defaultDatabase + "."
-                        + AbstractDataSourceFactory.POOL_KEY);
-            poolConfiguration.clear();
-        }
-        
-        //System.out.println("Configuration for testTorqueBindTorqueLookup:");
-        //debugConfiguration(torqueConfiguration);
-        //System.out.println();
-        
-        try
-        {
-            // initialize torque with the created configuration 
-            // and check that we can connect to the database.
-            try
-            {
-                Torque.init(torqueConfiguration);
-                torqueConnect();
-            }
-            finally
-            {
-                Torque.shutdown();
-            }
-        }
-        finally
-        {
-            unbindDataSource();
-        }
-    }
-    
-    /**
-     * creates and binds a BasicDataSource into jndi.
-     * @throws Exception if DataSource creation or binding fails.
-     */
-    protected void bindDataSource() throws Exception
-    {
-        BasicDataSource dataSource = getDataSource();
-        Context context = getInitialContext();
-        context.createSubcontext(JNDI_SUBCONTEXT);
-        context.bind(JNDI_PATH, dataSource);
-    }
-    
-    /**
-     * Retrieves a BasicDataSource from jndi.
-     * @throws Exception if the jndi lookup fails or no DataSource is bound.
-     */
-    protected BasicDataSource retrieveDataSource() throws Exception
-    {
-        Context context = getInitialContext();
-        BasicDataSource dataSource 
-                = (BasicDataSource) context.lookup(JNDI_PATH);
-
-        if (dataSource == null)
-        {
-            fail("DataSource should not be null");
-        }
-        return dataSource;
-    }
-        
-    /**
-     * unbinds and closes the BasicDataSource in jndi.
-     * @throws Exception if creation or binfding fails.
-     */
-    protected void unbindDataSource() throws Exception
-    {
-        Context context = getInitialContext();
-        BasicDataSource dataSource 
-                = (BasicDataSource) context.lookup(JNDI_PATH);
-
-        try
-        {
-            if (dataSource != null)
-            {
-                dataSource.close();
-            }
-        }
-        finally
-        {
-            context.unbind(JNDI_PATH);
-        }
-    }
-    
-    /**
-     * Creates a Data Source from the Torque configuration without using Torque.
-     * @return a SharedPoolDataSource source.
-     * @throws Exception if we cannot create a Data source.
-     */
-    protected BasicDataSource getDataSource() throws Exception
-    {
-        Configuration torqueConfiguration = getTorqueConfiguraton();
-        String defaultDatabase = getDefaultDatabase(torqueConfiguration);
-        Configuration dsfactoryConfiguration = torqueConfiguration.subset(
-                Torque.TORQUE_KEY + "."
-                + DataSourceFactory.DSFACTORY_KEY + "."
-                + defaultDatabase + "."
-                + AbstractDataSourceFactory.CONNECTION_KEY);
-        
-        BasicDataSource dataSource = new BasicDataSource();
-        for (Iterator i = dsfactoryConfiguration.getKeys(); i.hasNext();)
-        {
-            String key = (String) i.next();
-            String stringValue = dsfactoryConfiguration.getString(key);
-            
-            if ("user".equals(key))
-            {
-                // setUser() in SharedPoolDataSouce corresponds to
-                // setUsername() in BasicDataSourceFactory
-                key = "username";
-            }
-            else if ("driver".equals(key))
-            {
-                // setDriver() in SharedPoolDataSouce corresponds to
-                // setDriverClassName() in BasicDataSourceFactory
-                key = "driverClassName";
-            }
-                
-            Class propertyType =
-                    PropertyUtils.getPropertyType(dataSource, key);
-            Object value =
-                    ConvertUtils.convert(stringValue, propertyType);
-            PropertyUtils.setSimpleProperty(dataSource, key, value);
-        }
-        
-        return dataSource;
-    }
-
-    /**
-     * checks whether we can retrieve a connection from a DataSource.
-     * @throws Exception if no connection can be established.
-     */
-    protected void dataSourceConnect(DataSource dataSource) throws Exception
-    {
-        Connection connection = null;
-        try
-        {
-            connection = dataSource.getConnection();
-            connection.close();
-            connection = null;
-        }
-        finally
-        {
-            if (connection != null)
-            {
-                connection.close();
-            }
-        }
-    }
-
-    /**
-     * checks whether we can connect to the database via Torque.
-     * @throws Exception if no connection can be established.
-     */
-    protected void torqueConnect() throws Exception
-    {
-        Connection connection = null;
-        try
-        {
-        	connection = Torque.getConnection();
-            BookPeer.doSelect(new Criteria(), connection);
-            connection.close();
-            connection = null;
-        }
-        finally
-        {
-        	if (connection != null)
-            {
-        		connection.close();
-            }
-        }
-    }
-    
-    /**
-     * Retrieves (or creates if it does not exist) an InitialContext.
-     * @return the InitialContext.
-     * @throws NamingException if the InitialContext cannot be retrieved 
-     *         or created.
-     */
-    protected InitialContext getInitialContext() throws NamingException
-    {
-        Hashtable environment = new Hashtable();
-        environment.put(
-                Context.INITIAL_CONTEXT_FACTORY, 
-                org.apache.naming.java.javaURLContextFactory.class.getName());
-        InitialContext context = new InitialContext(environment);
-        return context;
-    }
-    
-    /**
-     * Retrieves the path for Torque's configuration from the System Properties,
-     * loads the configuration and returns it.
-     * @return Torque's configuration.
-     * @throws ConfigurationException if the configuration cannot be loaded.
-     */
-    protected static Configuration getTorqueConfiguraton() 
-            throws ConfigurationException
-    {
-        Configuration configuration = new PropertiesConfiguration(
-                System.getProperty(
-                        CONFIG_FILE_SYSTEM_PROPERTY));
-        return configuration;
-    }
-
-    /**
-     * extraxts the default Database out of Torque's configuration. 
-     * @param torqueConfiguration the Torque configuration
-     * @return the default Data Source.
-     */
-    protected static String getDefaultDatabase(
-            Configuration torqueConfiguration)
-    {
-        String defaultDatabase = torqueConfiguration.getString(
-                Torque.TORQUE_KEY + "."
-                + Torque.DATABASE_KEY + "."
-                + Torque.DEFAULT_KEY);
-        return defaultDatabase;
-    }
-    
-    /**
-     * Prints the contents of the configuration to System.out
-     * @param configuration the configuration to be debugged.
-     */
-    public static void debugConfiguration(Configuration configuration)
-    {
-        for (Iterator dsKeyIt = configuration.getKeys();
-        dsKeyIt.hasNext(); )
-        {
-            
-            String key = (String) dsKeyIt.next();
-            System.out.println(key + " = " + configuration.getString(key));
-        }
-    }
-}
\ No newline at end of file
+package org.apache.torque;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+import java.sql.Connection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.torque.dsfactory.AbstractDataSourceFactory;
+import org.apache.torque.dsfactory.DataSourceFactory;
+import org.apache.torque.dsfactory.JndiDataSourceFactory;
+import org.apache.torque.test.BookPeer;
+import org.apache.torque.util.Criteria;
+
+/**
+ * Test for configuration using JNDI. The test assumes that we have a 
+ * non-jndi configuration, and creates the data source configuration from it.
+ * It is tested whether we can bind a data source manually into jndi and
+ * retrieve it in Torque, and also it is tested whether we can bind a 
+ * data source using Torque. 
+ *
+ * @author <a href="mailto:fischer@seitenbau.de">Thomas Fischer</a>
+ * @version $Id $
+ */
+public class JndiConfigurationTest extends BaseRuntimeTestCase
+{
+    /**
+     * The subcontext where the data source is bound.
+     */
+    protected static final String JNDI_SUBCONTEXT = "jdbc";
+    
+    /**
+     * the full jndi path to the data source.
+     */
+    protected static final String JNDI_PATH 
+            = JNDI_SUBCONTEXT + "/" + "jndiTestDataSource";
+    
+    /**
+     * Creates a new instance.
+     */
+    public JndiConfigurationTest(String name)
+    {
+        super(name);
+    }
+
+    public void setUp()
+    {
+        // super.setUp() initializes torque, but here we want to
+        // do that ourselves
+    }
+    
+    /**
+     * Tests whether our home-made Data Source works.
+     * @throws Exception if the test fails.
+     */
+    public void testDataSource() throws Exception
+    {
+        BasicDataSource dataSource = null;
+        try
+        {
+            dataSource = getDataSource();
+            dataSourceConnect(dataSource);
+        }
+        finally
+        {
+            if (dataSource != null)
+            {
+                dataSource.close();
+            }
+        }
+    }
+    
+    /**
+     * Binds a DataSource to the jndi and checks that we have successfully 
+     * bound it. Then Torque is configured to lookup the DataSource in jndi,
+     * and it is checked if Torque can read from the database. Finally,
+     * the DataSource is closed and unbound.
+     * @throws Exception if the test fails
+     */
+    public void testExternalBindTorqueLookup() throws Exception
+    {
+        // compose the correct configuration
+        Configuration torqueConfiguration = getTorqueConfiguraton();
+        String defaultDatabase = getDefaultDatabase(torqueConfiguration);
+        
+        // remove the dsfactory configuration from the configuration
+        {
+            Configuration dsfactoryConfiguration = torqueConfiguration.subset(
+                    Torque.TORQUE_KEY + "."
+                    + DataSourceFactory.DSFACTORY_KEY + "."
+                    + defaultDatabase);
+            dsfactoryConfiguration.clear();
+        }
+        
+        // add the jndi configuration to the configuration
+        torqueConfiguration.setProperty(
+                Torque.TORQUE_KEY + "."
+                + DataSourceFactory.DSFACTORY_KEY + "."
+                + defaultDatabase + "."
+                + DataSourceFactory.FACTORY_KEY,
+                JndiDataSourceFactory.class.getName());
+        torqueConfiguration.setProperty(
+                Torque.TORQUE_KEY + "."
+                + DataSourceFactory.DSFACTORY_KEY + "."
+                + defaultDatabase + "."
+                + JndiDataSourceFactory.JNDI_KEY + "."
+                + JndiDataSourceFactory.PATH_KEY,
+                JNDI_PATH);
+        torqueConfiguration.setProperty(
+                Torque.TORQUE_KEY + "."
+                + DataSourceFactory.DSFACTORY_KEY + "."
+                + defaultDatabase + "."
+                + JndiDataSourceFactory.JNDI_KEY + "."
+                + Context.INITIAL_CONTEXT_FACTORY, 
+                org.apache.naming.java.javaURLContextFactory.class.getName());
+        
+        //System.out.println("Configuration for testExternalBindTorqueLookup:");
+        //debugConfiguration(torqueConfiguration);
+        //System.out.println();
+
+        try
+        {
+            // bind datasource and check bind.
+            bindDataSource();
+            BasicDataSource dataSource = retrieveDataSource();
+            dataSourceConnect(dataSource);
+            
+
+            // initialize torque with the created configuration 
+            // and check that we can connect to the database.
+            try
+            {
+                Torque.init(torqueConfiguration);
+                torqueConnect();
+            }
+            finally
+            {
+                Torque.shutdown();
+            }
+        }
+        finally
+        {
+            unbindDataSource();
+        }
+    }
+    
+    /**
+     * Binds a DataSource to the jndi and checks that we have successfully 
+     * bound it. Then Torque is configured to lookup the DataSource in jndi,
+     * and it is checked if Torque can read from the database. Finally,
+     * the DataSource is closed and unbound.
+     * @throws Exception if the test fails
+     */
+    public void testTorqueBindTorqueLookup() throws Exception
+    {
+        // compose the correct configuration
+        Configuration torqueConfiguration = getTorqueConfiguraton();
+        String defaultDatabase = getDefaultDatabase(torqueConfiguration);
+        
+        // add the jndi configuration to the configuration
+        torqueConfiguration.setProperty(
+                Torque.TORQUE_KEY + "."
+                + DataSourceFactory.DSFACTORY_KEY + "."
+                + defaultDatabase + "."
+                + DataSourceFactory.FACTORY_KEY,
+                JndiDataSourceFactory.class.getName());
+        torqueConfiguration.setProperty(
+                Torque.TORQUE_KEY + "."
+                + DataSourceFactory.DSFACTORY_KEY + "."
+                + defaultDatabase + "."
+                + JndiDataSourceFactory.JNDI_KEY + "."
+                + JndiDataSourceFactory.PATH_KEY,
+                JNDI_PATH);
+        torqueConfiguration.setProperty(
+                Torque.TORQUE_KEY + "."
+                + DataSourceFactory.DSFACTORY_KEY + "."
+                + defaultDatabase + "."
+                + JndiDataSourceFactory.JNDI_KEY + "."
+                + Context.INITIAL_CONTEXT_FACTORY, 
+                org.apache.naming.java.javaURLContextFactory.class.getName());
+        
+        // add the datasource configuration
+        torqueConfiguration.setProperty(
+                Torque.TORQUE_KEY + "."
+                + DataSourceFactory.DSFACTORY_KEY + "."
+                + defaultDatabase + "."
+                + JndiDataSourceFactory.DATASOURCE_KEY + "."
+                + JndiDataSourceFactory.CLASSNAME_KEY, 
+                BasicDataSource.class.getName());
+        {
+            Map tempStore = new HashMap();
+            Configuration connectionConfiguration 
+                    = torqueConfiguration.subset(
+                        Torque.TORQUE_KEY + "."
+                        + DataSourceFactory.DSFACTORY_KEY + "."
+                        + defaultDatabase + "."
+                        + AbstractDataSourceFactory.CONNECTION_KEY);
+            for (Iterator keyIt = connectionConfiguration.getKeys();
+               keyIt.hasNext();)
+            {
+                String key = (String) keyIt.next();
+                String value = connectionConfiguration.getString(key);
+                
+                if ("user".equals(key))
+                {
+                    // setUser() in SharedPoolDataSouce corresponds to
+                    // setUsername() in BasicDataSourceFactory
+                    key = "username";
+                }
+                else if ("driver".equals(key))
+                {
+                    // setDriver() in SharedPoolDataSouce corresponds to
+                    // setDriverClassName() in BasicDataSourceFactory
+                    key = "driverClassName";
+                }
+                tempStore.put(
+                        Torque.TORQUE_KEY + "."
+                        + DataSourceFactory.DSFACTORY_KEY + "."
+                        + defaultDatabase + "."
+                        + JndiDataSourceFactory.DATASOURCE_KEY + "."
+                        + key, 
+                        value);
+            }
+            // add the new keys
+            for (Iterator keyIt = tempStore.keySet().iterator(); 
+                keyIt.hasNext(); )
+            {
+                String key = (String) keyIt.next();
+                String value = (String) tempStore.get(key);
+                torqueConfiguration.setProperty(key, value);
+            }
+            
+            // remove the configuration for the original datasource
+            connectionConfiguration.clear();
+            Configuration poolConfiguration 
+                = torqueConfiguration.subset(
+                        Torque.TORQUE_KEY + "."
+                        + DataSourceFactory.DSFACTORY_KEY + "."
+                        + defaultDatabase + "."
+                        + AbstractDataSourceFactory.POOL_KEY);
+            poolConfiguration.clear();
+        }
+        
+        //System.out.println("Configuration for testTorqueBindTorqueLookup:");
+        //debugConfiguration(torqueConfiguration);
+        //System.out.println();
+        
+        try
+        {
+            // initialize torque with the created configuration 
+            // and check that we can connect to the database.
+            try
+            {
+                Torque.init(torqueConfiguration);
+                torqueConnect();
+            }
+            finally
+            {
+                Torque.shutdown();
+            }
+        }
+        finally
+        {
+            unbindDataSource();
+        }
+    }
+    
+    /**
+     * creates and binds a BasicDataSource into jndi.
+     * @throws Exception if DataSource creation or binding fails.
+     */
+    protected void bindDataSource() throws Exception
+    {
+        BasicDataSource dataSource = getDataSource();
+        Context context = getInitialContext();
+        context.createSubcontext(JNDI_SUBCONTEXT);
+        context.bind(JNDI_PATH, dataSource);
+    }
+    
+    /**
+     * Retrieves a BasicDataSource from jndi.
+     * @throws Exception if the jndi lookup fails or no DataSource is bound.
+     */
+    protected BasicDataSource retrieveDataSource() throws Exception
+    {
+        Context context = getInitialContext();
+        BasicDataSource dataSource 
+                = (BasicDataSource) context.lookup(JNDI_PATH);
+
+        if (dataSource == null)
+        {
+            fail("DataSource should not be null");
+        }
+        return dataSource;
+    }
+        
+    /**
+     * unbinds and closes the BasicDataSource in jndi.
+     * @throws Exception if creation or binfding fails.
+     */
+    protected void unbindDataSource() throws Exception
+    {
+        Context context = getInitialContext();
+        BasicDataSource dataSource 
+                = (BasicDataSource) context.lookup(JNDI_PATH);
+
+        try
+        {
+            if (dataSource != null)
+            {
+                dataSource.close();
+            }
+        }
+        finally
+        {
+            context.unbind(JNDI_PATH);
+        }
+    }
+    
+    /**
+     * Creates a Data Source from the Torque configuration without using Torque.
+     * @return a SharedPoolDataSource source.
+     * @throws Exception if we cannot create a Data source.
+     */
+    protected BasicDataSource getDataSource() throws Exception
+    {
+        Configuration torqueConfiguration = getTorqueConfiguraton();
+        String defaultDatabase = getDefaultDatabase(torqueConfiguration);
+        Configuration dsfactoryConfiguration = torqueConfiguration.subset(
+                Torque.TORQUE_KEY + "."
+                + DataSourceFactory.DSFACTORY_KEY + "."
+                + defaultDatabase + "."
+                + AbstractDataSourceFactory.CONNECTION_KEY);
+        
+        BasicDataSource dataSource = new BasicDataSource();
+        for (Iterator i = dsfactoryConfiguration.getKeys(); i.hasNext();)
+        {
+            String key = (String) i.next();
+            String stringValue = dsfactoryConfiguration.getString(key);
+            
+            if ("user".equals(key))
+            {
+                // setUser() in SharedPoolDataSouce corresponds to
+                // setUsername() in BasicDataSourceFactory
+                key = "username";
+            }
+            else if ("driver".equals(key))
+            {
+                // setDriver() in SharedPoolDataSouce corresponds to
+                // setDriverClassName() in BasicDataSourceFactory
+                key = "driverClassName";
+            }
+                
+            Class propertyType =
+                    PropertyUtils.getPropertyType(dataSource, key);
+            Object value =
+                    ConvertUtils.convert(stringValue, propertyType);
+            PropertyUtils.setSimpleProperty(dataSource, key, value);
+        }
+        
+        return dataSource;
+    }
+
+    /**
+     * checks whether we can retrieve a connection from a DataSource.
+     * @throws Exception if no connection can be established.
+     */
+    protected void dataSourceConnect(DataSource dataSource) throws Exception
+    {
+        Connection connection = null;
+        try
+        {
+            connection = dataSource.getConnection();
+            connection.close();
+            connection = null;
+        }
+        finally
+        {
+            if (connection != null)
+            {
+                connection.close();
+            }
+        }
+    }
+
+    /**
+     * checks whether we can connect to the database via Torque.
+     * @throws Exception if no connection can be established.
+     */
+    protected void torqueConnect() throws Exception
+    {
+        Connection connection = null;
+        try
+        {
+        	connection = Torque.getConnection();
+            BookPeer.doSelect(new Criteria(), connection);
+            connection.close();
+            connection = null;
+        }
+        finally
+        {
+        	if (connection != null)
+            {
+        		connection.close();
+            }
+        }
+    }
+    
+    /**
+     * Retrieves (or creates if it does not exist) an InitialContext.
+     * @return the InitialContext.
+     * @throws NamingException if the InitialContext cannot be retrieved 
+     *         or created.
+     */
+    protected InitialContext getInitialContext() throws NamingException
+    {
+        Hashtable environment = new Hashtable();
+        environment.put(
+                Context.INITIAL_CONTEXT_FACTORY, 
+                org.apache.naming.java.javaURLContextFactory.class.getName());
+        InitialContext context = new InitialContext(environment);
+        return context;
+    }
+    
+    /**
+     * Retrieves the path for Torque's configuration from the System Properties,
+     * loads the configuration and returns it.
+     * @return Torque's configuration.
+     * @throws ConfigurationException if the configuration cannot be loaded.
+     */
+    protected static Configuration getTorqueConfiguraton() 
+            throws ConfigurationException
+    {
+        Configuration configuration = new PropertiesConfiguration(
+                System.getProperty(
+                        CONFIG_FILE_SYSTEM_PROPERTY));
+        return configuration;
+    }
+
+    /**
+     * extraxts the default Database out of Torque's configuration. 
+     * @param torqueConfiguration the Torque configuration
+     * @return the default Data Source.
+     */
+    protected static String getDefaultDatabase(
+            Configuration torqueConfiguration)
+    {
+        String defaultDatabase = torqueConfiguration.getString(
+                Torque.TORQUE_KEY + "."
+                + Torque.DATABASE_KEY + "."
+                + Torque.DEFAULT_KEY);
+        return defaultDatabase;
+    }
+    
+    /**
+     * Prints the contents of the configuration to System.out
+     * @param configuration the configuration to be debugged.
+     */
+    public static void debugConfiguration(Configuration configuration)
+    {
+        for (Iterator dsKeyIt = configuration.getKeys();
+        dsKeyIt.hasNext(); )
+        {
+            
+            String key = (String) dsKeyIt.next();
+            System.out.println(key + " = " + configuration.getString(key));
+        }
+    }
+}

Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/ManagerTestConditional.java
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/ManagerTestConditional.java?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/org/apache/torque/ManagerTestConditional.java (original)
+++ db/torque/test/trunk/test-project/src/java/org/apache/torque/ManagerTestConditional.java Sat Nov 11 14:44:23 2006
@@ -1,19 +1,22 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *     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.
+ * 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.
  */
 
 import org.apache.torque.test.Author;

Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/TestInterface.java
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/TestInterface.java?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/org/apache/torque/TestInterface.java (original)
+++ db/torque/test/trunk/test-project/src/java/org/apache/torque/TestInterface.java Sat Nov 11 14:44:23 2006
@@ -1,19 +1,22 @@
 package org.apache.torque;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *     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.
+ * 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.
  */
 
 /**

Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/engine/database/transform/SQLToAppDataRuntimeTest.java
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/engine/database/transform/SQLToAppDataRuntimeTest.java?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/org/apache/torque/engine/database/transform/SQLToAppDataRuntimeTest.java (original)
+++ db/torque/test/trunk/test-project/src/java/org/apache/torque/engine/database/transform/SQLToAppDataRuntimeTest.java Sat Nov 11 14:44:23 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.transform;
 
 /*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *     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.
+ * 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.
  */
 
 import java.io.*;

Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/map/DatabaseMapTest.java
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/map/DatabaseMapTest.java?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/org/apache/torque/map/DatabaseMapTest.java (original)
+++ db/torque/test/trunk/test-project/src/java/org/apache/torque/map/DatabaseMapTest.java Sat Nov 11 14:44:23 2006
@@ -5,19 +5,22 @@
 import org.apache.torque.TorqueException;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *     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.
+ * 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.
  */
 
 /**

Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/om/OMByNameMethodsTest.java
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/om/OMByNameMethodsTest.java?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/src/java/org/apache/torque/om/OMByNameMethodsTest.java (original)
+++ db/torque/test/trunk/test-project/src/java/org/apache/torque/om/OMByNameMethodsTest.java Sat Nov 11 14:44:23 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.om;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *     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.
+ * 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.
  */
 
 import java.math.BigDecimal;



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message