myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jak...@apache.org
Subject svn commit: r992576 - in /myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources: META-INF/maven/ archetype-resources/src/main/java/ archetype-resources/src/main/webapp/ archetype-resources/src/main/webapp...
Date Sat, 04 Sep 2010 10:44:34 GMT
Author: jakobk
Date: Sat Sep  4 10:44:33 2010
New Revision: 992576

URL: http://svn.apache.org/viewvc?rev=992576&view=rev
Log:
updated helloworld20 archetype to fit the new archetype plugin

Added:
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype-metadata.xml
      - copied, changed from r992575, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype.xml
Removed:
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype.xml
Modified:
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/index.html
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css

Copied: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype-metadata.xml
(from r992575, myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype.xml)
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype-metadata.xml?p2=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype-metadata.xml&p1=myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype.xml&r1=992575&r2=992576&rev=992576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/maven/archetype-metadata.xml
Sat Sep  4 10:44:33 2010
@@ -17,20 +17,23 @@
     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-helloworld20</id>
-    <sources>
-        <source>src/main/java/HelloWorldController.java</source>
-    </sources>
-    <resources>
-        <resource>src/main/webapp/index.html</resource>
-        <resource>src/main/webapp/helloWorld.xhtml</resource>
-        <resource>src/main/webapp/page2.xhtml</resource>
-        <resource>src/main/webapp/WEB-INF/web.xml</resource>
-        <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
-        <resource>src/main/webapp/resources/css/style.css</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-helloworld20" 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>
+      </fileSet>
+  </fileSets>
+
+  <modules/>
+
+</archetype-descriptor>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java?rev=992576&r1=992575&r2=992576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
Sat Sep  4 10:44:33 2010
@@ -1,6 +1,3 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,14 +15,14 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package ${package};
 
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.RequestScoped;
 
 /**
- * A typical simple backing bean, that is backed to <code>${artifactId}.xhtml</code>
+ * A typical simple backing bean, that is backed to <code>helloWorld.xhtml</code>
  */
 @ManagedBean(name = "helloWorld")
 @RequestScoped
@@ -63,4 +60,4 @@ public class HelloWorldController
         this.name = name;
     }
 
-}
\ No newline at end of file
+}

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/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-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml?rev=992576&r1=992575&r2=992576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
Sat Sep  4 10:44:33 2010
@@ -1,8 +1,4 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
 <?xml version="1.0"?>
-
 <!--
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -21,11 +17,11 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-
 <faces-config version="2.0"
     xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
 	
-</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-helloworld20/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-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=992576&r1=992575&r2=992576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Sat Sep  4 10:44:33 2010
@@ -1,8 +1,4 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
 <?xml version="1.0"?>
-
 <!--
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml?rev=992576&r1=992575&r2=992576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
Sat Sep  4 10:44:33 2010
@@ -1,7 +1,22 @@
-#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
+    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 XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
@@ -17,8 +32,8 @@
         <h:form id="mainForm">
             <h:panelGrid columns="2">
                 <h:outputLabel for="name" value="Please enter your name"/>
-                <h:inputText id="name" value="${symbol_pound}{helloWorld.name}" required="true"/>
-                <h:commandButton value="Press me" action="${symbol_pound}{helloWorld.send}"/>
+                <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
+                <h:commandButton value="Press me" action="#{helloWorld.send}"/>
                 <h:messages showDetail="true" showSummary="false"/>
             </h:panelGrid>
         </h:form>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/index.html?rev=992576&r1=992575&r2=992576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/index.html
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/index.html
Sat Sep  4 10:44:33 2010
@@ -1,8 +1,24 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
+<!--
+    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.
+-->
 <html>
 <head>
     <meta http-equiv="refresh" content="0; URL=helloWorld.jsf">
 </head>
-</html>
\ No newline at end of file
+</html>
+        
\ No newline at end of file

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml?rev=992576&r1=992575&r2=992576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
Sat Sep  4 10:44:33 2010
@@ -1,7 +1,22 @@
-#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
+    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 XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
@@ -14,9 +29,9 @@
     <h:outputStylesheet name="style.css" library="css"/>
     <div id="container">
         <h1>MyFaces Hello World</h1>
-        <h:outputText value="Hello ${symbol_pound}{helloWorld.name}. We hope you enjoy
Apache MyFaces!"/>
+        <h:outputText value="Hello #{helloWorld.name}. We hope you enjoy Apache MyFaces!"/>
         <br/>
         <h:link value="Home" outcome="helloWorld"/>
     </div>
 </h:body>
-</html>
\ No newline at end of file
+</html>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css?rev=992576&r1=992575&r2=992576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
Sat Sep  4 10:44:33 2010
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
 body {
     background-color: rgb(0, 35, 75);
     font-family: tahoma, arial, helvetica, sans-serif;
@@ -13,4 +32,4 @@ body {
 
 h1 {
     font-size: 20px;
-}
\ No newline at end of file
+}



Mime
View raw message