You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by dd...@apache.org on 2008/10/13 18:34:52 UTC

svn commit: r704157 [1/2] - in /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype: ./ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/ src/main/resources/archetype-resources/__rootArtifactId...

Author: ddam
Date: Mon Oct 13 09:34:51 2008
New Revision: 704157

URL: http://svn.apache.org/viewvc?rev=704157&view=rev
Log:
JS2-904 : Maven archetype

Patch provided by Niels van Kampenhout, modified a bit for integration in Jetspeed. Thanks Niels!

Added:
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/java/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/java/MyPortlet.java   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/portlet.xml   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/tld/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/tld/portlet.tld   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/web.xml   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/sql/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/sql/min/
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/sql/min/j2-seed.xml   (with props)
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml   (with props)
Removed:
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/src/
Modified:
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/pom.xml
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype.xml
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/pom.xml?rev=704157&r1=704156&r2=704157&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/pom.xml Mon Oct 13 09:34:51 2008
@@ -15,16 +15,49 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   
+  $Id: pom.xml 678019 2008-07-18 19:57:49Z ate $
 -->
 <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>
-  <artifactId>jetspeed-archetype</artifactId>
-  <name>Jetspeed 2 Maven Archetype</name>
-  <url>http://maven.apache.org</url>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+
+  <artifactId>maven</artifactId>
+  <name>Jetspeed-2 Maven Plugins</name>
+  <description>Jetspeed-2 Maven Plugins</description>
   <parent>
     <groupId>org.apache.portals.jetspeed-2</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>jetspeed-2</artifactId>
     <version>2.2-SNAPSHOT</version>
   </parent>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>jetspeed-maven-utils</module>
