db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1421181 - in /db/torque/torque4/trunk/torque-test: pom.xml profiles.xml src/test/profile/mssql/Torque.properties src/test/profile/mysql/Torque.properties
Date Thu, 13 Dec 2012 10:02:40 GMT
Author: tfischer
Date: Thu Dec 13 10:02:38 2012
New Revision: 1421181

URL: http://svn.apache.org/viewvc?rev=1421181&view=rev
Log:
Move profiles to pom.xml
make test project pom parseable without profile

Removed:
    db/torque/torque4/trunk/torque-test/profiles.xml
Modified:
    db/torque/torque4/trunk/torque-test/pom.xml
    db/torque/torque4/trunk/torque-test/src/test/profile/mssql/Torque.properties
    db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties

Modified: db/torque/torque4/trunk/torque-test/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/pom.xml?rev=1421181&r1=1421180&r2=1421181&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/pom.xml (original)
+++ db/torque/torque4/trunk/torque-test/pom.xml Thu Dec 13 10:02:38 2012
@@ -64,14 +64,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!--  db driver -->
-    <dependency>
-      <artifactId>${torque.test.driver.artifactId}</artifactId>
-      <groupId>${torque.test.driver.groupId}</groupId>
-      <version>${torque.test.driver.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <!-- avalon -->
     <dependency>
       <groupId>avalon-framework</groupId>
@@ -305,12 +297,12 @@
             <artifactId>torque-templates</artifactId>
             <version>${project.version}</version>
           </dependency>
-          <dependency>
-            <!-- for jdbc2schema only -->
+          <!-- for generate-schema-from-jdbc only -->
+          <!-- dependency>
             <groupId>${torque.test.driver.groupId}</groupId>
             <artifactId>${torque.test.driver.artifactId}</artifactId>
             <version>${torque.test.driver.version}</version>
-          </dependency>
+          </dependency-->
         </dependencies>
       </plugin>
 
@@ -388,13 +380,6 @@
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>${torque.test.driver.groupId}</groupId>
-            <artifactId>${torque.test.driver.artifactId}</artifactId>
-            <version>${torque.test.driver.version}</version>
-          </dependency>
-        </dependencies>
       </plugin>
 
       <plugin>
@@ -487,9 +472,6 @@
       <properties>
         <torque.test.profileDirectory>derbyEmbedded</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.8.2.2</torque.test.driver.version>
         <torque.test.databaseSchema>bookstore</torque.test.databaseSchema>
         <torque.driver>org.apache.derby.jdbc.EmbeddedDriver</torque.driver>
         <torque.targetDatabase>derby</torque.targetDatabase>
@@ -499,6 +481,29 @@
         <torque.database.shutdown.url>jdbc:derby:target/bookstore;shutdown=true</torque.database.shutdown.url>
         <torque.database.shutdown.skip>false</torque.database.shutdown.skip>
       </properties>
+      <dependencies>
+        <dependency>
+          <artifactId>derby</artifactId>
+          <groupId>org.apache.derby</groupId>
+          <version>10.8.2.2</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>sql-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <artifactId>derby</artifactId>
+                <groupId>org.apache.derby</groupId>
+                <version>10.8.2.2</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
     
     <profile>
@@ -513,9 +518,6 @@
       <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>org.hsqldb</torque.test.driver.groupId>
-        <torque.test.driver.version>2.2.8</torque.test.driver.version>
         <torque.driver>org.hsqldb.jdbcDriver</torque.driver>
         <torque.targetDatabase>hsqldb</torque.targetDatabase>
         <torque.database.url>jdbc:hsqldb:target/sqltest;shutdown=true</torque.database.url>
@@ -524,7 +526,31 @@
         <torque.database.shutdown.url>none</torque.database.shutdown.url>
         <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
       </properties>
+      <dependencies>
+        <dependency>
+          <artifactId>hsqldb</artifactId>
+          <groupId>org.hsqldb</groupId>
+          <version>2.2.8</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>sql-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <artifactId>hsqldb</artifactId>
+                <groupId>org.hsqldb</groupId>
+                <version>2.2.8</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
+
     <profile>
       <!-- 
         hsqldb profile with beans and managers. Can only be run from
@@ -538,9 +564,6 @@
       <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>org.hsqldb</torque.test.driver.groupId>
-        <torque.test.driver.version>2.2.8</torque.test.driver.version>
         <torque.test.databaseSchema>torque_schema</torque.test.databaseSchema>
         <torque.driver>org.hsqldb.jdbcDriver</torque.driver>
         <torque.targetDatabase>hsqldb</torque.targetDatabase>
@@ -550,6 +573,304 @@
         <torque.database.shutdown.url>none</torque.database.shutdown.url>
         <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
       </properties>
+      <dependencies>
+        <dependency>
+          <artifactId>hsqldb</artifactId>
+          <groupId>org.hsqldb</groupId>
+          <version>2.2.8</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>sql-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <artifactId>hsqldb</artifactId>
+                <groupId>org.hsqldb</groupId>
+                <version>2.2.8</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </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.databaseSchema>bookstore</torque.test.databaseSchema>
+        <torque.driver>org.apache.derby.jdbc.ClientDriver</torque.driver>
+        <torque.targetDatabase>derby</torque.targetDatabase>
+        <torque.database.url>jdbc:derby://localhost:1527/bookstore;create=true</torque.database.url>
+        <torque.database.user>SA</torque.database.user>
+        <torque.database.password>SA</torque.database.password>
+        <torque.database.shutdown.url>none</torque.database.shutdown.url>
+        <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
+      </properties>
+      <dependencies>
+        <dependency>
+          <artifactId>derbyclient</artifactId>
+          <groupId>org.apache.derby</groupId>
+          <version>10.8.2.2</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>sql-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <artifactId>derbyclient</artifactId>
+                <groupId>org.apache.derby</groupId>
+                <version>10.8.2.2</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>mysql</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>mysql</torque.test.profileDirectory>
+        <torque.test.idmethod>native</torque.test.idmethod>
+        <torque.test.databaseSchema>bookstore</torque.test.databaseSchema>
+        <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>
+        <torque.database.shutdown.url>none</torque.database.shutdown.url>
+        <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
+      </properties>
+      <dependencies>
+        <dependency>
+          <artifactId>mysql-connector-java</artifactId>
+          <groupId>mysql</groupId>
+          <version>5.0.4</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>sql-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <artifactId>mysql-connector-java</artifactId>
+                <groupId>mysql</groupId>
+                <version>5.0.4</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
+    <profile>
+      <id>mssql</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <torque.test.profileDirectory>mssql</torque.test.profileDirectory>
+        <torque.test.idmethod>native</torque.test.idmethod>
+        <torque.test.databaseSchema>torque_schema</torque.test.databaseSchema>
+        <torque.driver>net.sourceforge.jtds.jdbc.Driver</torque.driver>
+        <torque.targetDatabase>mssql</torque.targetDatabase>
+        <torque.database.url>jdbc:jtds:sqlserver://localhost:1433/torque</torque.database.url>
+        <torque.database.user>torque</torque.database.user>
+        <torque.database.password></torque.database.password>
+        <torque.database.shutdown.url>none</torque.database.shutdown.url>
+        <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
+      </properties>
+      <dependencies>
+        <dependency>
+          <artifactId>jtds</artifactId>
+          <groupId>net.sourceforge.jtds</groupId>
+          <version>1.2.4</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>sql-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <artifactId>jtds</artifactId>
+                <groupId>net.sourceforge.jtds</groupId>
+                <version>1.2.4</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
     </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.databaseSchema>torque</torque.test.databaseSchema>
+        <torque.driver>oracle.jdbc.driver.OracleDriver</torque.driver>
+        <torque.targetDatabase>oracle</torque.targetDatabase>
+        <torque.database.url>jdbc:oracle:thin:@localhost:1521:XE</torque.database.url>
+        <torque.database.user>torque</torque.database.user>
+        <torque.database.password></torque.database.password>
+        <torque.database.shutdown.url>none</torque.database.shutdown.url>
+        <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
+      </properties>
+      <dependencies>
+        <dependency>
+          <artifactId>ojdbc14</artifactId>
+          <groupId>com.oracle</groupId>
+          <version>10.2.0.3.0</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>sql-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <artifactId>ojdbc14</artifactId>
+                <groupId>com.oracle</groupId>
+                <version>10.2.0.3.0</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </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.databaseSchema>bookstore</torque.test.databaseSchema>
+        <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>
+        <torque.database.shutdown.url>none</torque.database.shutdown.url>
+        <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
+      </properties>
+      <dependencies>
+        <dependency>
+          <artifactId>postgresql</artifactId>
+          <groupId>postgresql</groupId>
+          <version>9.1-901.jdbc4</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>sql-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <artifactId>postgresql</artifactId>
+                <groupId>postgresql</groupId>
+                <version>9.1-901.jdbc4</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </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.databaseSchema>bookstore</torque.test.databaseSchema>
+        <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>
+        <torque.database.shutdown.url>none</torque.database.shutdown.url>
+        <torque.database.shutdown.skip>true</torque.database.shutdown.skip>
+      </properties>
+      <dependencies>
+        <dependency>
+          <artifactId>mysql-connector-java</artifactId>
+          <groupId>mysql</groupId>
+          <version>3.1.12</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>sql-maven-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <artifactId>mysql-connector-java</artifactId>
+                <groupId>mysql</groupId>
+                <version>3.1.12</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </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>
 </project>

Modified: db/torque/torque4/trunk/torque-test/src/test/profile/mssql/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/mssql/Torque.properties?rev=1421181&r1=1421180&r2=1421181&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/profile/mssql/Torque.properties (original)
+++ db/torque/torque4/trunk/torque-test/src/test/profile/mssql/Torque.properties Thu Dec 13
10:02:38 2012
@@ -27,9 +27,9 @@ torque.database.bookstore.adapter = mssq
 # Using commons-dbcp
 torque.dsfactory.bookstore.factory = org.apache.torque.dsfactory.SharedPoolDataSourceFactory
 torque.dsfactory.bookstore.connection.driver = net.sourceforge.jtds.jdbc.Driver
-torque.dsfactory.bookstore.connection.url = jdbc:jtds:sqlserver://fastnet.dukece.com:1433/bookstore
-torque.dsfactory.bookstore.connection.user =  sa
-torque.dsfactory.bookstore.connection.password =
+torque.dsfactory.bookstore.connection.url = jdbc:jtds:sqlserver://localhost:49584/bookstore
+torque.dsfactory.bookstore.connection.user =  torque
+torque.dsfactory.bookstore.connection.password = torqueUserPassword
 
 torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
 torque.dsfactory.bookstore.pool.defaultAutoCommit = false

Modified: db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties?rev=1421181&r1=1421180&r2=1421181&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties (original)
+++ db/torque/torque4/trunk/torque-test/src/test/profile/mysql/Torque.properties Thu Dec 13
10:02:38 2012
@@ -29,7 +29,7 @@ torque.dsfactory.bookstore.factory = org
 torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
 torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/bookstore
 torque.dsfactory.bookstore.connection.user = root
-torque.dsfactory.bookstore.connection.password = 
+torque.dsfactory.bookstore.connection.password = mysql
 
 torque.dsfactory.bookstore.pool.validationQuery = SELECT 1
 torque.dsfactory.bookstore.pool.defaultAutoCommit = false



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