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 [2/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/profile/oracle/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/oracle/Torque.properties?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/oracle/Torque.properties (original)
+++ db/torque/test/trunk/profile/oracle/Torque.properties Sat Nov 11 14:44:23 2006
@@ -1,31 +1,34 @@
-# 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.
-
-#
-# Runtime settings for the oracle test profile
-#
-# $Id$
-#
-
-torque.database.default = bookstore
-torque.database.bookstore.adapter = oracle
-
-#Using commons-dbcp
-torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-torque.dsfactory.bookstore.connection.driver = org.oracle.jdbc.driver.OracleDriver
-torque.dsfactory.bookstore.connection.url = jdbc:oracle:thin:@alpha.tucana.at:1521:oracle
-torque.dsfactory.bookstore.connection.user = torque
-torque.dsfactory.bookstore.connection.password = torque
-
-torque.dsfactory.bookstore.pool.validationQuery = SELECT 1 FROM DUAL
\ 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.
+
+#
+# Runtime settings for the oracle test profile
+#
+# $Id$
+#
+
+torque.database.default = bookstore
+torque.database.bookstore.adapter = oracle
+
+# Using commons-dbcp
+torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.bookstore.connection.driver = org.oracle.jdbc.driver.OracleDriver
+torque.dsfactory.bookstore.connection.url = jdbc:oracle:thin:@alpha.tucana.at:1521:oracle
+torque.dsfactory.bookstore.connection.user = torque
+torque.dsfactory.bookstore.connection.password = torque
+
+torque.dsfactory.bookstore.pool.validationQuery = SELECT 1 FROM DUAL

Modified: db/torque/test/trunk/profile/oracle/project.properties
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/oracle/project.properties?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/oracle/project.properties (original)
+++ db/torque/test/trunk/profile/oracle/project.properties Sat Nov 11 14:44:23 2006
@@ -1,35 +1,38 @@
-## Copyright 2005 The Apache Software Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Generator and build settings for the oracle test profile
-#
-# $Id$
-#
-
-#build settings for replacing tokens in the schema files
-torque.test.base.idMethod = idbroker
-
-#settings for the generator
-torque.generateBeans = true
-
-torque.database = oracle
-torque.database.createUrl = jdbc:oracle:thin:@alpha.tucana.at:1521:oracle
-torque.database.buildUrl = jdbc:oracle:thin:@alpha.tucana.at:1521:oracle
-torque.database.driver = org.oracle.jdbc.driver.OracleDriver
-torque.database.user = torque
-torque.database.password = torque
-
-#settings for the datadump and jdbc task
-torque.database.url = jdbc:oracle:thin:@alpha.tucana.at:1521:oracle
\ 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.
+
+#
+# Generator and build settings for the oracle test profile
+#
+# $Id$
+#
+
+# build settings for replacing tokens in the schema files
+torque.test.base.idMethod = idbroker
+
+# settings for the generator
+torque.generateBeans = true
+
+torque.database = oracle
+torque.database.createUrl = jdbc:oracle:thin:@alpha.tucana.at:1521:oracle
+torque.database.buildUrl = jdbc:oracle:thin:@alpha.tucana.at:1521:oracle
+torque.database.driver = org.oracle.jdbc.driver.OracleDriver
+torque.database.user = torque
+torque.database.password = torque
+
+# settings for the datadump and jdbc task
+torque.database.url = jdbc:oracle:thin:@alpha.tucana.at:1521:oracle

Modified: db/torque/test/trunk/profile/oracle/project.xml
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/oracle/project.xml?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/oracle/project.xml (original)
+++ db/torque/test/trunk/profile/oracle/project.xml Sat Nov 11 14:44:23 2006
@@ -1,35 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
- ===========================================================================
- 
- project descriptor for the oracle test profile
- $Id$
-
--->
-
-<project>
-  <extend>../../../runtime/project.xml</extend>
-  <artifactId>torque-oracle-test</artifactId> 
-  <name>Torque-oracle-test</name>
-  <dependencies>
-    <dependency>
-      <artifactId>ojdbc</artifactId>
-      <groupId>oracle-jdbc</groupId>
-      <version>9.2.0.6</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>../../../runtime/project.xml</extend>
+  <artifactId>torque-oracle-test</artifactId> 
+  <name>Torque-oracle-test</name>
+  <dependencies>
+    <dependency>
+      <artifactId>ojdbc</artifactId>
+      <groupId>oracle-jdbc</groupId>
+      <version>9.2.0.6</version>
+    </dependency> 
+  </dependencies>
+</project>

Modified: db/torque/test/trunk/profile/postgresql/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/postgresql/Torque.properties?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/postgresql/Torque.properties (original)
+++ db/torque/test/trunk/profile/postgresql/Torque.properties Sat Nov 11 14:44:23 2006
@@ -1,31 +1,34 @@
-# 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.
-
-#
-# Runtime settings for the postgresql test profile
-#
-# $Id$
-#
-
-torque.database.default = bookstore
-torque.database.bookstore.adapter = postgresql
-
-#Using commons-dbcp
-torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-torque.dsfactory.bookstore.connection.driver = org.postgresql.Driver
-torque.dsfactory.bookstore.connection.url = jdbc:postgresql://localhost:5432/bookstore
-torque.dsfactory.bookstore.connection.user = torque
-torque.dsfactory.bookstore.connection.password = torque
-
-torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
\ 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.
+
+#
+# Runtime settings for the postgresql test profile
+#
+# $Id$
+#
+
+torque.database.default = bookstore
+torque.database.bookstore.adapter = postgresql
+
+# Using commons-dbcp
+torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.bookstore.connection.driver = org.postgresql.Driver
+torque.dsfactory.bookstore.connection.url = jdbc:postgresql://localhost:5432/bookstore
+torque.dsfactory.bookstore.connection.user = torque
+torque.dsfactory.bookstore.connection.password = torque
+
+torque.dsfactory.bookstore.pool.validationQuery = SELECT 1

Modified: db/torque/test/trunk/profile/postgresql/project.properties
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/postgresql/project.properties?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/postgresql/project.properties (original)
+++ db/torque/test/trunk/profile/postgresql/project.properties Sat Nov 11 14:44:23 2006
@@ -1,35 +1,38 @@
-# Copyright 2005 The Apache Software Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Generator and build settings for the postgresql test profile
-#
-# $Id$
-#
-
-#build settings for replacing tokens in the schema files
-torque.test.base.idMethod = idbroker
-
-#settings for the generator
-torque.generateBeans = true
-
-torque.database = postgresql
-torque.database.createUrl = jdbc:postgresql://localhost:5432/template1
-torque.database.buildUrl = jdbc:postgresql://localhost:5432/bookstore
-torque.database.driver = org.postgresql.Driver
-torque.database.user = torque
-torque.database.password = torque
-
-#settings for the datadump and jdbc task
-torque.database.url = jdbc:postgresql://localhost:5432/bookstore
\ 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.
+
+#
+# Generator and build settings for the postgresql test profile
+#
+# $Id$
+#
+
+# build settings for replacing tokens in the schema files
+torque.test.base.idMethod = idbroker
+
+# settings for the generator
+torque.generateBeans = true
+
+torque.database = postgresql
+torque.database.createUrl = jdbc:postgresql://localhost:5432/template1
+torque.database.buildUrl = jdbc:postgresql://localhost:5432/bookstore
+torque.database.driver = org.postgresql.Driver
+torque.database.user = torque
+torque.database.password = torque
+
+# settings for the datadump and jdbc task
+torque.database.url = jdbc:postgresql://localhost:5432/bookstore

Modified: db/torque/test/trunk/profile/postgresql/project.xml
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/postgresql/project.xml?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/postgresql/project.xml (original)
+++ db/torque/test/trunk/profile/postgresql/project.xml Sat Nov 11 14:44:23 2006
@@ -1,37 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
- ===========================================================================
- 
- project descriptor for the postgresql test profile
- $Id$
-
--->
-
-<project>
-  <extend>../../../runtime/project.xml</extend>
-  <artifactId>torque-postgresql-test</artifactId> 
-  <name>Torque-postgresql-test</name>
-  <dependencies>
-    <dependency>
-      <groupId>postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>7.4-jdbc3</version>
-      <jar>pg74.215.jdbc3.jar</jar>
-      <url>http://www.postgresql.org/</url>
-    </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>../../../runtime/project.xml</extend>
+  <artifactId>torque-postgresql-test</artifactId> 
+  <name>Torque-postgresql-test</name>
+  <dependencies>
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>7.4-jdbc3</version>
+      <jar>pg74.215.jdbc3.jar</jar>
+      <url>http://www.postgresql.org/</url>
+    </dependency>
+  </dependencies>
+</project>

Modified: db/torque/test/trunk/profile/sybase/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/sybase/Torque.properties?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/sybase/Torque.properties (original)
+++ db/torque/test/trunk/profile/sybase/Torque.properties Sat Nov 11 14:44:23 2006
@@ -1,31 +1,34 @@
-# 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.
-
-#
-# Runtime settings for the sybase test profile
-#
-# $Id$
-#
-
-torque.database.default = bookstore
-torque.database.bookstore.adapter = sybase
-
-#Using commons-dbcp
-torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-torque.dsfactory.bookstore.connection.driver = com.sybase.jdbc2.jdbc.SybDriver
-torque.dsfactory.bookstore.connection.url = jdbc:sybase:Tds:localhost:5000/bookstore
-torque.dsfactory.bookstore.connection.user = sa
-torque.dsfactory.bookstore.connection.password =
-
-torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
\ 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.
+
+#
+# Runtime settings for the sybase test profile
+#
+# $Id$
+#
+
+torque.database.default = bookstore
+torque.database.bookstore.adapter = sybase
+
+# Using commons-dbcp
+torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.bookstore.connection.driver = com.sybase.jdbc2.jdbc.SybDriver
+torque.dsfactory.bookstore.connection.url = jdbc:sybase:Tds:localhost:5000/bookstore
+torque.dsfactory.bookstore.connection.user = sa
+torque.dsfactory.bookstore.connection.password =
+
+torque.dsfactory.bookstore.pool.validationQuery = SELECT 1

Modified: db/torque/test/trunk/profile/sybase/project.properties
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/sybase/project.properties?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/sybase/project.properties (original)
+++ db/torque/test/trunk/profile/sybase/project.properties Sat Nov 11 14:44:23 2006
@@ -1,35 +1,38 @@
-# Copyright 2005 The Apache Software Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License")
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Generator and build settings for the sybase test profile
-#
-# $Id$
-#
-
-#build settings for replacing tokens in the schema files
-torque.test.base.idMethod = idbroker
-
-#settings for the generator
-torque.generateBeans = true
-
-torque.database = sybase
-torque.database.createUrl = jdbc:sybase:Tds:localhost:5000/master
-torque.database.buildUrl = jdbc:sybase:Tds:localhost:5000/bookstore
-torque.database.driver = com.sybase.jdbc2.jdbc.SybDriver
-torque.database.user = sa
-torque.database.password =
-
-#settings for the datadump and jdbc task
-torque.database.url = jdbc:sybase:Tds:localhost:5000/bookstore
\ 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.
+
+#
+# Generator and build settings for the sybase test profile
+#
+# $Id$
+#
+
+# build settings for replacing tokens in the schema files
+torque.test.base.idMethod = idbroker
+
+# settings for the generator
+torque.generateBeans = true
+
+torque.database = sybase
+torque.database.createUrl = jdbc:sybase:Tds:localhost:5000/master
+torque.database.buildUrl = jdbc:sybase:Tds:localhost:5000/bookstore
+torque.database.driver = com.sybase.jdbc2.jdbc.SybDriver
+torque.database.user = sa
+torque.database.password =
+
+# settings for the datadump and jdbc task
+torque.database.url = jdbc:sybase:Tds:localhost:5000/bookstore

Modified: db/torque/test/trunk/profile/sybase/project.xml
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/sybase/project.xml?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/sybase/project.xml (original)
+++ db/torque/test/trunk/profile/sybase/project.xml Sat Nov 11 14:44:23 2006
@@ -1,35 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
- ---------------------------------------------------------------------------
- 
- project descriptor for the sybase test profile
- $Id$
-
--->
-
-<project>
-  <extend>../../../runtime/project.xml</extend>
-  <artifactId>torque-sybase-test</artifactId> 
-  <name>Torque-sybase-test</name>
-  <dependencies>
-    <dependency>
-      <artifactId>sybase</artifactId>
-      <groupId>jconnect</groupId>
-      <version>5.5</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>../../../runtime/project.xml</extend>
+  <artifactId>torque-sybase-test</artifactId> 
+  <name>Torque-sybase-test</name>
+  <dependencies>
+    <dependency>
+      <artifactId>sybase</artifactId>
+      <groupId>jconnect</groupId>
+      <version>5.5</version>
+    </dependency> 
+  </dependencies>
+</project>

Modified: db/torque/test/trunk/profile/tv/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/tv/Torque.properties?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/tv/Torque.properties (original)
+++ db/torque/test/trunk/profile/tv/Torque.properties Sat Nov 11 14:44:23 2006
@@ -1,43 +1,46 @@
-# 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.
-
-#
-# Runtime settings for the mysql test profile
-#
-# $Id: Torque.properties 279964 2005-09-10 07:07:23Z tfischer $
-#
-
-torque.database.default = bookstore
-#torque.database.bookstore.adapter = mysql
-torque.database.bookstore.adapter = mssql
-torque.database.schema = sa
-
-#Using commons-dbcp
-torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-#torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
-#torque.dsfactory.bookstore.connection.url = jdbc:mysql://gatekeeper.home.lan:3306/bookstore
-#torque.dsfactory.bookstore.connection.user = torque
-#torque.dsfactory.bookstore.connection.password = torque
-
-torque.dsfactory.bookstore.connection.driver = com.microsoft.sqlserver.jdbc.SQLServerDriver
-torque.dsfactory.bookstore.connection.url = jdbc:sqlserver://localhost;databaseName=bookstore
-torque.dsfactory.bookstore.connection.user = sa
-torque.dsfactory.bookstore.connection.password = apache
-
-torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
-
-# Determines whether the managers cache instances of the business objects.
-# And also whether the MethodResultCache will really cache results.
-
-torque.manager.useCache = true
+# 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.
+
+#
+# Runtime settings for the mysql test profile
+#
+# $Id: Torque.properties 279964 2005-09-10 07:07:23Z tfischer $
+#
+
+torque.database.default = bookstore
+torque.database.bookstore.adapter = mysql
+# torque.database.bookstore.adapter = mssql
+# torque.database.schema = sa
+
+# Using commons-dbcp
+torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
+torque.dsfactory.bookstore.connection.url = jdbc:mysql://gatekeeper.home.lan:3306/bookstore
+torque.dsfactory.bookstore.connection.user = torque
+torque.dsfactory.bookstore.connection.password = torque
+
+# torque.dsfactory.bookstore.connection.driver = com.microsoft.sqlserver.jdbc.SQLServerDriver
+# torque.dsfactory.bookstore.connection.url = jdbc:sqlserver://localhost;databaseName=bookstore
+# torque.dsfactory.bookstore.connection.user = sa
+# torque.dsfactory.bookstore.connection.password = apache
+
+torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
+
+# Determines whether the managers cache instances of the business objects.
+# And also whether the MethodResultCache will really cache results.
+
+torque.manager.useCache = true

Modified: db/torque/test/trunk/profile/tv/project.properties
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/tv/project.properties?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/tv/project.properties (original)
+++ db/torque/test/trunk/profile/tv/project.properties Sat Nov 11 14:44:23 2006
@@ -1,44 +1,47 @@
-# 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.
-
-#
-# Generator and build settings for the mysql test profile
-#
-# $Id: project.properties 359291 2005-12-27 21:45:04Z tfischer $
-#
-
-#build settings for replacing tokens in the schema files
-torque.test.base.idMethod = idbroker
-
-#settings for the generator
-torque.generateBeans = true
-torque.useManagers = true
-
-#torque.database = mysql
-#torque.database.createUrl = jdbc:mysql://gatekeeper.home.lan:3306/mysql
-#torque.database.buildUrl = jdbc:mysql://gatekeeper.home.lan:3306/bookstore
-#torque.database.driver = org.gjt.mm.mysql.Driver
-#torque.database.user = torque
-#torque.database.password = torque
-
-torque.database = mssql
-torque.database.createUrl = jdbc:sqlserver://localhost
-torque.database.buildUrl = jdbc:sqlserver://localhost;databaseName=bookstore
-torque.database.driver = com.microsoft.sqlserver.jdbc.SQLServerDriver
-torque.database.user = sa
-torque.database.password = apache
-
-#settings for the datadump and jdbc task
-#torque.database.url = jdbc:mysql://gatekeeper.home.lan:3306/bookstore
-torque.database.url = jdbc:sqlserver://localhost;databaseName=bookstore
\ 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.
+
+#
+# Generator and build settings for the mysql test profile
+#
+# $Id: project.properties 359291 2005-12-27 21:45:04Z tfischer $
+#
+
+# build settings for replacing tokens in the schema files
+torque.test.base.idMethod = idbroker
+
+# settings for the generator
+torque.generateBeans = true
+torque.useManagers = true
+
+torque.database = mysql
+torque.database.createUrl = jdbc:mysql://gatekeeper.home.lan:3306/mysql
+torque.database.buildUrl = jdbc:mysql://gatekeeper.home.lan:3306/bookstore
+torque.database.driver = org.gjt.mm.mysql.Driver
+torque.database.user = torque
+torque.database.password = torque
+
+# torque.database = mssql
+# torque.database.createUrl = jdbc:sqlserver://localhost
+# torque.database.buildUrl = jdbc:sqlserver://localhost;databaseName=bookstore
+# torque.database.driver = com.microsoft.sqlserver.jdbc.SQLServerDriver
+# torque.database.user = sa
+# torque.database.password = apache
+
+# settings for the datadump and jdbc task
+torque.database.url = jdbc:mysql://gatekeeper.home.lan:3306/bookstore
+# torque.database.url = jdbc:sqlserver://localhost;databaseName=bookstore

Modified: db/torque/test/trunk/profile/tv/project.xml
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/profile/tv/project.xml?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/profile/tv/project.xml (original)
+++ db/torque/test/trunk/profile/tv/project.xml Sat Nov 11 14:44:23 2006
@@ -1,42 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
- ===========================================================================
- 
- project descriptor for the mysql test profile
- $Id: project.xml 359291 2005-12-27 21:45:04Z tfischer $
-
--->
-
-<project>
-  <extend>../../../runtime/project.xml</extend>
-  <artifactId>torque-mysql-test</artifactId> 
-  <name>Torque-mysql-test</name>
-  <dependencies>
-    <dependency>
-      <artifactId>mysql-connector-java</artifactId>
-      <groupId>mm.mysql</groupId>
-      <version>3.1.12-bin</version>
-    </dependency> 
-  </dependencies>
-  <dependencies>
-    <dependency>
-      <artifactId>sqljdbc</artifactId>
-      <groupId>mssql</groupId>
-      <version>1.1</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>../../../runtime/project.xml</extend>
+  <artifactId>torque-mysql-test</artifactId> 
+  <name>Torque-mysql-test</name>
+  <dependencies>
+    <dependency>
+      <artifactId>mysql-connector-java</artifactId>
+      <groupId>mm.mysql</groupId>
+      <version>3.1.12-bin</version>
+    </dependency> 
+  </dependencies>
+  <dependencies>
+    <dependency>
+      <artifactId>sqljdbc</artifactId>
+      <groupId>mssql</groupId>
+      <version>1.1</version>
+    </dependency> 
+  </dependencies>
+</project>

Modified: db/torque/test/trunk/test-project/maven.xml
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/maven.xml?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/maven.xml (original)
+++ db/torque/test/trunk/test-project/maven.xml Sat Nov 11 14:44:23 2006
@@ -1,254 +1,255 @@
-<?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.
- */
- -->
-
-<!-- ======================================================================== -->
-<!--                                                                          -->
-<!--  maven Buildfile for the test project                                    -->
-<!--  Defines the goals for running the tests                                 -->
-<!--                                                                          -->
-<!-- $Id$ -->
-<!--                                                                          -->
-<!-- ======================================================================== -->
-
-<project
-  xmlns:j="jelly:core"
-  xmlns:maven="jelly:maven"
-  default="torque-test:run">
-
-  <goal name="torque-test:run" description="builds and runs the test project">
-    <attainGoal name="torque-test:test"/>
-    <attainGoal name="torque-test:post-test"/>
-  </goal>
-
-
-  <goal name="torque-test:prepare"
-      description="copies resources and clears garbage from old tests">
-
-    <property file="../profile/${torque.test.profile}/build.properties" />
-    <property file="../profile/${torque.test.profile}/project.properties" />
-    
-    <delete dir="target/sql" />
-    <copy todir="${torque.schema.dir}">
-      <fileset dir="src/schema">
-        <include name="*" />
-      </fileset>
-      <filterset>
-        <filter token="DATABASE_DEFAULT" value="${torque.project}"/>
-        <filter token="DATABASE_ID_METHOD" value="${torque.test.base.idMethod}"/> 
-      </filterset>
-    </copy>
-    <copy todir="${torque.test.sql2xml.dir}">
-      <fileset dir="src/sql" />
-    </copy>
-  </goal>
-
-
-  <goal name="torque-test:pre-test"
-      prereqs="torque-test:prepare"
-      description="creates the docs, fills the database and creates om classes">
-    <attainGoal name="torque:doc"/>
-    <attainGoal name="torque:create-db"/>
-    <attainGoal name="torque:sql"/>
-    <attainGoal name="torque:id-table-init-sql"/>
-    <attainGoal name="torque:insert-sql"/>
-    <attainGoal name="torque:om"/>
-
-    <mkdir dir="${torque.test.compile.dir}" />
-    <javac
-      debug="${torque.compile.debug}"
-      deprecation="${torque.compile.deprecation}"
-      destdir="${torque.test.compile.dir}"
-      optimize="${torque.compile.optimize}"
-      srcdir="${torque.test.junit.src.dir}">
-      <include name="**/TestInterface.java" />
-      <classpath refid="maven.dependency.classpath"/>
-    </javac>
-
-    <javac
-      debug="${torque.compile.debug}"
-      deprecation="${torque.compile.deprecation}"
-      destdir="${torque.test.compile.dir}"
-      optimize="${torque.compile.optimize}"
-      srcdir="${torque.java.dir}">
-      <classpath>
-        <pathelement location="${torque.test.compile.dir}"/>
-        <path refid="maven.dependency.classpath"/>
-      </classpath>
-    </javac>
-
-    <javac
-      debug="${torque.compile.debug}"
-      deprecation="${torque.compile.deprecation}"
-      destdir="${torque.test.compile.dir}"
-      optimize="${torque.compile.optimize}"
-      srcdir="${torque.test.junit.src.dir}">
-      <include name="**/*Test.java" />
-
-      <j:set var="managers" value="${torque.useManagers}"/>
-      <j:if test="${managers == 'true'}">
-        <include name="**/ManagerTestConditional.java"/>
-      </j:if>
-      <j:set var="beans" value="${torque.generateBeans}"/>
-      <j:if test="${beans == 'true'}">
-        <include name="**/BeanTestConditional.java"/>
-      </j:if>
-      <j:set var="complex" value="${torque.complexObjectModel}"/>
-      <j:if test="${complex == 'true'}">
-        <j:set var="caching" value="${torque.objectIsCaching}"/>
-        <j:if test="${caching == 'true'}">
-          <include name="**/CopyTestConditional.java"/>
-        </j:if>
-      </j:if>
-      <classpath>
-        <pathelement location="${torque.test.compile.dir}"/>
-        <path refid="maven.dependency.classpath"/>
-      </classpath>
-    </javac>
-  </goal>
-
-  <postGoal name="torque-test:pre-test">
-    <j:set var="managers" value="${torque.useManagers}"/>
-    <j:if test="${managers == 'true'}">
-      <copy todir="${torque.test.compile.dir}">
-        <fileset dir="${torque.test.junit.src.dir}">
-          <include name="cache.ccf"/>
-        </fileset>
-      </copy>
-    </j:if>
-
-    <copy todir="${torque.test.compile.dir}">
-      <fileset dir="src/logging">
-        <include name="*"/>
-      </fileset>
-    </copy>
-  </postGoal>  
-
-  <goal name="torque-test:test"
-      prereqs="torque-test:pre-test"
-      description="run the tests for the om classes">
-    <taskdef
-      name="junit"
-      classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" />      
-    
-    <mkdir dir="${torque.test.log.dir}" />
-    <mkdir dir="${torque.test.junit.report.dir}" />
-
-    <echo>UseManagers is ${torque.useManagers}</echo>
-    <echo>GenerateBeans is ${torque.generateBeans}</echo>
-    <echo>ComplexObjectModel is ${torque.complexObjectModel}</echo>
-    <echo>ObjectIsCaching is ${torque.objectIsCaching}</echo>
-
-    <junit printsummary="no" haltonfailure="yes" fork="true">
-      <sysproperty 
-        key="torque.configuration.file" 
-        value="../profile/${torque.test.profile}/Torque.properties" />
-      <classpath>
-        <pathelement location="${torque.test.compile.dir}"/>
-        <path refid="maven.dependency.classpath"/>
-      </classpath>
-
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-
-      <batchtest todir="${torque.test.junit.report.dir}">
-        <fileset dir="${torque.test.junit.src.dir}">
-          <j:set var="managers" value="${torque.useManagers}"/>
-          <j:if test="${managers == 'true'}">
-            <include name="**/ManagerTestConditional.java"/>
-          </j:if>
-          <j:set var="beans" value="${torque.generateBeans}"/>
-          <j:if test="${beans == 'true'}">
-            <include name="**/BeanTestConditional.java"/>
-          </j:if>
-          <j:set var="complex" value="${torque.complexObjectModel}"/>
-          <j:if test="${complex == 'true'}">
-            <j:set var="caching" value="${torque.objectIsCaching}"/>
-            <j:if test="${caching == 'true'}">
-              <include name="**/CopyTestConditional.java"/>
-            </j:if>
-          </j:if>
-          <include name="**/*Test.java"/>
-          <exclude name="**/test/**/*.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </goal>
-  
-  
-  <goal name="torque-test:post-test"
-      description="tests tasks needing a filled database">
-    <attainGoal name="torque:datadtd"/>
-    <attainGoal name="torque:datadump"/>
-    
-    <!-- copy files generated by torque:datadump and torque:datadtd
-         to directory where it can be read by torque:datasql -->
-    <copy file="${torque.output.dir}/bookstore-bookstore-all-data.xml"
-      toFile="${torque.schema.dir}/bookstore-data.xml" />
-    <copy file="${torque.output.dir}/bookstore-data.dtd"
-      toDir="${torque.schema.dir}" />
-      
-    <attainGoal name="torque:datasql"/>
-    <attainGoal name="torque:jdbc"/>
-  </goal>
-  
-  <goal
-    name="torque-test:install" 
-    description="Builds and installs all Torque subprojects to the local repository">
-    <maven:reactor
-      basedir="../.."
-      includes="templates/project.xml,generator/project.xml,runtime/project.xml"
-      excludes=""
-      goals="jar:install"
-      ignoreFailures="false"
-    />
-    <maven:reactor
-      basedir="../.."
-      includes="maven-plugin/project.xml"
-      excludes=""
-      goals="plugin:install-now"
-      ignoreFailures="false"
-    />  
-  </goal>
-
-  <goal name="torque-test:install-run" 
-      description="Builds and installs all Torque components and run the test project"
-      prereqs="torque-test:install">
-    <attainGoal name="torque-test:run" />
-  </goal>
-
-  <goal 
-      name="torque-test:clean" 
-      description="clean all subproject affected by the test">
-    <maven:reactor
-      basedir="../.."
-      includes="templates/project.xml,generator/project.xml,runtime/project.xml,maven-plugin/project.xml"
-      excludes=""
-      goals="clean"
-      ignoreFailures="false"
-    />  
-    <attainGoal name="clean" />
-  </goal>
-
-  <goal name="torque-test:clean-install-run" 
-      description="Cleans, Builds and installs all Torque components and run the test project"
-      prereqs="torque-test:clean">
-    <attainGoal name="torque-test:install-run" />
-  </goal>
-
-</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.
+-->
+
+<!-- ======================================================================== -->
+<!--                                                                          -->
+<!--  maven Buildfile for the test project                                    -->
+<!--  Defines the goals for running the tests                                 -->
+<!--                                                                          -->
+<!-- $Id$ -->
+<!--                                                                          -->
+<!-- ======================================================================== -->
+
+<project
+  xmlns:j="jelly:core"
+  xmlns:maven="jelly:maven"
+  default="torque-test:run">
+
+  <goal name="torque-test:run" description="builds and runs the test project">
+    <attainGoal name="torque-test:test"/>
+    <attainGoal name="torque-test:post-test"/>
+  </goal>
+
+
+  <goal name="torque-test:prepare"
+      description="copies resources and clears garbage from old tests">
+
+    <property file="../profile/${torque.test.profile}/build.properties" />
+    <property file="../profile/${torque.test.profile}/project.properties" />
+    
+    <delete dir="target/sql" />
+    <copy todir="${torque.schema.dir}">
+      <fileset dir="src/schema">
+        <include name="*" />
+      </fileset>
+      <filterset>
+        <filter token="DATABASE_DEFAULT" value="${torque.project}"/>
+        <filter token="DATABASE_ID_METHOD" value="${torque.test.base.idMethod}"/> 
+      </filterset>
+    </copy>
+    <copy todir="${torque.test.sql2xml.dir}">
+      <fileset dir="src/sql" />
+    </copy>
+  </goal>
+
+
+  <goal name="torque-test:pre-test"
+      prereqs="torque-test:prepare"
+      description="creates the docs, fills the database and creates om classes">
+    <attainGoal name="torque:doc"/>
+    <attainGoal name="torque:create-db"/>
+    <attainGoal name="torque:sql"/>
+    <attainGoal name="torque:id-table-init-sql"/>
+    <attainGoal name="torque:insert-sql"/>
+    <attainGoal name="torque:om"/>
+
+    <mkdir dir="${torque.test.compile.dir}" />
+    <javac
+      debug="${torque.compile.debug}"
+      deprecation="${torque.compile.deprecation}"
+      destdir="${torque.test.compile.dir}"
+      optimize="${torque.compile.optimize}"
+      srcdir="${torque.test.junit.src.dir}">
+      <include name="**/TestInterface.java" />
+      <classpath refid="maven.dependency.classpath"/>
+    </javac>
+
+    <javac
+      debug="${torque.compile.debug}"
+      deprecation="${torque.compile.deprecation}"
+      destdir="${torque.test.compile.dir}"
+      optimize="${torque.compile.optimize}"
+      srcdir="${torque.java.dir}">
+      <classpath>
+        <pathelement location="${torque.test.compile.dir}"/>
+        <path refid="maven.dependency.classpath"/>
+      </classpath>
+    </javac>
+
+    <javac
+      debug="${torque.compile.debug}"
+      deprecation="${torque.compile.deprecation}"
+      destdir="${torque.test.compile.dir}"
+      optimize="${torque.compile.optimize}"
+      srcdir="${torque.test.junit.src.dir}">
+      <include name="**/*Test.java" />
+
+      <j:set var="managers" value="${torque.useManagers}"/>
+      <j:if test="${managers == 'true'}">
+        <include name="**/ManagerTestConditional.java"/>
+      </j:if>
+      <j:set var="beans" value="${torque.generateBeans}"/>
+      <j:if test="${beans == 'true'}">
+        <include name="**/BeanTestConditional.java"/>
+      </j:if>
+      <j:set var="complex" value="${torque.complexObjectModel}"/>
+      <j:if test="${complex == 'true'}">
+        <j:set var="caching" value="${torque.objectIsCaching}"/>
+        <j:if test="${caching == 'true'}">
+          <include name="**/CopyTestConditional.java"/>
+        </j:if>
+      </j:if>
+      <classpath>
+        <pathelement location="${torque.test.compile.dir}"/>
+        <path refid="maven.dependency.classpath"/>
+      </classpath>
+    </javac>
+  </goal>
+
+  <postGoal name="torque-test:pre-test">
+    <j:set var="managers" value="${torque.useManagers}"/>
+    <j:if test="${managers == 'true'}">
+      <copy todir="${torque.test.compile.dir}">
+        <fileset dir="${torque.test.junit.src.dir}">
+          <include name="cache.ccf"/>
+        </fileset>
+      </copy>
+    </j:if>
+
+    <copy todir="${torque.test.compile.dir}">
+      <fileset dir="src/logging">
+        <include name="*"/>
+      </fileset>
+    </copy>
+  </postGoal>  
+
+  <goal name="torque-test:test"
+      prereqs="torque-test:pre-test"
+      description="run the tests for the om classes">
+    <taskdef
+      name="junit"
+      classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" />      
+    
+    <mkdir dir="${torque.test.log.dir}" />
+    <mkdir dir="${torque.test.junit.report.dir}" />
+
+    <echo>UseManagers is ${torque.useManagers}</echo>
+    <echo>GenerateBeans is ${torque.generateBeans}</echo>
+    <echo>ComplexObjectModel is ${torque.complexObjectModel}</echo>
+    <echo>ObjectIsCaching is ${torque.objectIsCaching}</echo>
+
+    <junit printsummary="no" haltonfailure="yes" fork="true">
+      <sysproperty 
+        key="torque.configuration.file" 
+        value="../profile/${torque.test.profile}/Torque.properties" />
+      <classpath>
+        <pathelement location="${torque.test.compile.dir}"/>
+        <path refid="maven.dependency.classpath"/>
+      </classpath>
+
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+
+      <batchtest todir="${torque.test.junit.report.dir}">
+        <fileset dir="${torque.test.junit.src.dir}">
+          <j:set var="managers" value="${torque.useManagers}"/>
+          <j:if test="${managers == 'true'}">
+            <include name="**/ManagerTestConditional.java"/>
+          </j:if>
+          <j:set var="beans" value="${torque.generateBeans}"/>
+          <j:if test="${beans == 'true'}">
+            <include name="**/BeanTestConditional.java"/>
+          </j:if>
+          <j:set var="complex" value="${torque.complexObjectModel}"/>
+          <j:if test="${complex == 'true'}">
+            <j:set var="caching" value="${torque.objectIsCaching}"/>
+            <j:if test="${caching == 'true'}">
+              <include name="**/CopyTestConditional.java"/>
+            </j:if>
+          </j:if>
+          <include name="**/*Test.java"/>
+          <exclude name="**/test/**/*.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </goal>
+  
+  
+  <goal name="torque-test:post-test"
+      description="tests tasks needing a filled database">
+    <attainGoal name="torque:datadtd"/>
+    <attainGoal name="torque:datadump"/>
+    
+    <!-- copy files generated by torque:datadump and torque:datadtd
+         to directory where it can be read by torque:datasql -->
+    <copy file="${torque.output.dir}/bookstore-bookstore-all-data.xml"
+      toFile="${torque.schema.dir}/bookstore-data.xml" />
+    <copy file="${torque.output.dir}/bookstore-data.dtd"
+      toDir="${torque.schema.dir}" />
+      
+    <attainGoal name="torque:datasql"/>
+    <attainGoal name="torque:jdbc"/>
+  </goal>
+  
+  <goal
+    name="torque-test:install" 
+    description="Builds and installs all Torque subprojects to the local repository">
+    <maven:reactor
+      basedir="../.."
+      includes="templates/project.xml,generator/project.xml,runtime/project.xml"
+      excludes=""
+      goals="jar:install"
+      ignoreFailures="false"
+    />
+    <maven:reactor
+      basedir="../.."
+      includes="maven-plugin/project.xml"
+      excludes=""
+      goals="plugin:install-now"
+      ignoreFailures="false"
+    />  
+  </goal>
+
+  <goal name="torque-test:install-run" 
+      description="Builds and installs all Torque components and run the test project"
+      prereqs="torque-test:install">
+    <attainGoal name="torque-test:run" />
+  </goal>
+
+  <goal 
+      name="torque-test:clean" 
+      description="clean all subproject affected by the test">
+    <maven:reactor
+      basedir="../.."
+      includes="templates/project.xml,generator/project.xml,runtime/project.xml,maven-plugin/project.xml"
+      excludes=""
+      goals="clean"
+      ignoreFailures="false"
+    />  
+    <attainGoal name="clean" />
+  </goal>
+
+  <goal name="torque-test:clean-install-run" 
+      description="Cleans, Builds and installs all Torque components and run the test project"
+      prereqs="torque-test:clean">
+    <attainGoal name="torque-test:install-run" />
+  </goal>
+
+</project>

Modified: db/torque/test/trunk/test-project/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/pom.xml?view=diff&rev=473825&r1=473824&r2=473825
==============================================================================
--- db/torque/test/trunk/test-project/pom.xml (original)
+++ db/torque/test/trunk/test-project/pom.xml Sat Nov 11 14:44:23 2006
@@ -1,175 +1,193 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.db.torque</groupId>
-    <artifactId>torque</artifactId>
-    <version>3.2.1-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>torque-test-project</artifactId>
-  <packaging>jar</packaging>
-  <name>Torque Test Project</name>
-
-  <dependencies>
-    <dependency>
-      <artifactId>junit</artifactId>
-      <groupId>junit</groupId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <artifactId>runtime</artifactId>
-      <groupId>org.apache.db.torque</groupId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <!-- needed for SQLToAppDataRuntimeTest -->
-      <artifactId>generator</artifactId>
-      <groupId>org.apache.db.torque</groupId>
-      <version>${project.version}</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>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <artifactId>naming-java</artifactId>
-      <groupId>tomcat</groupId>
-      <version>5.0.28</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <artifactId>${torque.test.driver.artifactId}</artifactId>
-      <groupId>${torque.test.driver.groupId}</groupId>
-      <version>${torque.test.driver.version}</version>
-      <scope>test</scope>
-    </dependency>
-    
-  </dependencies>
-
-  <build>
-    <testSourceDirectory>src/java</testSourceDirectory>
-    <testResources>
-      <testResource>
-        <directory>src/java</directory>
-        <includes>
-          <include>*.ccf</include>
-        </includes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <configuration>
-              <tasks>
-                <copy todir="target/torque/test/schema">
-                  <fileset dir="src/schema">
-                    <include name="*" />
-                  </fileset>
-                  <filterset>
-                    <filter token="DATABASE_DEFAULT" value="bookstore"/>
-                    <filter token="DATABASE_ID_METHOD" value="${torque.test.idmethod}"/> 
-                  </filterset>
-                </copy>
-                <delete dir="target/torque/test/sql" />
-                <copy todir="target/torque/test/sql">
-                  <fileset dir="src/sql" />
-                </copy>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.db.torque</groupId>
-        <artifactId>torque-maven-plugin</artifactId>
-        <configuration>
-          <schemaDir>target/torque/test/schema</schemaDir>
-          <targetDatabase>${torque.targetDatabase}</targetDatabase>
-          <targetPackage>org.apache.torque.test</targetPackage>
-          <useManagers>${torque.useManagers}</useManagers>
-          <generateBeans>${torque.generateBeans}</generateBeans>
-          <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
-          <driver>${torque.driver}</driver>
-          <url>${torque.database.url}</url>
-          <user>${torque.database.user}</user>
-          <password>${torque.database.password}</password>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>om</goal>
-              <goal>sql</goal>
-              <goal>sqlExec</goal>
-              <goal>documentation</goal>
-              <goal>datadump</goal>
-              <goal>datasql</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <artifactId>${torque.test.driver.artifactId}</artifactId>
-            <groupId>${torque.test.driver.groupId}</groupId>
-            <version>${torque.test.driver.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/*Test.java</include>
-            <include>**/${torque.test.include.beans}</include>
-            <include>**/${torque.test.include.managers}</include>
-          </includes>
-          <excludes>
-            <exclude>**/BaseRuntimeTestCase.java</exclude>
-          </excludes>
-          <forkMode>pertest</forkMode>
-          <systemProperties>
-            <property>
-              <name>torque.configuration.file</name>
-              <value>../profile/${torque.test.profileDirectory}/Torque.properties</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>      
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <testIncludes>
-            <include>**/*Test.java</include>
-            <include>**/*TestCase.java</include>
-            <include>**/${torque.test.include.beans}</include>
-            <include>**/${torque.test.include.managers}</include>
-          </testIncludes>
-        </configuration>
-      </plugin>      
-    </plugins>
-  </build>
-</project>
+<!--
+ 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"?>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.db.torque</groupId>
+    <artifactId>torque</artifactId>
+    <version>3.2.1-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>torque-test-project</artifactId>
+  <packaging>jar</packaging>
+  <name>Torque Test Project</name>
+
+  <dependencies>
+    <dependency>
+      <artifactId>junit</artifactId>
+      <groupId>junit</groupId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <artifactId>runtime</artifactId>
+      <groupId>org.apache.db.torque</groupId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <!-- needed for SQLToAppDataRuntimeTest -->
+      <artifactId>generator</artifactId>
+      <groupId>org.apache.db.torque</groupId>
+      <version>${project.version}</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>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <artifactId>naming-java</artifactId>
+      <groupId>tomcat</groupId>
+      <version>5.0.28</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <artifactId>${torque.test.driver.artifactId}</artifactId>
+      <groupId>${torque.test.driver.groupId}</groupId>
+      <version>${torque.test.driver.version}</version>
+      <scope>test</scope>
+    </dependency>
+    
+  </dependencies>
+
+  <build>
+    <testSourceDirectory>src/java</testSourceDirectory>
+    <testResources>
+      <testResource>
+        <directory>src/java</directory>
+        <includes>
+          <include>*.ccf</include>
+        </includes>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <configuration>
+              <tasks>
+                <copy todir="target/torque/test/schema">
+                  <fileset dir="src/schema">
+                    <include name="*" />
+                  </fileset>
+                  <filterset>
+                    <filter token="DATABASE_DEFAULT" value="bookstore"/>
+                    <filter token="DATABASE_ID_METHOD" value="${torque.test.idmethod}"/> 
+                  </filterset>
+                </copy>
+                <delete dir="target/torque/test/sql" />
+                <copy todir="target/torque/test/sql">
+                  <fileset dir="src/sql" />
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.db.torque</groupId>
+        <artifactId>torque-maven-plugin</artifactId>
+        <configuration>
+          <schemaDir>target/torque/test/schema</schemaDir>
+          <targetDatabase>${torque.targetDatabase}</targetDatabase>
+          <targetPackage>org.apache.torque.test</targetPackage>
+          <useManagers>${torque.useManagers}</useManagers>
+          <generateBeans>${torque.generateBeans}</generateBeans>
+          <runOnlyOnSchemaChange>false</runOnlyOnSchemaChange>
+          <driver>${torque.driver}</driver>
+          <url>${torque.database.url}</url>
+          <user>${torque.database.user}</user>
+          <password>${torque.database.password}</password>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>om</goal>
+              <goal>sql</goal>
+              <goal>sqlExec</goal>
+              <goal>documentation</goal>
+              <goal>datadump</goal>
+              <goal>datasql</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <artifactId>${torque.test.driver.artifactId}</artifactId>
+            <groupId>${torque.test.driver.groupId}</groupId>
+            <version>${torque.test.driver.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/*Test.java</include>
+            <include>**/${torque.test.include.beans}</include>
+            <include>**/${torque.test.include.managers}</include>
+          </includes>
+          <excludes>
+            <exclude>**/BaseRuntimeTestCase.java</exclude>
+          </excludes>
+          <forkMode>pertest</forkMode>
+          <systemProperties>
+            <property>
+              <name>torque.configuration.file</name>
+              <value>../profile/${torque.test.profileDirectory}/Torque.properties</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>      
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <testIncludes>
+            <include>**/*Test.java</include>
+            <include>**/*TestCase.java</include>
+            <include>**/${torque.test.include.beans}</include>
+            <include>**/${torque.test.include.managers}</include>
+          </testIncludes>
+        </configuration>
+      </plugin>      
+    </plugins>
+  </build>
+</project>



---------------------------------------------------------------------
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