portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r376807 - in /portals/jetspeed-2/trunk: app-servers/build.xml app-servers/pom.xml applications/jetspeed/build.xml applications/jetspeed/pom.xml etc/pom.xml pom.xml settings.xml.sample
Date Fri, 10 Feb 2006 19:31:03 GMT
Author: rwatler
Date: Fri Feb 10 11:31:02 2006
New Revision: 376807

URL: http://svn.apache.org/viewcvs?rev=376807&view=rev
Log:
Maven2 Build Checkpoint Commit

After the BSR maven 2 repo is setup, the following steps will
allow one to use this minimalistic build:

1. copy and edit settings.xml.sample to ~/.m2/settings.xml
2. Use the following maven 2 commands to build:
   - build and deploy on tomcat: mvn -Ptomcat
   - build and run tests: mvn -Ptest
   - build only: mvn


Added:
    portals/jetspeed-2/trunk/applications/jetspeed/build.xml   (with props)
Modified:
    portals/jetspeed-2/trunk/app-servers/build.xml
    portals/jetspeed-2/trunk/app-servers/pom.xml
    portals/jetspeed-2/trunk/applications/jetspeed/pom.xml
    portals/jetspeed-2/trunk/etc/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=376807&r1=376806&r2=376807&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/build.xml Fri Feb 10 11:31:02 2006
@@ -16,19 +16,26 @@
 
   $Id:$
 -->
-<project name="etc" default="help">
+<project name="app-sources" default="help">
 
     <!-- Properties -->
 
     <property name="org.apache.jetspeed.deploy.skip" value="false"/>
     <property name="org.apache.jetspeed.server.home" value=""/>
     <property name="org.apache.jetspeed.catalina.version.major" value=""/>
-    <property name="org.apache.jetspeed.server.shared" value=""/>
-    <property name="org.apache.jetspeed.deploy.war.dir" value=""/>
-    <property name="org.apache.jetspeed.services.autodeployment.server" value=""/>
-    <property name="org.apache.jetspeed.services.autodeployment.port" value=""/>
-    <property name="org.apache.jetspeed.services.autodeployment.user" value=""/>
-    <property name="org.apache.jetspeed.services.autodeployment.password" value=""/>
+    <property name="org.apache.jetspeed.production.database.url" value=""/>
+    <property name="org.apache.jetspeed.production.database.driver" value=""/>
+    <property name="org.apache.jetspeed.production.database.user" value=""/>
+    <property name="org.apache.jetspeed.production.database.password" value=""/>
+    <property name="org.apache.jetspeed.groupid" value=""/>
+    <property name="org.apache.jetspeed.version" value=""/>
+    <property name="org.apache.portals.bridges.groupid" value=""/>
+    <property name="org.apache.portals.bridges.version" value=""/>
+    <property name="org.apache.pluto.groupid" value=""/>
+    <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 -->
 
@@ -41,26 +48,174 @@
         <echo message="    org.apache.jetspeed.deploy.skip=${org.apache.jetspeed.deploy.skip}"/>
         <echo message="    org.apache.jetspeed.server.home=${org.apache.jetspeed.server.home}"/>
         <echo message="    org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
