portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r376444 - in /portals/jetspeed-2/trunk: ./ app-servers/ applications/ applications/demo/ applications/j2-admin/ applications/jetspeed/ applications/rss/rss-war/ etc/ layout-portlets/
Date Thu, 09 Feb 2006 21:37:57 GMT
Author: rwatler
Date: Thu Feb  9 13:37:54 2006
New Revision: 376444

URL: http://svn.apache.org/viewcvs?rev=376444&view=rev
Log:
yet another maven2 build checkpoint

Added:
    portals/jetspeed-2/trunk/app-servers/build.xml   (with props)
    portals/jetspeed-2/trunk/app-servers/pom.xml   (with props)
    portals/jetspeed-2/trunk/applications/jetspeed/
    portals/jetspeed-2/trunk/applications/jetspeed/pom.xml   (with props)
    portals/jetspeed-2/trunk/settings.xml.sample
Modified:
    portals/jetspeed-2/trunk/applications/demo/pom.xml
    portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
    portals/jetspeed-2/trunk/applications/pom.xml
    portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
    portals/jetspeed-2/trunk/etc/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/pom.xml
    portals/jetspeed-2/trunk/pom.xml

Added: portals/jetspeed-2/trunk/app-servers/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/build.xml?rev=376444&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/build.xml (added)
+++ portals/jetspeed-2/trunk/app-servers/build.xml Thu Feb  9 13:37:54 2006
@@ -0,0 +1,67 @@
+<?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="etc" 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=""/>
+
+    <!-- Usage -->
+
+    <target name="help">
+        <echo message="Buildfile for the app-servers maven POM."/>
+        <echo message="Usage: ant [ tomcat ]"/>
+        <echo message="Where:"/>
+        <echo message="    tomcat - deploy to the tomcat app server."/>
+        <echo message="Configuration:"/>
+        <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}"/>
+    </target>
+
+    <!-- Tomcat Deployment -->
+
+    <target name="tomcat" depends="help, deploy-skip" unless="org.apache.jetspeed.skip">
+
+        <echo message="Tomcat deployment target NYI"/>
+
+    </target>
+
+    <!-- Utility Targets -->
+    <target name="deploy-skip">
+        <condition property="org.apache.jetspeed.skip">
+            <equals arg1="${org.apache.jetspeed.deploy.skip}" arg2="true"/>
+        </condition>
+    </target>
+
+</project>

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

Added: portals/jetspeed-2/trunk/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/app-servers/pom.xml?rev=376444&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (added)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Thu Feb  9 13:37:54 2006
@@ -0,0 +1,158 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- POM Identification -->
+
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <version>2.1-dev</version>
+    <artifactId>app-servers</artifactId>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <version>2.1-dev</version>
+        <artifactId>pom</artifactId>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>pom</packaging>
+    <name>Jetspeed-2 Portal Application Server Deployment</name>
+    <description>
+        Project used to deploy to Applications Servers.
+    </description>
+
+    <!-- Build Configuration -->
+
+    <build>
+
+        <!-- Plugin Executions -->
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+
+                    <!-- deploy to application server -->
+                    <execution>
+                        <id>app-servers-install</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="${org.apache.jetspeed.env.deploy.target}"
antfile="build.xml" dir="${basedir}" inheritall="off">
+                                    <property name="org.apache.jetspeed.deploy.skip"
+                                              value="${org.apache.jetspeed.env.skip.production}"/>
+                                    <property name="org.apache.jetspeed.server.home"
+                                              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}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </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 -->
+
+    <dependencies>
+
+        <!-- Build Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>etc</artifactId>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>demo</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>j2-admin</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>rss</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed</artifactId>
+            <type>war</type>
+        </dependency>
+
+    </dependencies>
+
+    <!-- Project Information -->
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/app-servers</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/app-servers</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/trunk/components/app-servers/</url>
+    </scm>
+
+</project>

Propchange: portals/jetspeed-2/trunk/app-servers/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/pom.xml?rev=376444&r1=376443&r2=376444&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/pom.xml Thu Feb  9 13:37:54 2006
@@ -53,34 +53,42 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>portals-gems</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>jetspeed-web-content</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>request</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.portals.bridges</groupId>
             <artifactId>portals-bridges-velocity</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
     </dependencies>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/j2-admin/pom.xml?rev=376444&r1=376443&r2=376444&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/pom.xml Thu Feb  9 13:37:54 2006
