You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/10/26 13:32:26 UTC

svn commit: r829768 - in /myfaces/tobago/trunk/example: ./ facelets/ retro/ retro/src/main/java/org/apache/myfaces/tobago/example/facelets/ retro/src/main/resources/ retro/src/main/webapp/WEB-INF/ retro/src/main/webapp/WEB-INF/classes/

Author: lofwyr
Date: Mon Oct 26 12:32:25 2009
New Revision: 829768

URL: http://svn.apache.org/viewvc?rev=829768&view=rev
Log:
Create a sample for JSF 1.1 and JDK 1.4

Added:
    myfaces/tobago/trunk/example/retro/   (props changed)
      - copied from r828992, myfaces/tobago/trunk/example/facelets/
    myfaces/tobago/trunk/example/retro/src/main/resources/
      - copied from r828992, myfaces/tobago/trunk/example/facelets/src/main/webapp/WEB-INF/classes/
Removed:
    myfaces/tobago/trunk/example/facelets/
    myfaces/tobago/trunk/example/retro/src/main/webapp/WEB-INF/classes/
Modified:
    myfaces/tobago/trunk/example/pom.xml
    myfaces/tobago/trunk/example/retro/pom.xml
    myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/MessageBackingBean.java
    myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/User.java
    myfaces/tobago/trunk/example/retro/src/main/resources/log4j.xml
    myfaces/tobago/trunk/example/retro/src/main/webapp/WEB-INF/web.xml

Modified: myfaces/tobago/trunk/example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/pom.xml?rev=829768&r1=829767&r2=829768&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/pom.xml (original)
+++ myfaces/tobago/trunk/example/pom.xml Mon Oct 26 12:32:25 2009
@@ -65,10 +65,12 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>
       <artifactId>jsp-api</artifactId>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
   
@@ -101,7 +103,7 @@
         <module>security</module>
         <module>experimental</module>
         <module>test</module>
-        <module>facelets</module>
+        <module>retro</module>
         <module>tobago-example-assembly</module>
         <module>tobago-theme-example</module>
         <module>seam</module>

Propchange: myfaces/tobago/trunk/example/retro/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 26 12:32:25 2009
@@ -0,0 +1,9 @@
+*.ipr
+*.iws
+*.iml
+*.log
+target
+.classpath
+.project
+.settings
+

Propchange: myfaces/tobago/trunk/example/retro/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: myfaces/tobago/trunk/example/retro/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/retro/pom.xml?rev=829768&r1=828992&r2=829768&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/retro/pom.xml (original)
+++ myfaces/tobago/trunk/example/retro/pom.xml Mon Oct 26 12:32:25 2009
@@ -22,13 +22,24 @@
     <artifactId>tobago-example</artifactId>
     <version>1.5.0-alpha-2-SNAPSHOT</version>
   </parent>
-  <artifactId>tobago-example-facelets</artifactId>
+  <artifactId>tobago-example-retro</artifactId>
   <packaging>war</packaging>
-  <name>Tobago Example Facelets</name>
+  <name>Tobago Example Retro</name>
+  <description>Sample app for JDK 1.4 and JSF 1.1</description>
   <build>
-    <finalName>tobago-example-facelets</finalName>
+    <finalName>tobago-example-retro</finalName>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+          <encoding>${maven.compile.encoding}</encoding>
+          <showWarnings>true</showWarnings>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tomcat-maven-plugin</artifactId>
         <configuration>
@@ -41,9 +52,9 @@
   </build>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/facelets</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/facelets</developerConnection>
-    <url>http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/facelets</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/retro</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tobago/trunk/example/retro</developerConnection>
+    <url>http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/retro</url>
   </scm>
 
   <repositories>
@@ -62,23 +73,108 @@
     </dependency-->
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-core</artifactId>
+      <version>${project.version}</version>
+      <classifier>jdk14retro</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-jsf-compat</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-jsf-compat</artifactId>
+      <version>${project.version}</version>
+      <classifier>jdk14retro</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-taglib-extension</artifactId>
+      <version>${project.version}</version>
+      <classifier>jdk14retro</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-scarborough</artifactId>
       <version>${project.version}</version>
+      <classifier>jdk14retro</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-theme-standard</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-speyside</artifactId>
       <version>${project.version}</version>
+      <classifier>jdk14retro</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-theme-scarborough</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-richmond</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-theme-scarborough</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-theme-speyside</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-standard</artifactId>
       <version>${project.version}</version>
