Author: nilsga
Date: Sun Jan 18 02:38:09 2009
New Revision: 735430
URL: http://svn.apache.org/viewvc?rev=735430&view=rev
Log:
Updated for struts2 2.1.6 and maven-jetty-pluto-embeddded 1.0.1
Removed:
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
Modified:
struts/maven/trunk/struts2-archetype-portlet/pom.xml
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/src/test/java/JettyPlutoLauncher.java
Modified: struts/maven/trunk/struts2-archetype-portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-portlet/pom.xml?rev=735430&r1=735429&r2=735430&view=diff
==============================================================================
--- struts/maven/trunk/struts2-archetype-portlet/pom.xml (original)
+++ struts/maven/trunk/struts2-archetype-portlet/pom.xml Sun Jan 18 02:38:09
2009
@@ -31,8 +31,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-portlet</artifactId>
- <version>2.1.1-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
+ <version>2.1.6-SNAPSHOT</version>
+ <packaging>jar</packaging>
<name>Struts 2 Archetypes - Portlet</name>
<scm>
Modified:
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml?rev=735430&r1=735429&r2=735430&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml
(original)
+++
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/META-INF/archetype.xml
Sun Jan 18 02:38:09 2009
@@ -15,7 +15,6 @@
<resource>src/main/webapp/WEB-INF/jsp/edit/index.jsp</resource>
<resource>src/main/webapp/WEB-INF/web.xml</resource>
<resource>src/main/webapp/WEB-INF/portlet.xml</resource>
- <resource>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</resource>
</resources>
</archetype>
Modified:
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml?rev=735430&r1=735429&r2=735430&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
(original)
+++
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml
Sun Jan 18 02:38:09 2009
@@ -19,19 +19,11 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-portlet-plugin</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.6</version>
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <excludes>
-
<exclude>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</exclude>
- </excludes>
- </resource>
- </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -51,7 +43,7 @@
<plugin>
<groupId>org.apache.pluto</groupId>
<artifactId>maven-pluto-plugin</artifactId>
- <version>1.1.3</version>
+ <version>1.1.6</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -64,12 +56,15 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <configuration>
-
<webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-
<webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
+ <configuration>
+
<webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+ <webAppConfig>
+
<contextPath>/${project.artifactId}</contextPath>
+
<defaultsDescriptor>/WEB-INF/jetty-pluto-web-default.xml</defaultsDescriptor>
+ </webAppConfig>
<systemProperties>
<systemProperty>
-
<name>org.apache.pluto.embedded.portletId</name>
+
<name>org.apache.pluto.embedded.portletIds</name>
<value>HelloPortlet</value>
</systemProperty>
</systemProperties>
@@ -81,7 +76,7 @@
<dependency>
<groupId>com.bekk.boss</groupId>
<artifactId>maven-jetty-pluto-embedded</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
@@ -91,41 +86,16 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.6rc1</version>
+ <version>6.1.14</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1</artifactId>
- <version>6.1.6rc1</version>
+ <version>6.1.14</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>
-
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Maven Repository (Snapshots and Test Builds)</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases><enabled>false</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </repository>
- <repository>
- <id>opensymphony</id>
- <name>opensymphony</name>
- <layout>legacy</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- <url>http://maven.opensymphony.com</url>
- </repository>
- </repositories>
-
</project>
Modified:
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/src/test/java/JettyPlutoLauncher.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/src/test/java/JettyPlutoLauncher.java?rev=735430&r1=735429&r2=735430&view=diff
==============================================================================
---
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/src/test/java/JettyPlutoLauncher.java
(original)
+++
struts/maven/trunk/struts2-archetype-portlet/src/main/resources/archetype-resources/src/test/java/JettyPlutoLauncher.java
Sun Jan 18 02:38:09 2009
@@ -7,7 +7,7 @@
public class JettyPlutoLauncher {
public static void main(String[] args) throws Exception {
- System.setProperty("org.apache.pluto.embedded.portletId", "HelloPortlet");
+ System.setProperty("org.apache.pluto.embedded.portletIds",
"HelloPortlet");
Server server = new Server(8080);
WebAppContext webapp = new WebAppContext("src/main/webapp",
"/${artifactId}");
webapp.setDefaultsDescriptor("/WEB-INF/jetty-pluto-web-default.xml");
