myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject svn commit: r1414700 - in /myfaces/extensions/scripting/trunk: extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/ extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/
Date Wed, 28 Nov 2012 14:09:34 GMT
Author: werpu
Date: Wed Nov 28 14:09:33 2012
New Revision: 1414700

URL: http://svn.apache.org/viewvc?rev=1414700&view=rev
Log:
rename the classes to their old names to keep compatibility to the docs

Added:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResource.java
      - copied, changed from r1414697, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/LocalResource.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceHandler.java
      - copied, changed from r1414697, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/LocalResourceHandler.java
Removed:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/LocalResource.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/LocalResourceHandler.java
Modified:
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml

Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResource.java
(from r1414697, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/LocalResource.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResource.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResource.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/LocalResource.java&r1=1414697&r2=1414700&rev=1414700&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/LocalResource.java
(original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResource.java
Wed Nov 28 14:09:33 2012
@@ -36,11 +36,11 @@ import java.util.Map;
  * @version $Revision$ $Date$
  */
 
-public class LocalResource extends Resource
+public class SourceResource extends Resource
 {
     File _location;
 
-    public LocalResource(final String libraryName, final String resourceName, File location)
+    public SourceResource(final String libraryName, final String resourceName, File location)
     {
         setLibraryName(libraryName);
         setResourceName(resourceName);
@@ -48,7 +48,7 @@ public class LocalResource extends Resou
         _location = location;
     }
 
-    public LocalResource(final String libraryName, final String resourceName, File location,
String contentType)
+    public SourceResource(final String libraryName, final String resourceName, File location,
String contentType)
     {
         setLibraryName(libraryName);
         setResourceName(resourceName);

Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceHandler.java
(from r1414697, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/LocalResourceHandler.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceHandler.java?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceHandler.java&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/LocalResourceHandler.java&r1=1414697&r2=1414700&rev=1414700&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/LocalResourceHandler.java
(original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceHandler.java
Wed Nov 28 14:09:33 2012
@@ -33,11 +33,11 @@ import java.util.List;
  * @version $Revision$ $Date$
  */
 
-public class LocalResourceHandler extends ResourceHandlerWrapper
+public class SourceResourceHandler extends ResourceHandlerWrapper
 {
     private final ResourceHandler _wrapped;
 
-    public LocalResourceHandler(ResourceHandler wrapped)
+    public SourceResourceHandler(ResourceHandler wrapped)
     {
         _wrapped = wrapped;
     }
@@ -55,17 +55,17 @@ public class LocalResourceHandler extend
             File resourceFile = new File(resourceRoot + "/resources/" + libraryName + "/"
+ resourceName);
             if (resourceFile.exists())
             {
-                return new LocalResource(libraryName, resourceName, resourceFile);
+                return new SourceResource(libraryName, resourceName, resourceFile);
             }
             resourceFile = new File(resourceRoot + "/META-INF/resources/" + libraryName +
"/" + resourceName);
             if (resourceFile.exists())
             {
-                return new LocalResource(libraryName, resourceName, resourceFile);
+                return new SourceResource(libraryName, resourceName, resourceFile);
             }
             resourceFile = new File(resourceRoot + "/" + libraryName + "/" + resourceName);
             if (resourceFile.exists())
             {
-                return new LocalResource(libraryName, resourceName, resourceFile);
+                return new SourceResource(libraryName, resourceName, resourceFile);
             }
         }
         return _wrapped.createResource(resourceName, libraryName);
@@ -84,17 +84,17 @@ public class LocalResourceHandler extend
             File resourceFile = new File(resourceRoot + "/resources/" + libraryName + "/"
+ resourceName);
             if (resourceFile.exists())
             {
-                return new LocalResource(libraryName, resourceName, resourceFile);
+                return new SourceResource(libraryName, resourceName, resourceFile);
             }
             resourceFile = new File(resourceRoot + "/META_INF/resources/" + libraryName +
"/" + resourceName);
             if (resourceFile.exists())
             {
-                return new LocalResource(libraryName, resourceName, resourceFile);
+                return new SourceResource(libraryName, resourceName, resourceFile);
             }
             resourceFile = new File(resourceRoot + "/" + libraryName + "/" + resourceName);
             if (resourceFile.exists())
             {
-                return new LocalResource(libraryName, resourceName, resourceFile);
+                return new SourceResource(libraryName, resourceName, resourceFile);
             }
 
         }

Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml?rev=1414700&r1=1414699&r2=1414700&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/faces-config.xml
Wed Nov 28 14:09:33 2012
@@ -124,9 +124,9 @@
             </system-event-listener-class>
             <system-event-class>javax.faces.event.PreRenderViewEvent</system-event-class>
         </system-event-listener>
-
-        <resource-handler>org.apache.myfaces.javaloader.test.TestResourceHandler</resource-handler>
-
-
+        <!--
+        <resource-handler>org.apache.myfaces.extensions.scripting.jsf.resources.SourceResourceHandler</resource-handler>
+        -->
+        <resource-handler>org.apache.myfaces.extensions.scripting.jsf.resources.SourceResourceHandler</resource-handler>
     </application>
 </faces-config>
\ No newline at end of file



Mime
View raw message