@@ -54,6 +54,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>portals-bridges-velocity</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
             <artifactId>portals-bridges-frameworks</artifactId>
         </dependency>
         <dependency>
@@ -68,31 +72,31 @@
             <groupId>myfaces</groupId>
             <artifactId>myfaces-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
 
         <!-- Runtime Dependencies -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>request</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>portals-bridges-velocity</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
     </dependencies>

Added: portals/jetspeed-2/trunk/applications/jetspeed/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed/pom.xml?rev=376444&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed/pom.xml (added)
+++ portals/jetspeed-2/trunk/applications/jetspeed/pom.xml Thu Feb  9 13:37:54 2006
@@ -0,0 +1,161 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- POM Identification -->
+
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <version>2.1-dev</version>
+    <artifactId>jetspeed</artifactId>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <version>2.1-dev</version>
+        <artifactId>rss-application</artifactId>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <packaging>war</packaging>
+    <name>Jetspeed-2 Enterprise Portal WAR</name>
+
+    <!-- Build Configuration -->
+
+    <build>
+
+        <!-- Plugin Configuration -->
+        <pluginManagement>    
+            <plugins>
+
+                <!-- WAR plugin -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <configuration>
+                        <warSourceDirectory>../../src/webapp</warSourceDirectory>
+                    </configuration>
+                </plugin> 
+
+            </plugins>
+        </pluginManagement>    
+
+    </build>
+
+    <!-- Dependencies -->
+
+    <dependencies>
+
+        <!-- Runtime Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>content-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-cm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-components</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-deploy-tools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-rdbms</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-prefs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-search</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-registry</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-id-generator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-file-cache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-locator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-capability</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-profiler</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-page-manager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-portal-site</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-portlet-factory</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-sso</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-statistics</artifactId>
+        </dependency>        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-header-resource</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-portal</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

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

Modified: portals/jetspeed-2/trunk/applications/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pom.xml?rev=376444&r1=376443&r2=376444&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/pom.xml Thu Feb  9 13:37:54 2006
@@ -42,6 +42,7 @@
     <!-- Application Modules -->
 
     <modules>
+        <module>jetspeed</module>
         <module>demo</module>
         <module>gems</module>
         <module>j2-admin</module>

Modified: portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml?rev=376444&r1=376443&r2=376444&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml Thu Feb  9 13:37:54 2006
@@ -66,10 +66,12 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>rss-jar</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
     </dependencies>

Modified: portals/jetspeed-2/trunk/etc/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/pom.xml?rev=376444&r1=376443&r2=376444&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/pom.xml Thu Feb  9 13:37:54 2006
@@ -70,13 +70,13 @@
 
                     <!-- populate test database instance -->
                     <execution>
-                        <id>etc-populate</id>
+                        <id>etc-populate-test</id>
                         <phase>generate-test-resources</phase>
                         <configuration>
                             <tasks>
                                 <ant target="populate" antfile="build.xml" dir="${basedir}"
inheritall="off">
                                     <property name="org.apache.jetspeed.database.skip"
-                                              value="${maven.test.skip}"/>
+                                              value="${org.apache.jetspeed.env.skip.test}"/>
                                     <property name="org.apache.jetspeed.database.default.name"
                                               value="${org.apache.jetspeed.test.database.default.name}"/>
                                     <property name="org.apache.jetspeed.database.url"
@@ -97,13 +97,42 @@
                         </goals>
                     </execution>
 
+                    <!-- populate production database instance -->
+                    <execution>
+                        <id>etc-populate-production</id>
+                        <phase>install</phase>
+                        <configuration>
+                            <tasks>
+                                <ant target="populate" antfile="build.xml" dir="${basedir}"
inheritall="off">
+                                    <property name="org.apache.jetspeed.database.skip"
+                                              value="${org.apache.jetspeed.env.skip.production}"/>
+                                    <property name="org.apache.jetspeed.database.default.name"
+                                              value="${org.apache.jetspeed.production.database.default.name}"/>
+                                    <property name="org.apache.jetspeed.database.url"
+                                              value="${org.apache.jetspeed.production.database.url}"/>
+                                    <property name="org.apache.jetspeed.database.jdbc.drivers.path"
+                                              value="${org.apache.jetspeed.production.jdbc.drivers.path}"/>
+                                    <property name="org.apache.jetspeed.database.driver"
+                                              value="${org.apache.jetspeed.production.database.driver}"/>
+                                    <property name="org.apache.jetspeed.database.user"
+                                              value="${org.apache.jetspeed.production.database.user}"/>
+                                    <property name="org.apache.jetspeed.database.password"
+                                              value="${org.apache.jetspeed.production.database.password}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </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 NPE mysterious on <replaceregexp>.
+                    issues that result in mysterious NPE on <replaceregexp>.
 
                     Note: All three ant dependencies are listed to keep nodeps in sync.
                 -->

