portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r376018 - in /portals/jetspeed-2/trunk: ./ components/page-manager/ components/portal/ components/profiler/ components/security/ components/sso/ components/statistics/ components/web-content/ etc/
Date Wed, 08 Feb 2006 18:10:54 GMT
Author: rwatler
Date: Wed Feb  8 10:10:51 2006
New Revision: 376018

URL: http://svn.apache.org/viewcvs?rev=376018&view=rev
Log:
- add maven.test.skip = true setting by default
- bump up httpclient version to 2.0.2 from 2.0 to eliminate old commons-lang version dep
- add conditional execution of test db population
- more misc dep corrections


Modified:
    portals/jetspeed-2/trunk/components/page-manager/pom.xml
    portals/jetspeed-2/trunk/components/portal/pom.xml
    portals/jetspeed-2/trunk/components/profiler/pom.xml
    portals/jetspeed-2/trunk/components/security/pom.xml
    portals/jetspeed-2/trunk/components/sso/pom.xml
    portals/jetspeed-2/trunk/components/statistics/pom.xml
    portals/jetspeed-2/trunk/components/web-content/pom.xml
    portals/jetspeed-2/trunk/etc/build.xml
    portals/jetspeed-2/trunk/etc/pom.xml
    portals/jetspeed-2/trunk/pom.xml

Modified: portals/jetspeed-2/trunk/components/page-manager/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/pom.xml?rev=376018&r1=376017&r2=376018&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/pom.xml Wed Feb  8 10:10:51 2006
@@ -68,8 +68,18 @@
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
 
         <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>etc</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-id-generator</artifactId>

Modified: portals/jetspeed-2/trunk/components/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/pom.xml?rev=376018&r1=376017&r2=376018&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/pom.xml Wed Feb  8 10:10:51 2006
@@ -124,6 +124,12 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>etc</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-statistics</artifactId>
             <scope>test</scope>
         </dependency>

Modified: portals/jetspeed-2/trunk/components/profiler/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/profiler/pom.xml?rev=376018&r1=376017&r2=376018&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/pom.xml Wed Feb  8 10:10:51 2006
@@ -57,6 +57,14 @@
             <artifactId>jetspeed-security</artifactId>
         </dependency>
 
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>etc</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <!-- Project Information -->

Modified: portals/jetspeed-2/trunk/components/security/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/security/pom.xml?rev=376018&r1=376017&r2=376018&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/security/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security/pom.xml Wed Feb  8 10:10:51 2006
@@ -77,6 +77,14 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>etc</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <!-- Build Configuration -->

Modified: portals/jetspeed-2/trunk/components/sso/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/sso/pom.xml?rev=376018&r1=376017&r2=376018&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/pom.xml Wed Feb  8 10:10:51 2006
@@ -57,6 +57,14 @@
             <artifactId>commons-httpclient</artifactId>
         </dependency>
 
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>etc</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <!-- Project Information -->

Modified: portals/jetspeed-2/trunk/components/statistics/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/statistics/pom.xml?rev=376018&r1=376017&r2=376018&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/pom.xml Wed Feb  8 10:10:51 2006
@@ -60,6 +60,12 @@
         <!-- Test Dependencies -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>etc</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-registry</artifactId>
             <scope>test</scope>
         </dependency>

Modified: portals/jetspeed-2/trunk/components/web-content/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/web-content/pom.xml?rev=376018&r1=376017&r2=376018&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/pom.xml Wed Feb  8 10:10:51 2006
@@ -53,6 +53,10 @@
             <artifactId>jetspeed-rewriter</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>portals-bridges-velocity</artifactId>
+        </dependency>
+        <dependency>
             <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
         </dependency>

Modified: portals/jetspeed-2/trunk/etc/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/build.xml?rev=376018&r1=376017&r2=376018&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/build.xml (original)
+++ portals/jetspeed-2/trunk/etc/build.xml Wed Feb  8 10:10:51 2006
@@ -20,6 +20,7 @@
 
     <!-- Properties -->
 
+    <property name="org.apache.jetspeed.database.skip" value="false"/>
     <property name="org.apache.jetspeed.database.default.name" value=""/>
     <property name="org.apache.jetspeed.database.url" value=""/>
     <property name="org.apache.jetspeed.database.jdbc.drivers.path" value=""/>
@@ -53,6 +54,7 @@
         <echo message="    schema - build schema for database."/>
         <echo message="    populate - build and populate database instance."/>
         <echo message="Configuration:"/>
+        <echo message="    org.apache.jetspeed.database.skip=${org.apache.jetspeed.database.skip}"/>
         <echo message="    org.apache.jetspeed.database.default.name=${org.apache.jetspeed.database.default.name}"/>
         <echo message="    org.apache.jetspeed.database.url=${org.apache.jetspeed.database.url}"/>
         <echo message="    org.apache.jetspeed.database.jdbc.drivers.path=${org.apache.jetspeed.database.jdbc.drivers.path}"/>
@@ -243,7 +245,7 @@
 
     <!-- Populate Database -->
 
-    <target name="populate">
+    <target name="populate" depends="populate-skip" unless="org.apache.jetspeed.skip">
 
         <!-- execute drop scripts -->
         <antcall target="sql-execute">
@@ -266,6 +268,12 @@
             <param name="database.arg.onerror" value="abort"/>
         </antcall>
 
+    </target>
+
+    <target name="populate-skip">
+        <condition property="org.apache.jetspeed.skip">
+            <equals arg1="${org.apache.jetspeed.database.skip}" arg2="true"/>
+        </condition>
     </target>
 
     <target name="sql-execute">

Modified: portals/jetspeed-2/trunk/etc/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/pom.xml?rev=376018&r1=376017&r2=376018&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/pom.xml Wed Feb  8 10:10:51 2006
@@ -75,6 +75,8 @@
                         <configuration>
                             <tasks>
                                 <ant target="populate" antfile="build.xml" dir="${basedir}"
inheritall="off">
+                                    <property name="org.apache.jetspeed.database.skip"
+                                              value="${maven.test.skip}"/>
                                     <property name="org.apache.jetspeed.database.default.name"
                                               value="${org.apache.jetspeed.test.database.default.name}"/>
                                     <property name="org.apache.jetspeed.database.url"

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=376018&r1=376017&r2=376018&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Wed Feb  8 10:10:51 2006
@@ -29,6 +29,9 @@
 
     <properties>
 
+        <!-- Build Properties -->
+        <maven.test.skip>true</maven.test.skip>
+
         <!-- Custom Deployment Properties -->
         <org.apache.jetspeed.server.home>/usr/share/tomcat5</org.apache.jetspeed.server.home>
         <org.apache.jetspeed.catalina.version.major>5</org.apache.jetspeed.catalina.version.major>
@@ -68,7 +71,7 @@
         <commons-dbcp.version>1.2.1</commons-dbcp.version>
         <commons-digester.version>1.5</commons-digester.version>
         <commons-fileupload.version>1.0</commons-fileupload.version>
-        <commons-httpclient.version>2.0</commons-httpclient.version>
+        <commons-httpclient.version>2.0.2</commons-httpclient.version>
         <commons-io.version>0.1</commons-io.version>
         <commons-lang.version>2.0</commons-lang.version>
         <commons-logging.version>1.0.3</commons-logging.version>



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