[waffle-scm] [678] trunk/examples: Upgraded examples to use 1.2-SNAPSHOT.

Thu, 15 May 2008 23:34:13 -0700

Title: [waffle-scm] [678] trunk/examples: Upgraded examples to use 1.2-SNAPSHOT.

Diff

Modified: trunk/examples/freemarker-example/pom.xml (677 => 678)

--- trunk/examples/freemarker-example/pom.xml	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/freemarker-example/pom.xml	2008-05-16 06:34:07 UTC (rev 678)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.codehaus.waffle</groupId>
     <artifactId>waffle-examples</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-freemarker-example</artifactId>
   <packaging>war</packaging>

Modified: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/model/Person.java (677 => 678)

--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/model/Person.java	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/model/Person.java	2008-05-16 06:34:07 UTC (rev 678)
@@ -25,4 +25,8 @@
     
     public List<Double> getGrades();
     
+    public boolean isWizard();
+    
+    public String getNotes();
+    
 }

Modified: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersistablePerson.java (677 => 678)

--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersistablePerson.java	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersistablePerson.java	2008-05-16 06:34:07 UTC (rev 678)
@@ -18,6 +18,8 @@
     private List<String> skills;
     private List<Integer> levels;
     private List<Double> grades;
+    private String notes;
+    private boolean wizard;
 
     public PersistablePerson() {
         id = new Long(0);
@@ -30,6 +32,8 @@
         skills = new ArrayList<String>();
         levels = new ArrayList<Integer>();
         grades = new ArrayList<Double>();
+        notes = "";
+        wizard = false;
     }
 
     public PersistablePerson(Person person) {
@@ -43,6 +47,8 @@
         this.skills = person.getSkills();
         this.levels = person.getLevels();
         this.grades = person.getGrades();
+        this.notes = person.getNotes();
+        this.wizard = person.isWizard();
     }
 
     public Long getId() {
@@ -125,4 +131,21 @@
         this.grades = grades;
     }
 
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public void setWizard(boolean wizard) {
+        this.wizard = wizard;
+    }
+
+    public boolean isWizard() {
+        return wizard;
+    }
+
+    
 }

Modified: trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl (677 => 678)

--- trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl	2008-05-16 06:34:07 UTC (rev 678)
@@ -62,6 +62,14 @@
             <label for=""
             <@w.textAsCSV "person.grades" person.getGrades()![] /> 
         </p>
+        <p class="fieldRow">
+            <label for="" wizard:</label>
+            <@w.text "person.wizard" "${person.wizard?string}"/>
+        </p>
+        <p class="fieldRow">
+            <label for=""
+            <@w.textarea "person.notes" "${person.notes}" />
+        </p>
     </fieldset>
     
     <div class="controls">

Modified: trunk/examples/freemarker-example/src/main/webapp/people/manage.ftl (677 => 678)

--- trunk/examples/freemarker-example/src/main/webapp/people/manage.ftl	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/freemarker-example/src/main/webapp/people/manage.ftl	2008-05-16 06:34:07 UTC (rev 678)
@@ -16,6 +16,7 @@
             <th>Last Name</th>
             <th>Email</th>
             <th>Date of Birth</th>
+            <th>Is Wizard</th>
             <th>Skills</th>
             <th>Select</th>
         </tr>
@@ -28,6 +29,7 @@
                 <td>${person.lastName}</td>
                 <td>${person.email}</td>
                 <td><#if person.dateOfBirth??>${person.dateOfBirth?string("dd/MM/yyyy")}</#if></td>
+                <td>${person.wizard?string}</td>
                 <td><@w.asCSV person.getSkills()![] /> </p></td>
                 <td><@w.checkbox "selectedIds" "${person.id}" /></td>
             </tr>

Modified: trunk/examples/jruby-example/pom.xml (677 => 678)

--- trunk/examples/jruby-example/pom.xml	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/jruby-example/pom.xml	2008-05-16 06:34:07 UTC (rev 678)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.codehaus.waffle</groupId>
     <artifactId>waffle-examples</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-jruby-example</artifactId>
   <packaging>war</packaging>

Modified: trunk/examples/migration-example/pom.xml (677 => 678)

--- trunk/examples/migration-example/pom.xml	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/migration-example/pom.xml	2008-05-16 06:34:07 UTC (rev 678)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.codehaus.waffle</groupId>
     <artifactId>waffle-examples</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-migration-example</artifactId>
   <packaging>war</packaging>

Modified: trunk/examples/mydvds-example/pom.xml (677 => 678)

--- trunk/examples/mydvds-example/pom.xml	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/mydvds-example/pom.xml	2008-05-16 06:34:07 UTC (rev 678)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.codehaus.waffle</groupId>
     <artifactId>waffle-examples</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-mydvds-example</artifactId>
   <packaging>war</packaging>

Modified: trunk/examples/paranamer-example/pom.xml (677 => 678)

--- trunk/examples/paranamer-example/pom.xml	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/paranamer-example/pom.xml	2008-05-16 06:34:07 UTC (rev 678)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.codehaus.waffle</groupId>
     <artifactId>waffle-examples</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-paranamer-example</artifactId>
   <packaging>war</packaging>

Modified: trunk/examples/pom.xml (677 => 678)

--- trunk/examples/pom.xml	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/pom.xml	2008-05-16 06:34:07 UTC (rev 678)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.waffle</groupId>
     <artifactId>waffle</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-examples</artifactId>
   <packaging>pom</packaging>

Modified: trunk/examples/simple-example/pom.xml (677 => 678)

--- trunk/examples/simple-example/pom.xml	2008-05-16 06:32:53 UTC (rev 677)
+++ trunk/examples/simple-example/pom.xml	2008-05-16 06:34:07 UTC (rev 678)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.codehaus.waffle</groupId>
     <artifactId>waffle-examples</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
   </parent>
   <artifactId>waffle-simple-example</artifactId>
   <packaging>war</packaging>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to