myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject svn commit: r1414703 - in /myfaces/extensions/scripting/trunk: extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ extscript-examples/ extscript-examples/blog-example/src/main/mojarra/ extscript-e...
Date Wed, 28 Nov 2012 14:12:07 GMT
Author: werpu
Date: Wed Nov 28 14:12:05 2012
New Revision: 1414703

URL: http://svn.apache.org/viewvc?rev=1414703&view=rev
Log:
adding web overrides for mojarra and myfaces

Added:
    myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/mojarra/
    myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/mojarra/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/myfaces/
    myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/myfaces/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/mojarra/
    myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/mojarra/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/myfaces/
    myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/myfaces/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/mojarra/
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/mojarra/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/myfaces/
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/myfaces/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/mojarra/
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/mojarra/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/myfaces/
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/myfaces/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/mojarra/
    myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/mojarra/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/myfaces/
    myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/myfaces/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/mojarra/
    myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/mojarra/override-web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/myfaces/
    myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/myfaces/override-web.xml
Modified:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ClassLoaderUtils.java
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/pom.xml

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ClassLoaderUtils.java?rev=1414703&r1=1414702&r2=1414703&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ClassLoaderUtils.java
(original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ClassLoaderUtils.java
Wed Nov 28 14:12:05 2012
@@ -28,8 +28,8 @@ import org.apache.myfaces.extensions.scr
 
 public class ClassLoaderUtils extends org.apache.myfaces.extensions.scripting.core.common.util.ClassLoaderUtils
 {
+    static ClassLoader _oldClassLoader = null;
 
-    static ClassLoader oldClassLoader = null;
     public static void registerThrowAwayClassloader()
     {
         //we do not have the luxury of a pluggable classloading extensions like in myfaces
@@ -47,11 +47,11 @@ public class ClassLoaderUtils extends or
             return;
         }
         //in case of an unchanged classloader we can recycle our old throw away classloader
-        if(oldClassLoader != null && loader.equals(oldClassLoader.getParent())) {
-            Thread.currentThread().setContextClassLoader(oldClassLoader);
+        if(_oldClassLoader != null && loader.equals(_oldClassLoader.getParent()))
{
+            Thread.currentThread().setContextClassLoader(_oldClassLoader);
         } else {
-            oldClassLoader = new ThrowAwayClassloader(loader);
-            Thread.currentThread().setContextClassLoader(oldClassLoader);
+            _oldClassLoader = new ThrowAwayClassloader(loader);
+            Thread.currentThread().setContextClassLoader(_oldClassLoader);
         }
     }
 

Added: myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/mojarra/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/mojarra/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/mojarra/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/mojarra/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+    </listener>
+
+</web-app>
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/myfaces/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/myfaces/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/myfaces/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/blog-example/src/main/myfaces/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>
+</web-app>
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/mojarra/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/mojarra/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/mojarra/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/mojarra/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+    </listener>
+
+</web-app>
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/myfaces/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/myfaces/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/myfaces/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/myfaces/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>
+</web-app>
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/mojarra/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/mojarra/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/mojarra/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/mojarra/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+    </listener>
+
+</web-app>
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/myfaces/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/myfaces/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/myfaces/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/myfaces/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>
+</web-app>
\ No newline at end of file

Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml?rev=1414703&r1=1414702&r2=1414703&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
(original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
Wed Nov 28 14:12:05 2012
@@ -151,18 +151,6 @@
 
     <!-- Listener, to allow Jetty serving MyFaces apps -->
 
-    <!--
-    <listener>
-        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-    </listener>
-    -->
-
-    <listener>
-        <listener-class>
-            com.sun.faces.config.ConfigureListener
-        </listener-class>
-    </listener>
-
     <!-- Faces Servlet -->
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>

Added: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/mojarra/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/mojarra/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/mojarra/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/mojarra/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+    </listener>
+
+</web-app>
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/myfaces/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/myfaces/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/myfaces/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/myfaces/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>
+</web-app>
\ No newline at end of file

Modified: myfaces/extensions/scripting/trunk/extscript-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/pom.xml?rev=1414703&r1=1414702&r2=1414703&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/pom.xml Wed Nov 28 14:12:05 2012
@@ -61,21 +61,7 @@
                     <port>9080</port>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.2.v20120308</version>
-                <configuration>
-                    <connectors>
-                        <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-                            <port>9090</port>
-                            <maxIdleTime>60000</maxIdleTime>
-                        </connector>
-                    </connectors>
-                    <scanIntervalSeconds>1</scanIntervalSeconds>
 
-                </configuration>
-            </plugin>
             <!-- tomcat plugin as alternative testing ground -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -111,6 +97,89 @@
             <properties>
                 <maven.war.webxml>${basedir}/src/main/conf/dev/web.xml</maven.war.webxml>
             </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-maven-plugin</artifactId>
+                        <version>8.1.2.v20120308</version>
+                        <configuration>
+                            <connectors>
+                                <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+                                    <port>9090</port>
+                                    <maxIdleTime>60000</maxIdleTime>
+                                </connector>
+                            </connectors>
+                            <scanIntervalSeconds>1</scanIntervalSeconds>
+                            <webAppConfig>
+                                <overrideDescriptor>
+                                    src/main/myfaces/override-myfaces-web.xml
+                                </overrideDescriptor>
+                            </webAppConfig>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- we use different profiles for jetty and myfaces so that their respective
listeners are fetched -->
+        <profile>
+            <id>myfaces</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-maven-plugin</artifactId>
+                        <version>8.1.2.v20120308</version>
+                        <configuration>
+                            <connectors>
+                                <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+                                    <port>9090</port>
+                                    <maxIdleTime>60000</maxIdleTime>
+                                </connector>
+                            </connectors>
+                            <scanIntervalSeconds>1</scanIntervalSeconds>
+                            <webAppConfig>
+                                <overrideDescriptor>
+                                    src/main/myfaces/override-web.xml
+                                </overrideDescriptor>
+                            </webAppConfig>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>mojarra</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-maven-plugin</artifactId>
+                        <version>8.1.2.v20120308</version>
+                        <configuration>
+                            <connectors>
+                                <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+                                    <port>9090</port>
+                                    <maxIdleTime>60000</maxIdleTime>
+                                </connector>
+                            </connectors>
+                            <scanIntervalSeconds>1</scanIntervalSeconds>
+                            <webAppConfig>
+                                <overrideDescriptor>
+                                    src/main/mojarra/override-web.xml
+                                </overrideDescriptor>
+                            </webAppConfig>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 

Added: myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/mojarra/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/mojarra/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/mojarra/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/mojarra/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+    </listener>
+
+</web-app>
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/myfaces/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/myfaces/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/myfaces/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/spring-example/src/main/myfaces/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>
+</web-app>
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/mojarra/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/mojarra/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/mojarra/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/mojarra/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+    </listener>
+
+</web-app>
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/myfaces/override-web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/myfaces/override-web.xml?rev=1414703&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/myfaces/override-web.xml
(added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/weld-example/src/main/myfaces/override-web.xml
Wed Nov 28 14:12:05 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
+    <listener>
+        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>
+</web-app>
\ No newline at end of file



Mime
View raw message