+      <classifier>jdk14retro</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-theme-scarborough</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-theme-speyside</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-taglib-extension</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
@@ -90,19 +186,30 @@
           <groupId>sun.jdk</groupId>
           <artifactId>tools</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.myfaces.tobago</groupId>
+          <artifactId>tobago-core</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>javax.el</groupId>
       <artifactId>el-api</artifactId>
-      <!-- in the case of Servlet 2.5 / JSP 2.1
-                 e. g. Tomcat 6 the scope should be "provided"
-            <scope>provided</scope>
-       -->
+      <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>el-impl</groupId>
-      <artifactId>el-impl</artifactId>
+      <groupId>com.sun.el</groupId>
+      <artifactId>el-ri</artifactId>
       <version>1.0</version>
     </dependency>
     <dependency>
@@ -115,33 +222,9 @@
       <artifactId>log4j</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>net.sf.retrotranslator</groupId>
+      <artifactId>retrotranslator-runtime</artifactId>
+    </dependency>
   </dependencies>
-  <profiles>
-    <profile>
-      <!--
-       mvn package cargo:start -Ptomcat5x
-      -->
-      <id>tomcat5x</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.cargo</groupId>
-            <artifactId>cargo-maven2-plugin</artifactId>
-            <configuration>
-              <container>
-                <containerId>tomcat5x</containerId>
-                <zipUrlInstaller>
-                  <url>http://apache.easy-webs.de/tomcat/tomcat-5/v5.5.23/bin/apache-tomcat-5.5.23.zip</url>
-                  <installDir>${project.build.directory}/tomcat5</installDir>
-                </zipUrlInstaller>
-              </container>
-              <configuration>
-                <home>${project.build.directory}/tomcat5/container</home>
-              </configuration>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
\ No newline at end of file
+</project>

Modified: myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/MessageBackingBean.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/MessageBackingBean.java?rev=829768&r1=828992&r2=829768&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/MessageBackingBean.java (original)
+++ myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/MessageBackingBean.java Mon Oct 26 12:32:25 2009
@@ -40,8 +40,8 @@
     return items;
   }
 
-  public List<User> getList() {
-    List<User> list = new ArrayList<User>();
+  public List getList() {
+    List list = new ArrayList();
     list.add(new User("Anton", "Antonius", new Date(), 10.1));
     list.add(new User("Bill", "Bilson", new Date(), 200.20));
     return list;

Modified: myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/User.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/User.java?rev=829768&r1=828992&r2=829768&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/User.java (original)
+++ myfaces/tobago/trunk/example/retro/src/main/java/org/apache/myfaces/tobago/example/facelets/User.java Mon Oct 26 12:32:25 2009
@@ -25,11 +25,11 @@
   private Date date;
   private Double value;
 
-  public User(String name, String surname, Date date, Double value) {
+  public User(String name, String surname, Date date, double value) {
     this.name = name;
     this.surname = surname;
     this.date = date;
-    this.value = value;
+    this.value = Double.valueOf(value);
   }
 
   public String getName() {

Modified: myfaces/tobago/trunk/example/retro/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/retro/src/main/resources/log4j.xml?rev=829768&r1=828992&r2=829768&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/retro/src/main/resources/log4j.xml (original)
+++ myfaces/tobago/trunk/example/retro/src/main/resources/log4j.xml Mon Oct 26 12:32:25 2009
@@ -21,7 +21,7 @@
 
 <log4j:configuration>
 
-  <appender name="logfile" class="org.apache.log4j.FileAppender">
+  <appender name="console" class="org.apache.log4j.FileAppender">
     <param name="File"   value="tobago-example-facelets.log" />
     <param name="Append" value="true" />
     <param name="Encoding" value="UTF-8" />
@@ -48,7 +48,7 @@
 
   <root>
     <priority value="info" />
-    <appender-ref ref="logfile" />
+    <appender-ref ref="console" />
   </root>
 
 </log4j:configuration>

Modified: myfaces/tobago/trunk/example/retro/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/retro/src/main/webapp/WEB-INF/web.xml?rev=829768&r1=828992&r2=829768&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/retro/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/example/retro/src/main/webapp/WEB-INF/web.xml Mon Oct 26 12:32:25 2009
@@ -17,10 +17,12 @@
  * limitations under the License.
 -->
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
+
+<!DOCTYPE web-app
+  PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+  "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
 
   <display-name>Tobago Facelets Example Application</display-name>