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 2015/04/23 11:53:48 UTC
svn commit: r1675565 - in /myfaces/tobago/trunk/tobago-example: pom.xml
tobago-example-addressbook-cdi/pom.xml tobago-example-addressbook/pom.xml
tobago-example-test/pom.xml
Author: lofwyr
Date: Thu Apr 23 09:53:48 2015
New Revision: 1675565
URL: http://svn.apache.org/r1675565
Log:
TOBAGO-1455: Updating examples to Jetty 9
Modified:
myfaces/tobago/trunk/tobago-example/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml
Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1675565&r1=1675564&r2=1675565&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Thu Apr 23 09:53:48 2015
@@ -38,21 +38,20 @@
<artifactId>tomcat-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
+ <!-- use this to change the context path: -->
<!--
<webApp>
<contextPath>/example</contextPath>
</webApp>
-->
- <!-- use this to change the port-->
+ <!-- use this to change the port: -->
<!--
- <connectors>
- <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>7080</port>
- </connector>
- </connectors>
+ <httpConnector>
+ <port>7080</port>
+ </httpConnector>
-->
</configuration>
</plugin>
@@ -74,15 +73,9 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>7.6.15.v20140411</version>
- <!--
- <version>8.1.15.v20140411</version>
- This only works with modifications,
- see http://jsflive.wordpress.com/2012/08/19/jsf-2-on-jetty-8/
- or Tobago 3.0.x
- -->
+ <version>9.3.0.M2</version>
<configuration>
<scanIntervalSeconds>5</scanIntervalSeconds>
</configuration>
@@ -145,39 +138,6 @@
</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>jsf-provided</id>
<activation>
<property>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml?rev=1675565&r1=1675564&r2=1675565&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/pom.xml Thu Apr 23 09:53:48 2015
@@ -52,8 +52,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <!--<groupId>org.eclipse.jetty</groupId>-->
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<loginServices>
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=1675565&r1=1675564&r2=1675565&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml Thu Apr 23 09:53:48 2015
@@ -47,8 +47,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <!--<groupId>org.eclipse.jetty</groupId>-->
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<loginServices>
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=1675565&r1=1675564&r2=1675565&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml Thu Apr 23 09:53:48 2015
@@ -266,14 +266,12 @@
</plugin>
-->
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
- <connectors>
- <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>8080</port>
- </connector>
- </connectors>
+ <httpConnector>
+ <port>8080</port>
+ </httpConnector>
<stopKey>stopKey</stopKey>
<stopPort>9999</stopPort>
</configuration>
@@ -282,7 +280,7 @@
<id>start-jetty</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run-exploded</goal>
+ <goal>deploy-war</goal>
</goals>
<configuration>
<daemon>true</daemon>