svn commit: r426903 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java

2006-07-30 Thread tmjee 
Author: tmjee
Date: Sun Jul 30 10:20:04 2006
New Revision: 426903

URL: http://svn.apache.org/viewvc?rev=426903&view=rev
Log:
WW-1398
  - added snippet to javadoc 


Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java?rev=426903&r1=426902&r2=426903&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/TimePicker.java
 Sun Jul 30 10:20:04 2006
@@ -23,6 +23,53 @@
 import com.opensymphony.xwork2.util.OgnlValueStack;
 
 /**
+ * 
+ * Renders timepicker element.
+ * Format supported by this component are:-
+ * 
+ *   
+ * Format
+ * Description
+ *   
+ *   
+ * #HH
+ * Display hour in two digit format
+ *   
+ *   
+ * #H
+ * Try to display hour in one digit format, if cannot use 2 digits
+ *   
+ *   
+ * #hh
+ * Display hour in two digit format
+ *   
+ *   
+ * #h
+ *  Try to display hour in one digit format, if cannot use 2 
digits
+ *   
+ *   
+ *  #mm
+ *  Display minutes in 2 digits format
+ *   
+ *   
+ * #m
+ *  Try to display minutes in 2 digits fomrat, if cannot use 2 
digits
+ *   
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
  * @version $Date$ $Id$
  */
 public class TimePicker extends TextField {

svn commit: r426917 - in /struts/struts2/trunk/apps/mailreader: ./ src/main/java/mailreader2/ src/main/resources/ src/main/resources/sql/ src/test/java/ src/test/java/mailreader2/ src/test/resources/

2006-07-30 Thread husted 
Author: husted
Date: Sun Jul 30 12:02:23 2006
New Revision: 426917

URL: http://svn.apache.org/viewvc?rev=426917&view=rev
Log:
WW-1399 Add initial support for HSQLDB and iBATIS

Added:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java
struts/struts2/trunk/apps/mailreader/src/main/resources/sql/
struts/struts2/trunk/apps/mailreader/src/main/resources/sql-map-config.xml

struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-schema.sql

struts/struts2/trunk/apps/mailreader/src/main/resources/sql/sql-map-config-derby.properties

struts/struts2/trunk/apps/mailreader/src/main/resources/sql/sql-map-config-hsql.properties
struts/struts2/trunk/apps/mailreader/src/main/resources/sql/sql-map.xml
struts/struts2/trunk/apps/mailreader/src/test/java/
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/

struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java

struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/MailreaderTest.java
struts/struts2/trunk/apps/mailreader/src/test/resources/
struts/struts2/trunk/apps/mailreader/src/test/resources/sql/

struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-sample.sql
Modified:
struts/struts2/trunk/apps/mailreader/pom.xml

Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?rev=426917&r1=426916&r2=426917&view=diff
==
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Sun Jul 30 12:02:23 2006
@@ -19,12 +19,23 @@
2.4
provided
 
+
+
+   hsqldb
+   hsqldb
+   1.8.0.4
+
+
+   com.ibatis
+   ibatis2-sqlmap
+   2.1.7.597
+
+
 
${pom.groupId}
struts-mailreader-dao
-   1.3.5-SNAPSHOT
+   1.3.5
 
- 
 
 
 

Added: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java?rev=426917&view=auto
==
--- struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java 
(added)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java 
Sun Jul 30 12:02:23 2006
@@ -0,0 +1,202 @@
+package mailreader2;
+
+/**
+ * 
+ * Provide properties to transfer data values between
+ * the view and model layers (data transfer object).
+ * 
+ *
+ * @author Ted Husted
+ * @version $Revision: 1.0 $ $Date: Jul 30, 2006 9:29:50 AM $
+ */
+public class AppData {
+
+private boolean nominal;
+
+private String locale_key;
+private String locale_code;
+private String locale_name;
+
+private String account_key;
+private String username;
+private String password;
+private String password2;
+private String fullname;
+private String email_from;
+private String email_replyto;
+
+private String protocol_key;
+private String protocol_code;
+private String protocol_name;
+
+private String host_key;
+private String host_name;
+private String host_user;
+private String host_pass;
+private Integer host_auto;
+
+public boolean isNominal() {
+return nominal;
+}
+
+public void setNominal(boolean nominal) {
+this.nominal = nominal;
+}
+
+public String getLocale_key() {
+return locale_key;
+}
+
+public void setLocale_key(String locale_key) {
+this.locale_key = locale_key;
+}
+
+public String getLocale_code() {
+return locale_code;
+}
+
+public void setLocale_code(String locale_code) {
+this.locale_code = locale_code;
+}
+
+public String getLocale_name() {
+return locale_name;
+}
+
+public void setLocale_name(String locale_name) {
+this.locale_name = locale_name;
+}
+
+public String getAccount_key() {
+return account_key;
+}
+
+public void setAccount_key(String account_key) {
+this.account_key = account_key;
+}
+
+public String getUsername() {
+return username;
+}
+
+public void setUsername(String username) {
+this.username = username;
+}
+
+public String getPassword() {
+return password;
+}
+
+public void setPassword(String password) {
+this.password = password;
+}
+
+public String getPassword2() {
+return password2;
+}
+
+public void setPassword2(String password2) {
+this.password2 = password2;
+}
+
+public String getFullname() {
+return fullname;
+}
+
+public void setFullname(String fullname) {
+

svn commit: r426921 - in /struts/struts2/trunk/apps/mailreader/src: main/resources/sql/mailreader-sample.sql test/resources/sql/mailreader-sample.sql

2006-07-30 Thread husted 
Author: husted
Date: Sun Jul 30 12:46:29 2006
New Revision: 426921

URL: http://svn.apache.org/viewvc?rev=426921&view=rev
Log:
WW-1399 Move SQL script file to apease Maven.

Added:

struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-sample.sql
  - copied, changed from r426917, 
struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-sample.sql
Removed:

struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-sample.sql

Copied: 
struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-sample.sql
 (from r426917, 
struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-sample.sql)
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-sample.sql?p2=struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-sample.sql&p1=struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-sample.sql&r1=426917&r2=426921&rev=426921&view=diff
==
(empty)

svn commit: r426954 - in /struts/struts2/trunk/apps/mailreader/src: main/java/mailreader2/ main/resources/sql/ test/java/mailreader2/ test/resources/sql/

2006-07-30 Thread husted 
Author: husted
Date: Sun Jul 30 15:01:59 2006
New Revision: 426954

URL: http://svn.apache.org/viewvc?rev=426954&view=rev
Log:
WW-1399 Extend unit tests for iBATIS statements; move the "sample" script back 
(seems to work now).

Added:

struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-sample.sql
  - copied, changed from r426921, 
struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-sample.sql
Removed:

struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-sample.sql
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java

struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Constants.java
struts/struts2/trunk/apps/mailreader/src/main/resources/sql/sql-map.xml

struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/MailreaderTest.java

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java?rev=426954&r1=426953&r2=426954&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java 
Sun Jul 30 15:01:59 2006
@@ -17,7 +17,7 @@
 private String locale_code;
 private String locale_name;
 
-private String account_key;
+private String registration_key;
 private String username;
 private String password;
 private String password2;
@@ -29,16 +29,44 @@
 private String protocol_code;
 private String protocol_name;
 
-private String host_key;
-private String host_name;
+private String subscription_key;
+private String subscription_host;
 private String host_user;
 private String host_pass;
 private Integer host_auto;
 
+/**
+ * Adapt internal Integer value to external boolean value. 
+ * @return False if host_auto==0, True otherwise
+ */
+public boolean isHost_auto_checkbox() {
+Integer _host_auto = getHost_auto();
+if (_host_auto == null) _host_auto = 0;
+return (_host_auto == 0);
+}
+
+/**
+ * Adapt internal Integer value to external boolean value. 
+ */
+public void setHost_auto_checkbox(boolean host_auto_checkbox) {
+if (host_auto_checkbox)
+setHost_auto(1);
+else setHost_auto(0);
+}
+
+/**
+ * Return true if a logic or state test passed,
+ * such as whether a record already exists.
+ * @return True if a business logic test passed.
+ */
 public boolean isNominal() {
 return nominal;
 }
 
+/**
+ * Record outcome of a logic or state test,
+ * such as whether a record already exists.
+ */
 public void setNominal(boolean nominal) {
 this.nominal = nominal;
 }
@@ -67,12 +95,12 @@
 this.locale_name = locale_name;
 }
 
-public String getAccount_key() {
-return account_key;
+public String getRegistration_key() {
+return registration_key;
 }
 
-public void setAccount_key(String account_key) {
-this.account_key = account_key;
+public void setRegistration_key(String registration_key) {
+this.registration_key = registration_key;
 }
 
 public String getUsername() {
@@ -139,20 +167,20 @@
 this.protocol_code = protocol_code;
 }
 
-public String getHost_key() {
-return host_key;
+public String getSubscription_key() {
+return subscription_key;
 }
 
-public void setHost_key(String host_key) {
-this.host_key = host_key;
+public void setSubscription_key(String subscription_key) {
+this.subscription_key = subscription_key;
 }
 
-public String getHost_name() {
-return host_name;
+public String getSubscription_host() {
+return subscription_host;
 }
 
-public void setHost_name(String host_name) {
-this.host_name = host_name;
+public void setSubscription_host(String subscription_host) {
+this.subscription_host = subscription_host;
 }
 
 public String getHost_user() {
@@ -185,18 +213,6 @@
 
 public void setHost_auto(Integer host_auto) {
 this.host_auto = host_auto;
-}
-
-public boolean isHost_auto_checkbox() {
-Integer _host_auto = getHost_auto();
-if (_host_auto == null) _host_auto = 0;
-return (_host_auto == 0);
-}
-
-public void setHost_auto_checkbox(boolean host_auto_checkbox) {
-if (host_auto_checkbox)
-setHost_auto(1);
-else setHost_auto(0);
 }
 
 }

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Constants.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Constants.java?rev=426954&r1=42695

svn commit: r426991 - in /struts/struts2/trunk/apps/mailreader/src: main/java/mailreader2/ main/resources/sql/ test/java/mailreader2/ test/resources/sql/

2006-07-30 Thread husted 
Author: husted
Date: Sun Jul 30 17:56:03 2006
New Revision: 426991

URL: http://svn.apache.org/viewvc?rev=426991&view=rev
Log:
WW-1399 Complete first set of tests for iBATIS statements.

Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java

struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Constants.java

struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-schema.sql
struts/struts2/trunk/apps/mailreader/src/main/resources/sql/sql-map.xml

struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/MailreaderTest.java

struts/struts2/trunk/apps/mailreader/src/test/resources/sql/mailreader-sample.sql

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java?rev=426991&r1=426990&r2=426991&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/AppData.java 
Sun Jul 30 17:56:03 2006
@@ -41,8 +41,8 @@
  */
 public boolean isHost_auto_checkbox() {
 Integer _host_auto = getHost_auto();
-if (_host_auto == null) _host_auto = 0;
-return (_host_auto == 0);
+if (_host_auto == null) _host_auto = Constants.DB_FALSE;
+return (_host_auto == Constants.DB_TRUE);
 }
 
 /**
@@ -50,8 +50,8 @@
  */
 public void setHost_auto_checkbox(boolean host_auto_checkbox) {
 if (host_auto_checkbox)
-setHost_auto(1);
-else setHost_auto(0);
+setHost_auto(Constants.DB_TRUE);
+else setHost_auto(Constants.DB_FALSE);
 }
 
 /**

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Constants.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Constants.java?rev=426991&r1=426990&r2=426991&view=diff
==
--- 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Constants.java 
(original)
+++ 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/Constants.java 
Sun Jul 30 17:56:03 2006
@@ -25,6 +25,9 @@
 
 // -- Statements --
 
+public static final Integer DB_FALSE = 0;
+public static final Integer DB_TRUE = 1;
+
 public static final String LOCALE_LIST = "LOCALE_LIST";
 public static final String REGISTRATION_INSERT_ASSERT = 
"REGISTRATION_INSERT_ASSERT";
 public static final String REGISTRATION_INSERT = "REGISTRATION_INSERT";

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-schema.sql
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-schema.sql?rev=426991&r1=426990&r2=426991&view=diff
==
--- 
struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-schema.sql
 (original)
+++ 
struts/struts2/trunk/apps/mailreader/src/main/resources/sql/mailreader-schema.sql
 Sun Jul 30 17:56:03 2006
@@ -29,7 +29,7 @@
   fk_registration  char(36),
   fk_protocol char(36),
   subscription_host  char(36),
-  subscription_user char(18),
-  subscription_pass char(18),
-  subscription_auto int
+  host_user char(18),
+  host_pass char(18),
+  host_auto int
 );

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/resources/sql/sql-map.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/sql/sql-map.xml?rev=426991&r1=426990&r2=426991&view=diff
==
--- struts/struts2/trunk/apps/mailreader/src/main/resources/sql/sql-map.xml 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/resources/sql/sql-map.xml Sun 
Jul 30 17:56:03 2006
@@ -39,7 +39,7 @@
 SELECT pk_registration AS registration_key, fk_locale AS locale_key,
 username, password, fullname, email_from, email_replyto
 FROM registration
-WHERE username=#username#;
+WHERE pk_registration=#registration_key#;
 
 
 
@@ -49,7 +49,7 @@
 WHERE pk_registration=#registration_key#;
 
 
-
+
 SELECT COUNT(*)
 FROM subscription
 WHERE fk_registration=#registration_key#
@@ -59,21 +59,23 @@
 
 INSERT INTO subscription
 (pk_subscription, fk_registration, fk_protocol, subscription_host, 
host_user, host_pass, host_auto)
-VALUES (#subscription_key#, #registration_key#, #protocol_key#, 
#username#,
-#subscription_host#, #host_user#, #host_pass#, #host_auto#);
+VALUES (#subscription_key#, #registration_key#, #protocol_key#, 
#subscription_host#,
+#host_user#, #hos

svn commit: r426992 - in /struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2: MailreaderTest.java SqlMapTest.java

2006-07-30 Thread husted 
Author: husted
Date: Sun Jul 30 17:58:27 2006
New Revision: 426992

URL: http://svn.apache.org/viewvc?rev=426992&view=rev
Log:
WW-1399 Rename iBATIS statement test suite.

Added:

struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java
  - copied, changed from r426991, 
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/MailreaderTest.java
Removed:

struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/MailreaderTest.java

Copied: 
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java 
(from r426991, 
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/MailreaderTest.java)
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java?p2=struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java&p1=struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/MailreaderTest.java&r1=426991&r2=426992&rev=426992&view=diff
==
--- 
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/MailreaderTest.java
 (original)
+++ 
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java 
Sun Jul 30 17:58:27 2006
@@ -6,7 +6,7 @@
  * @author Ted Husted
  * @version $Revision: 1.0 $ $Date: Jul 29, 2006 5:34:31 PM $
  */
-public class MailreaderTest extends BaseSqlMapTest {
+public class SqlMapTest extends BaseSqlMapTest {
 
 // DEFAULTS FROM SAMPLE SCRIPT