portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r377606 - in /portals/jetspeed-2/trunk: app-servers/build.xml app-servers/pom.xml components/pom.xml pom.xml settings.xml.sample
Date Tue, 14 Feb 2006 03:52:13 GMT
Author: rwatler
Date: Mon Feb 13 19:52:11 2006
New Revision: 377606

URL: http://svn.apache.org/viewcvs?rev=377606&view=rev
Log:
- fix DOS backslash path support in ant builds.
- remove explict local repository declarations for ant maven tasks: repository
  settings seem to be inherited correctly from parent POM.
- set catalina 5.5 version in sample settings.xml.
- move JDBC system path dependencies to test profile to eliminate a system
  path set via a property from the exported POMs that causes invalid POMs
  upon being read from the repository.


Modified:
    portals/jetspeed-2/trunk/app-servers/build.xml
    portals/jetspeed-2/trunk/app-servers/pom.xml
    portals/jetspeed-2/trunk/components/pom.xml
    portals/jetspeed-2/trunk/pom.xml
    portals/jetspeed-2/trunk/settings.xml.sample

Modified: portals/jetspeed-2/trunk/app-servers/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/build.xml?rev=377606&r1=377605&r2=377606&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/build.xml Mon Feb 13 19:52:11 2006
@@ -35,7 +35,6 @@
     <property name="org.apache.pluto.version" value=""/>
     <property name="portlet-api.groupid" value=""/>
     <property name="portlet-api.version" value=""/>
-    <property name="local.repository.location" value=""/>
 
     <!-- Usage -->
 
@@ -60,7 +59,6 @@
         <echo message="    org.apache.pluto.version=${org.apache.pluto.version}"/>
         <echo message="    portlet-api.groupid=${portlet-api.groupid}"/>
         <echo message="    portlet-api.version=${portlet-api.version}"/>
-        <echo message="    local.repository.location=${local.repository.location}"/>
     </target>
 
     <!-- Tomcat Deployment -->
@@ -95,7 +93,6 @@
             <dependency groupId="${portlet-api.groupid}"
                         artifactId="portlet-api"
                         version="${portlet-api.version}"/>
-            <localRepository location="${local.repository.location}"/>
         </dependencies>
         <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="true">
             <fileset refid="shared.lib.dependencies.id"/>
@@ -113,11 +110,10 @@
                         artifactId="jetspeed"
                         version="${org.apache.jetspeed.version}"
                         type="war"/>
-            <localRepository location="${local.repository.location}"/>
         </dependencies>
         <copy todir="${org.apache.jetspeed.server.home}/webapps">
             <fileset refid="jetspeed.dependency.id"/>
-            <mapper type="regexp" from=".*/([^/]*)-${org.apache.jetspeed.version}.war"
to="\1.war"/>
+            <mapper type="regexp" from=".*[/\\]([^/\\]*)-${org.apache.jetspeed.version}.war"
to="\1.war"/>
         </copy>
         <unjar src="${org.apache.jetspeed.server.home}/webapps/jetspeed.war" dest="${org.apache.jetspeed.server.home}/webapps/jetspeed"/>
 
@@ -179,11 +175,10 @@
                         artifactId="rss"
                         version="${org.apache.jetspeed.version}"
                         type="war"/>
-            <localRepository location="${local.repository.location}"/>
         </dependencies>
         <copy todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/deploy">
             <fileset refid="portletapp.dependencies.id"/>
-            <mapper type="regexp" from=".*/([^/]*)-(?:(?:${org.apache.jetspeed.version})|(?:${org.apache.portals.bridges.version})).war"
to="\1.war"/>
+            <mapper type="regexp" from=".*[/\\]([^/\\]*)-(?:(?:${org.apache.jetspeed.version})|(?:${org.apache.portals.bridges.version})).war"
to="\1.war"/>
         </copy>
 
         <!-- Generate and deploy application context file -->

