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/03/09 15:47:11 UTC
svn commit: r920900 - in /myfaces/extensions/scripting/trunk:
core/core/pom.xml examples/myfaces12-example/pom.xml
examples/myfaces20-example/pom.xml
examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java
pom.xml
Author: werpu
Date: Tue Mar 9 14:47:10 2010
New Revision: 920900
URL: http://svn.apache.org/viewvc?rev=920900&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-90
introducing meta bundles to reduce setup complexity for the end user!
Modified:
myfaces/extensions/scripting/trunk/core/core/pom.xml
myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java
myfaces/extensions/scripting/trunk/pom.xml
Modified: myfaces/extensions/scripting/trunk/core/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/pom.xml?rev=920900&r1=920899&r2=920900&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/core/core/pom.xml Tue Mar 9 14:47:10 2010
@@ -3,6 +3,7 @@
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>extscript-core</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>MyFaces Extension Scripting Core</name>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml?rev=920900&r1=920899&r2=920900&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml Tue Mar 9 14:47:10 2010
@@ -23,19 +23,7 @@
<dependency>
<groupId>org.apache.myfaces.extension-scripting</groupId>
- <artifactId>extscript-core</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.extension-scripting</groupId>
- <artifactId>extscript-core-java6</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.myfaces.extension-scripting</groupId>
- <artifactId>extscript-myfaces12-extensions</artifactId>
+ <artifactId>extscript-myfaces12-bundle</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
@@ -45,12 +33,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>
@@ -70,7 +60,6 @@
<scope>runtime</scope>
</dependency>
-
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml?rev=920900&r1=920899&r2=920900&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml Tue Mar 9 14:47:10 2010
@@ -44,44 +44,33 @@
<version>1.5.6</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extension-scripting</groupId>
- <artifactId>extscript-core</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.apache.myfaces.extension-scripting</groupId>
- <artifactId>extscript-myfaces2-extensions</artifactId>
+ <artifactId>extscript-myfaces20-bundle</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.extension-scripting</groupId>
- <artifactId>extscript-core-java6</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
-
-
- <dependency>
+
+
+ <dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
</dependency>
+
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java?rev=920900&r1=920899&r2=920900&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/java/org/apache/myfaces/otherEngines/TestBeanImpl.java Tue Mar 9 14:47:10 2010
@@ -1,7 +1,5 @@
package org.apache.myfaces.otherEngines;
-import org.apache.myfaces.scripting.core.util.FileUtils;
-
import javax.faces.FacesException;
import javax.faces.bean.ManagedBean;
import javax.faces.bean.RequestScoped;
@@ -19,7 +17,11 @@ public class TestBeanImpl implements Tes
try {
String resourceRoot = this.getClass().getClassLoader().getResource("./").getFile();
//dirty and only works if you run it in maven jetty:run but for the demo this is ok
- String resource = resourceRoot+"../../../../src/main/java/"+"org.apache.myfaces.otherEngines".replaceAll("\\.", FileUtils.getFileSeparatorForRegex())+File.separator+"TestBean.js";
+ String separator = File.separator;
+ if(separator.equals("\\")) {
+ separator = separator+separator;
+ }
+ String resource = resourceRoot+"../../../../src/main/java/"+"org.apache.myfaces.otherEngines".replaceAll("\\.", separator)+"TestBean.js";
_delegate = (TestBean) JavascriptProxyFactory.newInstance(TestBean.class, "TestBean", new File(resource));
} catch (ScriptException e) {
throw new FacesException(e);
Modified: myfaces/extensions/scripting/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/pom.xml?rev=920900&r1=920899&r2=920900&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/pom.xml Tue Mar 9 14:47:10 2010
@@ -21,6 +21,7 @@
<modules>
<module>core</module>
+ <module>bundles</module>
<module>examples</module>
</modules>