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 15:35:29 UTC
svn commit: r1675613 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-example/pom.xml tobago-example/tobago-example-addressbook/pom.xml
tobago-example/tobago-example-test/pom.xml
Author: lofwyr
Date: Thu Apr 23 13:35:29 2015
New Revision: 1675613
URL: http://svn.apache.org/r1675613
Log:
Merge from trunk
TOBAGO-1455: Updating examples to Jetty 9
Modified:
myfaces/tobago/branches/tobago-3.0.x/ (props changed)
myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml
Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 23 13:35:29 2015
@@ -1,3 +1,3 @@
/myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
/myfaces/tobago/branches/tobago-tree-table:1226794-1341423
-/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1657180,1657269,1657276,1657279,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665569,1666464,1668147,1668153,1668249,1675330
+/myfaces/tobago/trunk:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1628953,1636842,1636911,1640117,1640147,1640541,1640548,1640638,1640761,1640917,1641575,1641635,1641772,1641775,1641777,1657180,1657269,1657276,1657279,1658909,1658912,1659026,1659031,1660696,1660699,1660708,1660714,1665569,1666464,1668147,1668153,1668249,1675330,1675565,1675584,1675588-1675589
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml?rev=1675613&r1=1675612&r2=1675613&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/pom.xml Thu Apr 23 13:35:29 2015
@@ -43,24 +43,22 @@
<version>2.2</version>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <!--<groupId>org.eclipse.jetty</groupId>-->
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <configuration>
- <!--
- <webApp>
- <contextPath>/example</contextPath>
- </webApp>
- -->
- <!-- use this to change the port-->
- <!--
- <connectors>
- <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>7080</port>
- </connector>
- </connectors>
- -->
- </configuration>
+ <configuration>
+ <!-- use this to change the context path: -->
+<!--
+ <webApp>
+ <contextPath>/example</contextPath>
+ </webApp>
+-->
+ <!-- use this to change the port: -->
+<!--
+ <httpConnector>
+ <port>7080</port>
+ </httpConnector>
+-->
+ </configuration>
</plugin>
<plugin>
<!-- usage: mvn clean package tomee:run -Djsf=provided -->
@@ -80,13 +78,9 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <!--<groupId>org.eclipse.jetty</groupId>-->
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <!--<version>9.2.2.v20140723</version>-->
- <!--<version>9.1.1.v20140108</version>-->
- <!--<version>9.1.0.v20131115</version>-->
- <version>8.1.15.v20140411</version>
+ <version>9.3.0.M2</version>
<configuration>
<scanIntervalSeconds>5</scanIntervalSeconds>
<webAppConfig>
@@ -205,7 +199,6 @@
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <!--<groupId>org.eclipse.jetty</groupId>-->
<artifactId>jetty-maven-plugin</artifactId>
<configuration>
<connectors>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml?rev=1675613&r1=1675612&r2=1675613&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/pom.xml Thu Apr 23 13:35:29 2015
@@ -53,8 +53,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/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml?rev=1675613&r1=1675612&r2=1675613&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml Thu Apr 23 13:35:29 2015
@@ -159,6 +159,25 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <!-- DeltaSpike/CDI -->
+<!--
+ <dependency>
+ <groupId>org.apache.deltaspike.modules</groupId>
+ <artifactId>deltaspike-jsf-module-impl</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+-->
</dependencies>
<profiles>
<profile>
@@ -228,15 +247,13 @@
</plugin>
-->
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.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>
@@ -245,7 +262,7 @@
<id>start-jetty</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run-exploded</goal>
+ <goal>deploy-war</goal>
</goals>
<configuration>
<daemon>true</daemon>