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 2012/03/13 12:06:59 UTC
svn commit: r1300073 - in
/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src:
main/java/rewrite/org/apache/myfaces/extensions/scripting/core/common/util/
main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/ ma...
Author: werpu
Date: Tue Mar 13 11:06:58 2012
New Revision: 1300073
URL: http://svn.apache.org/viewvc?rev=1300073&view=rev
Log:
EXTSCRIPT-154: Code Rewrite/Refactoring, save state of affairs
Added:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/BehaviorHandlerReloadingStrategy.java
- copied, changed from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/BehaviorHandlerReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java
- copied, changed from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ComponentHandlerReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ConverterHandlerReloadingStrategy.java
- copied, changed from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ConverterHandlerReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ValidatorHandlerReloadingStrategy.java
- copied, changed from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ValidatorHandlerReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/MethodReloadingProbe.java
- copied, changed from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/MethodReloadingProbe.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/Probe.java
- copied, changed from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/Probe.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/Probe2.java
- copied, changed from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/Probe2.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/FileUtilsTest.java
- copied, changed from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/utilsTests/FileUtilsTest.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/ReflectUtilTest.java
- copied, changed from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/utilsTests/ReflectUtilTest.java
Removed:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/BehaviorHandlerReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ComponentHandlerReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ConverterHandlerReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ValidatorHandlerReloadingStrategy.java
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/common/util/FileUtils.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/Configuration.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/GlobalReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/JavaCompilerTest.java
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/common/util/FileUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/common/util/FileUtils.java?rev=1300073&r1=1300072&r2=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/common/util/FileUtils.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/common/util/FileUtils.java Tue Mar 13 11:06:58 2012
@@ -76,10 +76,10 @@ public class FileUtils {
File tempDir;
String baseTempPath = System.getProperty("java.io.tmpdir");
- String tempDirName = "myfaces_compilation_" + _tempMarker;
+ String tempDirName = "myfaces_compilation_"; //+ _tempMarker;
tempDir = new File(baseTempPath + File.separator + tempDirName);
- while (tempDir.exists()) {
+ /*while (tempDir.exists()) {
tempDirName = "myfaces_compilation_" + System.currentTimeMillis() + Math.random();
tempDir = new File(baseTempPath + File.separator + tempDirName);
}
@@ -91,7 +91,7 @@ public class FileUtils {
if (tempDir.mkdirs()) {
tempDir.deleteOnExit();
}
- }
+ } */
return tempDir;
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/Configuration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/Configuration.java?rev=1300073&r1=1300072&r2=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/Configuration.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/context/Configuration.java Tue Mar 13 11:06:58 2012
@@ -182,7 +182,8 @@ public class Configuration
*/
public void addSourceDir(int scriptingEngine, String sourceDir)
{
- WeavingContext.getInstance().getEngine(scriptingEngine).getSourcePaths().add(sourceDir);
+ if(!WeavingContext.getInstance().getEngine(scriptingEngine).getSourcePaths().contains(sourceDir))
+ WeavingContext.getInstance().getEngine(scriptingEngine).getSourcePaths().add(sourceDir);
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/GlobalReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/GlobalReloadingStrategy.java?rev=1300073&r1=1300072&r2=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/GlobalReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/GlobalReloadingStrategy.java Tue Mar 13 11:06:58 2012
@@ -41,6 +41,7 @@ import static rewrite.org.apache.myfaces
public class GlobalReloadingStrategy implements ReloadingStrategy
{
+ private static final String STRATEGY_PKG = "rewrite.org.apache.myfaces.extensions.scripting.jsf.facelet";
final Logger _logger = Logger.getLogger(GlobalReloadingStrategy.class.getName());
protected ReloadingStrategy _beanStrategy;
@@ -62,14 +63,10 @@ public class GlobalReloadingStrategy imp
/*
* external handlers coming from various submodules
*/
- // _componentHandlerStrategy = dynaload("org.apache.myfaces.extensions.scripting.facelet" +
- // ".ComponentHandlerReloadingStrategy");
- // _validatorHandlerStrategy = dynaload("org.apache.myfaces.extensions.scripting.facelet" +
- // ".ValidatorHandlerReloadingStrategy");
- // _converterHandlerStrategy = dynaload("org.apache.myfaces.extensions.scripting.facelet" +
- // ".ConverterHandlerReloadingStrategy");
- // _behaviorHandlerStrategy = dynaload("org.apache.myfaces.extensions.scripting.facelet" +
- // ".BehaviorHandlerReloadingStrategy");
+ _componentHandlerStrategy = dynaload(STRATEGY_PKG +".ComponentHandlerReloadingStrategy");
+ _validatorHandlerStrategy = dynaload(STRATEGY_PKG +".ValidatorHandlerReloadingStrategy");
+ _converterHandlerStrategy = dynaload(STRATEGY_PKG +".ConverterHandlerReloadingStrategy");
+ _behaviorHandlerStrategy = dynaload(STRATEGY_PKG +".BehaviorHandlerReloadingStrategy");
}
/**
@@ -99,14 +96,14 @@ public class GlobalReloadingStrategy imp
case ARTIFACT_TYPE_VALIDATOR:
return _noMappingStrategy.reload(toReload, artifactType);
- // case ARTIFACT_TYPE_COMPONENT_HANDLER:
- // return dynaReload(toReload, _componentHandlerStrategy, artifactType);
- // case ARTIFACT_TYPE_CONVERTER_HANDLER:
- // return dynaReload(toReload, _converterHandlerStrategy, artifactType);
- // case ARTIFACT_TYPE_VALIDATOR_HANDLER:
- // return dynaReload(toReload, _validatorHandlerStrategy, artifactType);
- // case ARTIFACT_TYPE_BEHAVIOR_HANDLER:
- // return dynaReload(toReload, _behaviorHandlerStrategy, artifactType);
+ case ARTIFACT_TYPE_COMPONENT_HANDLER:
+ return dynaReload(toReload, _componentHandlerStrategy, artifactType);
+ case ARTIFACT_TYPE_CONVERTER_HANDLER:
+ return dynaReload(toReload, _converterHandlerStrategy, artifactType);
+ case ARTIFACT_TYPE_VALIDATOR_HANDLER:
+ return dynaReload(toReload, _validatorHandlerStrategy, artifactType);
+ case ARTIFACT_TYPE_BEHAVIOR_HANDLER:
+ return dynaReload(toReload, _behaviorHandlerStrategy, artifactType);
default:
return _allOthers.reload(toReload, artifactType);
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/BehaviorHandlerReloadingStrategy.java (from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/BehaviorHandlerReloadingStrategy.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/BehaviorHandlerReloadingStrategy.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/BehaviorHandlerReloadingStrategy.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/BehaviorHandlerReloadingStrategy.java&r1=1300003&r2=1300073&rev=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/BehaviorHandlerReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/BehaviorHandlerReloadingStrategy.java Tue Mar 13 11:06:58 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.jsf.facelet;
+package rewrite.org.apache.myfaces.extensions.scripting.jsf.reloading;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.Cast;
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java (from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ComponentHandlerReloadingStrategy.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ComponentHandlerReloadingStrategy.java&r1=1300003&r2=1300073&rev=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ComponentHandlerReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java Tue Mar 13 11:06:58 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.jsf.facelet;
+package rewrite.org.apache.myfaces.extensions.scripting.jsf.reloading;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.Cast;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ReflectUtil;
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ConverterHandlerReloadingStrategy.java (from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ConverterHandlerReloadingStrategy.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ConverterHandlerReloadingStrategy.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ConverterHandlerReloadingStrategy.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ConverterHandlerReloadingStrategy.java&r1=1300003&r2=1300073&rev=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ConverterHandlerReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ConverterHandlerReloadingStrategy.java Tue Mar 13 11:06:58 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.jsf.facelet;
+package rewrite.org.apache.myfaces.extensions.scripting.jsf.reloading;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.Cast;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ReflectUtil;
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ValidatorHandlerReloadingStrategy.java (from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ValidatorHandlerReloadingStrategy.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ValidatorHandlerReloadingStrategy.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ValidatorHandlerReloadingStrategy.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ValidatorHandlerReloadingStrategy.java&r1=1300003&r2=1300073&rev=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/facelet/ValidatorHandlerReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ValidatorHandlerReloadingStrategy.java Tue Mar 13 11:06:58 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package rewrite.org.apache.myfaces.extensions.scripting.jsf.facelet;
+package rewrite.org.apache.myfaces.extensions.scripting.jsf.reloading;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.Cast;
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/JavaCompilerTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/JavaCompilerTest.java?rev=1300073&r1=1300072&r2=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/JavaCompilerTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/engine/compiler/JavaCompilerTest.java Tue Mar 13 11:06:58 2012
@@ -50,7 +50,6 @@ public class JavaCompilerTest
File probe2;
File root;
- JSR199Compiler compiler = new JSR199Compiler();
private static final String RESULT_HAS_NO_ERRORS = "result has no errors";
private static final String TARGET_DIR_EXISTS = "targetDir exists files are compiled into the targetDir";
private static final String CLASSFILE1_IS_COMPILED = "Classfile1 is compiled into the targetDir";
@@ -88,11 +87,14 @@ public class JavaCompilerTest
WeavingContext.getInstance().setConfiguration(new Configuration());
WeavingContext.getInstance().getConfiguration().addSourceDir(ScriptingConst.ENGINE_TYPE_JSF_JAVA,
root.getAbsolutePath());
+
}
@Test
public void testFullCompileWhitelist()
{
+ JSR199Compiler compiler = new JSR199Compiler();
+
File targetDir = null;
File target = WeavingContext.getInstance().getConfiguration().getCompileTarget();
@@ -122,16 +124,19 @@ public class JavaCompilerTest
assertTrue(CLASSFILE1_IS_COMPILED1, !classFile1.exists());
assertTrue(CLASSFILE2_IS_COMPILED, !classFile2.exists());
assertTrue(CLASSFILE2_IS_COMPILED, classFile3.exists());
-
+ WeavingContext.getInstance().getConfiguration().getCompileTarget().delete();
+ WeavingContext.getInstance().getConfiguration().getCompileTarget().mkdirs();
}
@Test
public void testFullCompile()
{
+ JSR199Compiler compiler = new JSR199Compiler();
File targetDir = null;
File target = FileUtils.getTempDir();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
target.mkdirs();
target.deleteOnExit();
@@ -153,7 +158,9 @@ public class JavaCompilerTest
assertTrue(CLASSFILE1_IS_COMPILED1, classFile1.exists());
assertTrue(CLASSFILE2_IS_COMPILED, classFile2.exists());
-
+ //WeavingContext.getInstance().getConfiguration().getCompileTarget().delete();
+ //WeavingContext.getInstance().getConfiguration().getCompileTarget().mkdirs();
+ //testFullCompileWhitelist();
}
}
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/MethodReloadingProbe.java (from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/MethodReloadingProbe.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/MethodReloadingProbe.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/MethodReloadingProbe.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/MethodReloadingProbe.java&r1=1300003&r2=1300073&rev=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/MethodReloadingProbe.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/MethodReloadingProbe.java Tue Mar 13 11:06:58 2012
@@ -1,4 +1,4 @@
-package org.apache.myfaces.extensions.scripting.core.probes;
+package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.probes;
/**
* Interface which will allow the proxying of our probe
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/Probe.java (from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/Probe.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/Probe.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/Probe.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/Probe.java&r1=1300003&r2=1300073&rev=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/Probe.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/Probe.java Tue Mar 13 11:06:58 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.extensions.scripting.core.probes;
+package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.probes;
import org.junit.Ignore;
@@ -28,7 +28,8 @@ import org.junit.Ignore;
*/
@Ignore
-public class Probe implements MethodReloadingProbe {
+public class Probe implements MethodReloadingProbe
+{
public Probe() {
}
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/Probe2.java (from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/Probe2.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/Probe2.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/Probe2.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/Probe2.java&r1=1300003&r2=1300073&rev=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/probes/Probe2.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/probes/Probe2.java Tue Mar 13 11:06:58 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.extensions.scripting.core.probes;
+package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.probes;
/**
* @author Werner Punz (latest modification by $Author$)
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/FileUtilsTest.java (from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/utilsTests/FileUtilsTest.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/FileUtilsTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/FileUtilsTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/utilsTests/FileUtilsTest.java&r1=1300003&r2=1300073&rev=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/utilsTests/FileUtilsTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/FileUtilsTest.java Tue Mar 13 11:06:58 2012
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.myfaces.extensions.scripting.core.utilsTests;
+package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.utilstest;
-import org.apache.myfaces.extensions.scripting.core.support.PathUtils;
-import org.apache.myfaces.extensions.scripting.core.util.FileUtils;
import org.junit.Before;
import org.junit.Test;
+import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.FileUtils;
+import rewrite.org.apache.myfaces.extensions.scripting.scanningcore.support.PathUtils;
import java.io.File;
import java.util.List;
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/ReflectUtilTest.java (from r1300003, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/utilsTests/ReflectUtilTest.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/ReflectUtilTest.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/ReflectUtilTest.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/utilsTests/ReflectUtilTest.java&r1=1300003&r2=1300073&rev=1300073&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/old/java/org/apache/myfaces/extensions/scripting/core/utilsTests/ReflectUtilTest.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/utilstest/ReflectUtilTest.java Tue Mar 13 11:06:58 2012
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.myfaces.extensions.scripting.core.utilsTests;
+package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.utilstest;
-import org.apache.myfaces.extensions.scripting.core.util.Cast;
-import org.apache.myfaces.extensions.scripting.core.util.ReflectUtil;
-import org.apache.myfaces.extensions.scripting.core.util.Null;
-import org.apache.myfaces.extensions.scripting.core.probes.Probe;
-import org.apache.myfaces.extensions.scripting.core.util.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.Cast;
+import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.Null;
+import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ReflectUtil;
+import rewrite.org.apache.myfaces.extensions.scripting.scanningcore.probes.Probe;
import java.lang.reflect.Method;
import java.util.Collection;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Testcase for our reflect utils