portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r377504 - in /portals/jetspeed-2/trunk: components/pom.xml etc/build.xml pom.xml
Date Mon, 13 Feb 2006 21:49:27 GMT
Author: rwatler
Date: Mon Feb 13 13:49:26 2006
New Revision: 377504

URL: http://svn.apache.org/viewcvs?rev=377504&view=rev
Log:
Maven2 cleanup: sql import corrections, jdbc-stdext group fixes

Modified:
    portals/jetspeed-2/trunk/components/pom.xml
    portals/jetspeed-2/trunk/etc/build.xml
    portals/jetspeed-2/trunk/pom.xml

Modified: portals/jetspeed-2/trunk/components/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/pom.xml?rev=377504&r1=377503&r2=377504&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/pom.xml Mon Feb 13 13:49:26 2006
@@ -184,6 +184,12 @@
             <artifactId>tyrex</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--
+            TODO: this dependency is causing POM validation errors when
+            the applications and components are pulled out of the maven2
+            repository... a better solution needs to be found to include
+            the jdbc drivers into the test builds.
+        -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>org.apache.jetspeed.test.jdbc.drivers.path</artifactId>

Modified: portals/jetspeed-2/trunk/etc/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/build.xml?rev=377504&r1=377503&r2=377504&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/build.xml (original)
+++ portals/jetspeed-2/trunk/etc/build.xml Mon Feb 13 13:49:26 2006
@@ -30,8 +30,7 @@
 
     <property name="org.apache.jetspeed.source.sql" value="${basedir}/sql"/>
     <property name="org.apache.jetspeed.database.source.sql" value="${org.apache.jetspeed.source.sql}/${org.apache.jetspeed.database.default.name}"/>
-    <property name="org.apache.jetspeed.target.sql" value="${basedir}/target/sql"/>
-    <property name="org.apache.jetspeed.database.target.sql" value="${org.apache.jetspeed.target.sql}/${org.apache.jetspeed.database.default.name}"/>
+    <property name="org.apache.jetspeed.database.target.sql" value="${basedir}/target/sql/${org.apache.jetspeed.database.default.name}"/>
 
     <property name="torque.contextProperties" value=""/>
     <property name="torque.runOnlyOnSchemaChange" value="true"/>
@@ -72,7 +71,7 @@
         <mkdir dir="${org.apache.jetspeed.database.target.sql}"/>
 
         <!-- copy general sql -->
-        <copy todir="${org.apache.jetspeed.target.sql}" overwrite="true" flatten="true"
verbose="true" failonerror="false">
+        <copy todir="${org.apache.jetspeed.database.target.sql}" overwrite="true" verbose="true"
failonerror="false">
             <fileset dir="${org.apache.jetspeed.source.sql}">
                 <include name="*.sql"/>
             </fileset>
@@ -250,7 +249,7 @@
 
         <!-- execute drop scripts -->
         <antcall target="sql-execute">
-            <param name="database.arg.scripts.dir" value="${org.apache.jetspeed.target.sql}"/>
+            <param name="database.arg.scripts.dir" value="${org.apache.jetspeed.database.target.sql}"/>
             <param name="database.arg.scripts" value="drop.sql"/>
             <param name="database.arg.onerror" value="continue"/>
         </antcall>
@@ -264,7 +263,7 @@
 
         <!-- execute default population scripts -->
         <antcall target="sql-execute">
-            <param name="database.arg.scripts.dir" value="${org.apache.jetspeed.target.sql}"/>
+            <param name="database.arg.scripts.dir" value="${org.apache.jetspeed.database.target.sql}"/>
             <param name="database.arg.scripts" value="populate-db-default.sql"/>
             <param name="database.arg.onerror" value="abort"/>
         </antcall>
@@ -275,7 +274,7 @@
 
         <!-- execute default userinfo population scripts -->
         <antcall target="sql-execute">
-            <param name="database.arg.scripts.dir" value="${org.apache.jetspeed.target.sql}"/>
+            <param name="database.arg.scripts.dir" value="${org.apache.jetspeed.database.target.sql}"/>
             <param name="database.arg.scripts" value="populate-userinfo-for-default-psml.sql"/>
             <param name="database.arg.onerror" value="abort"/>
         </antcall>

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=377504&r1=377503&r2=377504&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Mon Feb 13 13:49:26 2006
@@ -93,9 +93,9 @@
         <javax.mail.version>1.3.3</javax.mail.version>
         <javax.servlet.jstl.version>1.0.6</javax.servlet.jstl.version>
         <javax.servlet.version>2.3</javax.servlet.version>
+        <javax.sql.version>2.0</javax.sql.version>
         <javax.transaction.version>1.0.1B</javax.transaction.version>
         <jaxen.version>1.0-FCS-full</jaxen.version>
-        <jdbc.version>2.0</jdbc.version>
         <jdom.version>1.0</jdom.version>
         <jmock.version>1.0.1</jmock.version>
         <junit.version>3.8.1</junit.version>
@@ -648,9 +648,9 @@
                 <version>${javax.transaction.version}</version>
             </dependency>
             <dependency>
-                <groupId>jdbc</groupId>
+                <groupId>javax.sql</groupId>
                 <artifactId>jdbc-stdext</artifactId>
-                <version>${jdbc-stdext.version}</version>
+                <version>${javax.sql.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
@@ -659,6 +659,14 @@
             </dependency>
 
             <!-- Database Connection -->
+            <!--
+                TODO: this dependency is causing POM validation errors when
+                the applications and components are pulled out of the maven2
+                repository... a better solution needs to be found to include
+                the jdbc drivers into the test builds. The problem is the
+                use of the property in the system path, (dont know why it is
+                such a problem for the POM loader since it is defined).
+            -->
             <dependency>
                 <groupId>${pom.groupId}</groupId>
                 <artifactId>org.apache.jetspeed.test.jdbc.drivers.path</artifactId>



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


Mime
View raw message