Modified: portals/jetspeed-2/trunk/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/pom.xml?rev=377606&r1=377605&r2=377606&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Mon Feb 13 19:52:11 2006
@@ -87,8 +87,6 @@
                                               value="portlet-api"/>
                                     <property name="portlet-api.version"
                                               value="${portlet-api.version}"/>
-                                    <property name="local.repository.location"
-                                              value="${settings.localRepository}"/>
                                 </ant>
                             </tasks>
                         </configuration>

Modified: portals/jetspeed-2/trunk/components/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/pom.xml?rev=377606&r1=377605&r2=377606&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/pom.xml Mon Feb 13 19:52:11 2006
@@ -39,6 +39,39 @@
         Jetspeed-2 Components
     </description>
 
+    <!-- Profiles -->
+
+    <profiles>
+
+        <!-- Test Profile -->
+        <profile>
+            <id>test</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>test</value>
+                </property>
+            </activation>
+            <!--
+                Bug: This system scoped dependency is brought in via a profile
+                since system paths based on a property cannot appear as a main
+                build dependency since it will generate an invalid POM when the
+                pom is referenced as a dependency.
+            -->
+            <dependencies>
+                <!-- Database Driver -->
+                <dependency>
+                    <groupId>${pom.groupId}</groupId>
+                    <artifactId>org.apache.jetspeed.test.jdbc.drivers.path</artifactId>
+                    <version>${pom.version}</version>
+                    <scope>system</scope>
+                    <systemPath>${org.apache.jetspeed.test.jdbc.drivers.path}</systemPath>
+                </dependency>
+            </dependencies>
+        </profile>
+
+    </profiles>
+
     <!-- Component Modules -->
 
     <modules>
@@ -183,16 +216,6 @@
             <groupId>tyrex</groupId>
             <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>
         </dependency>
 
     </dependencies>

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=377606&r1=377605&r2=377606&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Mon Feb 13 19:52:11 2006
@@ -25,6 +25,17 @@
         <maven>2.0.2</maven>
     </prerequisites>
 
+    <!-- POM Identification -->
+
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>pom</artifactId>
+    <version>2.1-dev</version>
+    <packaging>pom</packaging>
+    <name>Jetspeed 2 Enterprise Portal</name>
+    <description>
+        Jetspeed is an Open Source implementation of an Enterprise Information Portal, using
Java and XML.
+    </description>
+
     <!-- Profiles -->
 
     <profiles>
@@ -129,17 +140,6 @@
 
     </properties>
 
-    <!-- POM Identification -->
-
-    <groupId>org.apache.portals.jetspeed-2</groupId>
-    <artifactId>pom</artifactId>
-    <version>2.1-dev</version>
-    <packaging>pom</packaging>
-    <name>Jetspeed 2 Enterprise Portal</name>
-    <description>
-        Jetspeed is an Open Source implementation of an Enterprise Information Portal, using
Java and XML.
-    </description>
-
     <!-- Default Modules -->
 
     <modules>
@@ -656,23 +656,6 @@
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
                 <version>${org.apache.derby.version}</version>
-            </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>
-                <version>${pom.version}</version>
-                <scope>system</scope>
-                <systemPath>${org.apache.jetspeed.test.jdbc.drivers.path}</systemPath>
             </dependency>
 
             <!-- LDAP -->

Modified: portals/jetspeed-2/trunk/settings.xml.sample
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/settings.xml.sample?rev=377606&r1=377605&r2=377606&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/settings.xml.sample (original)
+++ portals/jetspeed-2/trunk/settings.xml.sample Mon Feb 13 19:52:11 2006
@@ -54,7 +54,7 @@
     
                 <!-- J2 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>
+                <org.apache.jetspeed.catalina.version.major>5.5</org.apache.jetspeed.catalina.version.major>
                 <org.apache.jetspeed.services.autodeployment.server>localhost</org.apache.jetspeed.services.autodeployment.server>
                 <org.apache.jetspeed.services.autodeployment.port>8080</org.apache.jetspeed.services.autodeployment.port>
                 <org.apache.jetspeed.services.autodeployment.user>j2deployer</org.apache.jetspeed.services.autodeployment.user>



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