-        <echo message="    org.apache.jetspeed.server.shared=${org.apache.jetspeed.server.shared}"/>
-        <echo message="    org.apache.jetspeed.deploy.war.dir=${org.apache.jetspeed.deploy.war.dir}"/>
-        <echo message="    org.apache.jetspeed.services.autodeployment.server=${org.apache.jetspeed.services.autodeployment.server}"/>
-        <echo message="    org.apache.jetspeed.services.autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}"/>
-        <echo message="    org.apache.jetspeed.services.autodeployment.user=${org.apache.jetspeed.services.autodeployment.user}"/>
-        <echo message="    org.apache.jetspeed.services.autodeployment.password=${org.apache.jetspeed.services.autodeployment.password}"/>
+        <echo message="    org.apache.jetspeed.production.database.url=${org.apache.jetspeed.production.database.url}"/>
+        <echo message="    org.apache.jetspeed.production.database.driver=${org.apache.jetspeed.production.database.driver}"/>
+        <echo message="    org.apache.jetspeed.production.database.user=${org.apache.jetspeed.production.database.user}"/>
+        <echo message="    org.apache.jetspeed.production.database.password=${org.apache.jetspeed.production.database.password}"/>
+        <echo message="    org.apache.jetspeed.groupid=${org.apache.jetspeed.groupid}"/>
+        <echo message="    org.apache.jetspeed.version=${org.apache.jetspeed.version}"/>
+        <echo message="    org.apache.portals.bridges.groupid=${org.apache.portals.bridges.groupid}"/>
+        <echo message="    org.apache.portals.bridges.version=${org.apache.portals.bridges.version}"/>
+        <echo message="    org.apache.pluto.groupid=${org.apache.pluto.groupid}"/>
+        <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 -->
 
-    <target name="tomcat" depends="help, deploy-skip" unless="org.apache.jetspeed.skip">
+    <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"/>
 
-        <echo message="Tomcat deployment target NYI"/>
+    <target name="tomcat" depends="deploy-skip, tomcat-5-5" unless="org.apache.jetspeed.skip">
+
+        <!-- Deploy provided libraries in shared/lib -->
+        <delete>
+            <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
+                <include name="pluto-*.jar"/>
+                <include name="portals-bridges-common-*.jar"/>
+                <include name="jetspeed-commons-*.jar"/>
+                <include name="jetspeed-api-*.jar"/>
+                <include name="portlet-api-*.jar"/>
+            </fileset>
+        </delete>
+        <dependencies filesetId="shared.lib.dependencies.id" useScope="runtime">
+            <dependency groupId="${org.apache.pluto.groupid}"
+                        artifactId="pluto"
+                        version="${org.apache.pluto.version}"/>
+            <dependency groupId="${org.apache.portals.bridges.groupid}"
+                        artifactId="portals-bridges-common"
+                        version="${org.apache.portals.bridges.version}"/>
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        artifactId="jetspeed-commons"
+                        version="${org.apache.jetspeed.version}"/>
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        artifactId="jetspeed-api"
+                        version="${org.apache.jetspeed.version}"/>
+            <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"/>
+        </copy>
+
+        <!-- Deploy jetspeed applications -->
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/jetspeed"/>
+        <delete>
+            <fileset dir="${org.apache.jetspeed.server.home}/webapps">
+                <include name="jetspeed.war"/>
+            </fileset>
+        </delete>
+        <dependencies filesetId="jetspeed.dependency.id" useScope="runtime">
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        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"/>
+        </copy>
+        <unjar src="${org.apache.jetspeed.server.home}/webapps/jetspeed.war" dest="${org.apache.jetspeed.server.home}/webapps/jetspeed"/>
+
+        <!-- Deploy portlet and layout applications -->
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/demo"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/j2-admin"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/jpetstore"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/jsf-demo"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/perl"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/php"/>
+        <delete dir="${org.apache.jetspeed.server.home}/webapps/rss"/>
+        <delete>
+            <fileset dir="${org.apache.jetspeed.server.home}/webapps">
+                <include name="demo.war"/>
+                <include name="j2-admin.war"/>
+                <include name="jpetstore.war"/>
+                <include name="jsf-demo.war"/>
+                <include name="perl.war"/>
+                <include name="php.war"/>
+                <include name="rss.war"/>
+            </fileset>
+        </delete>
+        <delete>
+            <fileset dir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
+                <include name="j2-admin.xml"/>
+                <include name="jpetstore.xml"/>
+            </fileset>
+        </delete>
+        <dependencies filesetId="portletapp.dependencies.id" useScope="runtime">
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        artifactId="demo"
+                        version="${org.apache.jetspeed.version}"
+                        type="war"/>
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        artifactId="j2-admin"
+                        version="${org.apache.jetspeed.version}"
+                        type="war"/>
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        artifactId="jetspeed-layouts"
+                        version="${org.apache.jetspeed.version}"
+                        type="war"/>
+            <dependency groupId="${org.apache.portals.bridges.groupid}"
+                        artifactId="jpetstore"
+                        version="${org.apache.portals.bridges.version}"
+                        type="war"/>
+            <dependency groupId="${org.apache.portals.bridges.groupid}"
+                        artifactId="jsf-demo"
+                        version="${org.apache.portals.bridges.version}"
+                        type="war"/>
+            <dependency groupId="${org.apache.portals.bridges.groupid}"
+                        artifactId="perl"
+                        version="${org.apache.portals.bridges.version}"
+                        type="war"/>
+            <dependency groupId="${org.apache.portals.bridges.groupid}"
+                        artifactId="php"
+                        version="${org.apache.portals.bridges.version}"
+                        type="war"/>
+            <dependency groupId="${org.apache.jetspeed.groupid}"
+                        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"/>
+        </copy>
+
+        <!-- Generate and deploy application context file -->
+        <delete file="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/jetspeed.xml"/>
+        <copy todir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
+            <fileset dir="../etc/conf/tomcat">
+                <include name="jetspeed-tomcat-5.xml" unless="org.apache.jetspeed.tomcat.5.5"/>

