portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r638200 - in /portals/jetspeed-2/portal/trunk: ./ applications/ applications/jetspeed-demo/ applications/jetspeed/ applications/jetspeed/src/ applications/jetspeed/src/main/ components/jetspeed-capability/ components/jetspeed-deploy-tools/ ...
Date Tue, 18 Mar 2008 03:59:03 GMT
Author: ate
Date: Mon Mar 17 20:59:02 2008
New Revision: 638200

URL: http://svn.apache.org/viewvc?rev=638200&view=rev
Log:
Switch using new/rewritten maven plugins.
Note: syntax and configuration models have changed!

Also: new applications projects which build a base jetspeed war as well as a jetspeed-demo!
Also, still work in progress, but its getting there...

Added:
    portals/jetspeed-2/portal/trunk/applications/
    portals/jetspeed-2/portal/trunk/applications/jetspeed/
    portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/
    portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml   (with props)
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/
    portals/jetspeed-2/portal/trunk/applications/pom.xml   (with props)
Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml
    portals/jetspeed-2/portal/trunk/pom.xml

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml?rev=638200&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml Mon Mar 17 20:59:02 2008
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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>
+  <prerequisites>
+    <maven>2.0.7</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-demo</artifactId>
+  <name>Jetspeed-2 Demo Portal Application</name>
+  <description>Jetspeed-2 Demo Portal Application</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>applications</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <packaging>war</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed</artifactId>
+      <type>war</type>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>jetspeed</finalName>
+    <plugins>
+      <plugin>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>jetspeed-build-maven-plugin</artifactId>
+        <version>${pom.version}</version>
+        <executions>
+          <execution>
+            <id>unpack-appserver</id>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <unpack>
+                <artifact>${groupId}:jetspeed-portal-resources:jar</artifact>
+                <targetDirectory>${project.build.directory}/resources/META-INF</targetDirectory>
+                <resources>
+                  <resource>
+                    <path>conf/tomcat</path>
+                    <include>context.xml</include>
+                  </resource>
+                </resources>
+              </unpack>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>jetspeed-portal-resources</artifactId>
+            <version>${pom.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>${project.build.directory}/resources</directory>
+              <filtering>true</filtering>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>test-portal-deploy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+            <version>${pom.version}</version>
+            <configuration>
+              <targetDeployDirectory>${project.build.directory}/deploy</targetDeployDirectory>
+              <deployments>
+                <deployment>
+                  <artifact>org.apache.portals.bridges:jsf-demo:war</artifact>
+                  <type>war</type>
+                  <infuse>true</infuse>
+                  <expand>false</expand>
+                  <target>jsf-demo.war</target>
+                  <delete>./jsf-demo</delete>
+                </deployment>
+              </deployments>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>jsf-demo</artifactId>
+                <type>war</type>
+                <version>1.0.4</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-deploy-tools</artifactId>
+                <version>${pom.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>

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

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml?rev=638200&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml (added)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml Mon Mar 17 20:59:02 2008
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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>
+  <prerequisites>
+    <maven>2.0.7</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed</artifactId>
+  <name>Jetspeed-2 Portal Application</name>
+  <description>Jetspeed-2 Portal Application</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>applications</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <packaging>war</packaging>
+
+  <dependencies>
+    <!-- Runtime Dependencies -->
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-cm</artifactId>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-deploy-tools</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-rdbms</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-prefs</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-search</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-security</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-registry</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-id-generator</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-file-cache</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-locator</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-capability</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-profiler</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-page-manager</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-portal-site</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-portlet-factory</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-sso</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-statistics</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-header-resource</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-webapp-logging</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-serializer</artifactId>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <!-- the portal already includes the full spring -->
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <!-- brought in by ddlutils -->
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-portal</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>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.0.2</version>
+      </plugin>
+      <plugin>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>jetspeed-build-maven-plugin</artifactId>
+        <version>${pom.version}</version>
+        <executions>
+          <execution>
+            <id>unpack-dojo</id>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <unpack>
+                <file>${basedir}/src/main/javascript/dojo/dojo.zip</file>
+                <targetDirectory>${project.build.directory}/${project.build.finalName}/javascript/</targetDirectory>
+              </unpack>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-portal-resources</id>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <unpack>
+                <artifact>${groupId}:jetspeed-portal-resources:jar</artifact>
+                <targetDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF</targetDirectory>
+                <resources>
+                  <resource>
+                    <path>webapp/WEB-INF/assembly</path>
+                    <destination>assembly</destination>
+                  </resource>
+                  <resource>
+                    <path>db-ojb</path>
+                    <destination>classes</destination>
+                  </resource>
+                </resources>
+              </unpack>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>jetspeed-portal-resources</artifactId>
+            <version>${pom.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

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

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/jetspeed/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/pom.xml?rev=638200&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/pom.xml (added)
+++ portals/jetspeed-2/portal/trunk/applications/pom.xml Mon Mar 17 20:59:02 2008
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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>
+    <prerequisites>
+        <maven>2.0.7</maven>
+    </prerequisites>
+    
+    <artifactId>applications</artifactId>
+    <name>Jetspeed-2 Applications</name>
+    <description>Jetspeed-2 Applications</description>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-2</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>jetspeed</module>
+        <module>jetspeed-demo</module>
+<!--        
+        <module>layout-portlets</module>
+-->        
+    </modules>
+</project>

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

Propchange: portals/jetspeed-2/portal/trunk/applications/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/applications/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-capability/pom.xml Mon Mar 17 20:59:02 2008
@@ -73,31 +73,43 @@
     <plugins>
       <plugin>
         <groupId>${pom.groupId}</groupId>
-        <artifactId>jetspeed-maven-plugins</artifactId>
+        <artifactId>jetspeed-build-maven-plugin</artifactId>
         <version>${pom.version}</version>
-        <dependencies>
-        </dependencies>
         <executions>
           <execution>
             <id>unpack-test-resources</id>
             <goals>
-              <goal>unpack-resources</goal>
+              <goal>unpack</goal>
             </goals>
             <phase>process-test-resources</phase>
             <configuration>
-              <skip>${maven.test.skip}</skip>
-              <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-              <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>                            
-              <resources>
-                <unpack>
-                  <entryset dir="webapp/WEB-INF/assembly" includes="capabilities.xml,transaction.xml"/>
-                  <entryset dir="db-ojb"/>
-                  <entryset dir="seed/min" includes="j2-seed.xml"/>
-                </unpack>
-              </resources>
+               <skip>${maven.test.skip}</skip>
+               <unpack>
+                 <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+                   <resources>
+                       <resource>
+                           <path>webapp/WEB-INF/assembly</path>
+                           <include>capabilities.xml,transaction.xml</include>
+                       </resource>
+                       <resource>
+                           <path>db-ojb</path>
+                       </resource>
+                       <resource>
+                           <path>seed/min</path>
+                           <include>j2-seed.xml</include>
+                       </resource>
+                   </resources>
+              </unpack>
             </configuration>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>jetspeed-portal-resources</artifactId>
+            <version>${pom.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
     <testResources>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/pom.xml Mon Mar 17 20:59:02 2008
@@ -65,5 +65,42 @@
     </dependency>
     
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>jetspeed-build-maven-plugin</artifactId>
+        <version>${pom.version}</version>
+        <executions>
+          <execution>
+            <id>unpack-resources</id>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <unpack>
+                <targetDirectory>${project.build.directory}/classes/org/apache/jetspeed/tools/deploy</targetDirectory>
+                <resources>
+                  <resource>
+                    <path>webapp/WEB-INF/tld</path>
+                    <include>portlet.tld</include>
+                  </resource>
+                </resources>
+              </unpack>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>jetspeed-portal-resources</artifactId>
+            <version>${pom.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
   
 </project>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/pom.xml Mon Mar 17 20:59:02 2008
@@ -139,33 +139,45 @@
             </plugin>
             <plugin>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed-maven-plugins</artifactId>
+                <artifactId>jetspeed-build-maven-plugin</artifactId>
                 <version>${pom.version}</version>
-                <dependencies>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>unpack-test-resources</id>
                         <goals>
-                            <goal>unpack-resources</goal>
+                            <goal>unpack</goal>
                         </goals>
                         <phase>process-test-resources</phase>
                         <configuration>
                             <skip>${maven.test.skip}</skip>
-                            <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                            <targetBaseDirectory>${project.build.directory}</targetBaseDirectory>                            
-                            <resources>
-                                <unpack dest="webapp/WEB-INF/pages">
-                                    <entryset dir="webapp/WEB-INF/pages"/>
-                                </unpack>
-                                <unpack dest="test-classes">
-                                    <entryset dir="webapp/WEB-INF/assembly" includes="transaction.xml"/>
-                                    <entryset dir="db-ojb"/>
-                                </unpack>
-                            </resources>
+                            <unpack>
+                                <targetDirectory>${project.build.directory}</targetDirectory>
+                                <resources>
+                                    <resource>
+                                        <path>webapp/WEB-INF/pages</path>
+                                        <destination>webapp/WEB-INF/pages</destination>
+                                    </resource>
+                                    <resource>
+                                        <path>webapp/WEB-INF/assembly</path>
+                                        <include>transaction.xml</include>
+                                        <destination>test-classes</destination>
+                                    </resource>
+                                    <resource>
+                                        <path>db-ojb</path>
+                                        <destination>test-classes</destination>
+                                    </resource>
+                                </resources>
+                            </unpack>
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>${groupId}</groupId>
+                        <artifactId>jetspeed-portal-resources</artifactId>
+                        <version>${pom.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <testResources>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Mon Mar 17 20:59:02 2008
@@ -252,33 +252,42 @@
             </plugin>
             <plugin>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed-maven-plugins</artifactId>
+                <artifactId>jetspeed-build-maven-plugin</artifactId>
                 <version>${pom.version}</version>
-                <dependencies>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>unpack-test-resources</id>
                         <goals>
-                            <goal>unpack-resources</goal>
+                            <goal>unpack</goal>
                         </goals>
                         <phase>process-test-resources</phase>
                         <configuration>
                             <skip>${maven.test.skip}</skip>
-                            <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                            <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>                            
-                            <resources>
-                                <unpack>
-                                    <entryset dir="webapp/WEB-INF/assembly"/>
-                                    <entryset dir="db-ojb"/>
-                                </unpack>
-                                <unpack dest="webapp">
-                                    <entryset dir="webapp"/>
-                                </unpack>
-                            </resources>
+                            <unpack>
+                                <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+                                <resources>
+                                    <resource>
+                                        <path>webapp/WEB-INF/assembly</path>
+                                    </resource>
+                                    <resource>
+                                        <path>db-ojb</path>
+                                    </resource>
+                                    <resource>
+                                        <path>webapp</path>
+                                        <destination>webapp</destination>
+                                    </resource>
+                                </resources>
+                            </unpack>
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>${groupId}</groupId>
+                        <artifactId>jetspeed-portal-resources</artifactId>
+                        <version>${pom.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <testResources>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-prefs/pom.xml Mon Mar 17 20:59:02 2008
@@ -85,30 +85,39 @@
         <plugins>
             <plugin>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed-maven-plugins</artifactId>
+                <artifactId>jetspeed-build-maven-plugin</artifactId>
                 <version>${pom.version}</version>
-                <dependencies>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>unpack-test-resources</id>
                         <goals>
-                            <goal>unpack-resources</goal>
+                            <goal>unpack</goal>
                         </goals>
                         <phase>process-test-resources</phase>
                         <configuration>
                             <skip>${maven.test.skip}</skip>
-                            <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                            <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>                            
-                            <resources>
-                                <unpack>
-                                    <entryset dir="webapp/WEB-INF/assembly" includes="prefs.xml,transaction.xml,cache.xml"/>
-                                    <entryset dir="db-ojb"/>
-                                </unpack>
-                            </resources>
+                            <unpack>
+                                <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+                                <resources>
+                                    <resource>
+                                        <path>webapp/WEB-INF/assembly</path>
+                                        <include>prefs.xml,transaction.xml,cache.xml</include>
+                                    </resource>
+                                    <resource>
+                                        <path>db-ojb</path>
+                                    </resource>
+                                </resources>
+                            </unpack>
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>${groupId}</groupId>
+                        <artifactId>jetspeed-portal-resources</artifactId>
+                        <version>${pom.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <testResources>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/pom.xml Mon Mar 17 20:59:02 2008
@@ -97,31 +97,43 @@
         <plugins>
             <plugin>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed-maven-plugins</artifactId>
+                <artifactId>jetspeed-build-maven-plugin</artifactId>
                 <version>${pom.version}</version>
-                <dependencies>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>unpack-test-resources</id>
                         <goals>
-                            <goal>unpack-resources</goal>
+                            <goal>unpack</goal>
                         </goals>
                         <phase>process-test-resources</phase>
                         <configuration>
                             <skip>${maven.test.skip}</skip>
-                            <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                            <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>                            
-                            <resources>
-                                <unpack>
-                                    <entryset dir="webapp/WEB-INF/assembly" includes="profiler.xml,transaction.xml,security-*.xml"/>
-                                    <entryset dir="db-ojb"/>
-                                    <entryset dir="seed/min" includes="j2-seed.xml"/>
-                                </unpack>
-                            </resources>
+                            <unpack>
+                                <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+                                <resources>
+                                    <resource>
+                                        <path>webapp/WEB-INF/assembly</path>
+                                        <include>profiler.xml,transaction.xml,security-*.xml</include>
+                                    </resource>
+                                    <resource>
+                                        <path>db-ojb</path>
+                                    </resource>
+                                    <resource>
+                                        <path>seed/min</path>
+                                        <include>j2-seed.xml</include>
+                                    </resource>
+                                </resources>
+                            </unpack>
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>${groupId}</groupId>
+                        <artifactId>jetspeed-portal-resources</artifactId>
+                        <version>${pom.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <testResources>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/pom.xml Mon Mar 17 20:59:02 2008
@@ -140,30 +140,39 @@
             </plugin>
             <plugin>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed-maven-plugins</artifactId>
+                <artifactId>jetspeed-build-maven-plugin</artifactId>
                 <version>${pom.version}</version>
-                <dependencies>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>unpack-test-resources</id>
                         <goals>
-                            <goal>unpack-resources</goal>
+                            <goal>unpack</goal>
                         </goals>
                         <phase>process-test-resources</phase>
                         <configuration>
                             <skip>${maven.test.skip}</skip>
-                            <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                            <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>                            
-                            <resources>
-                                <unpack>
-                                    <entryset dir="webapp/WEB-INF/assembly" includes="prefs.xml,transaction.xml,cache.xml"/>
-                                    <entryset dir="db-ojb"/>
-                                </unpack>
-                            </resources>
+                            <unpack>
+                                <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+                                <resources>
+                                    <resource>
+                                        <path>webapp/WEB-INF/assembly</path>
+                                        <include>prefs.xml,transaction.xml,cache.xml</include>
+                                    </resource>
+                                    <resource>
+                                        <path>db-ojb</path>
+                                    </resource>
+                                </resources>
+                            </unpack>
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>${groupId}</groupId>
+                        <artifactId>jetspeed-portal-resources</artifactId>
+                        <version>${pom.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <testResources>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/pom.xml Mon Mar 17 20:59:02 2008
@@ -122,30 +122,39 @@
             </plugin>
             <plugin>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed-maven-plugins</artifactId>
+                <artifactId>jetspeed-build-maven-plugin</artifactId>
                 <version>${pom.version}</version>
-                <dependencies>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>unpack-test-resources</id>
                         <goals>
-                            <goal>unpack-resources</goal>
+                            <goal>unpack</goal>
                         </goals>
                         <phase>process-test-resources</phase>
                         <configuration>
                             <skip>${maven.test.skip}</skip>
-                            <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                            <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>                            
-                            <resources>
-                                <unpack>
-                                    <entryset dir="webapp/WEB-INF/assembly" includes="prefs.xml,transaction.xml,cache.xml,security-*.xml"/>
-                                    <entryset dir="db-ojb"/>
-                                </unpack>
-                            </resources>
+                            <unpack>
+                                <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+                                <resources>
+                                    <resource>
+                                        <path>webapp/WEB-INF/assembly</path>
+                                        <include>prefs.xml,transaction.xml,cache.xml,security-*.xml</include>
+                                    </resource>
+                                    <resource>
+                                        <path>db-ojb</path>
+                                    </resource>
+                                </resources>
+                            </unpack>
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>${groupId}</groupId>
+                        <artifactId>jetspeed-portal-resources</artifactId>
+                        <version>${pom.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <testResources>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/pom.xml Mon Mar 17 20:59:02 2008
@@ -65,6 +65,20 @@
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-beanutils</groupId>
+                    <artifactId>commons-beanutils-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-beanutils</groupId>
+                    <artifactId>commons-beanutils-bean-collections</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>javolution</groupId>
@@ -73,6 +87,16 @@
         <dependency>
             <groupId>org.apache.ddlutils</groupId>
             <artifactId>ddlutils</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         
         <!-- Runtime Dependencies -->
@@ -85,13 +109,6 @@
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
             <scope>runtime</scope>
-        </dependency>
-
-        <!-- defining optional dependencies which are included transitively so their exclusions (defined in the root pom) are honored -->
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <optional>true</optional>
         </dependency>
         
     </dependencies>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-sso/pom.xml Mon Mar 17 20:59:02 2008
@@ -87,30 +87,39 @@
         <plugins>
             <plugin>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed-maven-plugins</artifactId>
+                <artifactId>jetspeed-build-maven-plugin</artifactId>
                 <version>${pom.version}</version>
-                <dependencies>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>unpack-test-resources</id>
                         <goals>
-                            <goal>unpack-resources</goal>
+                            <goal>unpack</goal>
                         </goals>
                         <phase>process-test-resources</phase>
                         <configuration>
                             <skip>${maven.test.skip}</skip>
-                            <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                            <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>                            
-                            <resources>
-                                <unpack>
-                                    <entryset dir="webapp/WEB-INF/assembly" includes="prefs.xml,sso.xml,transaction.xml,cache.xml,security-*.xml"/>
-                                    <entryset dir="db-ojb"/>
-                                </unpack>
-                            </resources>
+                            <unpack>
+                                <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+                                <resources>
+                                    <resource>
+                                        <path>webapp/WEB-INF/assembly</path>
+                                        <include>prefs.xml,sso.xml,transaction.xml,cache.xml,security-*.xml</include>
+                                    </resource>
+                                    <resource>
+                                        <path>db-ojb</path>
+                                    </resource>
+                                </resources>
+                            </unpack>
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>${groupId}</groupId>
+                        <artifactId>jetspeed-portal-resources</artifactId>
+                        <version>${pom.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <testResources>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/pom.xml Mon Mar 17 20:59:02 2008
@@ -96,30 +96,39 @@
         <plugins>
             <plugin>
                 <groupId>${pom.groupId}</groupId>
-                <artifactId>jetspeed-maven-plugins</artifactId>
+                <artifactId>jetspeed-build-maven-plugin</artifactId>
                 <version>${pom.version}</version>
-                <dependencies>
-                </dependencies>
                 <executions>
                     <execution>
                         <id>unpack-test-resources</id>
                         <goals>
-                            <goal>unpack-resources</goal>
+                            <goal>unpack</goal>
                         </goals>
                         <phase>process-test-resources</phase>
                         <configuration>
                             <skip>${maven.test.skip}</skip>
-                            <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                            <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>                            
-                            <resources>
-                                <unpack>
-                                    <entryset dir="webapp/WEB-INF/assembly" includes="statistics.xml,transaction.xml"/>
-                                    <entryset dir="db-ojb"/>
-                                </unpack>
-                            </resources>
+                            <unpack>
+                                <targetDirectory>${project.build.testOutputDirectory}</targetDirectory>
+                                <resources>
+                                    <resource>
+                                        <path>webapp/WEB-INF/assembly</path>
+                                        <include>statistics.xml,transaction.xml</include>
+                                    </resource>
+                                    <resource>
+                                        <path>db-ojb</path>
+                                    </resource>
+                                </resources>
+                            </unpack>
                         </configuration>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>${groupId}</groupId>
+                        <artifactId>jetspeed-portal-resources</artifactId>
+                        <version>${pom.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
         <testResources>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/pom.xml Mon Mar 17 20:59:02 2008
@@ -39,7 +39,7 @@
     <plugins>
       <plugin>
         <groupId>${pom.groupId}</groupId>
-        <artifactId>jetspeed-maven-plugins</artifactId>
+        <artifactId>jetspeed-build-maven-plugin</artifactId>
         <version>${pom.version}</version>        
         <executions>
           <execution>

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=638200&r1=638199&r2=638200&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Mon Mar 17 20:59:02 2008
@@ -53,9 +53,7 @@
   <inceptionYear>1999</inceptionYear>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/portal/trunk</connection>
-    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/portal/trunk
-    </developerConnection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/portal/trunk</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/portal/trunk</url>
   </scm>
   <mailingLists>
@@ -188,7 +186,7 @@
       <roles>
         <role>Java Developer</role>
       </roles>
-    </developer>    
+    </developer>
     <developer>
       <name>Woonsan Ko</name>
       <id>woonsan</id>
@@ -257,15 +255,17 @@
   <!-- Properties -->
   <properties>
 
-    <!-- Default Build Properties -->        
-    
+    <!-- Default Build Properties -->
+
     <maven.test.skip>true</maven.test.skip>
-    
+
     <!-- default test jdbc driver artifact definition which is *required* to have proper default values to keep installed POMs valid -->
     <org.apache.jetspeed.test.jdbc.driver.groupId>org.apache.derby</org.apache.jetspeed.test.jdbc.driver.groupId>
     <org.apache.jetspeed.test.jdbc.driver.artifactId>derby</org.apache.jetspeed.test.jdbc.driver.artifactId>
-    <org.apache.jetspeed.test.jdbc.driver.version>${org.apache.derby.version}</org.apache.jetspeed.test.jdbc.driver.version>
-    
+    <org.apache.jetspeed.test.jdbc.driver.version>
+      ${org.apache.derby.version}
+    </org.apache.jetspeed.test.jdbc.driver.version>
+
     <!-- Build Dependency Version Properties -->
     <ant.version>1.7</ant.version>
     <jmock.version>1.0.1</jmock.version>
@@ -296,12 +296,12 @@
     <commons-digester.version>1.8</commons-digester.version>
     <commons-fileupload.version>1.2</commons-fileupload.version>
     <commons-httpclient.version>3.0.1</commons-httpclient.version>
-    <commons-io.version>0.1</commons-io.version>
+    <commons-io.version>1.3.1</commons-io.version>
     <commons-lang.version>2.1</commons-lang.version>
     <commons-logging.version>1.1</commons-logging.version>
     <commons-pool.version>1.3</commons-pool.version>
     <!-- ddlutils svn r551445 with patch applied from http://issues.apache.org/jira/browse/DDLUTILS-75#action_12521579 -->
-      <ddlutils.version>r551445-patched-75</ddlutils.version>
+    <ddlutils.version>r551445-patched-75</ddlutils.version>
     <directory.version>0.9.3</directory.version>
     <ehcache.version>1.2.4</ehcache.version>
     <hsqldb.version>1.8.0.2</hsqldb.version>
@@ -343,7 +343,7 @@
     <velocity.version>1.5</velocity.version>
     <xalan.version>2.4.1</xalan.version>
     <xerces.version>2.3.0</xerces.version>
-    <xml-apis.version>1.0.b2</xml-apis.version>
+    <xml-apis.version>2.0.2</xml-apis.version>
     <asm.version>2.2</asm.version>
     <commonj.version>1.1</commonj.version>
   </properties>
@@ -361,6 +361,29 @@
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
+        <artifactId>jetspeed-maven-utils</artifactId>
+        <version>${pom.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>jetspeed-build-maven</artifactId>
+        <version>${pom.version}</version>
+        <type>plugin</type>
+      </dependency>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>jetspeed-db-maven</artifactId>
+        <version>${pom.version}</version>
+        <type>plugin</type>
+      </dependency>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>jetspeed-deploy-maven</artifactId>
+        <version>${pom.version}</version>
+        <type>plugin</type>
+      </dependency>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
         <artifactId>jetspeed-commons</artifactId>
         <version>${pom.version}</version>
       </dependency>
@@ -374,7 +397,7 @@
         <artifactId>jetspeed-portal-resources</artifactId>
         <version>${pom.version}</version>
       </dependency>
-      
+
       <!-- J2 Components -->
       <dependency>
         <groupId>${pom.groupId}</groupId>
@@ -465,7 +488,7 @@
         <groupId>${pom.groupId}</groupId>
         <artifactId>jetspeed-statistics</artifactId>
         <version>${pom.version}</version>
-      </dependency>        
+      </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>
         <artifactId>jetspeed-header-resource</artifactId>
@@ -496,7 +519,13 @@
         <artifactId>jetspeed-serializer</artifactId>
         <version>${pom.version}</version>
       </dependency>
-      
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>jetspeed</artifactId>
+        <type>war</type>
+        <version>${pom.version}</version>
+      </dependency>
+
       <!-- Portals Applications JARs -->
       <dependency>
         <groupId>${pom.groupId}</groupId>
@@ -513,7 +542,7 @@
         <artifactId>jetspeed-layout-portlets</artifactId>
         <version>${pom.version}</version>
       </dependency>
-      
+
       <!-- Portals Applications -->
       <dependency>
         <groupId>${pom.groupId}</groupId>
@@ -545,7 +574,7 @@
         <type>war</type>
         <version>${pom.version}</version>
       </dependency>
-      
+
       <!-- Standard APIs -->
       <dependency>
         <groupId>portlet-api</groupId>
@@ -661,7 +690,7 @@
         <groupId>regexp</groupId>
         <artifactId>regexp</artifactId>
         <version>${regexp.version}</version>
-      </dependency>      
+      </dependency>
       <dependency>
         <groupId>commons-configuration</groupId>
         <artifactId>commons-configuration</artifactId>
@@ -674,6 +703,11 @@
       </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
+        <artifactId>commons-logging-api</artifactId>
+        <version>${commons-logging.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>${commons-logging.version}</version>
         <exclusions>
@@ -737,9 +771,9 @@
         <artifactId>ehcache</artifactId>
         <version>${ehcache.version}</version>
       </dependency>
-      
+
       <!-- defining dom4j (which is included by commons-configuration) just to be able to exclude
-           isorelax, msv and relaxngDatatype
+        isorelax, msv and relaxngDatatype
       -->
       <dependency>
         <groupId>dom4j</groupId>
@@ -761,7 +795,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <!-- Test -->
       <dependency>
         <groupId>junit</groupId>
@@ -1041,7 +1075,7 @@
         <artifactId>ant</artifactId>
         <version>${ant.version}</version>
       </dependency>
-      
+
       <!-- ASM -->
       <dependency>
         <groupId>asm</groupId>
@@ -1061,7 +1095,7 @@
         <version>${commonj.version}</version>
         <scope>provided</scope>
       </dependency>
-      
+
     </dependencies>
   </dependencyManagement>
 
@@ -1125,12 +1159,12 @@
             <disableXmlReport>true</disableXmlReport>
             <trimStackTrace>false</trimStackTrace>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
-            
+
             <!-- workaround for still not fixed SUREFIRE-288: Surefire tries to instantiate nested TestCase classes -->
             <excludes>
               <exclude>**/*$*</exclude>
             </excludes>
-            <!-- database related tests system properties -->	
+            <!-- database related tests system properties -->
             <systemProperties>
               <property>
                 <name>org.apache.jetspeed.test.database.user</name>
@@ -1169,9 +1203,7 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-        
-    </plugins>        
+
     <resources>
       <resource>
         <!-- default from Super POM -->
@@ -1187,7 +1219,8 @@
           <include>**/*.conf</include>
         </includes>
       </resource>
-    </resources>    
+    </resources>
+
     <testResources>
       <!-- default from Super POM -->
       <testResource>
@@ -1200,6 +1233,7 @@
         </excludes>
       </testResource>
     </testResources>
+
   </build>
 
   <profiles>
@@ -1209,71 +1243,23 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <modules>
+        <module>jetspeed-api</module>
         <module>maven</module>
         <module>jetspeed-portal-resources</module>
-        <module>jetspeed-api</module>
         <module>jetspeed-commons</module>
-        <module>components</module>    
+        <module>components</module>
+        <module>applications</module>
       </modules>
     </profile>
     <profile>
       <id>init</id>
       <modules>
+        <module>jetspeed-api</module>
         <module>maven</module>
         <module>jetspeed-portal-resources</module>
       </modules>
     </profile>
     <profile>
-      <id>init-db</id>
-      <build>
-        <plugins>
-          <plugin>
-            <inherited>false</inherited>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>jetspeed-maven-plugins</artifactId>
-            <version>${pom.version}</version>
-            <dependencies>
-              <dependency>
-                <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
-                <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
-                <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
-              </dependency>
-            </dependencies>
-            <executions>
-              <execution>
-                <id>pom-init-db</id>
-                <phase>test-compile</phase>
-                <goals>
-                  <goal>init-db</goal>
-                </goals>
-                <configuration>
-                  <unpackResources>
-                    <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                    <resources>
-                      <unpack includes="ddl/${org.apache.jetspeed.test.database.default.name}/"/> 
-                    </resources>
-                  </unpackResources>
-                  <sqlScripts>
-                    <sqlScript>
-                      <path>${project.build.directory}/ddl/${org.apache.jetspeed.test.database.default.name}/drop-schema.sql</path>
-                      <ignoreErrors>true</ignoreErrors>
-                    </sqlScript>
-                    <sqlScript>
-                      <path>${project.build.directory}/ddl/${org.apache.jetspeed.test.database.default.name}/create-schema.sql</path>
-                    </sqlScript>
-                  </sqlScripts>
-                  <username>${org.apache.jetspeed.test.database.user}</username>
-                  <password>${org.apache.jetspeed.test.database.password}</password>
-                  <url>${org.apache.jetspeed.test.database.url}</url>
-                  <driver>${org.apache.jetspeed.test.database.driver}</driver>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
       <id>test</id>
       <activation>
         <property>
@@ -1285,107 +1271,133 @@
         <maven.test.skip>false</maven.test.skip>
       </properties>
       <modules>
+        <module>jetspeed-api</module>
         <module>maven</module>
         <module>jetspeed-portal-resources</module>
-        <module>jetspeed-api</module>
         <module>jetspeed-commons</module>
-        <module>components</module>    
+        <module>components</module>
       </modules>
     </profile>
     <profile>
       <id>prod-db</id>
       <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>${pom.groupId}</groupId>
-              <artifactId>jetspeed-maven-plugins</artifactId>
-              <version>${pom.version}</version>
-              <dependencies>
-                <dependency>
-                  <groupId>${org.apache.jetspeed.production.jdbc.driver.groupId}</groupId>
-                  <artifactId>${org.apache.jetspeed.production.jdbc.driver.artifactId}</artifactId>
-                  <version>${org.apache.jetspeed.production.jdbc.driver.version}</version>
-                </dependency>
-              </dependencies>
-              <goals>
-                <goal>init-db</goal>
-              </goals>
-              <configuration>
-                <unpackResources>
-                  <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                  <resources>
-                    <unpack includes="ddl/${org.apache.jetspeed.production.database.default.name}/"/> 
-                  </resources>
-                </unpackResources>
-                <sqlScripts>
-                  <sqlScript>
-                    <path>${project.build.directory}/ddl/${org.apache.jetspeed.production.database.default.name}/drop-schema.sql</path>
-                    <ignoreErrors>true</ignoreErrors>
-                  </sqlScript>
-                  <sqlScript>
-                    <path>${project.build.directory}/ddl/${org.apache.jetspeed.production.database.default.name}/create-schema.sql</path>
-                  </sqlScript>
-                </sqlScripts>
+        <plugins>
+          <plugin>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-db-maven-plugin</artifactId>
+            <version>${pom.version}</version>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <connection>
                 <username>${org.apache.jetspeed.production.database.user}</username>
                 <password>${org.apache.jetspeed.production.database.password}</password>
                 <url>${org.apache.jetspeed.production.database.url}</url>
                 <driver>${org.apache.jetspeed.production.database.driver}</driver>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
+              </connection>
+              <unpack>
+                <artifact>${groupId}:jetspeed-portal-resources:jar</artifact>
+                <resources>
+                  <resource>
+                    <destination>ddl/production</destination>
+                    <path>ddl</path>
+                    <include>${org.apache.jetspeed.production.database.default.name}/</include>
+                  </resource>
+                </resources>
+              </unpack>
+              <sql>
+                <scripts>
+                  <script>
+                    <path>
+                      ${project.build.directory}/ddl/production/${org.apache.jetspeed.production.database.default.name}/drop-schema.sql
+                    </path>
+                    <ignoreErrors>true</ignoreErrors>
+                  </script>
+                  <script>
+                    <path>
+                      ${project.build.directory}/ddl/production/${org.apache.jetspeed.production.database.default.name}/create-schema.sql
+                    </path>
+                  </script>
+                </scripts>
+              </sql>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>${groupId}</groupId>
+                <artifactId>jetspeed-portal-resources</artifactId>
+                <version>${pom.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>${org.apache.jetspeed.production.jdbc.driver.groupId}</groupId>
+                <artifactId>${org.apache.jetspeed.production.jdbc.driver.artifactId}</artifactId>
+                <version>${org.apache.jetspeed.production.jdbc.driver.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
       </build>
-    </profile>      
+    </profile>
     <profile>
       <id>test-db</id>
       <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>${pom.groupId}</groupId>
-              <artifactId>jetspeed-maven-plugins</artifactId>
-              <version>${pom.version}</version>
-              <dependencies>
-                <dependency>
-                  <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
-                  <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
-                  <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
-                </dependency>
-              </dependencies>
-              <executions>
-                <execution>
-                  <goals>
-                    <goal>init-db</goal>
-                  </goals>
-                </execution>
-              </executions>
-              <configuration>
-                <unpackResources>
-                  <resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
-                  <resources>
-                    <unpack includes="ddl/${org.apache.jetspeed.test.database.default.name}/"/> 
-                  </resources>
-                </unpackResources>
-                <sqlScripts>
-                  <sqlScript>
-                    <path>${project.build.directory}/ddl/${org.apache.jetspeed.test.database.default.name}/drop-schema.sql</path>
-                    <ignoreErrors>true</ignoreErrors>
-                  </sqlScript>
-                  <sqlScript>
-                    <path>${project.build.directory}/ddl/${org.apache.jetspeed.test.database.default.name}/create-schema.sql</path>
-                  </sqlScript>
-                </sqlScripts>
+        <plugins>
+          <plugin>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-db-maven-plugin</artifactId>
+            <version>${pom.version}</version>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <connection>
                 <username>${org.apache.jetspeed.test.database.user}</username>
                 <password>${org.apache.jetspeed.test.database.password}</password>
                 <url>${org.apache.jetspeed.test.database.url}</url>
                 <driver>${org.apache.jetspeed.test.database.driver}</driver>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
+              </connection>
+              <unpack>
+                <artifact>${groupId}:jetspeed-portal-resources:jar</artifact>
+                <resources>
+                  <resource>
+                    <destination>ddl/test</destination>
+                    <path>ddl</path>
+                    <include>${org.apache.jetspeed.test.database.default.name}/</include>
+                  </resource>
+                </resources>
+              </unpack>
+              <sql>
+                <scripts>
+                  <script>
+                    <path>
+                      ${project.build.directory}/ddl/test/${org.apache.jetspeed.test.database.default.name}/drop-schema.sql
+                    </path>
+                    <ignoreErrors>true</ignoreErrors>
+                  </script>
+                  <script>
+                    <path>
+                      ${project.build.directory}/ddl/test/${org.apache.jetspeed.test.database.default.name}/create-schema.sql
+                    </path>
+                  </script>
+                </scripts>
+              </sql>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>${groupId}</groupId>
+                <artifactId>jetspeed-portal-resources</artifactId>
+                <version>${pom.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>${org.apache.jetspeed.test.jdbc.driver.groupId}</groupId>
+                <artifactId>${org.apache.jetspeed.test.jdbc.driver.artifactId}</artifactId>
+                <version>${org.apache.jetspeed.test.jdbc.driver.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
       </build>
-    </profile>      
-  </profiles>      
-  
+    </profile>
+  </profiles>
+
 </project>



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