EXTSCRIPT-175

and adding a missing license header, fine adjustment of the rat plugin git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1396964 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 11, 2012 · 9d68bb7 · 9d68bb7
1 parent 4d0faf7
commit 9d68bb7
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 11 deletions.
diff --git a/extscript-examples/blog-example/src/main/webapp/WEB-INF/web.xml b/extscript-examples/blog-example/src/main/webapp/WEB-INF/web.xml
@@ -38,7 +38,7 @@
         <param-name>javax.faces.PROJECT_STAGE</param-name>
         <param-value>Development</param-value>
     </context-param>
-
+    <!--
     <context-param>
         <description>Additional comma separated loader paths to allow direct editing on the sources directory instead
             of the deployment dir
@@ -77,7 +77,7 @@
             /Users/werpu2/development/workspace/extscript_trunk/extscript-examples/blog-example/src/main/webapp
         </param-value>
     </context-param>
-
+    -->
 
     <context-param>
         <description>State saving method: "client" or "server" (= default)

diff --git a/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/glassfish-web.xml b/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
 <!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <glassfish-web-app error-url="">
   <context-root>/myfaces20-extscript-helloworld</context-root>

diff --git a/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/sun-web.xml b/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/sun-web.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
 <!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
 <sun-web-app error-url="">
   <context-root>/myfaces20-extscript-helloworld</context-root>

diff --git a/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml b/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml
@@ -47,7 +47,7 @@
         </description>
         <param-name>org.apache.myfaces.extensions.scripting.groovy.LOADER_PATHS</param-name>
         <param-value>
-            /whatever//myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/groovy
+            /whatever/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/groovy
         </param-value>
     </context-param>
 
@@ -58,7 +58,7 @@
         </description>
         <param-name>org.apache.myfaces.extensions.scripting.java.LOADER_PATHS</param-name>
         <param-value>
-            /whatever//myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/java
+            /whatever/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/java
         </param-value>
     </context-param>
     
@@ -68,7 +68,7 @@
         </description>
         <param-name>org.apache.myfaces.extensions.scripting.scala.LOADER_PATHS</param-name>
         <param-value>
-            /whatever//myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala
+            /whatever/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala
         </param-value>
     </context-param>
     
@@ -77,7 +77,7 @@
         <description>resource paths for our custom JSF2 resource resolver</description>
         <param-name>org.apache.myfaces.extensions.scripting.resources.LOADER_PATHS</param-name>
         <param-value>
-            /whatever//myfaces20-extscript-helloworld/src/main/webapp/
+            /whatever/myfaces20-extscript-helloworld/src/main/webapp/
         </param-value>
     </context-param>
 
@@ -96,8 +96,8 @@
         up dependencies from other directories. Wildcarding regarding jar and zip files is allowed.
         </description>
         <param-name>org.apache.myfaces.extensions.scripting.ADDITIONAL_CLASSPATH</param-name>
-        <param-value>/whatever//myfaces20-extscript-helloworld/target/myfaces20-extscript-helloworld-1.0.4-SNAPSHOT/WEB-INF/lib/*.jar,
-        /whatever//myfaces20-extscript-helloworld/target/myfaces20-extscript-helloworld-1.0.4-SNAPSHOT/WEB-INF/classes</param-value>
+        <param-value>/whatever/myfaces20-extscript-helloworld/target/myfaces20-extscript-helloworld-1.0.4-SNAPSHOT/WEB-INF/lib/*.jar,
+        /whatever/myfaces20-extscript-helloworld/target/myfaces20-extscript-helloworld-1.0.4-SNAPSHOT/WEB-INF/classes</param-value>
     </context-param>
 
     -->

diff --git a/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml b/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml
@@ -26,7 +26,6 @@
     <title>Hello World</title>
 </h:head>
 <h:body>
-    <h:outputText value="#{javaHello.helloWorld}" />
-    <h:outputText value="#{groovyHello.helloWorld}" />
+    <h:outputFormat value="hello world" />
 </h:body>
 </html>
diff --git a/pom.xml b/pom.xml
@@ -156,9 +156,12 @@
                             <exclude>**/*.log</exclude>
                             <exclude>**/LICENSE.TXT</exclude>
                             <exclude>**/NOTICE.TXT</exclude>
+                            <exclude>**/asm-license.txt</exclude>
+                            <exclude>**/facelet-license.txt</exclude>
                             <exclude>.gitignore</exclude>
-			    <exclude>**/target/rat.txt</exclude>
+			                <exclude>**/target/rat.txt</exclude>
                             <exclude>atlassian-ide-plugin.xml</exclude>
+
                         </excludes>
                     </configuration>
                 </plugin>