+                <include name="jetspeed-tomcat-5.5.xml" if="org.apache.jetspeed.tomcat.5.5"/>

+            </fileset>
+            <filterset begintoken="@" endtoken="@">
+                <filter token="CONTEXT" value="jetspeed"/>
+                <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}"/>
+                <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}"/>
+                <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}"/>
+                <filter token="URL" value="${org.apache.jetspeed.production.database.url}"/>
+            </filterset>
+            <mapper type="merge" to="jetspeed.xml"/>
+        </copy>
 
     </target>
 
     <!-- Utility Targets -->
+
     <target name="deploy-skip">
         <condition property="org.apache.jetspeed.skip">
             <equals arg1="${org.apache.jetspeed.deploy.skip}" arg2="true"/>
+        </condition>
+    </target>
+
+    <target name="tomcat-5-5">
+        <condition property="org.apache.jetspeed.tomcat.5.5">
+            <equals arg1="${org.apache.jetspeed.catalina.version.major}" arg2="5.5"/>
         </condition>
     </target>
 

Modified: portals/jetspeed-2/trunk/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/pom.xml?rev=376807&r1=376806&r2=376807&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Fri Feb 10 11:31:02 2006
@@ -63,18 +63,32 @@
                                               value="${org.apache.jetspeed.server.home}"/>
                                     <property name="org.apache.jetspeed.catalina.version.major"
                                               value="${org.apache.jetspeed.catalina.version.major}"/>
-                                    <property name="org.apache.jetspeed.server.shared"
-                                              value="${org.apache.jetspeed.server.shared}"/>
-                                    <property name="org.apache.jetspeed.deploy.war.dir"
-                                              value="${org.apache.jetspeed.deploy.war.dir}"/>
-                                    <property name="org.apache.jetspeed.services.autodeployment.server"
-                                              value="${org.apache.jetspeed.services.autodeployment.server}"/>
-                                    <property name="org.apache.jetspeed.services.autodeployment.port"
-                                              value="${org.apache.jetspeed.services.autodeployment.port}"/>
-                                    <property name="org.apache.jetspeed.services.autodeployment.user"
-                                              value="${org.apache.jetspeed.services.autodeployment.user}"/>
-                                    <property name="org.apache.jetspeed.services.autodeployment.password"
-                                              value="${org.apache.jetspeed.services.autodeployment.password}"/>
+                                    <property name="org.apache.jetspeed.production.database.url"
+                                              value="${org.apache.jetspeed.production.database.url}"/>
+                                    <property name="org.apache.jetspeed.production.database.driver"
+                                              value="${org.apache.jetspeed.production.database.driver}"/>
+                                    <property name="org.apache.jetspeed.production.database.user"
+                                              value="${org.apache.jetspeed.production.database.user}"/>
+                                    <property name="org.apache.jetspeed.production.database.password"
+                                              value="${org.apache.jetspeed.production.database.password}"/>
+                                    <property name="org.apache.jetspeed.groupid"
+                                              value="${pom.groupId}"/>
+                                    <property name="org.apache.jetspeed.version"
+                                              value="${pom.version}"/>
+                                    <property name="org.apache.portals.bridges.groupid"
+                                              value="org.apache.portals.bridges"/>
+                                    <property name="org.apache.portals.bridges.version"
+                                              value="${org.apache.portals.bridges.version}"/>
+                                    <property name="org.apache.pluto.groupid"
+                                              value="org.apache.pluto"/>
+                                    <property name="org.apache.pluto.version"
+                                              value="${org.apache.pluto.version}"/>
+                                    <property name="portlet-api.groupid"
+                                              value="portlet-api"/>
+                                    <property name="portlet-api.version"
+                                              value="${portlet-api.version}"/>
+                                    <property name="local.repository.location"
+                                              value="${settings.localRepository}"/>
                                 </ant>
                             </tasks>
                         </configuration>