Modified: portals/jetspeed-2/trunk/layout-portlets/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/pom.xml?rev=376444&r1=376443&r2=376444&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/pom.xml Thu Feb  9 13:37:54 2006
@@ -83,6 +83,7 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
     </dependencies>

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/pom.xml?rev=376444&r1=376443&r2=376444&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Thu Feb  9 13:37:54 2006
@@ -25,38 +25,51 @@
         <maven>2.0.2</maven>
     </prerequisites>
 
+    <!-- Profiles -->
+
+    <profiles>
+
+        <!-- Test Profile -->
+        <profile>
+            <id>test</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>test</value>
+                </property>
+            </activation>
+            <properties>
+                <maven.test.skip>false</maven.test.skip>
+                <org.apache.jetspeed.env.skip.test>false</org.apache.jetspeed.env.skip.test>
+            </properties>
+        </profile>
+
+        <!-- Tomcat Production Profile -->
+        <profile>
+            <id>tomcat</id>
+            <activation>
+                <property>
+                    <name>deploy</name>
+                    <value>tomcat</value>
+                </property>
+            </activation>
+            <properties>
+                <org.apache.jetspeed.env.skip.production>false</org.apache.jetspeed.env.skip.production>
+                <org.apache.jetspeed.env.deploy.target>tomcat</org.apache.jetspeed.env.deploy.target>
+            </properties>
+        </profile>
+
+    </profiles>
+
     <!-- Properties -->
 
     <properties>
 
-        <!-- Build Properties -->
+        <!-- Default 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>
-        <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>
-        <org.apache.jetspeed.services.autodeployment.password>j2deployer</org.apache.jetspeed.services.autodeployment.password>
-
-        <!-- Custom Test Database Properties -->
-        <org.apache.jetspeed.test.jdbc.drivers.path>${org.apache.jetspeed.server.shared}/mysql-connector-java.jar</org.apache.jetspeed.test.jdbc.drivers.path>
-        <org.apache.jetspeed.test.database.default.name>mysql</org.apache.jetspeed.test.database.default.name>
-        <org.apache.jetspeed.test.database.url>jdbc:mysql://localhost/j2test</org.apache.jetspeed.test.database.url>
-        <org.apache.jetspeed.test.database.driver>com.mysql.jdbc.Driver</org.apache.jetspeed.test.database.driver>
-        <org.apache.jetspeed.test.database.user>tomcat4</org.apache.jetspeed.test.database.user>
-        <org.apache.jetspeed.test.database.password></org.apache.jetspeed.test.database.password>
-
-        <!-- Custom Production Database Properties -->
-        <org.apache.jetspeed.production.jdbc.drivers.path>${org.apache.jetspeed.server.shared}/mysql-connector-java.jar</org.apache.jetspeed.production.jdbc.drivers.path>
-        <org.apache.jetspeed.production.database.default.name>mysql</org.apache.jetspeed.production.database.default.name>
-        <org.apache.jetspeed.production.database.url>jdbc:mysql://localhost/j2</org.apache.jetspeed.production.database.url>
-        <org.apache.jetspeed.production.database.driver>com.mysql.jdbc.Driver</org.apache.jetspeed.production.database.driver>
-        <org.apache.jetspeed.production.database.user>tomcat4</org.apache.jetspeed.production.database.user>
-        <org.apache.jetspeed.production.database.password></org.apache.jetspeed.production.database.password>
+        <org.apache.jetspeed.env.skip.test>true</org.apache.jetspeed.env.skip.test>
+        <org.apache.jetspeed.env.skip.production>true</org.apache.jetspeed.env.skip.production>
+        <org.apache.jetspeed.env.deploy.target>tomcat</org.apache.jetspeed.env.deploy.target>
 
         <!-- Dependency Version Properties -->
         <ant.version>1.6.5</ant.version>
@@ -126,7 +139,7 @@
         Jetspeed is an Open Source implementation of an Enterprise Information Portal, using
Java and XML.
     </description>
 
-    <!-- POM Modules -->
+    <!-- Default Modules -->
 
     <modules>
 
