Author: woonsan
Date: Tue Dec 9 06:22:57 2008
New Revision: 724710
URL: http://svn.apache.org/viewvc?rev=724710&view=rev
Log:
Fixed archetype to use pluto 2.0-SNAPSHOT and portlet-api 2.0.
Also, changes to remove unnecessary dependencies.
Modified:
portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp
portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp
portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp
portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/pom.xml?rev=724710&r1=724709&r2=724710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/pom.xml Tue Dec 9 06:22:57 2008
@@ -36,13 +36,13 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0-alpha-4</version>
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0-alpha-4</version>
<extensions>true</extensions>
</plugin>
</plugins>
Modified: portals/jetspeed-2/portal/trunk/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/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml?rev=724710&r1=724709&r2=724710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/jetspeed-mvn-pa-pom.xml
Tue Dec 9 06:22:57 2008
@@ -43,33 +43,6 @@
</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>
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml?rev=724710&r1=724709&r2=724710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml
Tue Dec 9 06:22:57 2008
@@ -34,104 +34,9 @@
</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>
@@ -140,133 +45,10 @@
<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>
Modified: portals/jetspeed-2/portal/trunk/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/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp?rev=724710&r1=724709&r2=724710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/help.jsp
Tue Dec 9 06:22:57 2008
@@ -1,3 +1,2 @@
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<h4>Need help?</h4>
Modified: portals/jetspeed-2/portal/trunk/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/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp?rev=724710&r1=724709&r2=724710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/maximized.jsp
Tue Dec 9 06:22:57 2008
@@ -1,3 +1,2 @@
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<h4>This is a much bigger world isn't it?</h4>
Modified: portals/jetspeed-2/portal/trunk/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/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp?rev=724710&r1=724709&r2=724710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/src/main/webapp/normal.jsp
Tue Dec 9 06:22:57 2008
@@ -1,3 +1,2 @@
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<h4>Welcome to the Jetspeed World!</h4>
Modified: portals/jetspeed-2/portal/trunk/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/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml?rev=724710&r1=724709&r2=724710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/jetspeed-mvn-portal-pom.xml
Tue Dec 9 06:22:57 2008
@@ -220,32 +220,25 @@
<deployments>
<!-- shared/lib -->
<deployment>
- <artifact>portlet-api:portlet-api:jar</artifact>
+ <artifact>javax.portlet:portlet-api:jar</artifact>
</deployment>
<deployment>
- <artifact>org.apache.portals.jetspeed-2:jetspeed-api:jar</artifact>
+ <artifact>javax.ccpp:ccpp:jar</artifact>
</deployment>
<deployment>
- <artifact>org.apache.portals.jetspeed-2:jetspeed-commons:jar</artifact>
- </deployment>
- <deployment>
- <artifact>org.apache.pluto:pluto:jar</artifact>
+ <artifact>org.apache.portals.jetspeed-2:jetspeed-api:jar</artifact>
</deployment>
<deployment>
- <artifact>org.apache.portals.bridges:portals-bridges-common:jar</artifact>
+ <artifact>org.apache.portals.jetspeed-2:jetspeed-commons:jar</artifact>
</deployment>
- <!-- common/endorsed -->
<deployment>
- <artifact>xalan:xalan:jar</artifact>
- <destination>system</destination>
+ <artifact>org.apache.pluto:pluto-container-api:jar</artifact>
</deployment>
<deployment>
- <artifact>xerces:xercesImpl:jar</artifact>
- <destination>system</destination>
+ <artifact>org.apache.pluto:pluto-taglib:jar</artifact>
</deployment>
<deployment>
- <artifact>xml-apis:xml-apis:jar</artifact>
- <destination>system</destination>
+ <artifact>org.apache.portals.bridges:portals-bridges-common:jar</artifact>
</deployment>
<deployment>
<artifact>${dollar}{org.apache.jetspeed.production.jdbc.driver.groupId}:${dollar}{org.apache.jetspeed.production.jdbc.driver.artifactId}:jar</artifact>
@@ -284,11 +277,16 @@
<type>war</type>
</dependency>
<dependency>
- <groupId>portlet-api</groupId>
+ <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>${dollar}{portlet-api.version}</version>
</dependency>
<dependency>
+ <groupId>javax.ccpp</groupId>
+ <artifactId>ccpp</artifactId>
+ <version>${dollar}{ccpp.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>jetspeed-api</artifactId>
<version>${dollar}{org.apache.portals.jetspeed.version}</version>
@@ -300,7 +298,12 @@
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
+ <artifactId>pluto-container-api</artifactId>
+ <version>${dollar}{org.apache.pluto.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-taglib</artifactId>
<version>${dollar}{org.apache.pluto.version}</version>
</dependency>
<dependency>
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml?rev=724710&r1=724709&r2=724710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
Tue Dec 9 06:22:57 2008
@@ -62,6 +62,12 @@
<version>${dollar}{org.apache.portals.jetspeed.version}</version>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-container-api</artifactId>
+ <version>${dollar}{org.apache.pluto.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml?rev=724710&r1=724709&r2=724710&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
Tue Dec 9 06:22:57 2008
@@ -32,10 +32,11 @@
<properties>
<org.apache.portals.jetspeed.version>2.2-SNAPSHOT</org.apache.portals.jetspeed.version>
- <org.apache.pluto.version>1.0.1</org.apache.pluto.version>
+ <org.apache.pluto.version>2.0.0-SNAPSHOT</org.apache.pluto.version>
+ <ccpp.version>1.0</ccpp.version>
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
<servlet-api.version>2.4</servlet-api.version>
- <portlet-api.version>1.0</portlet-api.version>
+ <portlet-api.version>2.0</portlet-api.version>
<portal.context.name>${artifactId}</portal.context.name>
<org.apache.jetspeed.server.home>/opt/apache-tomcat-5.5.26/</org.apache.jetspeed.server.home>
@@ -62,7 +63,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>portlet-api</groupId>
+ <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>${dollar}{portlet-api.version}</version>
</dependency>
@@ -77,7 +78,7 @@
<dependencies>
<!-- Provided Dependencies -->
<dependency>
- <groupId>portlet-api</groupId>
+ <groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -125,13 +126,6 @@
<depends>install-portal,install-pa</depends>
</target>
<target>
- <id>db-pa</id>
- <depends>install-pa</depends>
- <name>pa</name>
- <dir>@rootdir@/${artifactId}-pa</dir>
- <profiles>db</profiles>
- </target>
- <target>
<id>db-portal</id>
<depends>install-portal</depends>
<name>portal</name>
@@ -140,7 +134,7 @@
</target>
<target>
<id>db</id>
- <depends>db-portal,db-pa</depends>
+ <depends>db-portal</depends>
</target>
<target>
<id>deploy-pa</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org
|