@@ -84,34 +98,9 @@
                     </execution>
 
                 </executions>
-
-                <!--
-                    Bug:  Dependencies should be in parent POM, but they are not propagated
-                    from the pluginManagement sections. Extensions also cannot be used since
-                    ant tag executions do not succeed in general: suspect class loading
-                    issues that result in mysterious NPE on <replaceregexp>.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
+
     </build>
 
     <!-- Dependencies -->
@@ -126,6 +115,26 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>demo</artifactId>
             <type>war</type>
         </dependency>
@@ -141,7 +150,32 @@
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-layouts</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>jpetstore</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>jsf-demo</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>perl</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>php</artifactId>
             <type>war</type>
         </dependency>
 

Added: portals/jetspeed-2/trunk/applications/jetspeed/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed/build.xml?rev=376807&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed/build.xml (added)
+++ portals/jetspeed-2/trunk/applications/jetspeed/build.xml Fri Feb 10 11:31:02 2006
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 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.
+
+  $Id:$
+-->
+<project name="jetspeed" default="help">
+
+    <!-- Properties -->
+
+    <property name="org.apache.jetspeed.catalina.version.major" value=""/>
+    <property name="org.apache.jetspeed.services.autodeployment.server" value=""/>
+    <property name="org.apache.jetspeed.services.autodeployment.port" value=""/>
+    <property name="org.apache.jetspeed.services.autodeployment.user" value=""/>
+    <property name="org.apache.jetspeed.services.autodeployment.password" value=""/>
+
+    <!-- Usage -->
+
+    <target name="help">
+        <echo message="Buildfile for the jetspeed maven POM."/>
+        <echo message="Usage: ant [ configure ]"/>
+        <echo message="Where:"/>
+        <echo message="    configure - setup runtime configuration for jetspeed."/>
+        <echo message="Configuration:"/>
+        <echo message="    org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
+        <echo message="    org.apache.jetspeed.services.autodeployment.server=${org.apache.jetspeed.services.autodeployment.server}"/>
+        <echo message="    org.apache.jetspeed.services.autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}"/>
+        <echo message="    org.apache.jetspeed.services.autodeployment.user=${org.apache.jetspeed.services.autodeployment.user}"/>
+        <echo message="    org.apache.jetspeed.services.autodeployment.password=${org.apache.jetspeed.services.autodeployment.password}"/>
+    </target>
+
+    <!-- Jetspeed Configuration -->
+
+    <target name="configure">
+
+        <!-- Build webapp resources -->        
+        <delete dir="target/webapp"/>
+        <mkdir dir="target/webapp"/>
+        <copy todir="target/webapp">
+            <fileset dir="../../src/webapp"/>
+        </copy>
+
+        <!-- Configure runtime configuration propertiee resource -->
+        <replace file="target/webapp/WEB-INF/conf/jetspeed.properties">
+            <replacefilter token="@AUTODEPLOYMENT_SERVER@"
+                           value="${org.apache.jetspeed.services.autodeployment.server}"/>
+            <replacefilter token="@AUTODEPLOYMENT_USER@"
+                           value="${org.apache.jetspeed.services.autodeployment.user}"/>
+            <replacefilter token="@AUTODEPLOYMENT_PASSWORD@"
+                           value="${org.apache.jetspeed.services.autodeployment.password}"/>
+            <replacefilter token="autodeployment.catalina.version.major=5"
+                           value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
+            <replacefilter token="autodeployment.port=8080"
+                           value="autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}"/>
+        </replace>
+
+        <!-- Build OJB resources -->        
+        <mkdir dir="target/webapp/WEB-INF/classes"/>
+        <copy todir="target/webapp/WEB-INF/classes">
+            <fileset dir="../../etc/db-ojb"/>
+        </copy>
+
+    </target>
+
+</project>