@@ -150,6 +163,9 @@
         <!-- J2 Applications -->
         <module>applications</module>
 
+        <!-- J2 Application Server Deployment -->
+        <module>app-servers</module>
+
     </modules>
 
     <!-- Repositories -->
@@ -216,16 +232,16 @@
                 <artifactId>content-server</artifactId>
                 <version>${pom.version}</version>
             </dependency>
- 
-            <!-- J2 Components -->
             <dependency>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed-cm</artifactId>
+                <artifactId>jetspeed2-taglib-treecontrol</artifactId>
                 <version>${pom.version}</version>
             </dependency>
+ 
+            <!-- J2 Components -->
             <dependency>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>content-server</artifactId>
+                <artifactId>jetspeed-cm</artifactId>
                 <version>${pom.version}</version>
             </dependency>
             <dependency>
@@ -334,15 +350,41 @@
                 <version>${pom.version}</version>
             </dependency>
     
-            <!-- Portals Applications -->
+            <!-- Portals Applications JARs -->
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>rss-jar</artifactId>
+                <version>${pom.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${pom.groupId}</groupId>
                 <artifactId>portals-gems</artifactId>
                 <version>${pom.version}</version>
             </dependency>
+
+            <!-- Portals Applications -->
             <dependency>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>rss-jar</artifactId>
+                <artifactId>demo</artifactId>
+                <type>war</type>
+                <version>${pom.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <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>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>jetspeed</artifactId>
+                <type>war</type>
                 <version>${pom.version}</version>
             </dependency>
 
@@ -695,11 +737,6 @@
                 <groupId>taglibs</groupId>
                 <artifactId>random</artifactId>
                 <version>${taglibs-random.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed2-taglib-treecontrol</artifactId>
-                <version>${pom.version}</version>
             </dependency>
             
             <!-- Velocity -->

Added: portals/jetspeed-2/trunk/settings.xml.sample
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/settings.xml.sample?rev=376444&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/settings.xml.sample (added)
+++ portals/jetspeed-2/trunk/settings.xml.sample Thu Feb  9 13:37:54 2006
@@ -0,0 +1,70 @@
+<?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:$
+-->
+
+<!--
+    settings.xml
+
+    This file is placed in ~/.m2 by convention. User defined
+    profiles must be defined or extended with these settings
+    to perform a complete J2 build and deployment.
+-->
+<settings xmlns="http://maven.apache.org/POM/4.0.0">
+
+    <profiles>
+
+        <!-- Default Profile -->
+        <profile>
+            <id>settings</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+    
+                <!-- J2 Test DB Properties -->
+                <org.apache.jetspeed.test.jdbc.drivers.path>/usr/share/tomcat5/shared/lib/mysql-connector-java.jar</org.apache.jetspeed.test.jdbc.drivers.path>
+                <org.apache.jetspeed.test.database.default.name>mysql</org.apache.jetspeed.test.database.default.name>
+                <org.apache.jetspeed.test.database.url>jdbc:mysql://localhost/j2test</org.apache.jetspeed.test.database.url>
+                <org.apache.jetspeed.test.database.driver>com.mysql.jdbc.Driver</org.apache.jetspeed.test.database.driver>
+                <org.apache.jetspeed.test.database.user>tomcat4</org.apache.jetspeed.test.database.user>
+                <org.apache.jetspeed.test.database.password></org.apache.jetspeed.test.database.password>
+    
+                <!-- J2 Production DB Properties -->
+                <org.apache.jetspeed.production.jdbc.drivers.path>/usr/share/tomcat5/shared/lib/mysql-connector-java.jar</org.apache.jetspeed.production.jdbc.drivers.path>
+                <org.apache.jetspeed.production.database.default.name>mysql</org.apache.jetspeed.production.database.default.name>
+                <org.apache.jetspeed.production.database.url>jdbc:mysql://localhost/j2</org.apache.jetspeed.production.database.url>
+                <org.apache.jetspeed.production.database.driver>com.mysql.jdbc.Driver</org.apache.jetspeed.production.database.driver>
+                <org.apache.jetspeed.production.database.user>tomcat4</org.apache.jetspeed.production.database.user>
+                <org.apache.jetspeed.production.database.password></org.apache.jetspeed.production.database.password>
+    
+                <!-- 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>
+                <org.apache.jetspeed.services.autodeployment.password>j2deployer</org.apache.jetspeed.services.autodeployment.password>
+    
+            </properties>
+        </profile>
+
+    </profiles>
+
+</settings>



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