You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/04/12 16:09:57 UTC
svn commit: r933247 - in /myfaces/extensions/scripting/trunk: ./
extscript-examples/ extscript-examples/myfaces12-example/
extscript-examples/myfaces12-example/src/main/conf/
extscript-examples/myfaces12-example/src/main/conf/dev/
extscript-examples/my...
Author: werpu
Date: Mon Apr 12 14:09:56 2010
New Revision: 933247
URL: http://svn.apache.org/viewvc?rev=933247&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-113
changing the entire infrastructure of the web.xml part to profiles so that we can switch our testing on with -P development
Added:
myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/conf/
myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/conf/dev/
myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/conf/dev/web.xml
- copied, changed from r933245, myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml (with props)
Modified:
myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/pom.xml
myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/faces-config.xml
myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BaseInterface.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java
myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/resources/styles/main.css
myfaces/extensions/scripting/trunk/extscript-examples/pom.xml
myfaces/extensions/scripting/trunk/pom.xml
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/pom.xml?rev=933247&r1=933246&r2=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/pom.xml Mon Apr 12 14:09:56 2010
@@ -14,8 +14,12 @@
<url>http://www.apache.org</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example</developerConnection>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example
+ </developerConnection>
<url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example</url>
</scm>
@@ -38,14 +42,14 @@
<version>1.2.8</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>1.2.8</version>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
@@ -79,4 +83,7 @@
</dependency>
</dependencies>
+
+
+
</project>
Copied: myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/conf/dev/web.xml (from r933245, myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/conf/dev/web.xml?p2=myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/conf/dev/web.xml&p1=myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml&r1=933245&r2=933247&rev=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/conf/dev/web.xml Mon Apr 12 14:09:56 2010
@@ -18,6 +18,13 @@
* specific language governing permissions and limitations
* under the License.
-->
+<!--
+This web.xml is for development purposes
+it can be pulled in via mvn -P development ....
+it replaces the original web.xml in case
+of a development profile being set!
+-->
+
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
@@ -82,24 +89,7 @@
<param-value>org.apache.myfaces.scripting.facelet.ReroutingResourceResolver</param-value>
</context-param>
- <!--
- <context-param>
- <description>Additional comma separated loader paths to allow direct editing on the sources directory instead
- of the deployment dir
- </description>
- <param-name>org.apache.myfaces.scripting.groovy.LOADER_PATHS</param-name>
- <param-value>D:/dev/work/ideaprojects/threads/extscript/examples/myfaces12-example/src/main/webapp/WEB-INF/groovy</param-value>
- </context-param>
-
- <context-param>
- <description>Additional comma separated loader paths to allow direct editing on the sources directory instead
- of the deployment dir
- </description>
- <param-name>org.apache.myfaces.scripting.java.LOADER_PATHS</param-name>
- <param-value>D:/dev/work/ideaprojects/threads/extscript/examples/myfaces12-example/src/main/webapp/WEB-INF/java</param-value>
- </context-param>
- -->
<context-param>
<description>State saving method: "client" or "server" (= default)
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/java/org/apache/myfaces/blank/HelloWorldController.java?rev=933247&r1=933246&r2=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/java/org/apache/myfaces/blank/HelloWorldController.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/java/org/apache/myfaces/blank/HelloWorldController.java Mon Apr 12 14:09:56 2010
@@ -26,6 +26,8 @@ public class HelloWorldController {
//properties
private String name;
+ private int mylen = 10;
+
/**
* default empty constructor
*/
@@ -51,4 +53,12 @@ public class HelloWorldController {
//do real logic, return a string which will be used for the navigation system of JSF
return "success";
}
+
+ public int getMylen() {
+ return mylen;
+ }
+
+ public void setMylen(int mylen) {
+ this.mylen = mylen;
+ }
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/faces-config.xml?rev=933247&r1=933246&r2=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/faces-config.xml Mon Apr 12 14:09:56 2010
@@ -29,6 +29,7 @@
<managed-bean-class>org.apache.myfaces.blank.HelloWorldController</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
+
<managed-bean>
<managed-bean-name>testbean</managed-bean-name>
<managed-bean-class>org.apache.myfaces.groovyloader.test.TestBean</managed-bean-class>
@@ -81,6 +82,7 @@
</phase-listener>
</lifecycle>
+
<!-- navigation rules for helloWorld.jsp -->
<navigation-rule>
<from-view-id>/helloWorld.*</from-view-id>
@@ -99,6 +101,7 @@
</navigation-case>
</navigation-rule>
+
<validator>
<validator-id>org.apache.myfaces.groovyloader.test.TestValidator</validator-id>
<validator-class>org.apache.myfaces.groovyloader.test.TestValidator</validator-class>
@@ -119,4 +122,5 @@
<renderer-class>org.apache.myfaces.groovyloader.test.TestRenderer</renderer-class>
</renderer>
</render-kit>
+
</faces-config>
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml?rev=933247&r1=933246&r2=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml Mon Apr 12 14:09:56 2010
@@ -45,6 +45,7 @@
<param-value>org.apache.myfaces.scripting.servlet.StartupServletContextPluginChainLoader</param-value>
</context-param>
+ <!--
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
of the deployment dir
@@ -81,7 +82,7 @@
<param-name>facelets.RESOURCE_RESOLVER</param-name>
<param-value>org.apache.myfaces.scripting.facelet.ReroutingResourceResolver</param-value>
</context-param>
-
+ -->
<!--
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
Added: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml?rev=933247&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml Mon Apr 12 14:09:56 2010
@@ -0,0 +1,174 @@
+<?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 version="2.5" 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_2_5.xsd">
+
+
+ <description>MyProject web.xml</description>
+ <context-param>
+ <description>
+ Initializes the plugins for our groovy handlers
+ </description>
+ <param-name>org.apache.myfaces.FACES_INIT_PLUGINS</param-name>
+ <param-value>org.apache.myfaces.scripting.servlet.StartupServletContextPluginChainLoader</param-value>
+ </context-param>
+
+
+
+ <context-param>
+ <description>Additional comma separated loader paths to allow direct editing on the sources directory instead
+ of the deployment dir
+ </description>
+ <param-name>org.apache.myfaces.scripting.groovy.LOADER_PATHS</param-name>
+ <param-value>
+ /Users/werpu2/development/workspace/extensions-scripting3/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy
+ </param-value>
+ </context-param>
+
+
+ <context-param>
+ <description>Additional comma separated loader paths to allow direct editing on the sources directory instead
+ of the deployment dir
+ </description>
+ <param-name>org.apache.myfaces.scripting.java.LOADER_PATHS</param-name>
+ <param-value>
+ /Users/werpu2/development/workspace/extensions-scripting3/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java
+ </param-value>
+ </context-param>
+
+ <context-param>
+ <description>resource paths for our custom JSF2 resource resolver</description>
+ <param-name>org.apache.myfaces.scripting.resources.LOADER_PATHS</param-name>
+ <param-value>
+ /Users/werpu2/development/workspace/extensions-scripting3/extscript-examples/myfaces20-example/src/main/webapp
+ </param-value>
+ </context-param>
+
+ <context-param>
+ <description>a redirecting Facelet resource resolver which allows to pick up templates and resources from our
+ source dir
+ </description>
+ <param-name>facelets.RESOURCE_RESOLVER</param-name>
+ <param-value>org.apache.myfaces.scripting.facelet.ReroutingResourceResolver</param-value>
+ </context-param>
+
+ <!--
+ <context-param>
+ <description>a comma separated whitelist of root packages which are compiled those and nothing else
+ will be compiled during all compile stages, all other files stay permanently as they are
+ </description>
+ <param-name>org.apache.myfaces.scripting.PGK_WHITELIST</param-name>
+ <param-value>org.apache.myfaces.groovyloader.blog</param-value>
+ </context-param>
+ -->
+
+
+ <!--
+ <context-param>
+ <description>Additional comma separated loader paths to allow direct editing on the sources directory instead
+ of the deployment dir
+ </description>
+ <param-name>org.apache.myfaces.scripting.groovy.LOADER_PATHS</param-name>
+ <param-value>D:/dev/work/ideaprojects/threads/extscript/examples/myfaces20-example/src/main/webapp/WEB-INF/groovy</param-value>
+ </context-param>
+
+
+ <context-param>
+ <description>Additional comma separated loader paths to allow direct editing on the sources directory instead
+ of the deployment dir
+ </description>
+ <param-name>org.apache.myfaces.scripting.java.LOADER_PATHS</param-name>
+ <param-value>D:/dev/work/ideaprojects/threads/extscript/examples/myfaces20-example/src/main/webapp/WEB-INF/java</param-value>
+ </context-param>
+
+
+ -->
+
+
+ <context-param>
+ <param-name>javax.faces.PROJECT_STAGE</param-name>
+ <param-value>Development</param-value>
+ </context-param>
+
+
+ <context-param>
+ <description>State saving method: "client" or "server" (= default)
+ See JSF Specification 2.5.3
+ </description>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.FACELETS_LIBRARIES</param-name>
+ <param-value>
+ /WEB-INF/facelets/groovy-taglib.xml;/WEB-INF/facelets/tomahawk.taglib.xml
+ </param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>/faces-config.xml</param-value>
+ </context-param>
+
+
+ <filter>
+ <filter-name>scriptingFilter</filter-name>
+ <filter-class>org.apache.myfaces.scripting.servlet.ScriptingServletFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>scriptingFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
+ </filter-mapping>
+
+ <!-- Listener, to allow Jetty serving MyFaces apps -->
+ <listener>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ </listener>
+
+ <!-- Faces Servlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Faces Servlet Mapping -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+
+
+ <!-- Welcome files -->
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Propchange: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/conf/dev/web.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java?rev=933247&r1=933246&r2=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java Mon Apr 12 14:09:56 2010
@@ -13,6 +13,7 @@ public class TestBeanImpl implements Tes
TestBean _delegate = null;
+
public TestBeanImpl() {
try {
String resourceRoot = this.getClass().getClassLoader().getResource("./").getFile();
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BaseInterface.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BaseInterface.java?rev=933247&r1=933246&r2=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BaseInterface.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BaseInterface.java Mon Apr 12 14:09:56 2010
@@ -27,5 +27,5 @@ package org.apache.myfaces.javaloader.bl
public interface BaseInterface {
-
+
}
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java?rev=933247&r1=933246&r2=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/instantbean/HelloBean.java Mon Apr 12 14:09:56 2010
@@ -20,7 +20,7 @@
package org.apache.myfaces.javaloader.instantbean;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
+import javax.faces.bean.SessionScoped;
/**
* @author Werner Punz (latest modification by $Author$)
@@ -28,8 +28,12 @@ import javax.faces.bean.RequestScoped;
*/
@ManagedBean
-@RequestScoped
+@SessionScoped
public class HelloBean {
+
+ int cnt = 0;
+
+
private String hello = "Hello world from an instant bean";
private String addedMethod() {
@@ -40,7 +44,22 @@ public class HelloBean {
return hello ;
}
+
+ public String getHello2() {
+ return hello ;
+ }
public void setHello(String hello) {
this.hello = hello;
}
+ public void setHello2(String hello) {
+ this.hello = hello;
+ }
+
+ public int getCnt() {
+ return ++cnt;
+ }
+
+ public void setCnt(int cnt) {
+ this.cnt = cnt;
+ }
}
Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/resources/styles/main.css
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/resources/styles/main.css?rev=933247&r1=933246&r2=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/resources/styles/main.css (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/resources/styles/main.css Mon Apr 12 14:09:56 2010
@@ -1,5 +1,5 @@
body {
- background-color: black;
+ background-color: white;
}
div.centerDiv {
Modified: myfaces/extensions/scripting/trunk/extscript-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/pom.xml?rev=933247&r1=933246&r2=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/pom.xml Mon Apr 12 14:09:56 2010
@@ -48,4 +48,16 @@
<module>spring-example</module>
</modules>
+
+
+ <profiles>
+ <profile>
+ <id>development</id>
+
+ <properties>
+ <maven.war.webxml>${basedir}/src/main/conf/dev/web.xml</maven.war.webxml>
+ </properties>
+ </profile>
+ </profiles>
+
</project>
Modified: myfaces/extensions/scripting/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/pom.xml?rev=933247&r1=933246&r2=933247&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/pom.xml Mon Apr 12 14:09:56 2010
@@ -112,12 +112,12 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test20</artifactId>
- <version>1.0.0-beta</version>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test20</artifactId>
+ <version>1.0.0-beta</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.easymock</groupId>