Propchange: portals/jetspeed-2/trunk/applications/jetspeed/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/applications/jetspeed/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed/pom.xml?rev=376807&r1=376806&r2=376807&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed/pom.xml Fri Feb 10 11:31:02 2006
@@ -49,12 +49,48 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
                     <configuration>
-                        <warSourceDirectory>../../src/webapp</warSourceDirectory>
+                        <warSourceDirectory>target/webapp</warSourceDirectory>
                     </configuration>
                 </plugin> 
 
             </plugins>
         </pluginManagement>    
+
+        <!-- Plugin Executions -->
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+
+                    <!-- deploy to application server -->
+                    <execution>
+                        <id>jetspeed-resources</id>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="configure" antfile="build.xml" dir="${basedir}"
inheritall="off">
+                                    <property name="org.apache.jetspeed.catalina.version.major"
+                                              value="${org.apache.jetspeed.catalina.version.major}"/>
+                                    <property name="org.apache.jetspeed.services.autodeployment.server"
+                                              value="${org.apache.jetspeed.services.autodeployment.server}"/>
+                                    <property name="org.apache.jetspeed.services.autodeployment.port"
+                                              value="${org.apache.jetspeed.services.autodeployment.port}"/>
+                                    <property name="org.apache.jetspeed.services.autodeployment.user"
+                                              value="${org.apache.jetspeed.services.autodeployment.user}"/>
+                                    <property name="org.apache.jetspeed.services.autodeployment.password"
+                                              value="${org.apache.jetspeed.services.autodeployment.password}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+
+                </executions>
+            </plugin>
+        </plugins>
 
     </build>
 

Modified: portals/jetspeed-2/trunk/etc/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/pom.xml?rev=376807&r1=376806&r2=376807&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/pom.xml Fri Feb 10 11:31:02 2006
@@ -127,62 +127,6 @@
                     </execution>
 
                 </executions>
