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/28 16:49:49 UTC
svn commit: r928421 - in
/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src:
main/java/org/apache/myfaces/scripting/api/
main/java/org/apache/myfaces/scripting/core/util/
test/java/org/apache/myfaces/extensions/scripting/lifecyc...
Author: werpu
Date: Sun Mar 28 14:49:49 2010
New Revision: 928421
URL: http://svn.apache.org/viewvc?rev=928421&view=rev
Log:
http://issues.apache.org/jira/browse/EXTSCRIPT-108
refactoring of the test dirs
adding a bunch of additional startup tests
fixing of a few minor bugs discovered by our unit tests
Added:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java
- copied, changed from r928420, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/lifecycle/StartupTestCase.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/StartupTestCase.java (contents, props changed)
- copied, changed from r928420, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/lifecycle/StartupTestCase.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/AbstractGeneratorTestCase.java (contents, props changed)
- copied, changed from r928420, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/support/AbstractGeneratorTestCase.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/MockServletContext.java (with props)
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TWeavingContext.java (contents, props changed)
- copied, changed from r928420, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/classIdentifier/TWeavingContext.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/brokenwebapp/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/brokenwebapp/WEB-INF/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/brokenwebapp/WEB-INF/web.xml (with props)
Removed:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/lifecycle/StartupTestCase.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/support/AbstractGeneratorTestCase.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/support/MockServletContext.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/classIdentifier/TWeavingContext.java
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/classIdentifier/JavaDynamicClassIdentifierTest.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/AbstractJavaCompilerTestCase.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/GroovyCompilerTest.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/ReloadingClassLoaderTest.java
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java?rev=928421&r1=928420&r2=928421&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java Sun Mar 28 14:49:49 2010
@@ -26,6 +26,9 @@ package org.apache.myfaces.scripting.api
*/
@SuppressWarnings("unused")
public class ScriptingConst {
+
+
+
public static final String SCRIPTING_CLASSLOADER = "org.apache.myfaces.SCRIPTING_CLASSLOADER";
public static final String SCRIPTING_GROOVFACTORY = "org.apache.myfaces.SCRIPTING_GROOVYFACTORY";
public static final String SCRIPTING_REQUSINGLETON = "org.apache.myfaces.SCRIPTING_REQUSINGLETON";
@@ -35,6 +38,8 @@ public class ScriptingConst {
public static final String INIT_PARAM_RESOURCE_PATH = "org.apache.myfaces.scripting.resources.LOADER_PATHS";
public static final String INIT_PARAM_CUSTOM_GROOVY_LOADER_PATHS = "org.apache.myfaces.scripting.groovy.LOADER_PATHS";
public static final String INIT_PARAM_CUSTOM_JAVA_LOADER_PATHS = "org.apache.myfaces.scripting.java.LOADER_PATHS";
+ public static final String INIT_PARAM_MYFACES_PLUGIN = "org.apache.myfaces.FACES_INIT_PLUGINS";
+
public static final String CONTEXT_VALUE_DIVIDER = ",";
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java?rev=928421&r1=928420&r2=928421&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContextInitializer.java Sun Mar 28 14:49:49 2010
@@ -55,15 +55,29 @@ public class WeavingContextInitializer {
initWeavers(servletContext);
initRefreshContext(servletContext);
initFileChangeDaemon(servletContext);
+ initExternalContext(servletContext);
+ }
+
+ private static void initExternalContext(ServletContext servletContext) {
+ if (!WeavingContext.isScriptingEnabled()) {
+ return;
+ }
WeavingContext.setExternalContext(servletContext);
}
private static void initFileChangeDaemon(ServletContext servletContext) {
+ if (!WeavingContext.isScriptingEnabled()) {
+ return;
+ }
+
FileChangedDaemon.startup(servletContext);
WeavingContext.getRefreshContext().setDaemon(FileChangedDaemon.getInstance());
}
private static void initConfiguration(ServletContext servletContext) {
+ if (!WeavingContext.isScriptingEnabled()) {
+ return;
+ }
final Configuration configuration = new Configuration();
servletContext.setAttribute(ScriptingConst.CTX_ATTR_CONFIGURATION, configuration);
WeavingContext.setConfiguration(configuration);
@@ -142,6 +156,10 @@ public class WeavingContextInitializer {
private static boolean initWeavers(ServletContext servletContext) {
_logger.fine("[EXT-SCRIPTING] initializing the weaving contexts");
+ if (!WeavingContext.isScriptingEnabled()) {
+ return false;
+ }
+
ScriptingWeaver groovyWeaver = new GroovyScriptingWeaver(servletContext);
ScriptingWeaver javaWeaver = new JavaScriptingWeaver(servletContext);
@@ -208,8 +226,12 @@ public class WeavingContextInitializer {
WeavingContext.setScriptingEnabled(false);
return;
}
- weaver.appendCustomScriptPath(scriptingRoot);
- weaver.appendCustomScriptPath(classRoot);
+ if (!StringUtils.isBlank(scriptingRoot)) {
+ weaver.appendCustomScriptPath(scriptingRoot);
+ }
+ if (!StringUtils.isBlank(classRoot)) {
+ weaver.appendCustomScriptPath(classRoot);
+ }
}
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/classIdentifier/JavaDynamicClassIdentifierTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/classIdentifier/JavaDynamicClassIdentifierTest.java?rev=928421&r1=928420&r2=928421&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/classIdentifier/JavaDynamicClassIdentifierTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/classIdentifier/JavaDynamicClassIdentifierTest.java Sun Mar 28 14:49:49 2010
@@ -19,6 +19,7 @@
package org.apache.myfaces.scripting.core.classIdentifier;
import org.apache.myfaces.scripting.core.CoreWeaver;
+import org.apache.myfaces.scripting.core.support.TWeavingContext;
import org.apache.myfaces.scripting.loaders.java.JavaScriptingWeaver;
import org.junit.Before;
import org.junit.Test;
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java (from r928420, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/lifecycle/StartupTestCase.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/lifecycle/StartupTestCase.java&r1=928420&r2=928421&rev=928421&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/lifecycle/StartupTestCase.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/FailedStartupTestcase.java Sun Mar 28 14:49:49 2010
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.myfaces.extensions.scripting.lifecycle;
+package org.apache.myfaces.scripting.core.lifecycle;
-import org.apache.myfaces.extensions.scripting.support.MockServletContext;
+import org.apache.myfaces.scripting.core.support.MockServletContext;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.core.util.WeavingContextInitializer;
import org.junit.Before;
@@ -30,33 +30,25 @@ import javax.servlet.ServletContext;
import static org.junit.Assert.*;
/**
- * Unit tests which should secure the startup cycle
+ * A Testcase simulating failed startup conditions
+ * (first a missing servlet filter)
*
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class StartupTestCase {
+public class FailedStartupTestCase {
ServletContext context;
@Before
public void init() {
- context = new MockServletContext();
- WeavingContextInitializer.initWeavingContext(context);
- }
+ context = new MockServletContext("../../src/test/resources/brokenwebapp");
- @Test
- public void testStartup() {
- assertTrue("Configuration must be reachable", WeavingContext.getConfiguration() != null);
- assertTrue("RefreshContext must be set", WeavingContext.getRefreshContext() != null);
- assertTrue("Daemon must be running", WeavingContext.getRefreshContext().getDaemon().isRunning());
- assertTrue("External context must be reachable", WeavingContext.getExternalContext() == context);
}
@Test
- public void testConfiguration() {
- assertTrue("Compile target dir must be set",WeavingContext.getConfiguration().getCompileTarget() != null);
- assertTrue("Initial compile flag must be set to allow the initial compile",WeavingContext.getConfiguration().isInitialCompile());
+ public void testStartup() {
+ WeavingContextInitializer.initWeavingContext(context);
+ assertFalse("Scripting must be disabled", WeavingContext.isScriptingEnabled());
}
-
}
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/StartupTestCase.java (from r928420, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/lifecycle/StartupTestCase.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/StartupTestCase.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/StartupTestCase.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/lifecycle/StartupTestCase.java&r1=928420&r2=928421&rev=928421&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/lifecycle/StartupTestCase.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/StartupTestCase.java Sun Mar 28 14:49:49 2010
@@ -17,9 +17,10 @@
* under the License.
*/
-package org.apache.myfaces.extensions.scripting.lifecycle;
+package org.apache.myfaces.scripting.core.lifecycle;
-import org.apache.myfaces.extensions.scripting.support.MockServletContext;
+import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.core.support.MockServletContext;
import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.core.util.WeavingContextInitializer;
import org.junit.Before;
@@ -47,16 +48,26 @@ public class StartupTestCase {
@Test
public void testStartup() {
+ assertTrue("Scripting must be enabled", WeavingContext.isScriptingEnabled());
assertTrue("Configuration must be reachable", WeavingContext.getConfiguration() != null);
assertTrue("RefreshContext must be set", WeavingContext.getRefreshContext() != null);
assertTrue("Daemon must be running", WeavingContext.getRefreshContext().getDaemon().isRunning());
+ assertTrue("Daemon must be running", WeavingContext.getFileChangedDaemon().isRunning());
assertTrue("External context must be reachable", WeavingContext.getExternalContext() == context);
+ assertTrue("Weaver must be set", WeavingContext.getWeaver() != null);
}
@Test
public void testConfiguration() {
- assertTrue("Compile target dir must be set",WeavingContext.getConfiguration().getCompileTarget() != null);
- assertTrue("Initial compile flag must be set to allow the initial compile",WeavingContext.getConfiguration().isInitialCompile());
+ assertTrue("Compile target dir must be set", WeavingContext.getConfiguration().getCompileTarget() != null);
+ assertTrue("Initial compile flag must be set to allow the initial compile", WeavingContext.getConfiguration().isInitialCompile());
+
+ assertTrue("Source dirs per registered scripting engine must be one", WeavingContext.getConfiguration().getSourceDirs(ScriptingConst.ENGINE_TYPE_JSF_JAVA).size() == 1);
+ assertTrue("Source dirs per registered scripting engine must be one", WeavingContext.getConfiguration().getSourceDirs(ScriptingConst.ENGINE_TYPE_JSF_GROOVY).size() == 1);
}
+ @Test
+ public void testNotFullyStarted() {
+ assertTrue("Startup not done yet", context.getAttribute(ScriptingConst.CTX_ATTR_STARTUP) == null);
+ }
}
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/StartupTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/lifecycle/StartupTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/AbstractGeneratorTestCase.java (from r928420, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/support/AbstractGeneratorTestCase.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/AbstractGeneratorTestCase.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/AbstractGeneratorTestCase.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/support/AbstractGeneratorTestCase.java&r1=928420&r2=928421&rev=928421&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/extensions/scripting/support/AbstractGeneratorTestCase.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/AbstractGeneratorTestCase.java Sun Mar 28 14:49:49 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.scripting.support;
+package org.apache.myfaces.scripting.core.support;
import junit.framework.TestCase;
import org.apache.myfaces.scripting.api.CompilationException;
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/AbstractGeneratorTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/AbstractGeneratorTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/MockServletContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/MockServletContext.java?rev=928421&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/MockServletContext.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/MockServletContext.java Sun Mar 28 14:49:49 2010
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+package org.apache.myfaces.scripting.core.support;
+
+import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.servlet.StartupServletContextPluginChainLoader;
+
+import javax.servlet.ServletContext;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Basic unit testing servlet context mock
+ *
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+public class MockServletContext extends org.apache.myfaces.test.mock.MockServletContext {
+
+ Map<String, Object> _attributes = new HashMap<String, Object>();
+ Map<String, String> _initParameters = new HashMap<String, String>();
+ String _resourceRoot = "../../src/test/resources/webapp";
+
+ public MockServletContext() {
+ setResourceRoot(_resourceRoot);
+ addInitParameter(ScriptingConst.INIT_PARAM_MYFACES_PLUGIN, StartupServletContextPluginChainLoader.class.getName());
+ }
+
+ public MockServletContext(String resourceRoot) {
+ setResourceRoot(resourceRoot);
+ addInitParameter(ScriptingConst.INIT_PARAM_MYFACES_PLUGIN, StartupServletContextPluginChainLoader.class.getName());
+ }
+
+ public void setResourceRoot(String newRoot) {
+ _resourceRoot = newRoot;
+ super.setDocumentRoot(new File(Thread.currentThread().getContextClassLoader().getResource("./").getPath() + _resourceRoot));
+ }
+
+}
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/MockServletContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/MockServletContext.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TWeavingContext.java (from r928420, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/classIdentifier/TWeavingContext.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TWeavingContext.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TWeavingContext.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/classIdentifier/TWeavingContext.java&r1=928420&r2=928421&rev=928421&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/classIdentifier/TWeavingContext.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TWeavingContext.java Sun Mar 28 14:49:49 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.scripting.core.classIdentifier;
+package org.apache.myfaces.scripting.core.support;
import org.apache.myfaces.scripting.refresh.FileChangedDaemon;
import org.apache.myfaces.scripting.api.ScriptingWeaver;
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TWeavingContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/core/support/TWeavingContext.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/AbstractJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/AbstractJavaCompilerTestCase.java?rev=928421&r1=928420&r2=928421&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/AbstractJavaCompilerTestCase.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/AbstractJavaCompilerTestCase.java Sun Mar 28 14:49:49 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.scripting.san
import java.io.File;
-import org.apache.myfaces.extensions.scripting.support.AbstractGeneratorTestCase;
+import org.apache.myfaces.scripting.core.support.AbstractGeneratorTestCase;
import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.sandbox.compiler.Compiler;
import org.junit.Ignore;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/GroovyCompilerTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/GroovyCompilerTest.java?rev=928421&r1=928420&r2=928421&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/GroovyCompilerTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/GroovyCompilerTest.java Sun Mar 28 14:49:49 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.scripting.sandbox;
-import org.apache.myfaces.extensions.scripting.support.AbstractGeneratorTestCase;
+import org.apache.myfaces.scripting.core.support.AbstractGeneratorTestCase;
import org.apache.myfaces.scripting.api.CompilationResult;
import org.apache.myfaces.scripting.api.Configuration;
import org.apache.myfaces.scripting.core.util.WeavingContext;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/ReloadingClassLoaderTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/ReloadingClassLoaderTest.java?rev=928421&r1=928420&r2=928421&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/ReloadingClassLoaderTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/org/apache/myfaces/scripting/sandbox/ReloadingClassLoaderTest.java Sun Mar 28 14:49:49 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.scripting.sandbox;
-import org.apache.myfaces.extensions.scripting.support.AbstractGeneratorTestCase;
+import org.apache.myfaces.scripting.core.support.AbstractGeneratorTestCase;
import org.apache.myfaces.scripting.sandbox.loader.ReloadingClassLoader;
import org.junit.Ignore;
Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/brokenwebapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/brokenwebapp/WEB-INF/web.xml?rev=928421&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/brokenwebapp/WEB-INF/web.xml (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/brokenwebapp/WEB-INF/web.xml Sun Mar 28 14:49:49 2010
@@ -0,0 +1,110 @@
+<?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">
+
+
+
+
+ <!--
+ <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>
+
+ <!-- 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-core-root/extscript-core/src/test/resources/brokenwebapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/resources/brokenwebapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL