You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2011/11/05 10:53:23 UTC
svn commit: r1197909 - in /myfaces/tobago/trunk: ./ tobago-example/
tobago-example/tobago-example-addressbook/
tobago-example/tobago-example-blank/ tobago-example/tobago-example-demo/
tobago-example/tobago-example-experimental/ tobago-example/tobago-ex...
Author: bommel
Date: Sat Nov 5 09:53:22 2011
New Revision: 1197909
URL: http://svn.apache.org/viewvc?rev=1197909&view=rev
Log:
improved jetty configuration
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-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-seam/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Sat Nov 5 09:53:22 2011
@@ -853,8 +853,19 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
- </plugin>
+ <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>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
@@ -1800,7 +1811,9 @@
<mojarra20.version>2.0.6</mojarra20.version>
<mojarra21.version>2.1.3_01</mojarra21.version>
<facelets.version>1.1.14</facelets.version>
- <jetty.version>6.1.26</jetty.version>
+ <jetty6.version>6.1.26</jetty6.version>
+ <jetty7.version>7.4.0.RC0</jetty7.version>
+ <!--<jetty7.version>7.5.4.v20111024</jetty7.version>-->
<slf4j.version>1.6.3</slf4j.version>
<logback.version>0.9.30</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=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Sat Nov 5 09:53:22 2011
@@ -27,31 +27,15 @@
<artifactId>tobago-example</artifactId>
<build>
- <plugins>
- <plugin>
- <!-- NOTE The addressbook run only with mvn jetty:run-exploded.
+ <!-- NOTE The addressbook run only with mvn jetty:run-exploded.
For the other examples mvn jetty:run should work.
For Debugging with jetty set following options
MAVEN_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
- -->
- <groupId>org.mortbay.jetty</groupId>
- <!-- for jetty 7 they have changed the artifactId -->
- <artifactId>jetty-maven-plugin</artifactId>
- <version>7.4.0.RC0</version>
-<!--
- <artifactId>maven-jetty-plugin</artifactId>
--->
- <!-- to change the port -->
- <configuration>
- <scanIntervalSeconds>5</scanIntervalSeconds>
-<!--
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8080</port>
- </connector>
- </connectors>
--->
- </configuration>
+ -->
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
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=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/pom.xml Sat Nov 5 09:53:22 2011
@@ -46,15 +46,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <server>tomcat</server>
- <update>true</update>
- <url>http://localhost:8080/manager</url>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<configuration>
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=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-blank/pom.xml Sat Nov 5 09:53:22 2011
@@ -29,13 +29,8 @@
<finalName>tobago-example-blank</finalName>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <server>tomcat</server>
- <update>true</update>
- <url>http://localhost:8080/manager</url>
- </configuration>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
</plugin>
</plugins>
</build>
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=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Sat Nov 5 09:53:22 2011
@@ -56,13 +56,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <server>tomcat</server>
- <update>true</update>
- <url>http://localhost:8080/manager</url>
- </configuration>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
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=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/pom.xml Sat Nov 5 09:53:22 2011
@@ -29,17 +29,10 @@
<build>
<finalName>tobago-example-experimental</finalName>
<plugins>
-
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <server>tomcat</server>
- <update>true</update>
- <url>http://localhost:8080/manager</url>
- </configuration>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
</plugin>
-
</plugins>
</build>
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=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/pom.xml Sat Nov 5 09:53:22 2011
@@ -29,13 +29,8 @@
<finalName>tobago-example-nonfacesrequest</finalName>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <server>tomcat</server>
- <update>true</update>
- <url>http://localhost:8080/manager</url>
- </configuration>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
</plugin>
</plugins>
</build>
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=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/pom.xml Sat Nov 5 09:53:22 2011
@@ -29,13 +29,8 @@
<finalName>tobago-example-sandbox</finalName>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <server>tomcat</server>
- <update>true</update>
- <url>http://localhost:8080/manager</url>
- </configuration>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-seam/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-seam/pom.xml?rev=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-seam/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-seam/pom.xml Sat Nov 5 09:53:22 2011
@@ -29,18 +29,8 @@
<finalName>tobago-example-seam</finalName>
<plugins>
<plugin>
- <!-- NOTE The demo and addressbook run only with mvn jetty:run-exploded.
- For the other examples mvn jetty:run should work.
- For Debugging with jetty set following options
- MAVEN_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
- or
- MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
- -->
<groupId>org.mortbay.jetty</groupId>
- <!-- jetty 6 -->
<artifactId>maven-jetty-plugin</artifactId>
- <!-- jetty 7 -->
- <!--<artifactId>jetty-maven-plugin</artifactId>-->
<configuration>
<jettyConfig>src/test/resources/jetty.xml</jettyConfig>
<userRealms>
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=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-security/pom.xml Sat Nov 5 09:53:22 2011
@@ -29,13 +29,8 @@
<finalName>tobago-example-security</finalName>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <server>tomcat</server>
- <update>true</update>
- <url>http://localhost:8080/manager</url>
- </configuration>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
</plugin>
</plugins>
</build>
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=1197909&r1=1197908&r2=1197909&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/pom.xml Sat Nov 5 09:53:22 2011
@@ -55,13 +55,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <configuration>
- <server>tomcat</server>
- <update>true</update>
- <url>http://localhost:8080/manager</url>
- </configuration>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>