-
-                <!--
-                    Bug:  Dependencies should be in parent POM, but they are not propagated
-                    from the pluginManagement sections. Extensions also cannot be used since
-                    ant tag executions do not succeed in general: suspect class loading
-                    issues that result in mysterious NPE on <replaceregexp>.
-
-                    Note: All three ant dependencies are listed to keep nodeps in sync.
-                -->
-                <dependencies>
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque</artifactId>
-                        <version>${torque.version}</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>jndi</groupId>
-                                <artifactId>jndi</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>javax.sql</groupId>
-                                <artifactId>jdbc-stdext</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque-gen</artifactId>
-                        <version>${torque.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque-gen</artifactId>
-                        <version>${torque.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>torque</groupId>
-                        <artifactId>torque-gen-templates</artifactId>
-                        <version>${torque.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-launcher</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-nodeps</artifactId>
-                        <version>${ant.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=376807&r1=376806&r2=376807&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Fri Feb 10 11:31:02 2006
@@ -106,6 +106,7 @@
         <nekohtml.version>0.9.3</nekohtml.version>
         <ojb.version>1.0.3</ojb.version>
         <org.apache.derby.version>10.1.1.0</org.apache.derby.version>
+        <org.apache.maven.artifact.ant.version>2.0.1</org.apache.maven.artifact.ant.version>
         <org.apache.pluto.version>1.0.1</org.apache.pluto.version>
         <org.apache.portals.bridges.version>1.0</org.apache.portals.bridges.version>
         <org.springframework.version>1.1.5</org.springframework.version>
@@ -365,25 +366,31 @@
             <!-- Portals Applications -->
             <dependency>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>demo</artifactId>
+                <artifactId>jetspeed-layouts</artifactId>
                 <type>war</type>
                 <version>${pom.version}</version>
             </dependency>
             <dependency>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>j2-admin</artifactId>
+                <artifactId>jetspeed</artifactId>
                 <type>war</type>
                 <version>${pom.version}</version>
             </dependency>
             <dependency>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>rss</artifactId>
+                <artifactId>demo</artifactId>
                 <type>war</type>
                 <version>${pom.version}</version>
             </dependency>
             <dependency>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed</artifactId>
+                <artifactId>j2-admin</artifactId>
+                <type>war</type>
+                <version>${pom.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>rss</artifactId>
                 <type>war</type>
                 <version>${pom.version}</version>
             </dependency>
@@ -773,6 +780,32 @@
                 <version>${org.apache.portals.bridges.version}</version>
             </dependency>
 
+            <!-- Portals Bridges Applications -->
+            <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>jpetstore</artifactId>
+                <type>war</type>
+                <version>${org.apache.portals.bridges.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>jsf-demo</artifactId>
+                <type>war</type>
+                <version>${org.apache.portals.bridges.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>perl</artifactId>
+                <type>war</type>
+                <version>${org.apache.portals.bridges.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>php</artifactId>
+                <type>war</type>
+                <version>${org.apache.portals.bridges.version}</version>
+            </dependency>
+
             <!-- MyFaces -->
             <dependency>
                 <groupId>myfaces</groupId>
@@ -871,6 +904,74 @@
 
             </plugins>
         </pluginManagement>    
+
+        <!-- Plugin Dependencies -->
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <!--
+                    Bug: Plugin dependencies must be in parent POM since they can only be
+                    defined once.
+                    Bug: Plugin dependencies are not propagated from pluginManagement.
+                    Bug: Versions must be specified here and not in dependencyManagement.
+
+                    Note: All three ant dependencies are listed to keep nodeps in sync.
+                -->
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant</artifactId>
+                        <version>${ant.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-launcher</artifactId>
+                        <version>${ant.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-nodeps</artifactId>
+                        <version>${ant.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.maven</groupId>
+                        <artifactId>maven-artifact-ant</artifactId>
+                        <version>${org.apache.maven.artifact.ant.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>torque</groupId>
+                        <artifactId>torque</artifactId>
+                        <version>${torque.version}</version>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>jndi</groupId>
+                                <artifactId>jndi</artifactId>
+                            </exclusion>
+                            <exclusion>
+                                <groupId>javax.sql</groupId>
+                                <artifactId>jdbc-stdext</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
+                    <dependency>
+                        <groupId>torque</groupId>
+                        <artifactId>torque-gen</artifactId>
+                        <version>${torque.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>torque</groupId>
+                        <artifactId>torque-gen</artifactId>
+                        <version>${torque.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>torque</groupId>
+                        <artifactId>torque-gen-templates</artifactId>
+                        <version>${torque.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
 
     </build>
 

Modified: portals/jetspeed-2/trunk/settings.xml.sample
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/settings.xml.sample?rev=376807&r1=376806&r2=376807&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/settings.xml.sample (original)
+++ portals/jetspeed-2/trunk/settings.xml.sample Fri Feb 10 11:31:02 2006
@@ -55,8 +55,6 @@
                 <!-- 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.server.shared>${org.apache.jetspeed.server.home}/shared/lib</org.apache.jetspeed.server.shared>
-                <org.apache.jetspeed.deploy.war.dir>${org.apache.jetspeed.server.home}/webapps</org.apache.jetspeed.deploy.war.dir>
                 <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