EXTSCRIPT-166
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1353739 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-cdi/pom.xml b/extscript-core-root/extscript-cdi/pom.xml
index d098bc4..66587f1 100644
--- a/extscript-core-root/extscript-cdi/pom.xml
+++ b/extscript-core-root/extscript-cdi/pom.xml
@@ -47,6 +47,7 @@
<artifactId>extscript-core</artifactId>
<version>1.0.4-SNAPSHOT</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.deltaspike.cdictrl</groupId>
<artifactId>deltaspike-cdictrl-api</artifactId>
@@ -59,7 +60,7 @@
<version>${deltaspike.version}</version>
<scope>provided</scope>
</dependency>
-
+ -->
<!-- openwebbeans -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
diff --git a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
index 5907376..1e3feac 100644
--- a/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
+++ b/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java
@@ -60,7 +60,7 @@
{
String sourceDir = getSourceDir();
if(sourceDir == null) {
- sourceDir = _sourceFile.getPath();
+ sourceDir = _sourceFile.getParent()+File.separator;
}
return _sourceFile.getAbsolutePath().substring(sourceDir.length());
}
diff --git a/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java b/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java
index beb242e..e878019 100644
--- a/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java
+++ b/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/core/context/InitialFullScanTest.java
@@ -69,9 +69,10 @@
while(enumeration.hasMoreElements()) {
URL currentDir = enumeration.nextElement();
String currentDirStr = currentDir.getFile();
- currentDirStr = currentDirStr.replaceAll("target"+File.separatorChar+"test\\-classes",
+ currentDirStr = currentDirStr.replaceAll("%5c", FileUtils.getFileSeparatorForRegex());
+ currentDirStr = currentDirStr.replaceAll("target/test\\-classes",
"src/main/java");
- currentDirStr = currentDirStr.replaceAll("target"+File.separatorChar+"classes",
+ currentDirStr = currentDirStr.replaceAll("target/classes",
"src/main/java");
currentDirStr = currentDirStr.replaceAll("context", "api");
javaEngine.getSourcePaths().add(currentDirStr);
diff --git a/pom.xml b/pom.xml
index aae5780..4b230e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<!-- test -->
<properties>
<myfaces12.version>1.2.9</myfaces12.version>
- <myfaces2.version>2.1.7-SNAPSHOT</myfaces2.version>
+ <myfaces2.version>2.1.7</myfaces2.version>
<extval.version>2.0.5</extval.version>
<groovy.version>1.7.2</groovy.version>
<maven-scala-plugin.scalaVersion>2.15.2</maven-scala-plugin.scalaVersion>
diff --git a/src/site/site.xml b/src/site/site.xml
index a20e68f..3092494 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -115,7 +115,18 @@
<item name="Others" href="../otherProjects.html"/>
</menu>
+ <menu name="External Resources">
+ <item name="Ext-Scripting Interview" href="http://www.jsfcentral.com/articles/punz-03-12.html"/>
+ <item name="Groovy Language Homepage" href="http://http://groovy.codehaus.org/" />
+ <item name="Scala Language Homepage" href="http://www.scala-lang.org/" />
+ <item name="Scala and Apache MyFaces Part 1"
+ href="http://www.irian.at/de/blog/-/blogs/marrying-scala-with-apache-myfaces" />
+ <item name="Scala and Apache MyFaces Part 2"
+ href="http://www.irian.at/de/blog/-/blogs/marrying-scala-with-apache-myfaces" />
+ <item name="Scala and Apache MyFaces Part 3"
+ href="http://www.irian.at/de/blog/-/blogs/marrying-scala-with-apache-myfaces" />
+ </menu>
<menu name="Foundation">
<item name="ASF" href="http://apache.org/" />
diff --git a/src/site/xdoc/installation.xml b/src/site/xdoc/installation.xml
index 88469cb..f0ebe19 100644
--- a/src/site/xdoc/installation.xml
+++ b/src/site/xdoc/installation.xml
@@ -300,6 +300,15 @@
<some project path>/src/main/webapp/WEB-INF/java
</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.extensions.scripting.scala.LOADER_PATHS</param-name>
+ <param-value>
+ <some project path>/src/main/webapp/WEB-INF/scala
+ </param-value>
+</context-param>
]]></source>
<ul>
<li>