+    <module>jetspeed-mvn-maven-plugin</module>
+    <module>jetspeed-unpack-maven-plugin</module>
+    <module>jetspeed-deploy-maven-plugin</module>
+    <module>jetspeed-db-maven-plugin</module>
+    <module>jetspeed-archetype</module>
+  </modules>
+
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <reportSets>
+          <reportSet>            
+            <reports>              
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
 </project>

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml Mon Oct 13 09:34:51 2008
@@ -0,0 +1,82 @@
+<?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.
+-->
+<archetype-descriptor name="my">
+  <fileSets>
+    <fileSet filtered="true" encoding="UTF-8">
+      <directory></directory>
+      <includes>
+        <include>jetspeed-mvn-settings.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <modules>
+    <module id="${rootArtifactId}-portal" dir="__rootArtifactId__-portal" name="${rootArtifactId}-portal">
+      <fileSets>
+        <fileSet filtered="true" encoding="UTF-8">
+          <directory>src/main/webapp</directory>
+          <includes>
+            <include>**/*.psml</include>
+          </includes>
+        </fileSet>
+        <fileSet filtered="true" encoding="UTF-8">
+          <directory>src/sql</directory>
+          <includes>
+            <include>**/*.xml</include>
+          </includes>
+        </fileSet>
+        <fileSet filtered="true" encoding="UTF-8">
+          <directory></directory>
+          <includes>
+            <include>jetspeed-mvn-portal-pom.xml</include>
+          </includes>
+        </fileSet>
+      </fileSets>
+    </module>
+    <module id="${rootArtifactId}-pa" dir="__rootArtifactId__-pa" name="${rootArtifactId}-pa">
+      <fileSets>
+        <fileSet filtered="true" packaged="true" encoding="UTF-8">
+          <directory>src/main/java</directory>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
+        <fileSet filtered="true" encoding="UTF-8">
+          <directory>src/main/webapp</directory>
+          <includes>
+            <include>**/*.jsp</include>
+            <include>**/*.xml</include>
+          </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8">
+          <directory>src/main/webapp</directory>
+          <includes>
+            <include>**/*.tld</include>
+          </includes>
+        </fileSet>
+        <fileSet filtered="true" encoding="UTF-8">
+          <directory></directory>
+          <includes>
+            <include>jetspeed-mvn-pa-pom.xml</include>
+          </includes>
+        </fileSet>
+      </fileSets>
+    </module>
+  </modules>
+</archetype-descriptor>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype.xml?rev=704157&r1=704156&r2=704157&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/META-INF/maven/archetype.xml Mon Oct 13 09:34:51 2008
@@ -1,27 +1,38 @@
 <?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
+  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.
+   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.
 -->
 <archetype>
-  <id>jetspeed-archetype</id>
+  <id>my</id>
   <resources>
-    <resource>src/main/webapp/decorations/layout/readme.txt</resource>
-    <resource>src/main/webapp/decorations/portlet/readme.txt</resource>
-    <resource>src/main/webapp/desktop-themes/readme.txt</resource>
-    <resource>src/main/webapp/WEB-INF/pages/readme.txt</resource>
+    <resource>jetspeed-archetype-pa/src/main/java/org/example/MyPortlet.java</resource>
+    <resource>jetspeed-archetype-pa/src/main/webapp/WEB-INF/tld/portlet.tld</resource>
+    <resource>jetspeed-archetype-pa/src/main/webapp/WEB-INF/portlet.xml</resource>
+    <resource>jetspeed-archetype-pa/src/main/webapp/WEB-INF/web.xml</resource>
+    <resource>jetspeed-archetype-pa/src/main/webapp/maximized.jsp</resource>
+    <resource>jetspeed-archetype-pa/src/main/webapp/help.jsp</resource>
+    <resource>jetspeed-archetype-pa/src/main/webapp/normal.jsp</resource>
+    <resource>jetspeed-archetype-pa/pom.xml</resource>
+    <resource>jetspeed-archetype-pa/jetspeed-mvn-pa-pom.xml</resource>
+    <resource>jetspeed-archetype-portal/src/sql/min/j2-seed.xml</resource>
+    <resource>jetspeed-archetype-portal/src/main/webapp/WEB-INF/pages/default-page.psml</resource>
+    <resource>jetspeed-archetype-portal/pom.xml</resource>
+    <resource>jetspeed-archetype-portal/jetspeed-mvn-portal-pom.xml</resource>
+    <resource>jetspeed-mvn-settings.xml</resource>
   </resources>
-</archetype>
+</archetype>
\ No newline at end of file

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml Mon Oct 13 09:34:51 2008
@@ -0,0 +1,127 @@
+#set($dollar = '$')
+<?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.
+-->
+<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.9</maven>
+  </prerequisites>
+
+  <parent>
+    <groupId>${groupId}</groupId>
+    <artifactId>${parentArtifactId}</artifactId>
+    <version>${version}</version>
+  </parent>
+
+  <artifactId>jetspeed-mvn-pa-pom</artifactId>
+  <name>Jetspeed-2 Maven Invoker Configuration for My Portlet Application</name>
+  <description>Jetspeed-2 Maven Invoker Configuration for My Portlet Application</description>
+
+  <packaging>pom</packaging>
+
+  <build>
+    <defaultGoal>process-resources</defaultGoal>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>db</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>resources</id>
+                <goals>
+                  <goal>resources</goal>
+                </goals>
+                <phase>process-resources</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+        <resources>
+          <resource>
+            <directory>${dollar}{basedir}/src/conf/jpox</directory>
+            <targetPath>../jpox</targetPath>
+            <filtering>true</filtering>
+          </resource>
+        </resources>
+      </build>
+    </profile>
+
+    <profile>
+      <id>deploy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>deploy</id>
+                <goals>
+                  <goal>deploy</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <targetBaseDir>${dollar}{org.apache.jetspeed.server.home}</targetBaseDir>
+                  <portalName>${dollar}{org.apache.jetspeed.portal.context.name}</portalName>
+                  <deployments>
+                    <!-- portlet app -->
+                    <deployment>
+                      <artifact>${dollar}{pom.groupId}:${parentArtifactId}-pa:war</artifact>
+                      <infuse>true</infuse>
+                      <expand>true</expand>
+                      <delete>./${parentArtifactId}-pa.war</delete>
+                    </deployment>
+                  </deployments>
+                </configuration>
+              </execution>
+            </executions>
+
+            <dependencies>
+              <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>${parentArtifactId}-pa</artifactId>
+                <version>${pom.version}</version>
+                <type>war</type>
+              </dependency>
+
+              <!-- plugin own dependencies -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-deploy-tools</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+  </profiles>
+
+</project>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml Mon Oct 13 09:34:51 2008
@@ -0,0 +1,272 @@
+#set($dollar = '$')
+<?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.
+-->
+<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.9</maven>
+  </prerequisites>
+
+  <artifactId>${artifactId}</artifactId>
+  <name>My Portlet Application</name>
+  <parent>
+    <groupId>${groupId}</groupId>
+    <artifactId>${rootArtifactId}</artifactId>
+    <version>${version}</version>
+  </parent>
+
+  <packaging>war</packaging>
+  <dependencies>
+
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>1.1</version>
+    </dependency>
+
+	<dependency>
+	  <groupId>net.sourceforge.htmlcleaner</groupId>
+	  <artifactId>htmlcleaner</artifactId>
+	  <version>2.1</version>
+	</dependency>
+
+    <dependency>
+      <groupId>org.ostermiller</groupId>
+      <artifactId>ostermillerutils</artifactId>
+      <version>1.06</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+    <dependency>
+      <artifactId>commons-io</artifactId>
+      <groupId>commons-io</groupId>
+      <version>1.3.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.0</version>
+    </dependency>
+
+    <!-- log4j and commons logging -->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <artifactId>log4j</artifactId>
+      <groupId>log4j</groupId>
+      <version>1.2.8</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <version>1.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-digester</groupId>
+          <artifactId>commons-digester</artifactId>
+        </exclusion>
+        <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>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <!-- Jetspeed dependencies -->
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-api</artifactId>
+      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-webapp-logging</artifactId>
+      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+    </dependency>
+
+    <!-- Portals Bridges Common provides the GenericServletPortlet -->
+    <dependency>
+      <artifactId>portals-bridges-common</artifactId>
+      <groupId>org.apache.portals.bridges</groupId>
+      <version>${dollar}{org.apache.portals.bridges.common.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-validator</groupId>
+      <artifactId>commons-validator</artifactId>
+      <version>1.3.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-digester</groupId>
+          <artifactId>commons-digester</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-beanutils</groupId>
+          <artifactId>commons-beanutils</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.8</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.transaction</groupId>
+      <artifactId>jta</artifactId>
+      <version>1.0.1B</version>
+    </dependency>
+
+    <!-- Freemarker -->
+    <dependency>
+      <artifactId>freemarker</artifactId>
+      <groupId>freemarker</groupId>
+      <version>2.3.8</version>
+    </dependency>
+
+    <!-- for mail -->
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.3.3</version>
+    </dependency>
+
+    <!-- for JAXB 2.0 -->
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.stream</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.1.3</version>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <finalName>${artifactId}</finalName>
+    <resources>
+      <resource>
+        <!-- default from Super POM -->
+        <directory>${dollar}{basedir}/src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>${dollar}{basedir}/src/main/webresources</directory>
+        <targetPath>../${dollar}{pom.artifactId}</targetPath>
+        <filtering>true</filtering>
+      </resource>
+      <resource>
+        <directory>${dollar}{basedir}/src/main/java</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.jdo</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
+</project>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/java/MyPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/java/MyPortlet.java?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/java/MyPortlet.java (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/java/MyPortlet.java Mon Oct 13 09:34:51 2008
@@ -0,0 +1,73 @@
+package ${package};
+
+/*
+ * Copyright 2001-2005 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.
+ */
+
+import java.io.IOException;
+import javax.portlet.PortletConfig;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+
+public class MyPortlet extends GenericPortlet {
+
+    private static final String NORMAL_VIEW = "/normal.jsp";
+    private static final String MAXIMIZED_VIEW = "/maximized.jsp";
+    private static final String HELP_VIEW = "/help.jsp";
+
+    private PortletRequestDispatcher normalView;
+    private PortletRequestDispatcher maximizedView;
+    private PortletRequestDispatcher helpView;
+
+    public void doView( RenderRequest request, RenderResponse response )
+        throws PortletException, IOException {
+
+        if( WindowState.MINIMIZED.equals( request.getWindowState() ) ) {
+            return;
+        }
+
+        if ( WindowState.NORMAL.equals( request.getWindowState() ) ) {
+            normalView.include( request, response );
+        } else {
+            maximizedView.include( request, response );
+        }
+    }
+
+    protected void doHelp( RenderRequest request, RenderResponse response )
+        throws PortletException, IOException {
+
+        helpView.include( request, response );
+
+    }
+
+    public void init( PortletConfig config ) throws PortletException {
+        super.init( config );
+        normalView = config.getPortletContext().getRequestDispatcher( NORMAL_VIEW );
+        maximizedView = config.getPortletContext().getRequestDispatcher( MAXIMIZED_VIEW );
+        helpView = config.getPortletContext().getRequestDispatcher( HELP_VIEW );
+    }
+
+    public void destroy() {
+        normalView = null;
+        maximizedView = null;
+        helpView = null;
+        super.destroy();
+    }
+
+}

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/java/MyPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/java/MyPortlet.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/portlet.xml?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/portlet.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/portlet.xml Mon Oct 13 09:34:51 2008
@@ -0,0 +1,46 @@
+<?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.
+-->
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
+                        http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+
+    <portlet>
+        <description>This is a test.</description>
+        <portlet-name>myportlet</portlet-name>
+        <display-name>MyPortlet Portlet</display-name>
+        <portlet-class>${package}.MyPortlet</portlet-class>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/normal.jsp</value>
+        </init-param>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>My Portlet</title>
+            <short-title>My Portlet</short-title>
+            <keywords>test</keywords>
+        </portlet-info>
+    </portlet>
+
+</portlet-app>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/tld/portlet.tld
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/tld/portlet.tld?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/tld/portlet.tld (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/tld/portlet.tld Mon Oct 13 09:34:51 2008
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<!-- 
+Copyright 2004 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.
+-->
+<taglib>
+    <tlibversion>1.0</tlibversion>
+    <jspversion>1.1</jspversion>
+    <shortname>portlet</shortname>
+    <uri>http://java.sun.com/portlet</uri>
+    <tag>
+        <name>defineObjects</name>
+        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
+        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+    <tag>
+        <name>param</name>
+        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
+        <bodycontent>empty</bodycontent>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>actionURL</name>
+        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
+        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
+        <bodycontent>JSP</bodycontent>
+        <attribute>
+            <name>windowState</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>portletMode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>secure</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>renderURL</name>
+        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
+        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
+        <bodycontent>JSP</bodycontent>
+        <attribute>
+            <name>windowState</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>portletMode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>secure</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>namespace</name>
+        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+</taglib>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/tld/portlet.tld
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/tld/portlet.tld
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/web.xml?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/web.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/web.xml Mon Oct 13 09:34:51 2008
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+                         "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
+  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.
+-->
+<web-app>
+    <display-name>My Portal</display-name>
+
+    <description>Generated Portlet Wrapper</description>
+
+    <servlet>
+        <servlet-name>${parentArtifactId}-pa</servlet-name>
+        <display-name>${parentArtifactId}-pa Portlet</display-name>
+        <description>Portlet for Jetspeed Fusion</description>
+        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+        <init-param>
+            <param-name>registerAtInit</param-name>
+            <param-value>1</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portletApplication</param-name>
+            <param-value>${parentArtifactId}-pa</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>JetspeedContainer</servlet-name>
+        <url-pattern>/container/*</url-pattern>
+    </servlet-mapping>
+
+    <taglib>
+        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
+        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
+    </taglib>
+</web-app>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp Mon Oct 13 09:34:51 2008
@@ -0,0 +1,3 @@
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+<h4>Need help?</h4>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp Mon Oct 13 09:34:51 2008
@@ -0,0 +1,3 @@
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+<h4>This is a much bigger world isn't it?</h4>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp Mon Oct 13 09:34:51 2008
@@ -0,0 +1,3 @@
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+<h4>Welcome to the Jetspeed World!</h4>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml Mon Oct 13 09:34:51 2008
@@ -0,0 +1,544 @@
+#set($dollar = '$')
+<?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.
+-->
+<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.9</maven>
+  </prerequisites>
+
+  <parent>
+    <groupId>${groupId}</groupId>
+    <artifactId>${parentArtifactId}</artifactId>
+    <version>${version}</version>
+  </parent>
+
+  <artifactId>jetspeed-mvn-portal-pom</artifactId>
+  <name>Jetspeed-2 Maven Invoker Configuration for My Portal</name>
+  <description>Jetspeed-2 Maven Invoker Configuration for My Portal</description>
+
+  <packaging>pom</packaging>
+
+  <properties>    
+    <org.apache.jetspeed.portal.context.name>${parentArtifactId}</org.apache.jetspeed.portal.context.name>
+    <portal.unpacked.dir>${dollar}{project.parent.artifactId}-portal-${dollar}{project.parent.version}</portal.unpacked.dir>
+  </properties>
+
+  <build>
+    <defaultGoal>process-resources</defaultGoal>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>db</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-db-maven-plugin</artifactId>
+            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+            <configuration>
+              <connection>
+                <username>${dollar}{org.apache.jetspeed.production.database.user}</username>
+                <password>${dollar}{org.apache.jetspeed.production.database.password}</password>
+                <url>${dollar}{org.apache.jetspeed.production.database.url}</url>
+                <driver>${dollar}{org.apache.jetspeed.production.database.driver}</driver>
+              </connection>
+            </configuration>
+            <executions>
+              <execution>
+                <id>unpack</id>
+                <goals>
+                  <goal>init</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <unpack>
+                    <artifact>org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar</artifact>
+                    <resources>
+                      <resource>
+                        <destination>ddl</destination>
+                        <path>ddl</path>
+                        <include>${dollar}{org.apache.jetspeed.production.database.default.name}/</include>
+                      </resource>
+                    </resources>
+                  </unpack>
+                </configuration>
+              </execution>
+              <execution>
+                <id>execute-sql</id>
+                <goals>
+                  <goal>init</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <sql>
+                    <scripts>
+                      <script>
+                        <path>${dollar}{project.build.directory}/ddl/${dollar}{org.apache.jetspeed.production.database.default.name}/drop-schema.sql</path>
+                        <ignoreErrors>true</ignoreErrors>
+                      </script>
+                      <script>
+                        <path>${dollar}{project.build.directory}/ddl/${dollar}{org.apache.jetspeed.production.database.default.name}/create-schema.sql</path>
+                      </script>
+                    </scripts>
+                  </sql>
+                </configuration>
+              </execution>
+              <execution>
+                <id>seed</id>
+                <goals>
+                  <goal>init</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <seed>
+                    <categories>serializer</categories>
+                    <filterPropertiesFileName>
+                      ${dollar}{project.build.directory}/${parentArtifactId}-portal-${dollar}{pom.version}/WEB-INF/conf/spring-filter.properties
+                    </filterPropertiesFileName>
+                    <applicationRootPath>${dollar}{project.build.directory}/${parentArtifactId}-portal-${dollar}{pom.version}</applicationRootPath>
+                    <files>
+                      <file>${dollar}{basedir}/src/sql/min/j2-seed.xml</file>
+                    </files>
+                    <initProperties>
+                      <org.apache.jetspeed.database.user>${dollar}{org.apache.jetspeed.production.database.user}</org.apache.jetspeed.database.user>
+                      <org.apache.jetspeed.database.password>${dollar}{org.apache.jetspeed.production.database.password}</org.apache.jetspeed.database.password>
+                      <org.apache.jetspeed.database.url>${dollar}{org.apache.jetspeed.production.database.url}</org.apache.jetspeed.database.url>
+                      <org.apache.jetspeed.database.driver>${dollar}{org.apache.jetspeed.production.database.driver}</org.apache.jetspeed.database.driver>
+                    </initProperties>
+                  </seed>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-portal-resources</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-db-tools</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>${dollar}{org.apache.jetspeed.production.jdbc.driver.groupId}</groupId>
+                <artifactId>${dollar}{org.apache.jetspeed.production.jdbc.driver.artifactId}</artifactId>
+                <version>${dollar}{org.apache.jetspeed.production.jdbc.driver.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>deploy</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-unpack-maven-plugin</artifactId>
+            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>unpack-appserver</id>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <unpack>
+                    <artifact>org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar</artifact>
+                    <resources>
+                      <resource>
+                        <path>conf</path>
+                        <include>tomcat/context.xml</include>
+                      </resource>
+                    </resources>
+                  </unpack>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-portal-resources</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>resources</id>
+                <goals>
+                  <goal>resources</goal>
+                </goals>
+                <phase>process-resources</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>deploy</id>
+                <goals>
+                  <goal>deploy</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <targetBaseDir>${dollar}{org.apache.jetspeed.server.home}</targetBaseDir>
+                  <portalName>${dollar}{org.apache.jetspeed.portal.context.name}</portalName>
+                  <destinations>
+                    <conf>conf</conf>
+                    <context>conf/Catalina/localhost</context>
+                  </destinations>
+                  <deployments>
+                    <!-- shared/lib -->
+                    <deployment>
+                      <artifact>portlet-api:portlet-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-commons:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.pluto:pluto:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.bridges:portals-bridges-common:jar</artifact>
+                    </deployment>
+                    <!-- common/endorsed -->
+                    <deployment>
+                      <artifact>xalan:xalan:jar</artifact>
+                      <destination>system</destination>
+                    </deployment>
+                    <deployment>
+                      <artifact>xerces:xercesImpl:jar</artifact>
+                      <destination>system</destination>
+                    </deployment>
+                    <deployment>
+                      <artifact>xml-apis:xml-apis:jar</artifact>
+                      <destination>system</destination>
+                    </deployment>
+                    <deployment>
+                      <artifact>${dollar}{org.apache.jetspeed.production.jdbc.driver.groupId}:${dollar}{org.apache.jetspeed.production.jdbc.driver.artifactId}:jar</artifact>
+                      <destination>system</destination>
+                    </deployment>
+                    <!-- ${parentArtifactId} portal expanded -->
+                    <deployment>
+                      <artifact>${dollar}{pom.groupId}:${parentArtifactId}-portal:war</artifact>
+                      <expand>true</expand>
+                      <targetName>${dollar}{org.apache.jetspeed.portal.context.name}</targetName>
+                      <delete>./${dollar}{org.apache.jetspeed.portal.context.name}.war</delete>
+                    </deployment>
+                    <!-- ${parentArtifactId} portal tomcat context -->
+                    <deployment>
+                      <file>${dollar}{project.build.directory}/resources/context.xml</file>
+                      <targetName>${dollar}{org.apache.jetspeed.portal.context.name}.xml</targetName>
+                      <destination>context</destination>
+                    </deployment>
+                    
+                    <!-- admin pa -->
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
+                      <delete>./j2-admin</delete>
+                    </deployment>
+                    
+                  </deployments>
+                </configuration>
+              </execution>
+            </executions>
+
+            <dependencies>
+              <dependency>
+                <groupId>${dollar}{pom.groupId}</groupId>
+                <artifactId>${parentArtifactId}-portal</artifactId>
+                <version>${dollar}{pom.version}</version>
+                <type>war</type>
+              </dependency>
+              <dependency>
+                <groupId>portlet-api</groupId>
+                <artifactId>portlet-api</artifactId>
+                <version>${dollar}{portlet-api.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-api</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-commons</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto</artifactId>
+                <version>${dollar}{org.apache.pluto.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>portals-bridges-common</artifactId>
+                <version>${dollar}{org.apache.portals.bridges.common.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>${dollar}{org.apache.jetspeed.production.jdbc.driver.groupId}</groupId>
+                <artifactId>${dollar}{org.apache.jetspeed.production.jdbc.driver.artifactId}</artifactId>
+                <version>${dollar}{org.apache.jetspeed.production.jdbc.driver.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>xalan</groupId>
+                <artifactId>xalan</artifactId>
+                <version>2.4.1</version>
+              </dependency>
+              <dependency>
+                <groupId>xerces</groupId>
+                <artifactId>xercesImpl</artifactId>
+                <version>2.3.0</version>
+              </dependency>
+              <dependency>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+                <version>2.0.2</version>
+              </dependency>
+              
+              <!-- j2-admin -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>j2-admin</artifactId>
+                <!--<version>${dollar}{org.apache.portals.jetspeed.version}</version>-->
+                <version>2.2-SNAPSHOT</version>
+                <type>war</type>
+              </dependency>
+              
+              
+
+              <!-- plugin own dependencies -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-deploy-tools</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+        <resources>
+          <resource>
+            <directory>${dollar}{basedir}/src/conf</directory>
+            <targetPath>../resources</targetPath>
+            <filtering>true</filtering>
+          </resource>
+          <resource>
+            <directory>${dollar}{project.build.directory}/tomcat</directory>
+            <targetPath>../resources</targetPath>
+            <filtering>true</filtering>
+          </resource>
+        </resources>
+      </build>
+    </profile>
+
+    <profile>
+      <id>seed</id>
+      <build>
+        <plugins>
+
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-db-maven-plugin</artifactId>
+            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>seed</id>
+                <goals>
+                  <goal>init</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <connection>
+                    <username>${dollar}{org.apache.jetspeed.production.database.user}</username>
+                    <password>${dollar}{org.apache.jetspeed.production.database.password}</password>
+                    <url>${dollar}{org.apache.jetspeed.production.database.url}</url>
+                    <driver>${dollar}{org.apache.jetspeed.production.database.driver}</driver>
+                  </connection>
+                  <unpack>
+                    <artifact>org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar</artifact>
+                    <resources>
+                      <resource>
+                        <path>seed</path>
+                        <destination>db/seed</destination>
+                      </resource>
+                    </resources>
+                  </unpack>
+                  <seed>
+                    <categories>serializer</categories>
+                    <filterPropertiesFileName>
+                      ${dollar}{project.build.directory}/${dollar}{portal.unpacked.dir}/WEB-INF/conf/spring-filter.properties
+                    </filterPropertiesFileName>
+                    <applicationRootPath>
+                      ${dollar}{project.build.directory}/${dollar}{portal.unpacked.dir}
+                    </applicationRootPath>
+                    <files>
+                      <file>${dollar}{project.build.directory}/db/seed/j2-seed.xml</file>
+                    </files>
+                    <initProperties>
+                      <org.apache.jetspeed.database.user>${dollar}{org.apache.jetspeed.production.database.user}</org.apache.jetspeed.database.user>
+                      <org.apache.jetspeed.database.password>${dollar}{org.apache.jetspeed.production.database.password}</org.apache.jetspeed.database.password>
+                      <org.apache.jetspeed.database.url>${dollar}{org.apache.jetspeed.production.database.url}</org.apache.jetspeed.database.url>
+                      <org.apache.jetspeed.database.driver>${dollar}{org.apache.jetspeed.production.database.driver}</org.apache.jetspeed.database.driver>
+                    </initProperties>
+                  </seed>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-portal-resources</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-db-tools</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>${dollar}{org.apache.jetspeed.production.jdbc.driver.groupId}</groupId>
+                <artifactId>${dollar}{org.apache.jetspeed.production.jdbc.driver.artifactId}</artifactId>
+                <version>${dollar}{org.apache.jetspeed.production.jdbc.driver.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>seed-dbpsml</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-db-maven-plugin</artifactId>
+            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>seed-dbpsml</id>
+                <goals>
+                  <goal>init</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <psml>
+                    <categories>pageSerializer</categories>
+                    <filterPropertiesFileName>
+                      ${dollar}{project.build.directory}/${dollar}{portal.unpacked.dir}/WEB-INF/conf/spring-filter.properties
+                    </filterPropertiesFileName>
+                    <applicationRootPath>
+                      ${dollar}{project.build.directory}/${dollar}{portal.unpacked.dir}
+                    </applicationRootPath>
+                    <initProperties>
+                      <org.apache.jetspeed.database.user>${dollar}{org.apache.jetspeed.production.database.user}</org.apache.jetspeed.database.user>
+                      <org.apache.jetspeed.database.password>${dollar}{org.apache.jetspeed.production.database.password}</org.apache.jetspeed.database.password>
+                      <org.apache.jetspeed.database.url>${dollar}{org.apache.jetspeed.production.database.url}</org.apache.jetspeed.database.url>
+                      <org.apache.jetspeed.database.driver>${dollar}{org.apache.jetspeed.production.database.driver}</org.apache.jetspeed.database.driver>
+                    </initProperties>
+                  </psml>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-portal-resources</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-db-tools</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>${dollar}{org.apache.jetspeed.production.jdbc.driver.groupId}</groupId>
+                <artifactId>${dollar}{org.apache.jetspeed.production.jdbc.driver.artifactId}</artifactId>
+                <version>${dollar}{org.apache.jetspeed.production.jdbc.driver.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>deploy-dbpsml</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>deploy</id>
+                <goals>
+                  <goal>deploy</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <targetBaseDir>${dollar}{org.apache.jetspeed.server.home}</targetBaseDir>
+                  <portalName>${dollar}{org.apache.jetspeed.portal.context.name}</portalName>
+                  <destinations>
+                    <conf>webapps/${dollar}{org.apache.jetspeed.portal.context.name}/WEB-INF/conf</conf>
+                  </destinations>
+                  <deployments>
+                    <deployment>
+                      <file>${dollar}{basedir}/src/etc/dbpsml/spring-filter-key.properties</file>
+                      <destination>conf</destination>
+                    </deployment>
+                  </deployments>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <!-- plugin own dependencies -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-deploy-tools</artifactId>
+                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+  </profiles>
+
+</project>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml Mon Oct 13 09:34:51 2008
@@ -0,0 +1,139 @@
+#set($dollar = '$')
+<?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.
+-->
+<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.9</maven>
+  </prerequisites>
+
+  <artifactId>${artifactId}</artifactId>
+  <name>My Portal</name>
+  <parent>
+    <groupId>${groupId}</groupId>
+    <artifactId>${rootArtifactId}</artifactId>
+    <version>${version}</version>
+  </parent>
+
+  <packaging>war</packaging>
+  <dependencies>
+    <!-- jetspeed compile time dependencies -->
+    <!--
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-api</artifactId>
+      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-portal</artifactId>
+      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+    </dependency>
+    -->
+    <!-- jetspeed war dependencies -->
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-dependencies</artifactId>
+      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed</artifactId>
+      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+      <type>war</type>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+        <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+        <executions>
+          <execution>
+            <id>deploy-jetspeed-layouts</id>
+            <goals>
+              <goal>deploy</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <targetBaseDir>${dollar}{project.build.directory}/${dollar}{project.build.finalName}</targetBaseDir>
+              <destinations>
+                <local>WEB-INF/deploy/local</local>
+              </destinations>
+              <deployments>
+                <deployment>
+                  <artifact>org.apache.portals.jetspeed-2:jetspeed-layouts:war</artifact>
+                  <destination>local</destination>
+                </deployment>
+              </deployments>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-layouts</artifactId>
+            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+            <type>war</type>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warName>${dollar}{pom.artifactId}</warName>
+          <!--<overlays>
+            <overlay>
+              <id>jetspeed1</id>
+              <groupId>org.apache.portals.jetspeed-2</groupId>
+              <artifactId>jetspeed</artifactId>
+              <includes>
+                <include>decorations/layout/css/**</include>
+                <include>decorations/portlet/clear/**</include>
+                <include>decorations/portlet/decorator.vm</include>
+              </includes>
+            </overlay>
+            <overlay>
+              <id>jetspeed2</id>
+              <groupId>org.apache.portals.jetspeed-2</groupId>
+              <artifactId>jetspeed</artifactId>
+              <excludes>
+                <exclude>*.jsp</exclude>
+                <exclude>ajax/**</exclude>
+                <exclude>decorations/**</exclude>
+                <exclude>images/**</exclude>
+                <exclude>javascript/**</exclude>
+                <exclude>WEB-INF/pages/**</exclude>
+                <exclude>WEB-INF/min-pages/**</exclude>
+              </excludes>
+            </overlay>
+          </overlays>-->
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org