You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/02/03 10:31:24 UTC
svn commit: r1240040 - in /myfaces/tobago/trunk: ./ tobago-example/
tobago-example/src/ tobago-example/src/test/
tobago-example/src/test/resources/ tobago-example/tobago-example-addressbook/
tobago-example/tobago-example-addressbook/src/test/resources/...
Author: lofwyr
Date: Fri Feb 3 09:31:23 2012
New Revision: 1240040
URL: http://svn.apache.org/viewvc?rev=1240040&view=rev
Log:
TOBAGO-1089: Examples: Update to Jetty 7 and cleanup
Added:
myfaces/tobago/trunk/tobago-example/src/
myfaces/tobago/trunk/tobago-example/src/test/
myfaces/tobago/trunk/tobago-example/src/test/resources/
myfaces/tobago/trunk/tobago-example/src/test/resources/jettykeystore (props changed)
- copied unchanged from r1239039, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/keystore/jettykeystore
Removed:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/keystore/
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-example/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/test/resources/realm.properties
myfaces/tobago/trunk/tobago-example/tobago-example-assembly/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-experimental/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/trunk/tobago-example/tobago-theme-example/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Fri Feb 3 09:31:23 2012
@@ -852,20 +852,12 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty6.version}</version>
- <configuration>
- <scanIntervalSeconds>5</scanIntervalSeconds>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty7.version}</version>
- <configuration>
- <scanIntervalSeconds>5</scanIntervalSeconds>
- </configuration>
- </plugin>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty7.version}</version>
+ <configuration>
+ <scanIntervalSeconds>5</scanIntervalSeconds>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
@@ -1811,9 +1803,12 @@
<mojarra20.version>2.0.6</mojarra20.version>
<mojarra21.version>2.1.3_01</mojarra21.version>
<facelets.version>1.1.14</facelets.version>
- <jetty6.version>6.1.26</jetty6.version>
- <jetty7.version>7.4.0.RC0</jetty7.version>
- <!--<jetty7.version>7.5.4.v20111024</jetty7.version>-->
+ <jetty7.version>7.4.5.v20110725</jetty7.version>
+ <!--
+ <jetty7.version>7.5.4.v20111024</jetty7.version>
+ <jetty7.version>7.6.0.RC4</jetty7.version>
+ <jetty7.version>8.1.0.RC5</jetty7.version>
+ -->
<slf4j.version>1.6.4</slf4j.version>
<logback.version>1.0.0</logback.version>
<commons-io.version>1.1</commons-io.version>
Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Fri Feb 3 09:31:23 2012
@@ -37,6 +37,10 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
@@ -121,6 +125,39 @@
</profile>
<profile>
+ <id>ssl</id>
+ <!--
+ Use
+
+ mvn -P ssl jetty:run
+
+ to run the jetty using https, this should work in every example. But need to have the parent example folder
+ checked out.
+ -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <configuration>
+ <connectors>
+ <connector implementation="org.eclipse.jetty.server.ssl.SslSocketConnector">
+ <port>1443</port>
+ <maxIdleTime>30000</maxIdleTime>
+ <keystore>../src/test/resources/jettykeystore</keystore>
+ <password>xxxxxx</password>
+ <keyPassword>xxxxxx</keyPassword>
+ </connector>
+ </connectors>
+ <stopKey>stopKey</stopKey>
+ <stopPort>9999</stopPort>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>myfaces-1.1</id>
<activation>
<property>
Propchange: myfaces/tobago/trunk/tobago-example/src/test/resources/jettykeystore
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml Fri Feb 3 09:31:23 2012
@@ -24,7 +24,7 @@
</parent>
<artifactId>tobago-example-addressbook</artifactId>
<packaging>war</packaging>
- <name>Tobago Example Addressbook</name>
+ <name>Tobago Example Addressbook (Simple, but full functional application with persistence)</name>
<build>
<finalName>tobago-example-addressbook</finalName>
@@ -47,15 +47,16 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<configuration>
- <contextPath>/</contextPath>
- <userRealms>
- <userRealm implementation="org.mortbay.jetty.security.HashUserRealm">
+ <loginServices>
+ <loginService implementation="org.eclipse.jetty.security.HashLoginService">
<name>addressbook-realm</name>
<config>src/test/resources/realm.properties</config>
- </userRealm>
- </userRealms>
+ </loginService>
+ </loginServices>
+ <stopKey>stopKey</stopKey>
+ <stopPort>9999</stopPort>
</configuration>
<dependencies>
<!-- <dependency>
@@ -112,31 +113,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>ssl</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.security.SslSocketConnector">
- <port>1443</port>
- <maxIdleTime>30000</maxIdleTime>
- <keystore>src/test/keystore/jettykeystore</keystore>
- <password>xxxxxx</password>
- <keyPassword>xxxxxx</keyPassword>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.tango-project</groupId>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/test/resources/realm.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/test/resources/realm.properties?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/test/resources/realm.properties (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/test/resources/realm.properties Fri Feb 3 09:31:23 2012
@@ -16,8 +16,5 @@
#
# username: password [,rolename ...]
-guest: guest
-admin: admin,admin
-
-
-
+guest: guest,addressbook-user
+admin: admin,addressbook-user,admin
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-assembly/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-assembly/pom.xml Fri Feb 3 09:31:23 2012
@@ -20,7 +20,7 @@
<artifactId>tobago-example-assembly</artifactId>
<packaging>pom</packaging>
<name>Tobago Example Assembly</name>
- <description>This is the MyFaces Tobago Example Assembly</description>
+ <description>Tobago Example Assembly (Helps to build the Tobago releases)</description>
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -88,4 +88,4 @@
</profile>
</profiles>
- </project>
\ No newline at end of file
+ </project>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml Fri Feb 3 09:31:23 2012
@@ -24,17 +24,11 @@
</parent>
<artifactId>tobago-example-blank</artifactId>
<packaging>war</packaging>
- <name>Tobago Example Blank</name>
+ <name>Tobago Example Blank (A minimal Tobago application)</name>
<build>
<finalName>tobago-example-blank</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- </plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Fri Feb 3 09:31:23 2012
@@ -56,10 +56,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<version>1.0-beta-3</version>
@@ -390,28 +386,6 @@
</dependencies>
</profile>
<profile>
- <id>ssl</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.security.SslSocketConnector">
- <port>1443</port>
- <maxIdleTime>30000</maxIdleTime>
- <keystore>src/test/keystore/jettykeystore</keystore>
- <password>xxxxxx</password>
- <keyPassword>xxxxxx</keyPassword>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<!--
mvn package cargo:start -Ptomcat6x
-->
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/pom.xml Fri Feb 3 09:31:23 2012
@@ -28,12 +28,6 @@
<description>Experimental stuff and showcases.</description>
<build>
<finalName>tobago-example-experimental</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/pom.xml Fri Feb 3 09:31:23 2012
@@ -27,12 +27,6 @@
<name>Tobago Example Non-Faces-Request</name>
<build>
<finalName>tobago-example-nonfacesrequest</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml Fri Feb 3 09:31:23 2012
@@ -29,10 +29,6 @@
<finalName>tobago-example-sandbox</finalName>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>apt-maven-plugin</artifactId>
<executions>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml Fri Feb 3 09:31:23 2012
@@ -27,12 +27,6 @@
<name>Tobago Example Security</name>
<build>
<finalName>tobago-example-security</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- </plugins>
</build>
<dependencies>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml Fri Feb 3 09:31:23 2012
@@ -55,10 +55,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
<version>1.0-beta-3</version>
@@ -174,8 +170,8 @@
</dependency>
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.9</version>
+ <artifactId>tomahawk12</artifactId>
+ <version>1.1.11</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -284,15 +280,14 @@
-->
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<configuration>
<connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>8080</port>
</connector>
</connectors>
- <!-- XXX what is a good name for stopKey? -->
- <stopKey>foo</stopKey>
+ <stopKey>stopKey</stopKey>
<stopPort>9999</stopPort>
</configuration>
<executions>
@@ -316,7 +311,6 @@
</executions>
</plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
@@ -348,28 +342,6 @@
</build>
</profile>
<profile>
- <id>ssl</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.security.SslSocketConnector">
- <port>1443</port>
- <maxIdleTime>30000</maxIdleTime>
- <keystore>src/test/keystore/jettykeystore</keystore>
- <password>xxxxxx</password>
- <keyPassword>xxxxxx</keyPassword>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<!--
mvn package cargo:start -Ptomcat6x
-->
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml Fri Feb 3 09:31:23 2012
@@ -97,7 +97,7 @@
<filter-name>MyFacesExtensionsFilter</filter-name>
<url-pattern>/faces/myFacesExtensionResource/*</url-pattern>
</filter-mapping>
-
+
<error-page>
<error-code>404</error-code>
<location>/faces/404.xhtml</location>
Modified: myfaces/tobago/trunk/tobago-example/tobago-theme-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-theme-example/pom.xml?rev=1240040&r1=1240039&r2=1240040&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-theme-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-theme-example/pom.xml Fri Feb 3 09:31:23 2012
@@ -23,7 +23,7 @@
<version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-example</artifactId>
- <name>Tobago Theme Example</name>
+ <name>Tobago Theme Example (Show how to write an own theme)</name>
<build>
<plugins>