You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/03/07 21:05:29 UTC

svn commit: r515731 - in /myfaces/tobago/trunk/example: addressbook/ blank/ demo/ demo/src/main/java/org/apache/myfaces/tobago/example/demo/ demo/src/main/webapp/WEB-INF/ facelets/ facelets/src/main/webapp/

Author: bommel
Date: Wed Mar  7 12:05:28 2007
New Revision: 515731

URL: http://svn.apache.org/viewvc?view=rev&rev=515731
Log:
cleanup examples

Modified:
    myfaces/tobago/trunk/example/addressbook/pom.xml
    myfaces/tobago/trunk/example/blank/pom.xml
    myfaces/tobago/trunk/example/demo/pom.xml
    myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
    myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml
    myfaces/tobago/trunk/example/facelets/pom.xml
    myfaces/tobago/trunk/example/facelets/src/main/webapp/helloWorldNext.xml

Modified: myfaces/tobago/trunk/example/addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/addressbook/pom.xml?view=diff&rev=515731&r1=515730&r2=515731
==============================================================================
--- myfaces/tobago/trunk/example/addressbook/pom.xml (original)
+++ myfaces/tobago/trunk/example/addressbook/pom.xml Wed Mar  7 12:05:28 2007
@@ -29,7 +29,7 @@
   <build>
     <finalName>tobago-example-addressbook</finalName>
     <plugins>
-      <plugin>
+      <!--<plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tomcat-maven-plugin</artifactId>
         <version>1.0-SNAPSHOT</version>
@@ -38,7 +38,7 @@
           <update>true</update>
           <url>http://localhost:8080/manager</url>
         </configuration>
-      </plugin>
+      </plugin>-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>

Modified: myfaces/tobago/trunk/example/blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/blank/pom.xml?view=diff&rev=515731&r1=515730&r2=515731
==============================================================================
--- myfaces/tobago/trunk/example/blank/pom.xml (original)
+++ myfaces/tobago/trunk/example/blank/pom.xml Wed Mar  7 12:05:28 2007
@@ -27,7 +27,7 @@
   <name>Example Blank</name>
   <build>
     <finalName>tobago-example-blank</finalName>
-    <plugins>
+    <!--<plugins>
      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tomcat-maven-plugin</artifactId>
@@ -38,7 +38,7 @@
           <url>http://localhost:8080/manager</url>
         </configuration>
       </plugin>
-    </plugins>
+    </plugins>-->
   </build>
 
   <scm>

Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/pom.xml?view=diff&rev=515731&r1=515730&r2=515731
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Wed Mar  7 12:05:28 2007
@@ -30,7 +30,7 @@
   <build>
     <finalName>tobago-example-demo</finalName>
     <plugins>
-      <plugin>
+      <!--<plugin>
         <groupId>org.apache.myfaces.tobago</groupId>
         <artifactId>maven-theme-plugin</artifactId>
         <version>${project.version}</version>
@@ -41,7 +41,7 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
+      </plugin>-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -144,13 +144,6 @@
       <version>2.0</version>
       <scope>provided</scope>
     </dependency>
-    <!--<dependency>-->
-    <!--<groupId>myfaces</groupId>-->
-    <!--<artifactId>tomahawk</artifactId>-->
-    <!--<version>1.1.0</version>-->
-    <!--<purpose>jar</purpose>-->
-    <!--</dependency>-->
-
   </dependencies>
   <profiles>
     <profile>

Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?view=diff&rev=515731&r1=515730&r2=515731
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Wed Mar  7 12:05:28 2007
@@ -60,6 +60,8 @@
 
   private boolean[] bool;
 
+  private boolean update;
+
   private Boolean boolTest;
 
   private String[] text;
@@ -207,6 +209,12 @@
         {ToolBarTag.LABEL_OFF, ToolBarTag.LABEL_BOTTOM, ToolBarTag.LABEL_RIGHT};
     toolbarTextItems = getSelectItems(toolbarTextKeys, "demo");
     toolbarTextPosition = ToolBarTag.LABEL_BOTTOM;
+  }
+
+
+  public boolean isUpdate() {
+    update = !update;
+    return update;
   }
 
   public void resetSession() throws IOException {

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml?view=diff&rev=515731&r1=515730&r2=515731
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml Wed Mar  7 12:05:28 2007
@@ -94,17 +94,6 @@
     <location>/faces/error/throwable.jsp</location>
   </error-page>
 
-  <!-- mime -->
-  <mime-mapping>
-    <extension>wml</extension>
-    <mime-type>text/vnd.wap.wml</mime-type>
-  </mime-mapping>
-
-  <mime-mapping>
-    <extension>wbmp</extension>
-    <mime-type>image/vnd.wap.wbmp</mime-type>
-  </mime-mapping>
-
   <!-- The Usual Welcome File List -->
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>

Modified: myfaces/tobago/trunk/example/facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/facelets/pom.xml?view=diff&rev=515731&r1=515730&r2=515731
==============================================================================
--- myfaces/tobago/trunk/example/facelets/pom.xml (original)
+++ myfaces/tobago/trunk/example/facelets/pom.xml Wed Mar  7 12:05:28 2007
@@ -29,7 +29,7 @@
   <name>Example Facelets</name>
   <build>
     <finalName>tobago-example-facelets</finalName>
-    <plugins>
+    <!--<plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>tomcat-maven-plugin</artifactId>
@@ -40,7 +40,7 @@
           <url>http://localhost:8080/manager</url>
         </configuration>
       </plugin>
-    </plugins>
+    </plugins>-->
   </build>
 
   <scm>

Modified: myfaces/tobago/trunk/example/facelets/src/main/webapp/helloWorldNext.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/facelets/src/main/webapp/helloWorldNext.xml?view=diff&rev=515731&r1=515730&r2=515731
==============================================================================
--- myfaces/tobago/trunk/example/facelets/src/main/webapp/helloWorldNext.xml (original)
+++ myfaces/tobago/trunk/example/facelets/src/main/webapp/helloWorldNext.xml Wed Mar  7 12:05:28 2007
@@ -21,7 +21,7 @@
         xmlns:ui="http://java.sun.com/jsf/facelets"
         xmlns:tc="http://myfaces.apache.org/tobago/component"
         xmlns:tx="http://myfaces.apache.org/tobago/facelet-extension">
-  <tc:page label="Tobago Hello World Faclets">
+  <tc:page height="200" width="300" label="Tobago Hello World Faclets">
     <f:facet name="layout">
       <tc:gridLayout/>
     </f:facet>