myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1519644 - in /myfaces/tobago/trunk: ./ tobago-example/ tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/ tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/ tobago-example/tobago-example-test/src/main/java/org/apa...
Date Tue, 03 Sep 2013 11:03:11 GMT
Author: lofwyr
Date: Tue Sep  3 11:03:10 2013
New Revision: 1519644

URL: http://svn.apache.org/r1519644
Log:
- updating Jetty to current 7.x version
- cleanup

Modified:
    myfaces/tobago/trunk/pom.xml
    myfaces/tobago/trunk/tobago-example/pom.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBean.java

Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1519644&r1=1519643&r2=1519644&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Tue Sep  3 11:03:10 2013
@@ -859,14 +859,6 @@
           <version>2.3</version>
         </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>
           <version>1.1</version>
@@ -1737,12 +1729,6 @@
     <mojarra20.version>2.0.11</mojarra20.version>
     <mojarra21.version>2.1.20</mojarra21.version>
     <mojarra22.version>2.2.0-m12</mojarra22.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.7.5</slf4j.version>
     <logback.version>1.0.11</logback.version>
     <log4j.version>1.2.17</log4j.version>

Modified: myfaces/tobago/trunk/tobago-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/pom.xml?rev=1519644&r1=1519643&r2=1519644&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/pom.xml Tue Sep  3 11:03:10 2013
@@ -62,26 +62,27 @@
       </plugin>
 
     </plugins>
-  </build>
 
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty-maven-plugin</artifactId>
+          <version>7.6.12.v20130726</version>
+          <!--<version>8.1.0.RC5</version>-->
+          <!--<version>8.1.9.v20130131</version>-->
+          <configuration>
+            <scanIntervalSeconds>5</scanIntervalSeconds>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  
   <profiles>
     <profile>
       <id>default-modules</id>
-       <activation>
+      <activation>
         <property>
           <name>!non-default-modules</name>
         </property>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=1519644&r1=1519643&r2=1519644&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
Tue Sep  3 11:03:10 2013
@@ -58,12 +58,8 @@
   </managed-bean>
 
   <lifecycle>
-    <phase-listener>
-      org.apache.myfaces.tobago.example.demo.SynchronizeNavigationPhaseListener
-    </phase-listener>
-    <phase-listener>
-      org.apache.myfaces.tobago.util.DebugPhaseListener
-    </phase-listener>
+    <phase-listener>org.apache.myfaces.tobago.example.demo.SynchronizeNavigationPhaseListener</phase-listener>
+    <!--<phase-listener>org.apache.myfaces.tobago.util.DebugPhaseListener</phase-listener>-->
   </lifecycle>
 
   <managed-bean>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml?rev=1519644&r1=1519643&r2=1519644&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml
Tue Sep  3 11:03:10 2013
@@ -60,12 +60,9 @@
   </managed-bean>
 
   <lifecycle>
-    <phase-listener>
-      org.apache.myfaces.tobago.util.DebugPhaseListener
-    </phase-listener>
+    <phase-listener>org.apache.myfaces.tobago.util.DebugPhaseListener</phase-listener>
   </lifecycle>
 
-
   <navigation-rule>
     <navigation-case>
       <from-outcome>solarList</from-outcome>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBean.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBean.java?rev=1519644&r1=1519643&r2=1519644&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBean.java
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ResourceBean.java
Tue Sep  3 11:03:10 2013
@@ -21,8 +21,6 @@ package org.apache.myfaces.tobago.exampl
 
 import org.apache.myfaces.tobago.context.ResourceManager;
 import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.faces.context.FacesContext;
 import java.util.Arrays;
@@ -30,8 +28,6 @@ import java.util.List;
 
 public class ResourceBean {
 
-  private static final Logger LOG = LoggerFactory.getLogger(ResourceBean.class);
-
   private List<ResourceEntry> resources;
   private int fails;
 



Mime
View raw message