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/01/09 17:12:15 UTC
svn commit: r897483 - in /myfaces/extensions/scripting/trunk/core: ./
core-java6/
core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/
core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/
core-java6/src/test/r...
Author: werpu
Date: Sat Jan 9 16:12:14 2010
New Revision: 897483
URL: http://svn.apache.org/viewvc?rev=897483&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-42
Added:
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/facelet/
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java (with props)
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java (with props)
Modified:
myfaces/extensions/scripting/trunk/core/core-java6/pom.xml
myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java
myfaces/extensions/scripting/trunk/core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/TestCompilerAPI.java
myfaces/extensions/scripting/trunk/core/core-java6/src/test/resources/TestProbe1.java
myfaces/extensions/scripting/trunk/core/core-java6/src/test/resources/TestProbe2.java
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/pom.xml
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
myfaces/extensions/scripting/trunk/core/pom.xml
Modified: myfaces/extensions/scripting/trunk/core/core-java6/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core-java6/pom.xml?rev=897483&r1=897482&r2=897483&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core-java6/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/core/core-java6/pom.xml Sat Jan 9 16:12:14 2010
@@ -1,6 +1,6 @@
-<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">
+<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>core-java6</artifactId>
<packaging>jar</packaging>
@@ -12,7 +12,6 @@
</description>
-
<parent>
<groupId>org.apache.myfaces.extension-scripting</groupId>
<artifactId>core-root</artifactId>
@@ -38,7 +37,7 @@
<artifactId>commons-beanutils</artifactId>
<version>1.8.0</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>1.2.8</version>
Modified: myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java?rev=897483&r1=897482&r2=897483&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/JSR199Compiler.java Sat Jan 9 16:12:14 2010
@@ -58,9 +58,9 @@
private static final String FILE_SEPARATOR = File.separator;
- JavaCompiler javaCompiler = ToolProvider.getSystemJavaCompiler();
+ JavaCompiler javaCompiler = ToolProvider.getSystemJavaCompiler();
DiagnosticCollector<JavaFileObject> diagnosticCollector = new DiagnosticCollector();
- ContainerFileManager fileManager = null;
+ ContainerFileManager fileManager = null;
public JSR199Compiler() {
Modified: myfaces/extensions/scripting/trunk/core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/TestCompilerAPI.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/TestCompilerAPI.java?rev=897483&r1=897482&r2=897483&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/TestCompilerAPI.java (original)
+++ myfaces/extensions/scripting/trunk/core/core-java6/src/test/java/org/apache/myfaces/javaloader/core/compilerTest/TestCompilerAPI.java Sat Jan 9 16:12:14 2010
@@ -22,8 +22,10 @@
import org.apache.commons.io.FilenameUtils;
import org.apache.myfaces.scripting.api.DynamicCompiler;
import org.apache.myfaces.scripting.core.util.ReflectUtil;
+
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+
import org.junit.Test;
import java.io.File;
@@ -84,17 +86,17 @@
@Test
public void testFullCompile() {
- File targetDir = null;
+ File targetDir = null;
try {
-
+
DynamicCompiler compiler = (DynamicCompiler) ReflectUtil.instantiate(getScriptingFacadeClass(true));//new ReflectCompilerFacade();
File target = compiler.compileAllFiles(root.getAbsolutePath(), "");
assertTrue("target exists files are compiled into the target", target != null);
- File classFile1 = new File(target.getAbsolutePath()+"/compiler/TestProbe1.class");
- File classFile2 = new File(target.getAbsolutePath()+"/compiler/TestProbe2.class");
+ File classFile1 = new File(target.getAbsolutePath() + "/compiler/TestProbe1.class");
+ File classFile2 = new File(target.getAbsolutePath() + "/compiler/TestProbe2.class");
assertTrue("Classfile1 is compiled into the target", classFile1.exists());
assertTrue("Classfile2 is compiled into the target", classFile2.exists());
Modified: myfaces/extensions/scripting/trunk/core/core-java6/src/test/resources/TestProbe1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core-java6/src/test/resources/TestProbe1.java?rev=897483&r1=897482&r2=897483&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core-java6/src/test/resources/TestProbe1.java (original)
+++ myfaces/extensions/scripting/trunk/core/core-java6/src/test/resources/TestProbe1.java Sat Jan 9 16:12:14 2010
@@ -1,8 +1,8 @@
package compiler;
/**
-* a simple testprobe to check if the compiler api works
-*/
+ * a simple testprobe to check if the compiler api works
+ */
public class TestProbe1 {
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/core/core-java6/src/test/resources/TestProbe2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core-java6/src/test/resources/TestProbe2.java?rev=897483&r1=897482&r2=897483&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core-java6/src/test/resources/TestProbe2.java (original)
+++ myfaces/extensions/scripting/trunk/core/core-java6/src/test/resources/TestProbe2.java Sat Jan 9 16:12:14 2010
@@ -1,8 +1,8 @@
package compiler;
/**
-* a simple testprobe to check if the compiler api works
-*/
+ * a simple testprobe to check if the compiler api works
+ */
public class TestProbe2 {
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/pom.xml?rev=897483&r1=897482&r2=897483&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/pom.xml Sat Jan 9 16:12:14 2010
@@ -1,6 +1,6 @@
-<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">
+<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>myfaces12-extensions</artifactId>
<packaging>jar</packaging>
@@ -17,14 +17,14 @@
</parent>
<dependencies>
-
+
<dependency>
<groupId>org.apache.myfaces.extension-scripting</groupId>
<artifactId>core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -39,12 +39,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.11</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.8.0</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
<version>1.0</version>
Added: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java?rev=897483&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java (added)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java Sat Jan 9 16:12:14 2010
@@ -0,0 +1,48 @@
+package org.apache.myfaces.scripting.facelet;
+
+import com.sun.facelets.impl.DefaultResourceResolver;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+/**
+ * decorated Facelet resource resolver to reroute
+ * the resource requests to our source path if possible
+ */
+public class ReroutingResourceResolver extends DefaultResourceResolver {
+
+ DefaultResourceResolver _delegate = new DefaultResourceResolver();
+ volatile boolean _initiated = false;
+ List<String> _resourceDirs = null;
+
+
+ Log log = LogFactory.getLog(this.getClass());
+
+ @Override
+ public URL resolveUrl(String path) {
+
+ if (!_initiated) {
+ _resourceDirs = WeavingContext.getConfiguration().getResourceDirs();
+ _initiated = true;
+ }
+
+ if (_resourceDirs != null && !_resourceDirs.isEmpty()) {
+ for (String resourceDir : _resourceDirs) {
+ File resource = new File(resourceDir + path);
+ if (resource.exists()) try {
+ return resource.toURI().toURL();
+ } catch (MalformedURLException e) {
+ log.error(e);
+ }
+ }
+ }
+
+ return _delegate.resolveUrl(path);
+ }
+}
+
Propchange: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java?rev=897483&r1=897482&r2=897483&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java Sat Jan 9 16:12:14 2010
@@ -19,6 +19,7 @@
package org.apache.myfaces.scripting.servlet;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,13 +37,13 @@
/**
* @author werpu
- * @date: 14.08.2009
- * <p/>
- * Startup context plugin chainloader
- * for myfaces 1.2.x,
- * we hook ourselfs into the startup event
- * system we have for myfaces 1.2.x+ to do the initial
- * configuration before the myfaces init itself starts!
+ * <p/>
+ * <p/>
+ * Startup context plugin chainloader
+ * for MyFaces 1.2.x,
+ * we hook ourselves into the startup event
+ * system we have for MyFaces 1.2.x+ to do the initial
+ * configuration before the MyFaces init itself starts!
*/
public class StartupServletContextPluginChainLoader implements StartupListener {
final Log log = LogFactory.getLog(this.getClass());
@@ -69,9 +70,9 @@
/**
* initiates the first compile and scan in the subsystem
*
- * @param weaver our weaver which reveices the trigger calls
+ * @param weaver our weaver which receives the trigger calls
*/
- private final void initInitialCompileAndScan(ScriptingWeaver weaver) {
+ private void initInitialCompileAndScan(ScriptingWeaver weaver) {
log.info("[EXT-SCRIPTING] Compiling all sources for the first time");
weaver.requestRefresh();
weaver.fullClassScan();
@@ -85,7 +86,7 @@
* @param servletContext the servlet context singleton which keeps
* the context for distribution
*/
- private final void initRefreshContext(ServletContext servletContext) {
+ private void initRefreshContext(ServletContext servletContext) {
RefreshContext rContext = new RefreshContext();
servletContext.setAttribute("RefreshContext", rContext);
WeavingContext.setRefreshContext(rContext);
@@ -98,9 +99,9 @@
*
* @param servletContext the application scoped holder for our weaver
* @param loader the chain loader which serves the weavers
- * @return the weaver instance wich is generated and stored
+ * @return the weaver instance which is generated and stored
*/
- private final ScriptingWeaver initScriptingWeaver(ServletContext servletContext, CustomChainLoader loader) {
+ private ScriptingWeaver initScriptingWeaver(ServletContext servletContext, CustomChainLoader loader) {
ScriptingWeaver weaver = loader.getScriptingWeaver();
servletContext.setAttribute("ScriptingWeaver", weaver);
return weaver;
@@ -108,12 +109,12 @@
/**
* initializes our custom chain loader which gets plugged into
- * the myfaces loading part for classes!
+ * the MyFaces loading part for classes!
*
- * @param servletContext
- * @return
+ * @param servletContext the servlet context to be passed down
+ * @return the custom chain loader for loading our classes over our classloaders
*/
- private final CustomChainLoader initChainLoader(ServletContext servletContext) {
+ private CustomChainLoader initChainLoader(ServletContext servletContext) {
CustomChainLoader loader = new CustomChainLoader(servletContext);
ClassUtils.addClassLoadingExtension(loader, true);
return loader;
@@ -122,12 +123,20 @@
/**
* initializes the central config storage!
*
- * @param servletContext
+ * @param servletContext the applications servlet context
*/
- private final void initConfig(ServletContext servletContext) {
+ private void initConfig(ServletContext servletContext) {
Configuration conf = new Configuration();
servletContext.setAttribute(ScriptingConst.CTX_CONFIGURATION, conf);
WeavingContext.setConfiguration(conf);
+ //we now add the resource loader path here
+ String resourceDirs = servletContext.getInitParameter(ScriptingConst.INIT_PARAM_RESOURCE_PATH);
+ if (!StringUtils.isBlank(resourceDirs)) {
+ String[] splittedResourceDirs = resourceDirs.split(",");
+ for (String resourceDir : splittedResourceDirs) {
+ conf.addResourceDir(resourceDir);
+ }
+ }
}
public void postInit(ServletContextEvent evt) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml?rev=897483&r1=897482&r2=897483&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml Sat Jan 9 16:12:14 2010
@@ -1,6 +1,6 @@
-<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">
+<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>
@@ -41,14 +41,14 @@
<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>
<build>
Added: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java?rev=897483&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java (added)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java Sat Jan 9 16:12:14 2010
@@ -0,0 +1,47 @@
+package org.apache.myfaces.scripting.facelet;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
+import org.apache.myfaces.view.facelets.impl.DefaultResourceResolver;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+/**
+ * decorated Facelet resource resolver to reroute
+ * the resource requests to our source path if possible
+ */
+public class ReroutingResourceResolver extends DefaultResourceResolver {
+
+ DefaultResourceResolver _delegate = new DefaultResourceResolver();
+ volatile boolean _initiated = false;
+ List<String> _resourceDirs = null;
+
+
+ Log log = LogFactory.getLog(this.getClass());
+
+ @Override
+ public URL resolveUrl(String path) {
+
+ if (!_initiated) {
+ _resourceDirs = WeavingContext.getConfiguration().getResourceDirs();
+ _initiated = true;
+ }
+
+ if (_resourceDirs != null && !_resourceDirs.isEmpty()) {
+ for (String resourceDir : _resourceDirs) {
+ File resource = new File(resourceDir + path);
+ if (resource.exists()) try {
+ return resource.toURI().toURL();
+ } catch (MalformedURLException e) {
+ log.error(e);
+ }
+ }
+ }
+
+ return _delegate.resolveUrl(path);
+ }
+}
Propchange: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/facelet/ReroutingResourceResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/resources/META-INF/faces-config.xml?rev=897483&r1=897482&r2=897483&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/resources/META-INF/faces-config.xml Sat Jan 9 16:12:14 2010
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<faces-config 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-facesconfig_2_0.xsd"
- version = "2.0">
+<faces-config 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-facesconfig_2_0.xsd"
+ version="2.0">
<!--
* Licensed to the Apache Software Foundation (ASF) under one
Modified: myfaces/extensions/scripting/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/pom.xml?rev=897483&r1=897482&r2=897483&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/core/pom.xml Sat Jan 9 16:12:14 2010
@@ -1,12 +1,12 @@
-<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">
+<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>core-root</artifactId>
<packaging>pom</packaging>
<name>groovy core engine</name>
- <version>1.0-SNAPSHOT</version>
-
+ <version>1.0-SNAPSHOT</version>
+
<description>
groovy myfaces core engine meta project
</description>
@@ -17,10 +17,10 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <modules>
- <module>core</module>
- <module>myfaces12-extensions</module>
- <module>myfaces2-extensions</module>
- <module>core-java6</module>
- </modules>
+ <modules>
+ <module>core</module>
+ <module>myfaces12-extensions</module>
+ <module>myfaces2-extensions</module>
+ <module>core-java6</module>
+ </modules>
</project>
\ No newline at end of file