myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject svn commit: r815756 - in /myfaces/extensions/scripting/trunk: core/core/src/main/java/org/apache/myfaces/scripting/core/ core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/ core/myfaces2-extensions/ examples/myfaces20-example/ examples/m...
Date Wed, 16 Sep 2009 13:15:31 GMT
Author: werpu
Date: Wed Sep 16 13:15:31 2009
New Revision: 815756

URL: http://svn.apache.org/viewvc?rev=815756&view=rev
Log:
ongoing works to enable jdk5
so far the only showstopper left is
that jci requires an older version of asm which is incompatible.

Modified:
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/ajaxTest.xhtml

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java?rev=815756&r1=815755&r2=815756&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
(original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
Wed Sep 16 13:15:31 2009
@@ -43,12 +43,10 @@
         }
     }
 
-    @Override
     public void appendCustomScriptPath(String scriptPaths) {
         throw new RuntimeException("Method not supported from this facade");
     }
 
-    @Override
     public Object reloadScriptingInstance(Object o) {
         if (o.getClass().getName().contains("TestBean2")) {
             System.out.println("Debugpoint found");
@@ -63,7 +61,6 @@
 
     }
 
-    @Override
     public Class reloadScriptingClass(Class aclass) {
         if (aclass.getName().contains("TestBean2")) {
             System.out.println("Debugpoint found");
@@ -78,7 +75,6 @@
 
     }
 
-    @Override
     public Class loadScriptingClassFromName(String className) {
         for (ScriptingWeaver weaver : _weavers) {
             Class retVal = weaver.loadScriptingClassFromName(className);

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java?rev=815756&r1=815755&r2=815756&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
(original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
Wed Sep 16 13:15:31 2009
@@ -47,7 +47,7 @@
 
     private static final String JAVA_FILE_ENDING = ".java";
     private static final String JSR199_COMPILER = "org.apache.myfaces.scripting.loaders.java.jsr199.CompilerFacade";
-    private static final String JCI_COMPILER = "org.apache.myfaces.scripting.loaders.java.jci";
+    private static final String JCI_COMPILER = "org.apache.myfaces.scripting.loaders.java.jci.CompilerFacade";
 
     /**
      * helper to allow initial compiler classpath scanning

Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml?rev=815756&r1=815755&r2=815756&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml Wed Sep 16 13:15:31
2009
@@ -54,4 +54,16 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml?rev=815756&r1=815755&r2=815756&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml Wed Sep 16 13:15:31
2009
@@ -13,31 +13,38 @@
     <version>1.0-SNAPSHOT</version>
     <url>http://www.apache.org</url>
 
-
-    
     <repositories>
         <repository>
             <id>maven2-repository.dev.java.net</id>
             <url>http://download.java.net/maven/2</url>
         </repository>
-     
+
     </repositories>
 
     <build>
         <plugins>
+
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
                 <version>6.1.1</version>
                 <configuration>
                     <connectors>
-                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                        <connector implementation = "org.mortbay.jetty.nio.SelectChannelConnector">
                             <port>9090</port>
                             <maxIdleTime>60000</maxIdleTime>
                         </connector>
                     </connectors>
                     <scanIntervalSeconds>1</scanIntervalSeconds>
-                    
+
                 </configuration>
 
             </plugin>
@@ -52,13 +59,12 @@
             <version>1.5.6</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.apache.myfaces.extension-scripting</groupId>
             <artifactId>core</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.myfaces.extension-scripting</groupId>
             <artifactId>myfaces2-extensions</artifactId>
@@ -70,8 +76,7 @@
             <artifactId>core-java6</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-	
-	
+
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
@@ -84,14 +89,12 @@
             <version>2.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>javax.portlet</groupId>
             <artifactId>portlet-api</artifactId>
             <version>1.0</version>
         </dependency>
-      
 
-       
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/ajaxTest.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/ajaxTest.xhtml?rev=815756&r1=815755&r2=815756&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/ajaxTest.xhtml
(original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/ajaxTest.xhtml
Wed Sep 16 13:15:31 2009
@@ -14,6 +14,7 @@
 
 
 		<h:form id = "form">
+
             <h:outputScript name = "jsf.js" library = "javax.faces" target = "head" />
        	</h:form>
 	</ui:define>



Mime
View raw message