myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jak...@apache.org
Subject svn commit: r992601 - in /myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources: META-INF/maven/ archetype-resources/ archetype-resources/src/main/java/ archetype-resources/src/main/webapp/ archety...
Date Sat, 04 Sep 2010 13:34:20 GMT
Author: jakobk
Date: Sat Sep  4 13:34:20 2010
New Revision: 992601

URL: http://svn.apache.org/viewvc?rev=992601&view=rev
Log:
MYFACES-2909 Update archetypes to fit Archetype plugin 2.0.x (myfaces-archetype-helloworld-portlets)

Added:
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype-metadata.xml
  (contents, props changed)
      - copied, changed from r992575, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml
Removed:
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml
Modified:
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/NameBean.java
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp

Copied: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype-metadata.xml
(from r992575, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype-metadata.xml?p2=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype-metadata.xml&p1=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml&r1=992575&r2=992601&rev=992601&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype-metadata.xml
Sat Sep  4 13:34:20 2010
@@ -17,24 +17,38 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0
http://maven.apache.org/xsd/archetype-1.0.0.xsd">
-    
-  <id>myfaces-archetype-helloworld-portlets</id>
-  <sources>
-    <source>src/main/java/NameBean.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/log4j/log4j.properties</resource>
-    <resource>src/main/webapp/index.jsp</resource>
-    <resource>src/main/webapp/edit.jsp</resource>
-    <resource>src/main/webapp/help.jsp</resource>
-    <resource>src/main/webapp/helloworld/hello.jsp</resource>
-    <resource>src/main/webapp/helloworld/index.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/portlet.xml</resource>
-    <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
-    <resource>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</resource>
-  </resources>
-</archetype>
\ No newline at end of file
+<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
+                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                      xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0
http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
+
+                      name="myfaces-archetype-helloworld-portlets" partial="false">
+
+  <requiredProperties/>
+
+  <fileSets>
+      <fileSet filtered="true" packaged="true">
+          <directory>src/main/java/</directory>
+      </fileSet>
+      <fileSet filtered="false" packaged="false">
+          <directory>src/main/webapp/</directory>
+          <excludes>
+              <exclude>WEB-INF/faces-config.xml</exclude>
+              <exclude>WEB-INF/portlet.xml</exclude>
+          </excludes>
+      </fileSet>
+      <fileSet filtered="true" packaged="false">
+          <directory>src/main/webapp/</directory>
+          <includes>
+              <!-- faces-config and portlet.xml need to be filtered -->
+              <include>WEB-INF/faces-config.xml</include>
+              <include>WEB-INF/portlet.xml</include>
+          </includes>
+      </fileSet>
+      <fileSet filtered="false" packaged="false">
+          <directory>src/main/log4j/</directory>
+      </fileSet>
+  </fileSets>
+
+  <modules/>
+
+</archetype-descriptor>

Propchange: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml?rev=992601&r1=992600&r2=992601&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
Sat Sep  4 13:34:20 2010
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
@@ -16,7 +19,8 @@
  KIND, either express or implied.  See the License for the
  specific language governing permissions and limitations
  under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0"
+-->
+<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>
@@ -24,15 +28,15 @@
     <artifactId>${artifactId}</artifactId>
     <packaging>war</packaging>
     <version>${version}</version>
-    <name>A custom project using myfaces</name>
+    <name>A custom project using myfaces 1.2 with the portlet bridge</name>
     <url>http://www.myorganization.org</url>
 
     <properties>
-        <jsf-myfaces.version>1.2.7</jsf-myfaces.version>
-        <jsf-ri.version>1.2_13</jsf-ri.version>
-        <maven.jetty.plugin.version>6.1.16</maven.jetty.plugin.version>
+        <jsf-myfaces.version>1.2.9</jsf-myfaces.version>
+        <jsf-ri.version>1.2_15</jsf-ri.version>
+        <maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
         <log4j.version>1.2.13</log4j.version>
-        <portlet-bridge.version>1.0.0-beta</portlet-bridge.version>
+        <portlet-bridge.version>1.0.0</portlet-bridge.version>
     </properties>
     
     <dependencies>
@@ -67,13 +71,13 @@
         <dependency>
           <groupId>org.apache.myfaces.portlet-bridge</groupId>
           <artifactId>portlet-bridge-api</artifactId>
-          <version>${portlet-bridge.version}</version>
+          <version>${symbol_dollar}{portlet-bridge.version}</version>
         </dependency>
         
         <dependency>
           <groupId>org.apache.myfaces.portlet-bridge</groupId>
           <artifactId>portlet-bridge-impl</artifactId>
-          <version>${portlet-bridge.version}</version>
+          <version>${symbol_dollar}{portlet-bridge.version}</version>
         </dependency>
     </dependencies>
         
@@ -102,7 +106,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                      <webXml>
-                            ${project.build.directory}/pluto-resources/web.xml
+                            ${symbol_dollar}{project.build.directory}/pluto-resources/web.xml
                     </webXml>
                 </configuration>
               </plugin>
@@ -136,7 +140,7 @@
                 <dependency>
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
-                    <version>${log4j.version}</version>
+                    <version>${symbol_dollar}{log4j.version}</version>
                     <type>jar</type>
                 </dependency>
             </dependencies>
@@ -153,9 +157,9 @@
                     <plugin>
                       <groupId>org.mortbay.jetty</groupId>
                       <artifactId>maven-jetty-plugin</artifactId>
-                      <version>${maven.jetty.plugin.version}</version>
+                      <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
                       <configuration>
-                        <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+                        <webXml>${symbol_dollar}{project.build.directory}/pluto-resources/web.xml</webXml>
                         <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
                         <systemProperties>
                             <systemProperty>
@@ -198,14 +202,14 @@
                 <dependency>
                     <groupId>org.apache.myfaces.core</groupId>
                     <artifactId>myfaces-api</artifactId>
-                    <version>${jsf-myfaces.version}</version>
+                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
                     <scope>compile</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.myfaces.core</groupId>
                     <artifactId>myfaces-impl</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                    <scope>compile</scope>
+                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
+                    <scope>runtime</scope>
                 </dependency>
             </dependencies>
         </profile>
@@ -222,14 +226,23 @@
                 <dependency>
                     <groupId>javax.faces</groupId>
                     <artifactId>jsf-api</artifactId>
-                    <version>${jsf-ri.version}</version>
+                    <version>${symbol_dollar}{jsf-ri.version}</version>
+                    <scope>compile</scope>
                 </dependency>
                 <dependency>
                     <groupId>javax.faces</groupId>
                     <artifactId>jsf-impl</artifactId>
-                    <version>${jsf-ri.version}</version>
+                    <version>${symbol_dollar}{jsf-ri.version}</version>
+                    <scope>runtime</scope>
                 </dependency>
             </dependencies>
+            <repositories>
+                <repository>
+                    <id>java.net</id>
+                    <url>http://download.java.net/maven/1</url>
+                    <layout>legacy</layout>
+                </repository>
+            </repositories>
         </profile>
     </profiles>  
 </project>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/NameBean.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/NameBean.java?rev=992601&r1=992600&r2=992601&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/NameBean.java
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/NameBean.java
Sat Sep  4 13:34:20 2010
@@ -1,4 +1,22 @@
-package $package;
+/*
+ * 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 ${package};
 
 public class NameBean
 {

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml?rev=992601&r1=992600&r2=992601&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
Sat Sep  4 13:34:20 2010
@@ -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 faces-config PUBLIC
   "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
   "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
@@ -22,4 +40,5 @@
     <managed-bean-class>${package}.NameBean</managed-bean-class>
     <managed-bean-scope>request</managed-bean-scope>
   </managed-bean>
-</faces-config>
\ No newline at end of file
+</faces-config>
+        
\ No newline at end of file

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=992601&r1=992600&r2=992601&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Sat Sep  4 13:34:20 2010
@@ -20,23 +20,17 @@
 	   
 -->
 <!-- The Jetty Pluto Plugin needs to have a Webapp 2.3 web-xml.  Don't know why. -->
-<web-app>
+<web-app>
  
-  <context-param>
+  <context-param>
     <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
     <param-value>.jsp</param-value>
-  </context-param>
+  </context-param>
   
-  <!-- Listener, to allow Jetty serving MyFaces apps -->
-  <!-- TODO: is this needed anymore for jetty?  I don't think so.. -->
-  <!-- listener>
-    <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-  </listener -->
-
   <!-- Faces Servlet -->
   <servlet>
     <servlet-name>faces</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
 
@@ -49,6 +43,6 @@
   <servlet-mapping>
     <servlet-name>faces</servlet-name>
     <url-pattern>*.jsf</url-pattern>
-  </servlet-mapping>
+  </servlet-mapping>
   
 </web-app>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp?rev=992601&r1=992600&r2=992601&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
Sat Sep  4 13:34:20 2010
@@ -1,3 +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.
+--%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <%@ page contentType="text/html;charset=UTF-8"%>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp?rev=992601&r1=992600&r2=992601&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
Sat Sep  4 13:34:20 2010
@@ -1,3 +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.
+--%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <%@ page contentType="text/html;charset=UTF-8"%>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp?rev=992601&r1=992600&r2=992601&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
Sat Sep  4 13:34:20 2010
@@ -1,3 +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.
+--%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <%@ page contentType="text/html;charset=UTF-8"%>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp?rev=992601&r1=992600&r2=992601&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
Sat Sep  4 13:34:20 2010
@@ -1,3 +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.
+--%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <%@ page contentType="text/html;charset=UTF-8"%>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp?rev=992601&r1=992600&r2=992601&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
Sat Sep  4 13:34:20 2010
@@ -1,3 +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.
+--%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <%@ page contentType="text/html;charset=UTF-8"%>
@@ -17,7 +35,7 @@
             <ul>
               <li>
                 <h:commandLink value="HelloWorld example" action="helloWorld"/>
-              </li>
+              </li>
             </ul>
           </h:panelGroup>
         </h:panelGrid>



Mime
View raw message