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:09:31 UTC
svn commit: r897481 [1/2] - in /myfaces/extensions/scripting/trunk/core:
core/ core/src/main/groovy/org/apache/myfaces/groovyloader/core/
core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/
core/src/main/java/org/apache/myfaces/extensi...
Author: werpu
Date: Sat Jan 9 16:09:28 2010
New Revision: 897481
URL: http://svn.apache.org/viewvc?rev=897481&view=rev
Log:
I must have reformatted the code
Modified:
myfaces/extensions/scripting/trunk/core/core/pom.xml
myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/Groovy2GroovyObjectReloadingProxy.groovy
myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyGlobalReloadingStrategy.groovy
myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/StandardGroovyReloadingStrategy.groovy
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/CompilerFactory.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/GroovyCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/JavacCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/Jsr199Compiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/ClassLoaderUtils.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/ReloadingClassLoader.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/support/AbstractThrowAwayClassLoader.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/support/ClassFileLoader.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/DynamicClassIdentifier.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/DynamicCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ReloadingStrategy.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Unreloadable.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/ConstructorLevelReloadingHandler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/MethodLevelReloadingHandler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/ReloadingInvocationHandler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/ClassScanUtils.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/DefaultDependencyScanner.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/ExtendedClassReader.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/MethodScanVisitor.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/GlobalReloadingStrategy.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/ManagedBeanReloadingStrategy.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/NoMappingReloadingStrategy.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/Array.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ReflectUtil.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/Strategy.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/jsf/RefreshPhaseListener.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaDependencyScannerMT.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaThrowAwayClassloader.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/RecompiledClassLoader.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilationResult.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/CompilerFacade.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jdk5/JavacCompiler.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/util/FileStrategy.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/ReloadingMetadata.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/sourceTracking/SourcFileDeltaHolder.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/sourceTracking/SourceFilesetState.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/sourceTracking/SourceFilesetStateHolder.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
myfaces/extensions/scripting/trunk/core/core/src/main/java/test/ListTest.java
myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/faces-config.xml
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/compiler/GroovyCompilerTest.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/dependencyScan/probes/Probe.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/extensions/scripting/loader/ReloadingClassLoaderTest.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/compilerTest/TestCompilerAPI.java
myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/util/Probe.java
myfaces/extensions/scripting/trunk/core/core/src/test/resources/compiler/TestProbe1.java
myfaces/extensions/scripting/trunk/core/core/src/test/resources/compiler/TestProbe2.java
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java
myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/FacesContextProxy.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BaseAnnotationScanListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BehaviorRendererImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ConverterImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/MapEntityAnnotationScanner.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/SingleEntityAnnotationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ValidatorImplementationListener.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/purged/PurgedClientBehaviorRenderer.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/purged/PurgedComponent.java
myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/servlet/StartupServletContextPluginChainLoader.java
Modified: myfaces/extensions/scripting/trunk/core/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/pom.xml?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/core/core/pom.xml Sat Jan 9 16:09:28 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</artifactId>
<packaging>jar</packaging>
@@ -31,20 +31,22 @@
<artifactId>groovy-all</artifactId>
<version>1.6.4</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<version>1.2.8</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>1.2.8</version>
<scope>provided</scope>
</dependency>
+
+
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -56,7 +58,7 @@
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.2</version>
-
+
</dependency>
<dependency>
@@ -65,7 +67,6 @@
<version>4.3</version>
<scope>test</scope>
</dependency>
-
</dependencies>
@@ -78,9 +79,9 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
-
+
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo.groovy</groupId>
<artifactId>groovy-maven-plugin</artifactId>
@@ -107,5 +108,5 @@
</plugins>
</build>
-
+
</project>
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/Groovy2GroovyObjectReloadingProxy.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/Groovy2GroovyObjectReloadingProxy.groovy?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/Groovy2GroovyObjectReloadingProxy.groovy (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/Groovy2GroovyObjectReloadingProxy.groovy Sat Jan 9 16:09:28 2010
@@ -1,22 +1,21 @@
-
/*
- * 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.
- */
+* 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.groovyloader.core
import org.apache.myfaces.groovyloader.core.GroovyWeaver
@@ -51,47 +50,46 @@
we have to derive from our own object here
*/
- boolean tainted = false
-
- GroovyWeaver weaver = null
+ boolean tainted = false
- Groovy2GroovyObjectReloadingProxy(Class aClass) {
- super(aClass)
- initialize()
- }
+ GroovyWeaver weaver = null
- public Groovy2GroovyObjectReloadingProxy(MetaClass metaClass) {
- super(metaClass); //To change body of overridden methods use File | Settings | File Templates.
- // initialize()
- }
+ Groovy2GroovyObjectReloadingProxy(Class aClass) {
+ super(aClass)
+ initialize()
+ }
+ public Groovy2GroovyObjectReloadingProxy(MetaClass metaClass) {
+ super(metaClass); //To change body of overridden methods use File | Settings | File Templates.
+ // initialize()
+ }
- protected Object addMethodProxy(Object a_object) {
- //TODO isolate this so that we have a generic solution
- //and a jsf solution
- }
+ protected Object addMethodProxy(Object a_object) {
+ //TODO isolate this so that we have a generic solution
+ //and a jsf solution
+ }
- /**
- * originally we tried invoke on method
- * metaclass replacement
- * that did not work out
- * a new class is generated
- * on every instance
- * so we intercept simply the object
- * creation and do the reloading there
- */
- public Object invokeConstructor(Object[] objects) {
- Object a_object = super.invokeConstructor(objects); //To change body of overridden methods use File | Settings | File Templates.
+ /**
+ * originally we tried invoke on method
+ * metaclass replacement
+ * that did not work out
+ * a new class is generated
+ * on every instance
+ * so we intercept simply the object
+ * creation and do the reloading there
+ */
+ public Object invokeConstructor(Object[] objects) {
+ Object a_object = super.invokeConstructor(objects); //To change body of overridden methods use File | Settings | File Templates.
- if (weaver == null)
- weaver = WeavingContext.getWeaver();
+ if (weaver == null)
+ weaver = WeavingContext.getWeaver();
- a_object = weaver.reloadScriptingInstance(a_object);
+ a_object = weaver.reloadScriptingInstance(a_object);
- return a_object;
+ return a_object;
- }
+ }
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyGlobalReloadingStrategy.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyGlobalReloadingStrategy.groovy?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyGlobalReloadingStrategy.groovy (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyGlobalReloadingStrategy.groovy Sat Jan 9 16:09:28 2010
@@ -21,16 +21,17 @@
*/
public class GroovyGlobalReloadingStrategy extends org.apache.myfaces.scripting.core.reloading.GlobalReloadingStrategy {
- //we cannot use a constructor here to bypass a groovy bug
- //we use an explicit call to setWeaver instead
- public GroovyGlobalReloadingStrategy() {
- super();
- _allOthers = new StandardGroovyReloadingStrategy()
- }
+ //we cannot use a constructor here to bypass a groovy bug
+ //we use an explicit call to setWeaver instead
- public void setWeaver(ScriptingWeaver weaver) {
- super.setWeaver( weaver )
- _allOthers.setWeaver( weaver )
- }
+ public GroovyGlobalReloadingStrategy() {
+ super();
+ _allOthers = new StandardGroovyReloadingStrategy()
+ }
+
+ public void setWeaver(ScriptingWeaver weaver) {
+ super.setWeaver(weaver)
+ _allOthers.setWeaver(weaver)
+ }
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/StandardGroovyReloadingStrategy.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/StandardGroovyReloadingStrategy.groovy?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/StandardGroovyReloadingStrategy.groovy (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/StandardGroovyReloadingStrategy.groovy Sat Jan 9 16:09:28 2010
@@ -25,37 +25,36 @@
public class StandardGroovyReloadingStrategy extends SimpleReloadingStrategy {
- public StandardGroovyReloadingStrategy(BaseWeaver weaver) {
- super(weaver);
- }
-
-
- /**
- * central algorithm which determines which property values are overwritten and which are not
- */
- protected void mapProperties(def target, def src) {
- src.properties.each {property ->
- //ok here is the algorithm, basic datatypes usually are not copied but read in anew and then overwritten
- //later on
- //all others can be manually overwritten by adding an attribute <attributename>_changed
-
- try {
- if (target.properties.containsKey(property.key)
- && !property.key.equals("metaClass") //the class information and meta class information cannot be changed
- && !property.key.equals("class") //otherwise we will get following error
- // java.lang.IllegalArgumentException: object is not an instance of declaring class
- && !(
- target.properties.containsKey(property.key + "_changed") //||
- //nothing further needed the phases take care of that
- )) {
- target.setProperty(property.key, property.value)
- }
- } catch (Exception e) {
-
- }
+ public StandardGroovyReloadingStrategy(BaseWeaver weaver) {
+ super(weaver);
+ }
+
+ /**
+ * central algorithm which determines which property values are overwritten and which are not
+ */
+ protected void mapProperties(def target, def src) {
+ src.properties.each {property ->
+ //ok here is the algorithm, basic datatypes usually are not copied but read in anew and then overwritten
+ //later on
+ //all others can be manually overwritten by adding an attribute <attributename>_changed
+
+ try {
+ if (target.properties.containsKey(property.key)
+ && !property.key.equals("metaClass") //the class information and meta class information cannot be changed
+ && !property.key.equals("class") //otherwise we will get following error
+ // java.lang.IllegalArgumentException: object is not an instance of declaring class
+ && !(
+ target.properties.containsKey(property.key + "_changed") //||
+ //nothing further needed the phases take care of that
+ )) {
+ target.setProperty(property.key, property.value)
}
+ } catch (Exception e) {
+
+ }
}
+ }
+
-
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/CompilerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/CompilerFactory.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/CompilerFactory.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/CompilerFactory.java Sat Jan 9 16:09:28 2010
@@ -8,7 +8,6 @@
* implementation based on the current JVM for you. If you're using a Java 6
* VM, it will return a compiler using the JSR-199 API, otherwise it will
* return a compiler that uses the Javac tool.</p>
- *
*/
public class CompilerFactory {
@@ -35,8 +34,7 @@
// it's at least 1.6 as otherwise you wouldn't even be able
// to load the module (the target VM is set to 1.5 after all).
return Jsr199CompilerLoader.createJsr199Compiler();
- }
- else {
+ } else {
if (logger.isWarnEnabled() &&
!System.getProperty("java.vendor").contains("Sun Microsystems")) {
logger.warn("This application is running on a Java runtime that neither supports the JSR-199 API " +
@@ -54,7 +52,6 @@
* <p>Utility class that loads the JSR-199 compiler implementation. The sole purpose
* of this class is to ensure that the current class loader doesn't try to load the
* class 'Jsr199Compiler' until it's sure that we're running on a JVM 6 platform.</p>
- *
*/
private static class Jsr199CompilerLoader {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/GroovyCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/GroovyCompiler.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/GroovyCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/GroovyCompiler.java Sat Jan 9 16:09:28 2010
@@ -35,7 +35,6 @@
/**
* <p>A compiler implementation that can be used to compile Groovy source files.</p>
- *
*/
public class GroovyCompiler implements Compiler {
@@ -49,9 +48,9 @@
/**
* <p>Compiles the given file and creates an according class file in the given target path.</p>
*
- * @param sourcePath the path to the source directory
- * @param targetPath the path to the target directory
- * @param file the file of the class you want to compile
+ * @param sourcePath the path to the source directory
+ * @param targetPath the path to the target directory
+ * @param file the file of the class you want to compile
* @param classLoader the class loader to use to determine the classpath
* @return the compilation result
*/
@@ -63,9 +62,9 @@
/**
* <p>Compiles the given file and creates an according class file in the given target path.</p>
*
- * @param sourcePath the path to the source directory
- * @param targetPath the path to the target directory
- * @param file the file of the class you want to compile
+ * @param sourcePath the path to the source directory
+ * @param targetPath the path to the target directory
+ * @param file the file of the class you want to compile
* @param classLoader the class loader to use to determine the classpath
* @return the compilation result
*/
@@ -109,7 +108,6 @@
* our compilation API consists of.</p>
*
* @param message the Groovy compiler message you want to convert
- *
* @return the final converted compilation message
*/
protected CompilationResult.CompilationMessage convertMessage(Message message) {
@@ -123,7 +121,7 @@
} else {
if (logger.isDebugEnabled()) {
logger.debug(
- "This compiler came across an unknown message kind ['" + message + "']. It will be ignored.");
+ "This compiler came across an unknown message kind ['" + message + "']. It will be ignored.");
}
return null;
@@ -133,9 +131,9 @@
/**
* <p>Configures the compiler by building its configuration object.</p>
*
- * @param sourcePath the path to the source directory
- * @param targetPath the path to the target directory
- * @param file the file of the class you want to compile
+ * @param sourcePath the path to the source directory
+ * @param targetPath the path to the target directory
+ * @param file the file of the class you want to compile
* @param classLoader the class loader to use to determine the classpath
* @return the compiler configuration
*/
@@ -155,7 +153,7 @@
// Generate debugging information.
configuration.setDebug(true);
-
+
return configuration;
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/JavacCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/JavacCompiler.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/JavacCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/JavacCompiler.java Sat Jan 9 16:09:28 2010
@@ -140,7 +140,7 @@
// Invoke the Javac compiler
Method compile = compilerClass.getMethod("compile", new Class[]{String[].class, PrintWriter.class});
Integer returnCode = (Integer) compile.invoke(null,
- new Object[]{ buildCompilerArguments(sourcePath, targetPath, file, classLoader),
+ new Object[]{buildCompilerArguments(sourcePath, targetPath, file, classLoader),
new PrintWriter(compilerOutput)});
CompilationResult result = new CompilationResult(compilerOutput.toString());
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/Jsr199Compiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/Jsr199Compiler.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/Jsr199Compiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/compiler/Jsr199Compiler.java Sat Jan 9 16:09:28 2010
@@ -104,8 +104,7 @@
if (Diagnostic.Kind.ERROR.equals(diagnostic.getKind())) {
result.registerError(message);
- }
- else if (Diagnostic.Kind.WARNING.equals(diagnostic.getKind()) ||
+ } else if (Diagnostic.Kind.WARNING.equals(diagnostic.getKind()) ||
Diagnostic.Kind.MANDATORY_WARNING.equals(diagnostic.getKind())) {
result.registerWarning(message);
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/ClassLoaderUtils.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/ClassLoaderUtils.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/ClassLoaderUtils.java Sat Jan 9 16:09:28 2010
@@ -30,7 +30,6 @@
/**
* <p>Utility class for class loading purposes, e.g. to determine the classpath of a
* class loader hierarchy.</p>
- *
*/
public class ClassLoaderUtils {
@@ -43,7 +42,7 @@
/**
* <p>Returns the default class loader to use.</p>
- *
+ *
* @return the default class loader to use
*/
public static ClassLoader getDefaultClassLoader() {
@@ -57,10 +56,9 @@
/**
* <p>Determines whether the given class is loadable by the given class loader.</p>
- *
- * @param className the class you want to check
+ *
+ * @param className the class you want to check
* @param classLoader the class loader to use for that check
- *
* @return <code>true</code>, if the given class is loadable by the given class loader
*/
public static boolean isClassAvailable(String className, ClassLoader classLoader) {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/ReloadingClassLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/ReloadingClassLoader.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/ReloadingClassLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/ReloadingClassLoader.java Sat Jan 9 16:09:28 2010
@@ -53,6 +53,7 @@
* use this version of the file separator in regex methods, like replaceAll().
*/
private static String FILE_SEPARATOR = File.separator;
+
static {
if ("\\".equals(FILE_SEPARATOR)) {
FILE_SEPARATOR = "\\\\";
@@ -72,7 +73,7 @@
* each class has got its own class loader.
*/
private Map<String, ThrowAwayClassLoader> classLoaders =
- new HashMap<String, ThrowAwayClassLoader>();
+ new HashMap<String, ThrowAwayClassLoader>();
/**
* The target directory for the compiler, i.e. the directory that contains the
@@ -143,8 +144,7 @@
// linkage errors / exceptions.
reloadClass(className);
}
- }
- else {
+ } else {
if (logger.isTraceEnabled()) {
logger.trace("A new dynamic class '"
+ className + "' has been found by this class loader '" + this + "'.");
@@ -157,15 +157,13 @@
ThrowAwayClassLoader classLoader = classLoaders.get(className);
return classLoader.loadClass(className, resolve);
- }
- else {
+ } else {
// Even though there is no class file available, there's still a chance that this
// class loader has forcefully reloaded a statically compiled class.
if (classLoaders.containsKey(className)) {
ThrowAwayClassLoader classLoader = classLoaders.get(className);
return classLoader.loadClass(className, resolve);
- }
- else {
+ } else {
// However, if there's neither a .class file nor a reloadable class loader
// available, just delegate to the parent class loader.
return super.loadClass(className, resolve);
@@ -182,7 +180,7 @@
*/
public URL[] getURLs() {
try {
- return new URL[]{ compilationDirectory.toURI().toURL() };
+ return new URL[]{compilationDirectory.toURI().toURL()};
} catch (IOException ex) {
logger.error("Couldn't resolve the URL to the compilation directory '" + compilationDirectory + "'.", ex);
return new URL[0];
@@ -210,8 +208,7 @@
// reference is already outdated.
ThrowAwayClassLoader classLoader = (ThrowAwayClassLoader) classObj.getClassLoader();
return classLoader.isOutdated(classFile.lastModified());
- }
- else {
+ } else {
return true;
}
}
@@ -237,8 +234,7 @@
File classFile = resolveClassFile(className);
if (classFile != null && classFile.exists()) {
classLoader = new ClassFileLoader(className, classFile, this);
- }
- else {
+ } else {
classLoader = new OverridingClassLoader(className, this);
}
@@ -247,8 +243,7 @@
if (oldClassLoader != null) {
logger.info("Replaced the class loader '" + oldClassLoader + "' with the class loader '"
+ classLoader + "' as this class loader is supposed to reload the class '" + className + "'.");
- }
- else {
+ } else {
logger.info("Installed a new class loader '" + classLoader + "' for the class '"
+ className + "' as this class loader is supposed to reload it.");
}
@@ -262,7 +257,6 @@
* created, hence a copy is created).</p>
*
* @param parentClassLoader the parent ClassLoader to use
- *
* @return a copy of the current reloading class loader
*/
public ReloadingClassLoader cloneWithParentClassLoader(ClassLoader parentClassLoader) {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/support/AbstractThrowAwayClassLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/support/AbstractThrowAwayClassLoader.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/support/AbstractThrowAwayClassLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/support/AbstractThrowAwayClassLoader.java Sat Jan 9 16:09:28 2010
@@ -127,11 +127,10 @@
/**
* <p>Determines whether this class loader is supposed to load the given class.</p>
- *
+ *
* @param className the name of the class
- *
* @return <code>true</code>, if this class loader is supposed to load the
- * given class, <code>false</code> otherwise
+ * given class, <code>false</code> otherwise
*/
protected boolean isEligibleForLoading(String className) {
return getClassName().equals(className);
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/support/ClassFileLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/support/ClassFileLoader.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/support/ClassFileLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/extensions/scripting/loader/support/ClassFileLoader.java Sat Jan 9 16:09:28 2010
@@ -78,7 +78,7 @@
*/
public URL[] getURLs() {
try {
- return new URL[]{ classFile.toURI().toURL() };
+ return new URL[]{classFile.toURI().toURL()};
}
catch (IOException ex) {
logger.error("Couldn't resolve the URL to the class file '"
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/AnnotationScanListener.java Sat Jan 9 16:09:28 2010
@@ -40,7 +40,7 @@
*/
public boolean supportsAnnotation(String annotation);
-
+
/**
* class file registration of the supported annotation
*
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java Sat Jan 9 16:09:28 2010
@@ -240,7 +240,7 @@
synchronized (RefreshContext.BEAN_SYNC_MONITOR) {
if (WeavingContext.getRefreshContext().isRecompileRecommended(getScriptingEngine())) {
- recompileRefresh();
+ recompileRefresh();
return;
}
@@ -263,7 +263,7 @@
}
private void recompileRefresh() {
- synchronized(RefreshContext.COMPILE_SYNC_MONITOR) {
+ synchronized (RefreshContext.COMPILE_SYNC_MONITOR) {
fullRecompile();
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/CompilerConst.java Sat Jan 9 16:09:28 2010
@@ -21,18 +21,18 @@
/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * Various constants shared over the various compiler implementations
- * JSR or non JSR!
+ * <p/>
+ * Various constants shared over the various compiler implementations
+ * JSR or non JSR!
*/
public class CompilerConst {
- public static final String STD_ERROR_HEAD = "Java Compiler, Error on line: ";
- public static final String JC_CLASSPATH = "-cp";
- public static final String JC_TARGET_PATH = "-d";
- public static final String JC_SOURCEPATH = "-sourcepath";
- public static final String JC_DEBUG = "-g";
- public static final String JAVA_WILDCARD = "*.java ";
- public static final String JC_VERBOSE = "-verbose";
+ public static final String STD_ERROR_HEAD = "Java Compiler, Error on line: ";
+ public static final String JC_CLASSPATH = "-cp";
+ public static final String JC_TARGET_PATH = "-d";
+ public static final String JC_SOURCEPATH = "-sourcepath";
+ public static final String JC_DEBUG = "-g";
+ public static final String JAVA_WILDCARD = "*.java ";
+ public static final String JC_VERBOSE = "-verbose";
public static final String JC_SOURCE = "-source";
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Configuration.java Sat Jan 9 16:09:28 2010
@@ -1,22 +1,37 @@
package org.apache.myfaces.scripting.api;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.Map;
-import java.util.Collection;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* Configuration class keeping all the core elements of the configuration
* this class has to be thread save in its internal data structures!
- * <p />
+ * <p/>
* since the end goal is that a single thread has to preinit the config
* we don«t have to synchronize its access!
- * <p />
+ * <p/>
*/
public class Configuration {
- Map<Integer, CopyOnWriteArrayList<String>> _sourceDirs = new ConcurrentHashMap<Integer, CopyOnWriteArrayList<String>>();
- Map<Integer, String> _compileTarget = new ConcurrentHashMap<Integer, String>();
+ /**
+ * the source dirs per scripting engine
+ */
+ volatile Map<Integer, CopyOnWriteArrayList<String>> _sourceDirs = new ConcurrentHashMap<Integer, CopyOnWriteArrayList<String>>();
+
+ /**
+ * the compile target directories depending on the scripting engine
+ */
+ volatile Map<Integer, String> _compileTarget = new ConcurrentHashMap<Integer, String>();
+
+ /**
+ * we keep track of separate resource dirs
+ * for systems which can use resource loaders
+ * <p/>
+ * so that we can load various resources as well
+ * from separate sourcedirs instead
+ */
+ volatile List<String> _resourceDirs = new CopyOnWriteArrayList<String>();
public Collection<String> getSourceDirs(int scriptingEngine) {
return _sourceDirs.get(scriptingEngine);
@@ -38,4 +53,12 @@
public String getCompileTarget(int scriptingEngine) {
return _compileTarget.get(scriptingEngine);
}
+
+ public void addResourceDir(String dir) {
+ _resourceDirs.add(dir);
+ }
+
+ public List<String> getResourceDirs() {
+ return _resourceDirs;
+ }
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/DynamicClassIdentifier.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/DynamicClassIdentifier.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/DynamicClassIdentifier.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/DynamicClassIdentifier.java Sat Jan 9 16:09:28 2010
@@ -20,20 +20,21 @@
/**
* @author werpu
- * Generic class identifier interface
- * has to be implemented by all identifiers
+ * Generic class identifier interface
+ * has to be implemented by all identifiers
*/
public interface DynamicClassIdentifier {
- /**
+ /**
* identifies whether a given class is dynamic or not
- *
+ *
* @param clazz the class which has to be investigates
* @return true if it is dynamic false if not
*/
public boolean isDynamic(Class clazz);
/**
- * gets the engine
+ * gets the engine
+ *
* @param clazz
* @return
*/
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/DynamicCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/DynamicCompiler.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/DynamicCompiler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/DynamicCompiler.java Sat Jan 9 16:09:28 2010
@@ -34,7 +34,6 @@
*/
public interface DynamicCompiler {
/**
- *
* compiles a single file into a class
*
* @param sourceRoot the source search path (root of our source)
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ReloadingStrategy.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ReloadingStrategy.java Sat Jan 9 16:09:28 2010
@@ -3,18 +3,18 @@
/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * Generic strategy for reloading
- * this should encapsule various
- * reloading strategies
- * which have to be applied depending
- * on the artefact
- *
+ * <p/>
+ * Generic strategy for reloading
+ * this should encapsule various
+ * reloading strategies
+ * which have to be applied depending
+ * on the artefact
*/
public interface ReloadingStrategy {
public Object reload(Object toReload, int artefactType);
public ScriptingWeaver getWeaver();
+
public void setWeaver(ScriptingWeaver weaver);
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingConst.java Sat Jan 9 16:09:28 2010
@@ -64,4 +64,5 @@
public static final String CTX_REQUEST_CNT = "RequestCnt";
public static final String CTX_CONFIGURATION = "ExtScriptingConfig";
+ public static final String INIT_PARAM_RESOURCE_PATH = "org.apache.myfaces.scripting.resources.LOADER_PATHS";
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingWeaver.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/ScriptingWeaver.java Sat Jan 9 16:09:28 2010
@@ -124,7 +124,7 @@
/**
* loads a list of possible dynamic classes
* for the current given state of the source dirs
- *
+ *
* @return a list of classes representing the current source state
*/
public Collection<String> loadPossibleDynamicClasses();
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Unreloadable.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Unreloadable.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Unreloadable.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/Unreloadable.java Sat Jan 9 16:09:28 2010
@@ -3,16 +3,16 @@
/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * <p>
- * This interface can be used by managed beans
- * to prevent reloading.
- * </p>
- * <p>
- * The managed bean reloading strategy is very aggressive
- * it drops all dynamic managed beans out of the corresponding
- * scopes if possible to enforce a clean reload wherever possible.
- * </p>
+ * <p/>
+ * <p>
+ * This interface can be used by managed beans
+ * to prevent reloading.
+ * </p>
+ * <p>
+ * The managed bean reloading strategy is very aggressive
+ * it drops all dynamic managed beans out of the corresponding
+ * scopes if possible to enforce a clean reload wherever possible.
+ * </p>
*/
public interface Unreloadable {
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/ConstructorLevelReloadingHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/ConstructorLevelReloadingHandler.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/ConstructorLevelReloadingHandler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/ConstructorLevelReloadingHandler.java Sat Jan 9 16:09:28 2010
@@ -41,7 +41,7 @@
public class ConstructorLevelReloadingHandler extends ReloadingInvocationHandler implements Serializable, Decorated {
ScriptingWeaver _weaver = null;
-
+
public void setLoadedClass(Class loadedClass) {
_loadedClass = loadedClass;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/DummyWeaver.java Sat Jan 9 16:09:28 2010
@@ -28,13 +28,13 @@
/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * a dummy weaver in case the filter has not been set
+ * <p/>
+ * a dummy weaver in case the filter has not been set
*/
public class DummyWeaver implements Serializable, ScriptingWeaver {
/**
- *
+ *
*/
private static final long serialVersionUID = -1504583349449148143L;
@@ -42,23 +42,23 @@
}
public Object reloadScriptingInstance(Object o, int artefactType) {
- return o;
+ return o;
}
public Class reloadScriptingClass(Class aclass) {
- return aclass;
+ return aclass;
}
public Class loadScriptingClassFromName(String className) {
- return ClassUtils.forName(className);
+ return ClassUtils.forName(className);
}
public int getScriptingEngine() {
- return ScriptingConst.ENGINE_TYPE_ALL;
+ return ScriptingConst.ENGINE_TYPE_ALL;
}
public boolean isDynamic(Class clazz) {
- return false;
+ return false;
}
public ScriptingWeaver getWeaverInstance(Class weaverClass) {
@@ -76,7 +76,7 @@
}
public Collection<String> loadPossibleDynamicClasses() {
- return null;
+ return null;
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/MethodLevelReloadingHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/MethodLevelReloadingHandler.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/MethodLevelReloadingHandler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/MethodLevelReloadingHandler.java Sat Jan 9 16:09:28 2010
@@ -39,13 +39,11 @@
*
* @author Werner Punz
*/
-public class MethodLevelReloadingHandler extends ReloadingInvocationHandler implements Serializable {
+public class MethodLevelReloadingHandler extends ReloadingInvocationHandler implements Serializable {
transient ScriptingWeaver _weaver = null;
int _artefactType;
-
-
public MethodLevelReloadingHandler(Object rootObject, int artefactType) {
_loadedClass = rootObject.getClass();
_delegate = rootObject;
@@ -118,7 +116,6 @@
}
}
-
public int getArtefactType() {
return _artefactType;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/ReloadingInvocationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/ReloadingInvocationHandler.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/ReloadingInvocationHandler.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/ReloadingInvocationHandler.java Sat Jan 9 16:09:28 2010
@@ -8,10 +8,10 @@
/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * We set our own invocation handler
- * here to allow reflection utils directly targetting our
- * _delegate.
+ * <p/>
+ * We set our own invocation handler
+ * here to allow reflection utils directly targetting our
+ * _delegate.
*/
public abstract class ReloadingInvocationHandler implements InvocationHandler, Decorated {
Class _loadedClass = null;
@@ -20,16 +20,17 @@
/**
* simplified invoke for more dynamic upon invocation
* on our reloading objects
+ *
* @param o
* @param m
* @param args
* @return
*/
- public Object invoke(Object o, String m, Object ... args) {
+ public Object invoke(Object o, String m, Object... args) {
return ReflectUtil.executeMethod(o, m, args);
}
-
-
+
+
public Class getLoadedClass() {
return _loadedClass;
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/ClassScanUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/ClassScanUtils.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/ClassScanUtils.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/ClassScanUtils.java Sat Jan 9 16:09:28 2010
@@ -24,30 +24,27 @@
/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * Utils which store the shared code
- *
- *
+ * <p/>
+ * Utils which store the shared code
*/
class ClassScanUtils {
public static final String BINARY_PACKAGE = "\\/";
- private static final String DOMAIN_JAVA = "java.";
- private static final String DOMAIN_JAVAX = "javax.";
- private static final String DOMAIN_COM_SUN = "com.sun";
- private static final String DOMAIN_APACHE = "org.apache.";
- private static final String DOMAIN_MYFACES = "org.apache.myfaces";
- private static final String DOMAIN_JBOSS = "org.jboss";
- private static final String DOMAIN_SPRING = "org.springframework";
- private static final String DOMAIN_JUNIT = "org.junit";
- private static final String DOMAIN_ECLIPSE = "org.eclipse";
- private static final String DOMAIN_NETBEANS = "org.netbeans";
- private static final String DOMAIN_GROOVY = "groovy.";
- private static final String DOMAIN_SCALA = "scala.";
- private static final String DOMAIN_JYTHON = "jython.";
- private static final String DOMAIN_JRUBY = "jruby.";
-
+ private static final String DOMAIN_JAVA = "java.";
+ private static final String DOMAIN_JAVAX = "javax.";
+ private static final String DOMAIN_COM_SUN = "com.sun";
+ private static final String DOMAIN_APACHE = "org.apache.";
+ private static final String DOMAIN_MYFACES = "org.apache.myfaces";
+ private static final String DOMAIN_JBOSS = "org.jboss";
+ private static final String DOMAIN_SPRING = "org.springframework";
+ private static final String DOMAIN_JUNIT = "org.junit";
+ private static final String DOMAIN_ECLIPSE = "org.eclipse";
+ private static final String DOMAIN_NETBEANS = "org.netbeans";
+ private static final String DOMAIN_GROOVY = "groovy.";
+ private static final String DOMAIN_SCALA = "scala.";
+ private static final String DOMAIN_JYTHON = "jython.";
+ private static final String DOMAIN_JRUBY = "jruby.";
/**
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/DefaultDependencyScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/DefaultDependencyScanner.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/DefaultDependencyScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/DefaultDependencyScanner.java Sat Jan 9 16:09:28 2010
@@ -68,7 +68,7 @@
private final void investigateInheritanceHierarchy(ClassLoader loader, Set<String> retVal, String className, Set<String> whiteList) {
//we now have to fetch the parent hierarchy
- try {
+ try {
Class toCheck = loader.loadClass(className);
scanCurrentClass(loader, retVal, className, whiteList);
Class parent = toCheck.getSuperclass();
@@ -79,7 +79,7 @@
}
} catch (ClassNotFoundException e) {
- log.error("DefaultDependencyScanner.investigateInheritanceHierarchy()" +e);
+ log.error("DefaultDependencyScanner.investigateInheritanceHierarchy()" + e);
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/ExtendedClassReader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/ExtendedClassReader.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/ExtendedClassReader.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/ExtendedClassReader.java Sat Jan 9 16:09:28 2010
@@ -20,7 +20,7 @@
* @throws IOException
*/
public ExtendedClassReader(ClassLoader loader, String className) throws IOException {
- super(loader.getResourceAsStream(className.replace('.', '/')
+ super(loader.getResourceAsStream(className.replace('.', '/')
+ ".class"));
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/MethodScanVisitor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/MethodScanVisitor.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/MethodScanVisitor.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/dependencyScan/MethodScanVisitor.java Sat Jan 9 16:09:28 2010
@@ -44,20 +44,20 @@
public AnnotationVisitor visitAnnotationDefault() {
- return null;
+ return null;
}
public AnnotationVisitor visitAnnotation(String s, boolean b) {
- return null;
+ return null;
}
public AnnotationVisitor visitParameterAnnotation(int i, String s, boolean b) {
- return null;
+ return null;
}
public void visitAttribute(Attribute attribute) {
//log.log(Level.INFO, "MethodAttr {0}:", attribute.type);
-
+
}
public void visitCode() {
@@ -98,23 +98,23 @@
}
public void visitLabel(Label label) {
-
+
}
public void visitLdcInsn(Object o) {
-
+
}
public void visitIincInsn(int i, int i1) {
-
+
}
public void visitTableSwitchInsn(int i, int i1, Label label, Label[] labels) {
-
+
}
public void visitLookupSwitchInsn(Label label, int[] ints, Label[] labels) {
-
+
}
public void visitMultiANewArrayInsn(String s, int i) {
@@ -136,14 +136,14 @@
}
public void visitLineNumber(int i, Label label) {
-
+
}
public void visitMaxs(int i, int i1) {
-
+
}
public void visitEnd() {
-
+
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/GlobalReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/GlobalReloadingStrategy.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/GlobalReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/GlobalReloadingStrategy.java Sat Jan 9 16:09:28 2010
@@ -46,7 +46,7 @@
public GlobalReloadingStrategy() {
-
+
}
/**
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/ManagedBeanReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/ManagedBeanReloadingStrategy.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/ManagedBeanReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/ManagedBeanReloadingStrategy.java Sat Jan 9 16:09:28 2010
@@ -66,7 +66,7 @@
/**
* In our case the dropping already has happend at request time
* no need for another reloading here
- *
+ *
* @param scriptingInstance
* @param artefactType
* @return
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/NoMappingReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/NoMappingReloadingStrategy.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/NoMappingReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/NoMappingReloadingStrategy.java Sat Jan 9 16:09:28 2010
@@ -25,23 +25,23 @@
/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * <p />
- * The renderer is a stateless flyweight pattern the reloading strategy is
- * to do nothing, this should give optimal results
- *
- * <p />
- * The components are a similar case they are not flyweight
- * but the properties usually are preserved by the lifecycle if possible
- * or assigned by the tag handlers
- *
- * <p />
- * The same also applies to other flyweight patterned classes
- * like converters or validators
- *
- * <p />
- * The only ones which need to keep some state are the ones
- * which keep delegates, like the NavHandler
+ * <p/>
+ * <p/>
+ * The renderer is a stateless flyweight pattern the reloading strategy is
+ * to do nothing, this should give optimal results
+ * <p/>
+ * <p/>
+ * The components are a similar case they are not flyweight
+ * but the properties usually are preserved by the lifecycle if possible
+ * or assigned by the tag handlers
+ * <p/>
+ * <p/>
+ * The same also applies to other flyweight patterned classes
+ * like converters or validators
+ * <p/>
+ * <p/>
+ * The only ones which need to keep some state are the ones
+ * which keep delegates, like the NavHandler
*/
public class NoMappingReloadingStrategy extends SimpleReloadingStrategy {
@@ -50,7 +50,6 @@
}
-
@Override
protected void mapProperties(Object target, Object src) {
return;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java Sat Jan 9 16:09:28 2010
@@ -125,7 +125,7 @@
}
public void setWeaver(ScriptingWeaver weaver) {
- _weaver = weaver;
+ _weaver = weaver;
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/Array.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/Array.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/Array.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/Array.java Sat Jan 9 16:09:28 2010
@@ -23,8 +23,8 @@
* @version $Revision$ $Date$
*/
-public class Array extends Cast{
- public Array(Class clazz, Object ... value) {
- super(java.lang.reflect.Array.newInstance(clazz,0).getClass(), value);
+public class Array extends Cast {
+ public Array(Class clazz, Object... value) {
+ super(java.lang.reflect.Array.newInstance(clazz, 0).getClass(), value);
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ClassUtils.java Sat Jan 9 16:09:28 2010
@@ -63,57 +63,56 @@
* @param className the className from the class which has to be rewritten
* @throws ClassNotFoundException
*/
- /* public static void markAsDynamicJava(String classPath, String className) throws ClassNotFoundException {
- FileInputStream fIstr = null;
- FileOutputStream foStream = null;
- try {
- File classFile = classNameToFile(classPath, className);
- fIstr = new FileInputStream(classFile);
-
- ClassNode node = new ClassNode();
- ClassReader clsReader = new ClassReader(fIstr);
- //ClassWriter wrt = new ClassWriter();
- clsReader.accept((ClassVisitor) node, ClassReader.SKIP_FRAMES);
- //node.accept(wrt);
- ClassWriter wrt = new ClassWriter(0);
+ /* public static void markAsDynamicJava(String classPath, String className) throws ClassNotFoundException {
+ FileInputStream fIstr = null;
+ FileOutputStream foStream = null;
+ try {
+ File classFile = classNameToFile(classPath, className);
+ fIstr = new FileInputStream(classFile);
+
+ ClassNode node = new ClassNode();
+ ClassReader clsReader = new ClassReader(fIstr);
+ //ClassWriter wrt = new ClassWriter();
+ clsReader.accept((ClassVisitor) node, ClassReader.SKIP_FRAMES);
+ //node.accept(wrt);
+ ClassWriter wrt = new ClassWriter(0);
- if (node.visibleAnnotations == null) {
- node.visibleAnnotations = new LinkedList<AnnotationNode>();
- }
+ if (node.visibleAnnotations == null) {
+ node.visibleAnnotations = new LinkedList<AnnotationNode>();
+ }
- boolean hasAnnotation = false;
- String annotationMarker = Type.getDescriptor(ScriptingClass.class);
- for (Object elem : node.visibleAnnotations) {
- AnnotationNode aNode = (AnnotationNode) elem;
- if (aNode.desc.equals(annotationMarker)) {
- hasAnnotation = true;
- break;
- }
- }
- if (!hasAnnotation) {
- node.visibleAnnotations.add(new AnnotationNode(annotationMarker));
+ boolean hasAnnotation = false;
+ String annotationMarker = Type.getDescriptor(ScriptingClass.class);
+ for (Object elem : node.visibleAnnotations) {
+ AnnotationNode aNode = (AnnotationNode) elem;
+ if (aNode.desc.equals(annotationMarker)) {
+ hasAnnotation = true;
+ break;
}
- node.accept(wrt);
+ }
+ if (!hasAnnotation) {
+ node.visibleAnnotations.add(new AnnotationNode(annotationMarker));
+ }
+ node.accept(wrt);
- byte[] finalClass = wrt.toByteArray();
- fIstr.close();
- fIstr = null;
-
- foStream = new FileOutputStream(classNameToFile(classPath, className));
- foStream.write(finalClass);
- foStream.flush();
+ byte[] finalClass = wrt.toByteArray();
+ fIstr.close();
+ fIstr = null;
- } catch (FileNotFoundException ex) {
- throw new ClassNotFoundException("Class " + className + " not found ");
+ foStream = new FileOutputStream(classNameToFile(classPath, className));
+ foStream.write(finalClass);
+ foStream.flush();
- } catch (IOException e) {
- logError(e);
- } finally {
- closeStreams(fIstr, foStream);
- }
+ } catch (FileNotFoundException ex) {
+ throw new ClassNotFoundException("Class " + className + " not found ");
- } */
+ } catch (IOException e) {
+ logError(e);
+ } finally {
+ closeStreams(fIstr, foStream);
+ }
+} */
private static void logError(IOException e) {
Log log = LogFactory.getLog(ClassUtils.class);
log.error(e);
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/FileUtils.java Sat Jan 9 16:09:28 2010
@@ -34,6 +34,7 @@
/**
* Get the file separator for this platform.
+ *
* @return The file separator.
*/
public static String getFileSeparator() {
@@ -42,6 +43,7 @@
/**
* Get the file separator for this platform, properly escaped for usage in a regular expression.
+ *
* @return The file separator, escaped for in a regex.
*/
public static String getFileSeparatorForRegex() {
@@ -87,16 +89,16 @@
* @param strategy
*/
public static void listFiles(File rootDir, Strategy strategy) {
- if(!rootDir.isDirectory()) {
+ if (!rootDir.isDirectory()) {
strategy.apply(rootDir);
return;
}
//TODO apply a filter here instead of doing the check directly
- File [] files = rootDir.listFiles();
- for(File file: files) {
+ File[] files = rootDir.listFiles();
+ for (File file : files) {
boolean isDirectory = file.isDirectory();
- if(isDirectory && !file.getName().endsWith(".")) {
+ if (isDirectory && !file.getName().endsWith(".")) {
listFiles(file, strategy);
strategy.apply(file);
} else if (!isDirectory) {
@@ -117,7 +119,7 @@
if (!path.exists()) {
if (!path.mkdirs()) {
throw new IllegalStateException("It wasn't possible to create the target " +
- "directory for the compiler ['" + path.getAbsolutePath() + "'].");
+ "directory for the compiler ['" + path.getAbsolutePath() + "'].");
}
// If we've created the destination directory, we'll delete it as well once the application exits
@@ -130,7 +132,7 @@
* fetches recursively the files under the current root
*
* @param sourcePath the source path from which the walker should start from
- * @param fileType the pattern upon which the file has to be matched to aka *.java etc...
+ * @param fileType the pattern upon which the file has to be matched to aka *.java etc...
* @return
*/
public static List<File> fetchSourceFiles(File sourcePath, String fileType) {
@@ -146,10 +148,10 @@
* <path>/<appendix>;...
*
* @param sourcePath the sourcePath from which the directory traversal should happen from
- * @param appendix the appendix which has to be appended to every path found
+ * @param appendix the appendix which has to be appended to every path found
* @return a string builder of the paths found
*/
- public static StringBuilder fetchSourcePaths(File sourcePath, String appendix) {
+ public static StringBuilder fetchSourcePaths(File sourcePath, String appendix) {
DirStrategy dirStrategy = new DirStrategy();
listFiles(sourcePath, dirStrategy);
@@ -160,7 +162,7 @@
for (File foundDir : dirStrategy.getFoundFiles()) {
String dirName = foundDir.getAbsolutePath();
sourcesList.append(dirName);
- sourcesList.append( File.separator);
+ sourcesList.append(File.separator);
sourcesList.append(appendix);
}
return sourcesList;
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ReflectUtil.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ReflectUtil.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ReflectUtil.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/ReflectUtil.java Sat Jan 9 16:09:28 2010
@@ -298,7 +298,7 @@
if (e instanceof IllegalAccessException) {
//do nothing
} else if (e instanceof IllegalArgumentException) {
- //do nothing
+ //do nothing
} else {
throw new RuntimeException(e);
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/Strategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/Strategy.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/Strategy.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/Strategy.java Sat Jan 9 16:09:28 2010
@@ -21,11 +21,10 @@
/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * Applied strategy class for iteration walkers
- * to make the handling of iterated objects
- * more scripty al
- *
+ * <p/>
+ * Applied strategy class for iteration walkers
+ * to make the handling of iterated objects
+ * more scripty al
*/
public interface Strategy {
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/jsf/RefreshPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/jsf/RefreshPhaseListener.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/jsf/RefreshPhaseListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/jsf/RefreshPhaseListener.java Sat Jan 9 16:09:28 2010
@@ -29,12 +29,12 @@
/**
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
- *
- * We use a phase listener here for all parts of the refresh
- * which have to rely on jsf access
- *
- * Which means all parts which need some kind of FacesConfig have
- * to rely on this one, we trigger before the first phase
+ * <p/>
+ * We use a phase listener here for all parts of the refresh
+ * which have to rely on jsf access
+ * <p/>
+ * Which means all parts which need some kind of FacesConfig have
+ * to rely on this one, we trigger before the first phase
*/
public class RefreshPhaseListener implements PhaseListener {
@@ -47,7 +47,7 @@
//we fetch the earliest phase possible, in case of a normal get it is the render phase
//in every other case it is the restore view phase
Map requestMap = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
- if(requestMap.containsKey(EQ_KEY)) return;
+ if (requestMap.containsKey(EQ_KEY)) return;
requestMap.put(EQ_KEY, Boolean.TRUE);
WeavingContext.doRequestRefreshes();
@@ -56,7 +56,7 @@
}
public PhaseId getPhaseId() {
- return PhaseId.ANY_PHASE;
+ return PhaseId.ANY_PHASE;
}
}
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java?rev=897481&r1=897480&r2=897481&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java Sat Jan 9 16:09:28 2010
@@ -40,6 +40,7 @@
/*dummy constructor do not use it it bypasses
* a bug in the maven-groovy stub compiler regarding
* base classes*/
+
public MetaclassStubcompilerFix() {
super(MetaclassStubcompilerFix.class);
}