You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2010/04/20 19:14:54 UTC
svn commit: r935999 - in /myfaces/portlet-bridge/core/trunk:
examples/demo/pom.xml pom.xml
Author: sobryan
Date: Tue Apr 20 17:14:53 2010
New Revision: 935999
URL: http://svn.apache.org/viewvc?rev=935999&view=rev
Log:
Changes to get jetty:run to work correctly..
Modified:
myfaces/portlet-bridge/core/trunk/examples/demo/pom.xml
myfaces/portlet-bridge/core/trunk/pom.xml
Modified: myfaces/portlet-bridge/core/trunk/examples/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/demo/pom.xml?rev=935999&r1=935998&r2=935999&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/demo/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/demo/pom.xml Tue Apr 20 17:14:53 2010
@@ -15,6 +15,7 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
@@ -82,15 +83,6 @@
<plugin>
<groupId>org.apache.pluto</groupId>
<artifactId>maven-pluto-plugin</artifactId>
- <version>1.1.6</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -115,7 +107,7 @@
<webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
<systemProperties>
<systemProperty>
- <name>org.apache.pluto.embedded.portletId</name>
+ <name>org.apache.pluto.embedded.portletIds</name>
<value>portlet-bridge-demo</value>
</systemProperty>
</systemProperties>
@@ -124,15 +116,6 @@
<plugin>
<groupId>org.apache.pluto</groupId>
<artifactId>maven-pluto-plugin</artifactId>
- <version>1.1.4</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: myfaces/portlet-bridge/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/pom.xml?rev=935999&r1=935998&r2=935999&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk/pom.xml Tue Apr 20 17:14:53 2010
@@ -32,6 +32,7 @@
<specName>Portlet ${portletSpecVersion} Bridge for JavaServer Faces ${jsfSpecVersion}</specName>
<projectSeries>1.x</projectSeries>
<jetty-plugin.version>6.1.16</jetty-plugin.version>
+ <pluto-distribution.version>1.1.6</pluto-distribution.version>
<pluto-embedded.version>1.0.1</pluto-embedded.version>
<jsf.version>1.2_03</jsf.version>
</properties>
@@ -209,6 +210,20 @@
<artifactId>maven-jetty-plugin</artifactId>
<version>${jetty-plugin.version}</version>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>maven-pluto-plugin</artifactId>
+ <version>${pluto-distribution.version}</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>