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 2009/09/10 12:25:50 UTC
svn commit: r813355 - in /myfaces/extensions/scripting/trunk: ./ core-java6/
core-java6/src/ core/ core/src/ engine/ engine/core-java6/
engine/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/
engine/core-java6/src/test/ engine...
Author: werpu
Date: Thu Sep 10 10:25:49 2009
New Revision: 813355
URL: http://svn.apache.org/viewvc?rev=813355&view=rev
Log:
http://issues.apache.org/jira/browse/EXTSCRIPT-12
project reorg
Added:
myfaces/extensions/scripting/trunk/engine/
myfaces/extensions/scripting/trunk/engine/core/
- copied from r809742, myfaces/extensions/scripting/trunk/core/
myfaces/extensions/scripting/trunk/engine/core-java6/
- copied from r812471, myfaces/extensions/scripting/trunk/core-java6/
myfaces/extensions/scripting/trunk/engine/core-java6/pom.xml
- copied unchanged from r812662, myfaces/extensions/scripting/trunk/core-java6/pom.xml
myfaces/extensions/scripting/trunk/engine/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/CompilerFacade.java
- copied unchanged from r813093, myfaces/extensions/scripting/trunk/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/CompilerFacade.java
myfaces/extensions/scripting/trunk/engine/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java
- copied unchanged from r813347, myfaces/extensions/scripting/trunk/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ContainerFileManager.java
myfaces/extensions/scripting/trunk/engine/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/RecompiledClassLoader.java
- copied unchanged from r813093, myfaces/extensions/scripting/trunk/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/RecompiledClassLoader.java
myfaces/extensions/scripting/trunk/engine/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ReflectCompilerFacade.java
- copied unchanged from r813347, myfaces/extensions/scripting/trunk/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/ReflectCompilerFacade.java
myfaces/extensions/scripting/trunk/engine/core-java6/src/test/
- copied from r813347, myfaces/extensions/scripting/trunk/core-java6/src/test/
myfaces/extensions/scripting/trunk/engine/core/pom.xml
- copied, changed from r812796, myfaces/extensions/scripting/trunk/core/pom.xml
myfaces/extensions/scripting/trunk/engine/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy
- copied unchanged from r809890, myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/
- copied from r812363, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/api/DynamicCompiler.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/api/DynamicCompiler.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java
- copied unchanged from r813347, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java
- copied unchanged from r813070, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/core/util/ReflectUtil.java
- copied unchanged from r813347, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/util/ReflectUtil.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java
- copied unchanged from r813347, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/NavigationHandlerProxy.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/NavigationHandlerProxy.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/loaders/java/
- copied from r812365, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
- copied unchanged from r813347, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScriptingClass.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScriptingClass.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/loaders/java/_ScriptingClass.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/_ScriptingClass.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jci/CompilerFacade.java
- copied unchanged from r813347, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jci/CompilerFacade.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java
- copied unchanged from r812796, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
- copied unchanged from r813070, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
- copied unchanged from r813347, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
myfaces/extensions/scripting/trunk/engine/pom.xml (with props)
myfaces/extensions/scripting/trunk/myfaces2-extensions/
myfaces/extensions/scripting/trunk/myfaces2-extensions/pom.xml
myfaces/extensions/scripting/trunk/myfaces2-extensions/src/
myfaces/extensions/scripting/trunk/myfaces2-extensions/src/main/
Removed:
myfaces/extensions/scripting/trunk/core-java6/pom.xml
myfaces/extensions/scripting/trunk/core-java6/src/
myfaces/extensions/scripting/trunk/core/pom.xml
myfaces/extensions/scripting/trunk/core/src/
myfaces/extensions/scripting/trunk/engine/core/src/main/groovy/org/apache/myfaces/groovyloader/jsf/
myfaces/extensions/scripting/trunk/engine/core/src/main/groovy/org/apache/myfaces/groovyloader/test/
myfaces/extensions/scripting/trunk/engine/core/src/main/java/org/apache/myfaces/scripting/scratchpad/
myfaces/extensions/scripting/trunk/engine/core/src/test/java/
Modified:
myfaces/extensions/scripting/trunk/examples/pom.xml
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/Blog.groovy
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtil.java
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/examples/src/main/webapp/page2.xhtml
myfaces/extensions/scripting/trunk/pom.xml
Copied: myfaces/extensions/scripting/trunk/engine/core/pom.xml (from r812796, myfaces/extensions/scripting/trunk/core/pom.xml)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/engine/core/pom.xml?p2=myfaces/extensions/scripting/trunk/engine/core/pom.xml&p1=myfaces/extensions/scripting/trunk/core/pom.xml&r1=812796&r2=813355&rev=813355&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/engine/core/pom.xml Thu Sep 10 10:25:49 2009
@@ -41,13 +41,14 @@
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>1.2.8-SNAPSHOT</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>1.2.8-SNAPSHOT</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -103,4 +104,5 @@
</plugins>
</build>
+
</project>
Added: myfaces/extensions/scripting/trunk/engine/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/engine/pom.xml?rev=813355&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/engine/pom.xml (added)
+++ myfaces/extensions/scripting/trunk/engine/pom.xml Thu Sep 10 10:25:49 2009
@@ -0,0 +1,23 @@
+<project xmlns = "http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>engine</artifactId>
+ <packaging>pom</packaging>
+ <name>groovy core engine</name>
+
+ <description>
+ groovy myfaces core engine meta project
+ </description>
+
+ <parent>
+ <groupId>org.apache.myfaces.extension-scripting</groupId>
+ <artifactId>root</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <modules>
+ <module>core</module>
+ <module>core-java6</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange: myfaces/extensions/scripting/trunk/engine/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/engine/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/pom.xml?rev=813355&r1=813354&r2=813355&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/pom.xml Thu Sep 10 10:25:49 2009
@@ -14,6 +14,8 @@
<url>http://www.apache.org</url>
+
+
<build>
<plugins>
<plugin>
@@ -28,7 +30,9 @@
</connector>
</connectors>
<scanIntervalSeconds>1</scanIntervalSeconds>
+
</configuration>
+
</plugin>
</plugins>
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/Blog.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/Blog.groovy?rev=813355&r1=813354&r2=813355&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/Blog.groovy (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/blog/Blog.groovy Thu Sep 10 10:25:49 2009
@@ -66,4 +66,5 @@
return null;
}
+
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java?rev=813355&r1=813354&r2=813355&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java Thu Sep 10 10:25:49 2009
@@ -23,23 +23,26 @@
import org.apache.myfaces.scripting.loaders.java.ScriptingClass;
import static org.apache.myfaces.javaloader.blog.JSFUtil.*;
-import static org.apache.myfaces.scripting.core.util.ClassUtils.*;
+import static org.apache.myfaces.scripting.core.util.ReflectUtil.*;
/**
* @author werpu2
* @date: 01.09.2009
*/
-@ScriptingClass
+
public class Blog {
- String title = "Hello to the myfaces dynamic blogging";
+ String title = "Hello to the myfaces dynamic blogging example";
String title1 = "You can alter the code for this small blogging application on the fly, " +
"you even can add new classes on the fly and Java will pick it up";
String title3 = "bla";
String title4 = "bla2";
+ String title5 = "test from title5";
+
+
String firstName = "";
String lastName = "";
@@ -86,6 +89,7 @@
* the same behavior you get from scripting engines!
*
*/
+ //service.addEntry(entry);
executeMethod(service, "addEntry", cast(Object.class, entry));
}
@@ -138,12 +142,13 @@
return content;
}
+
public void setContent(String content) {
this.content = content;
}
public String getTitle3() {
- return "aaaaa";
+ return "title 3 from java blog";
}
public void setTitle3(String title3) {
@@ -157,4 +162,15 @@
public void setTitle4(String title4) {
this.title4 = title4;
}
+
+
+ public String getTitle5() {
+ return title5;
+ }
+
+ public void setTitle5(String title5) {
+
+ }
+
+
}
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java?rev=813355&r1=813354&r2=813355&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/BlogService.java Thu Sep 10 10:25:49 2009
@@ -28,7 +28,6 @@
* @author werpu2
* @date: 01.09.2009
*/
-@ScriptingClass
public class BlogService {
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtil.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtil.java?rev=813355&r1=813354&r2=813355&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtil.java (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtil.java Thu Sep 10 10:25:49 2009
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+
import javax.faces.context.FacesContext;
import java.lang.reflect.Method;
@@ -60,13 +60,14 @@
pointing towards the lingering jars
The compiler cannot pick up the implicit containers classpaths
- return FacesContext.getCurrentInstance().getELContext().getELResolver().getValue(FacesContext.getCurrentInstance().getELContext(), null, beanName);
*/
//we use the introspection calls here to achieve our goal that way
//we can shift the dependency resolution from compile time to runtime
return executeFunction(elResolver, "getValue", cast(ClassUtils.classForName("javax.el.ELContext"), elContext), nullCast(Object.class), cast(Object.class, beanName));
+ // return FacesContext.getCurrentInstance().getELContext().getELResolver().getValue(FacesContext.getCurrentInstance().getELContext(), null, beanName);
+
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java?rev=813355&r1=813354&r2=813355&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java Thu Sep 10 10:25:49 2009
@@ -2,14 +2,14 @@
import org.apache.myfaces.scripting.loaders.java.ScriptingClass;
-@ScriptingClass
+
public class TestBean2 {
String sayHello = "hello worldgggg";
String hello2 = "hello from added attribute";
- String hello3 = "hello from added attribute 2";
-
+ String hello3 = "hello from added attribute 2";
+
public String getSayHello() {
- return "hello from a Java coded dynamic bean" + TestClass2.hello2 + hello3;
+ return " Java dynamic bean - "+TestClass2.hello2 + hello3;
}
public String getSayHello2() {
@@ -22,4 +22,6 @@
System.out.println("hello world");
}
+
+
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/web.xml?rev=813355&r1=813354&r2=813355&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/web.xml Thu Sep 10 10:25:49 2009
@@ -46,7 +46,7 @@
</context-param>
- <!--
+
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
of the deployment dir
@@ -56,10 +56,6 @@
</param-value>
</context-param>
- <context-param>
- <param-name>org.apache.myfaces.scripting.java.JAR_PATHS</param-name>
- <param-value>/Users/werpu2/development/apache-tomcat-6.0.16/lib</param-value>
- </context-param>
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
@@ -69,7 +65,7 @@
<param-value>/Users/werpu2/development/workspace/extensions-scripting/examples/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/examples/src/main/webapp/page2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/page2.xhtml?rev=813355&r1=813354&r2=813355&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/page2.xhtml (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/page2.xhtml Thu Sep 10 10:25:49 2009
@@ -13,6 +13,10 @@
<h:commandLink id = "link1" action = "back">
<h:outputText id = "linkText" value = "GO HOME" />
</h:commandLink>
+
+ <h:commandLink id = "link12" action = "xxx">
+ <h:outputText id = "linkText2" value = "GO HOME" />
+ </h:commandLink>
</h:form>
</f:view>
</body>
Added: myfaces/extensions/scripting/trunk/myfaces2-extensions/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/myfaces2-extensions/pom.xml?rev=813355&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/myfaces2-extensions/pom.xml (added)
+++ myfaces/extensions/scripting/trunk/myfaces2-extensions/pom.xml Thu Sep 10 10:25:49 2009
@@ -0,0 +1,45 @@
+<project xmlns = "http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>myfaces2-extensions</artifactId>
+ <packaging>jar</packaging>
+ <name>myfaces2-extensions</name>
+
+ <description>
+ extension-scripting classes which enable myfaces 2.0 compatibility
+ </description>
+
+ <parent>
+ <groupId>org.apache.myfaces.extension-scripting</groupId>
+ <artifactId>root</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: myfaces/extensions/scripting/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/pom.xml?rev=813355&r1=813354&r2=813355&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/pom.xml Thu Sep 10 10:25:49 2009
@@ -13,8 +13,7 @@
</description>
<modules>
- <module>core</module>
- <module>core-java6</module>
+ <module>engine</module>
<!--
<module>myfaces12-extensions</module>
@@ -23,7 +22,6 @@
<module>examples</module>
<module>spring-example</module>
</modules>
- /Users/werpu2/development/workspace/extensions-scripting//Users/werpu2/development/workspace/extensions-scripting/
<repositories>
<repository>