[corejsf~subversion:160] ...
- From: cayhorstmann@kenai.com
- To: commits@corejsf.kenai.com
- Subject: [corejsf~subversion:160] ...
- Date: Sat, 16 Jan 2010 15:21:56 +0000
Project: corejsf
Repository: subversion
Revision: 160
Author: cayhorstmann
Date: 2010-01-16 15:21:51 UTC
Link:
Log Message:
------------
...
Revisions:
----------
160
Modified Paths:
---------------
ch12/mail/src/java/com/corejsf/NewAccount.java
ch12/slsb/src/java/com/corejsf/CredentialsManager.java
ch12/sfsb/src/java/com/corejsf/UserBean.java
ch12/jpa/src/java/com/corejsf/Credentials.java
ch12/webservice/lib/weather-ws.jar
ch12/jpa/src/java/com/corejsf/UserBean.java
ch12/webservice/web/resources/images
ch12/slsb/src/java/com/corejsf/UserBean.java
ch12/slsb/src/java/com/corejsf/Credentials.java
ch12/webservice/src/java/com/corejsf/WeatherBean.java
ch12/sfsb/src/java/META-INF/persistence.xml
ch12/db/src/java/com/corejsf/UserBean.java
ch12/sfsb/src/java/com/corejsf/Credentials.java
Added Paths:
------------
ch12/db/web/META-INF
ch12/mail/web/META-INF/context.xml
Diffs:
------
Index: ch12/mail/src/java/com/corejsf/NewAccount.java
===================================================================
--- ch12/mail/src/java/com/corejsf/NewAccount.java (revision 159)
+++ ch12/mail/src/java/com/corejsf/NewAccount.java (revision 160)
@@ -1,5 +1,6 @@
package com.corejsf;
+import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ResourceBundle;
import java.util.logging.Level;
@@ -20,15 +21,13 @@
@Named // or @ManagedBean
@SessionScoped
-public class NewAccount {
+public class NewAccount implements Serializable {
private String name;
private String emailAddress;
private String password;
- private Logger logger = Logger.getLogger("com.corejsf");
-
@Resource(name="mail/gmailAccount")
- private Session mailSession;
+ private Session mailSession;
public String getName() { return name; }
public void setName(String newValue) { name = newValue; }
@@ -43,7 +42,7 @@
return "done";
}
catch (Exception ex) {
- logger.log(Level.SEVERE, "login failed", ex);
+ Logger.getLogger("com.corejsf").log(Level.SEVERE, "login failed",
ex);
return "error";
}
}
@@ -79,4 +78,4 @@
tr.sendMessage(message, message.getAllRecipients());
tr.close();
}
-}
\ No newline at end of file
+}
Index: ch12/mail/web/META-INF/context.xml
===================================================================
--- ch12/mail/web/META-INF/context.xml (revision 0)
+++ ch12/mail/web/META-INF/context.xml (revision 160)
@@ -0,0 +1,11 @@
+<!-- This file is only required for Tomcat -->
+<Context>
+ <Resource
+ name="jdbc/mydb"
+ auth="Container"
+ type="javax.sql.DataSource"
+ username="APP"
+ password="APP"
+ driverClassName="org.apache.derby.jdbc.ClientDriver"
+ url="jdbc:derby://localhost:1527/COREJSF;create=true"/>
+</Context>
\ No newline at end of file
Index: ch12/slsb/src/java/com/corejsf/UserBean.java
===================================================================
--- ch12/slsb/src/java/com/corejsf/UserBean.java (revision 159)
+++ ch12/slsb/src/java/com/corejsf/UserBean.java (revision 160)
@@ -1,5 +1,6 @@
package com.corejsf;
+import java.io.Serializable;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -11,7 +12,7 @@
@Named("user") // or @ManagedBean(name="user")
@SessionScoped
-public class UserBean {
+public class UserBean implements Serializable {
private String name;
private String password;
private boolean loggedIn;
@@ -46,4 +47,4 @@
loggedIn = false;
return "login";
}
-}
\ No newline at end of file
+}
Index: ch12/slsb/src/java/com/corejsf/CredentialsManager.java
===================================================================
--- ch12/slsb/src/java/com/corejsf/CredentialsManager.java (revision 159)
+++ ch12/slsb/src/java/com/corejsf/CredentialsManager.java (revision 160)
@@ -19,7 +19,7 @@
List<Credentials> result = query.getResultList();
if (result.size() != 1) return 0;
Credentials c = result.get(0);
- String storedPassword = c.getPassword();
+ String storedPassword = c.getPasswd();
if (password.equals(storedPassword.trim()))
return c.incrementLoginCount();
else
Index: ch12/slsb/src/java/com/corejsf/Credentials.java
===================================================================
--- ch12/slsb/src/java/com/corejsf/Credentials.java (revision 159)
+++ ch12/slsb/src/java/com/corejsf/Credentials.java (revision 160)
@@ -1,22 +1,23 @@
package com.corejsf;
+import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.Id;
@Entity
-public class Credentials {
+public class Credentials implements Serializable {
@Id
private String username;
- private String password;
+ private String passwd;
private int loginCount;
public Credentials() {} // Required by JPA
public Credentials(String username, String password) {
this.username = username;
- this.password = password;
+ this.passwd = password;
}
- public String getPassword() { return password; }
+ public String getPasswd() { return passwd; }
public String getUsername() { return username; }
public int incrementLoginCount() { loginCount++; return loginCount; }
}
\ No newline at end of file
Index: ch12/db/src/java/com/corejsf/UserBean.java
===================================================================
--- ch12/db/src/java/com/corejsf/UserBean.java (revision 159)
+++ ch12/db/src/java/com/corejsf/UserBean.java (revision 160)
@@ -1,5 +1,6 @@
package com.corejsf;
+import java.io.Serializable;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -16,7 +17,7 @@
@Named("user") // or @ManagedBean(name="user")
@SessionScoped
-public class UserBean {
+public class UserBean implements Serializable {
private String name;
private String password;
private int count;
@@ -77,13 +78,13 @@
try
{
PreparedStatement passwordQuery = conn.prepareStatement(
- "SELECT password, logincount from Credentials WHERE username
= ?");
+ "SELECT passwd, logincount from Credentials WHERE username =
?");
passwordQuery.setString(1, name);
ResultSet result = passwordQuery.executeQuery();
if (!result.next()) return;
- String storedPassword = result.getString("password");
+ String storedPassword = result.getString("passwd");
loggedIn = password.equals(storedPassword.trim());
count = result.getInt("logincount");
Index: ch12/db/web/META-INF
===================================================================
--- ch12/db/web/META-INF (revision 0)
+++ ch12/db/web/META-INF (revision 160)
@@ -0,0 +1,11 @@
+<!-- This file is only required for Tomcat -->
+<Context>
+ <Resource
+ name="jdbc/mydb"
+ auth="Container"
+ type="javax.sql.DataSource"
+ username="APP"
+ password="APP"
+ driverClassName="org.apache.derby.jdbc.ClientDriver"
+ url="jdbc:derby://localhost:1527/COREJSF;create=true"/>
+</Context>
\ No newline at end of file
Index: ch12/jpa/src/java/META-INF/context.xml
===================================================================
--- ch12/jpa/src/java/META-INF/context.xml (revision 159)
+++ ch12/jpa/src/java/META-INF/context.xml (revision 160)
@@ -1,11 +0,0 @@
-<!-- This file is only required for Tomcat -->
-<Context>
- <Resource
- name="jdbc/mydb"
- auth="Container"
- type="javax.sql.DataSource"
- username="APP"
- password="APP"
- driverClassName="org.apache.derby.jdbc.ClientDriver"
- url="jdbc:derby://localhost:1527/COREJSF;create=true"/>
-</Context>
\ No newline at end of file
Index: ch12/jpa/src/java/com/corejsf/UserBean.java
===================================================================
--- ch12/jpa/src/java/com/corejsf/UserBean.java (revision 159)
+++ ch12/jpa/src/java/com/corejsf/UserBean.java (revision 160)
@@ -1,5 +1,6 @@
package com.corejsf;
+import java.io.Serializable;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -22,12 +23,11 @@
@Named("user") // or @ManagedBean(name="user")
@SessionScoped
-public class UserBean {
+public class UserBean implements Serializable {
private String name;
private String password;
private int count;
private boolean loggedIn;
- private Logger logger = Logger.getLogger("com.corejsf");
@PersistenceUnit(unitName="default")
private EntityManagerFactory emf;
@@ -47,7 +47,7 @@
try {
doLogin();
} catch (Exception ex) {
- logger.log(Level.SEVERE, "login failed", ex);
+ Logger.getLogger("com.corejsf").log(Level.SEVERE, "login failed",
ex);
return "internalError";
}
if (loggedIn)
@@ -77,7 +77,7 @@
if (result.size() == 1) {
Credentials c = result.get(0);
- if (c.getPassword().trim().equals(password)) {
+ if (c.getPasswd().trim().equals(password)) {
loggedIn = true;
count = c.incrementLoginCount();
}
@@ -91,4 +91,4 @@
em.close();
}
}
-}
\ No newline at end of file
+}
Index: ch12/jpa/src/java/com/corejsf/Credentials.java
===================================================================
--- ch12/jpa/src/java/com/corejsf/Credentials.java (revision 159)
+++ ch12/jpa/src/java/com/corejsf/Credentials.java (revision 160)
@@ -1,22 +1,23 @@
package com.corejsf;
+import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.Id;
@Entity
-public class Credentials {
+public class Credentials implements Serializable {
@Id
private String username;
- private String password;
+ private String passwd;
private int loginCount;
public Credentials() {} // Required by JPA
public Credentials(String username, String password) {
this.username = username;
- this.password = password;
+ this.passwd = password;
}
- public String getPassword() { return password; }
+ public String getPasswd() { return passwd; }
public String getUsername() { return username; }
public int incrementLoginCount() { loginCount++; return loginCount; }
}
\ No newline at end of file
Index: ch12/sfsb/src/java/META-INF/context.xml
===================================================================
--- ch12/sfsb/src/java/META-INF/context.xml (revision 159)
+++ ch12/sfsb/src/java/META-INF/context.xml (revision 160)
@@ -1,11 +0,0 @@
-<!-- This file is only required for Tomcat -->
-<Context>
- <Resource
- name="jdbc/mydb"
- auth="Container"
- type="javax.sql.DataSource"
- username="APP"
- password="APP"
- driverClassName="org.apache.derby.jdbc.ClientDriver"
- url="jdbc:derby://localhost:1527/COREJSF;create=true"/>
-</Context>
\ No newline at end of file
Index: ch12/sfsb/src/java/META-INF/persistence.xml
===================================================================
--- ch12/sfsb/src/java/META-INF/persistence.xml (revision 159)
+++ ch12/sfsb/src/java/META-INF/persistence.xml (revision 160)
@@ -5,11 +5,10 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence ;
http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd";>
<persistence-unit name="default" transaction-type="JTA">
- <jta-data-source>java:/mydb</jta-data-source>
+ <jta-data-source>jdbc/mydb</jta-data-source>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
- <properties>
- <property name="hibernate.dialect"
- value="org.hibernate.dialect.DerbyDialect"/>
- </properties>
+ <properties>
+ <property name="eclipselink.ddl-generation" value="create-tables"/>
+ </properties>
</persistence-unit>
</persistence>
Index: ch12/sfsb/src/java/com/corejsf/UserBean.java
===================================================================
--- ch12/sfsb/src/java/com/corejsf/UserBean.java (revision 159)
+++ ch12/sfsb/src/java/com/corejsf/UserBean.java (revision 160)
@@ -19,7 +19,6 @@
private String password;
private boolean loggedIn;
private int count;
- private Logger logger = Logger.getLogger("com.corejsf");
@PersistenceContext(unitName="default")
private EntityManager em;
@@ -37,7 +36,7 @@
doLogin();
}
catch (Exception ex) {
- logger.log(Level.SEVERE, "login failed", ex);
+ Logger.getLogger("com.corejsf").log(Level.SEVERE, "login failed",
ex);
return "internalError";
}
if (loggedIn)
@@ -59,7 +58,7 @@
List<Credentials> result = query.getResultList();
if (result.size() == 1) {
Credentials c = result.get(0);
- String storedPassword = c.getPassword();
+ String storedPassword = c.getPasswd();
loggedIn = password.equals(storedPassword.trim());
count = c.incrementLoginCount();
}
Index: ch12/sfsb/src/java/com/corejsf/Credentials.java
===================================================================
--- ch12/sfsb/src/java/com/corejsf/Credentials.java (revision 159)
+++ ch12/sfsb/src/java/com/corejsf/Credentials.java (revision 160)
@@ -1,22 +1,23 @@
package com.corejsf;
+import java.io.Serializable;
import javax.persistence.Entity;
import javax.persistence.Id;
@Entity
-public class Credentials {
+public class Credentials implements Serializable {
@Id
private String username;
- private String password;
+ private String passwd;
private int loginCount;
public Credentials() {} // Required by JPA
public Credentials(String username, String password) {
this.username = username;
- this.password = password;
+ this.passwd = password;
}
- public String getPassword() { return password; }
+ public String getPasswd() { return passwd; }
public String getUsername() { return username; }
public int incrementLoginCount() { loginCount++; return loginCount; }
}
\ No newline at end of file
Index: ch12/webservice/lib/weather-ws.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ch12/webservice/src/java/com/corejsf/WeatherBean.java
===================================================================
--- ch12/webservice/src/java/com/corejsf/WeatherBean.java (revision 159)
+++ ch12/webservice/src/java/com/corejsf/WeatherBean.java (revision 160)
@@ -11,10 +11,13 @@
import com.corejsf.ws.Forecast;
import com.corejsf.ws.ForecastReturn;
import com.corejsf.ws.Weather;
+import java.io.Serializable;
+import java.util.logging.Level;
+import java.util.logging.Logger;
@Named // or @ManagedBean
@SessionScoped
-public class WeatherBean {
+public class WeatherBean implements Serializable {
@WebServiceRef(wsdlLocation="http://ws.cdyne.com/WeatherWS/Weather.asmx?wsdl";)
private Weather service;
@@ -32,11 +35,14 @@
try {
ForecastReturn ret =
service.getWeatherSoap().getCityForecastByZIP(zip);
response = ret.getForecastResult().getForecast();
+ for (Forecast f : response)
+ if (f.getDesciption() == null || f.getDesciption().length() ==
0)
+ f.setDesciption("Not Available");
city = ret.getCity();
return "success";
} catch(Exception e) {
- e.printStackTrace();
+ Logger.getLogger("com.corejsf").log(Level.SEVERE, "Remote call
failed", e);
return "error";
}
}
-}
\ No newline at end of file
+}
Property changes on: ch12/webservice/web/resources/images
___________________________________________________________________
Added: svn:ignore
+ .gif
|
[corejsf~subversion:160] ... |
cayhorstmann | 01/16/2010 |
