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 2009/08/31 22:54:15 UTC
svn commit: r809742 - in /myfaces/extensions/scripting/trunk:
core/src/main/groovy/org/apache/myfaces/groovyloader/core/
core/src/main/java/org/apache/myfaces/groovyloader/core/
core/src/main/java/org/apache/myfaces/javaloader/core/ core/src/main/java/...
Author: werpu
Date: Mon Aug 31 20:54:14 2009
New Revision: 809742
URL: http://svn.apache.org/viewvc?rev=809742&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-3
Major core refactoring which will make it easier in the near future to
add new engines.
Added:
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java (contents, props changed)
- copied, changed from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/groovyloader/core/DynamicClassIdentifier.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java (contents, props changed)
- copied, changed from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/groovyloader/core/MetaclassStubcompilerFix.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java (contents, props changed)
- copied, changed from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/DynamicClassIdentifier.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java (contents, props changed)
- copied, changed from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/JavaScriptingWeaver.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScriptingClass.java (contents, props changed)
- copied, changed from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/ScriptingClass.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/CompilerFacade.java (contents, props changed)
- copied, changed from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/jsr199/CompilerFacade.java
Removed:
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/groovyloader/core/DynamicClassIdentifier.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/groovyloader/core/MetaclassStubcompilerFix.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/DynamicClassIdentifier.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/JavaScriptingWeaver.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/ScriptingClass.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/jsr199/CompilerFacade.java
Modified:
myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/Groovy2GroovyObjectReloadingProxy.groovy
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/DynamicClassIdentifierHolder.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
myfaces/extensions/scripting/trunk/core/src/test/java/org/apache/myfaces/javaloader/core/JavaDynamicClassIdentifierTest.java
myfaces/extensions/scripting/trunk/core/src/test/java/org/apache/myfaces/javaloader/core/Probe2.java
myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
Modified: myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/Groovy2GroovyObjectReloadingProxy.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/Groovy2GroovyObjectReloadingProxy.groovy?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/Groovy2GroovyObjectReloadingProxy.groovy (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/groovy/org/apache/myfaces/groovyloader/core/Groovy2GroovyObjectReloadingProxy.groovy Mon Aug 31 20:54:14 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.groovyloader.core
import org.apache.myfaces.groovyloader.core.GroovyWeaver
-import org.apache.myfaces.groovyloader.core.MetaclassStubcompilerFix
+import org.apache.myfaces.scripting.loaders.groovy.MetaclassStubcompilerFix
import org.apache.myfaces.scripting.core.util.ProxyUtils
import org.apache.myfaces.scripting.core.util.ProxyUtils
Modified: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/DynamicClassIdentifierHolder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/DynamicClassIdentifierHolder.java?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/DynamicClassIdentifierHolder.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/core/DynamicClassIdentifierHolder.java Mon Aug 31 20:54:14 2009
@@ -27,8 +27,8 @@
*/
public class DynamicClassIdentifierHolder implements DynamicClassIdentifier {
- DynamicClassIdentifier _groovyIdentifier = new org.apache.myfaces.groovyloader.core.DynamicClassIdentifier();
- DynamicClassIdentifier _javaIdentifier = new org.apache.myfaces.javaloader.core.DynamicClassIdentifier();
+ DynamicClassIdentifier _groovyIdentifier = new org.apache.myfaces.scripting.loaders.groovy.DynamicClassIdentifier();
+ DynamicClassIdentifier _javaIdentifier = new org.apache.myfaces.scripting.loaders.java.DynamicClassIdentifier();
public boolean isDynamic(Class clazz) {
Modified: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java Mon Aug 31 20:54:14 2009
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
-import org.apache.myfaces.groovyloader.core.DynamicClassIdentifier;
import org.apache.myfaces.scripting.api.Decorated;
import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.core.util.ProxyUtils;
Modified: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java Mon Aug 31 20:54:14 2009
@@ -30,7 +30,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.groovyloader.core.DynamicClassIdentifier;
import org.apache.myfaces.scripting.core.util.ProxyUtils;
/**
Modified: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java Mon Aug 31 20:54:14 2009
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
-import org.apache.myfaces.groovyloader.core.DynamicClassIdentifier;
import org.apache.myfaces.scripting.api.Decorated;
import org.apache.myfaces.scripting.core.util.ProxyUtils;
Modified: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java Mon Aug 31 20:54:14 2009
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
-import org.apache.myfaces.groovyloader.core.DynamicClassIdentifier;
import org.apache.myfaces.scripting.api.Decorated;
import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.core.util.ProxyUtils;
Modified: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java Mon Aug 31 20:54:14 2009
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
-import org.apache.myfaces.groovyloader.core.DynamicClassIdentifier;
import org.apache.myfaces.scripting.api.Decorated;
import org.apache.myfaces.scripting.core.util.ProxyUtils;
Copied: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java (from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/groovyloader/core/DynamicClassIdentifier.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java?p2=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java&p1=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/groovyloader/core/DynamicClassIdentifier.java&r1=809734&r2=809742&rev=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/groovyloader/core/DynamicClassIdentifier.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java Mon Aug 31 20:54:14 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.groovyloader.core;
+package org.apache.myfaces.scripting.loaders.groovy;
import org.apache.myfaces.scripting.api.ScriptingConst;
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/DynamicClassIdentifier.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java (from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/groovyloader/core/MetaclassStubcompilerFix.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java?p2=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java&p1=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/groovyloader/core/MetaclassStubcompilerFix.java&r1=809734&r2=809742&rev=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/groovyloader/core/MetaclassStubcompilerFix.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java Mon Aug 31 20:54:14 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.groovyloader.core;
+package org.apache.myfaces.scripting.loaders.groovy;
import groovy.lang.DelegatingMetaClass;
import groovy.lang.MetaClass;
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/groovy/MetaclassStubcompilerFix.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java (from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/DynamicClassIdentifier.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java?p2=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java&p1=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/DynamicClassIdentifier.java&r1=809734&r2=809742&rev=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/DynamicClassIdentifier.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java Mon Aug 31 20:54:14 2009
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.javaloader.core;
+package org.apache.myfaces.scripting.loaders.java;
import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.loaders.java.ScriptingClass;
import java.lang.annotation.Annotation;
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java (from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/JavaScriptingWeaver.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java?p2=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java&p1=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/JavaScriptingWeaver.java&r1=809734&r2=809742&rev=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/JavaScriptingWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java Mon Aug 31 20:54:14 2009
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.javaloader.core;
+package org.apache.myfaces.scripting.loaders.java;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.javaloader.core.jsr199.CompilerFacade;
+import org.apache.myfaces.scripting.loaders.java.jsr199.CompilerFacade;
import org.apache.myfaces.scripting.api.DynamicCompiler;
import org.apache.myfaces.scripting.api.ScriptingConst;
import org.apache.myfaces.scripting.api.ScriptingWeaver;
-import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
import org.apache.myfaces.scripting.core.BaseWeaver;
import javax.servlet.ServletContext;
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScriptingClass.java (from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/ScriptingClass.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScriptingClass.java?p2=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScriptingClass.java&p1=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/ScriptingClass.java&r1=809734&r2=809742&rev=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/ScriptingClass.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScriptingClass.java Mon Aug 31 20:54:14 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.javaloader.core;
+package org.apache.myfaces.scripting.loaders.java;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScriptingClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ScriptingClass.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/CompilerFacade.java (from r809734, myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/jsr199/CompilerFacade.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/CompilerFacade.java?p2=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/CompilerFacade.java&p1=myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/jsr199/CompilerFacade.java&r1=809734&r2=809742&rev=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/javaloader/core/jsr199/CompilerFacade.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/CompilerFacade.java Mon Aug 31 20:54:14 2009
@@ -1,4 +1,4 @@
-package org.apache.myfaces.javaloader.core.jsr199;
+package org.apache.myfaces.scripting.loaders.java.jsr199;
import org.apache.myfaces.scripting.api.DynamicCompiler;
import org.apache.commons.logging.LogFactory;
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/CompilerFacade.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/CompilerFacade.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java Mon Aug 31 20:54:14 2009
@@ -22,8 +22,8 @@
import org.apache.myfaces.scripting.api.ScriptingWeaver;
import org.apache.myfaces.scripting.core.util.ProxyUtils;
import org.apache.myfaces.scripting.core.ScriptingWeaverHolder;
+import org.apache.myfaces.scripting.loaders.java.JavaScriptingWeaver;
import org.apache.myfaces.shared_impl.util.ClassLoaderExtension;
-import org.apache.myfaces.javaloader.core.JavaScriptingWeaver;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: myfaces/extensions/scripting/trunk/core/src/test/java/org/apache/myfaces/javaloader/core/JavaDynamicClassIdentifierTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/test/java/org/apache/myfaces/javaloader/core/JavaDynamicClassIdentifierTest.java?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/test/java/org/apache/myfaces/javaloader/core/JavaDynamicClassIdentifierTest.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/test/java/org/apache/myfaces/javaloader/core/JavaDynamicClassIdentifierTest.java Mon Aug 31 20:54:14 2009
@@ -23,6 +23,7 @@
import static org.junit.Assert.*;
import org.apache.myfaces.scripting.core.DynamicClassIdentifierHolder;
import org.apache.myfaces.scripting.api.ScriptingConst;
+import org.apache.myfaces.scripting.loaders.java.DynamicClassIdentifier;
/**
* @author werpu
Modified: myfaces/extensions/scripting/trunk/core/src/test/java/org/apache/myfaces/javaloader/core/Probe2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/src/test/java/org/apache/myfaces/javaloader/core/Probe2.java?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/src/test/java/org/apache/myfaces/javaloader/core/Probe2.java (original)
+++ myfaces/extensions/scripting/trunk/core/src/test/java/org/apache/myfaces/javaloader/core/Probe2.java Mon Aug 31 20:54:14 2009
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.javaloader.core;
-import org.apache.myfaces.javaloader.core.ScriptingClass;
+import org.apache.myfaces.scripting.loaders.java.ScriptingClass;
/**
* @author werpu
Modified: myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java?rev=809742&r1=809741&r2=809742&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java Mon Aug 31 20:54:14 2009
@@ -1,6 +1,6 @@
package org.apache.myfaces.javaloader.test;
-import org.apache.myfaces.javaloader.core.ScriptingClass;
+import org.apache.myfaces.scripting.loaders.java.ScriptingClass;
@ScriptingClass
public class TestBean2 {
@@ -9,7 +9,7 @@
String hello3 = "hello from added attribute 2";
public String getSayHello() {
- return "hello from a Java coded dynamic bean "+TestClass2.hello2+hello3 ;
+ return "hello from a Java coded dynamic bean"+TestClass2.hello2+hello3 ;
}
public String getSayHello2() {
return hello2;