Author: husted
Date: Tue Dec 4 10:42:34 2007
New Revision: 601031
URL: http://svn.apache.org/viewvc?rev=601031&view=rev
Log:
WW-1399 Add Table annotations.
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserImpl.java
Modified: struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java?rev=601031&r1=601030&r2=601031&view=diff
==============================================================================
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/action/Index.java Tue Dec
4 10:42:34 2007
@@ -45,12 +45,12 @@
* interact only with the entity helpers, and not the underlying JPA.
* </p>
* <p>
- * Any helper method that is not physically bound the the UI API should be
- * moved to the service layer! In most cases, the remaining Action methods
- * will either call ActionErrors, return a result value meaningful only to
- * the UI, or retain state used by other Action helper methods. (A generic
- * ServiceError class with an ActionError adapter might allow us to move
- * 3/4 of the Action helper methods to the service layer.)
+ * Any helper method that is not physically bound the the UI API should be
moved
+ * to the service layer! In most cases, the remaining Action methods will
either
+ * call ActionErrors, return a result value meaningful only to the UI, or
retain
+ * state used by other Action helper methods. (A generic ServiceError class
with
+ * an ActionError adapter might allow us to move 3/4 of the Action helper
+ * methods to the service layer.)
* </p>
*/
@Conversion(conversions = {
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java?rev=601031&r1=601030&r2=601031&view=diff
==============================================================================
---
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java
(original)
+++
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/protocol/ProtocolImpl.java
Tue Dec 4 10:42:34 2007
@@ -24,6 +24,7 @@
import javax.persistence.Entity;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
+import javax.persistence.Table;
import entity.UuidEntity;
@@ -34,7 +35,8 @@
* development). The annotation mode is by field.
* </p>
*/
[EMAIL PROTECTED](name = "APP_PROTOCOL")
[EMAIL PROTECTED](name = "PROTOCOL")
[EMAIL PROTECTED](name = "APP_PROTOCOL")
@NamedQueries( {
@NamedQuery(name = ProtocolImpl.COUNT, query =
ProtocolImpl.COUNT_QUERY),
@NamedQuery(name = ProtocolImpl.FIND_ALL, query =
ProtocolImpl.FIND_ALL_QUERY) })
@@ -49,7 +51,7 @@
*/
public static final String COUNT = "Protocol.COUNT";
- private static final String COUNT_QUERY = "SELECT COUNT(*) FROM
APP_PROTOCOL";
+ private static final String COUNT_QUERY = "SELECT COUNT(*) FROM PROTOCOL";
/**
* <p>
@@ -58,7 +60,7 @@
*/
public static final String FIND_ALL = "Protocol.FIND_ALL";
- private static final String FIND_ALL_QUERY = "SELECT p FROM APP_PROTOCOL
p";
+ private static final String FIND_ALL_QUERY = "SELECT p FROM PROTOCOL p";
// ---- FIELDS ----
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java?rev=601031&r1=601030&r2=601031&view=diff
==============================================================================
---
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java
(original)
+++
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/subscription/SubscriptionImpl.java
Tue Dec 4 10:42:34 2007
@@ -27,6 +27,7 @@
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToOne;
+import javax.persistence.Table;
import entity.UuidEntity;
import entity.protocol.Protocol;
@@ -45,17 +46,18 @@
@NamedQuery(name = Subscription.COUNT, query =
SubscriptionImpl.COUNT_QUERY),
@NamedQuery(name = Subscription.FIND_ALL, query =
SubscriptionImpl.FIND_ALL_QUERY),
@NamedQuery(name = Subscription.FIND_BY_NAME, query =
SubscriptionImpl.FIND_BY_NAME_QUERY) })
[EMAIL PROTECTED](name = "APP_SUBSCRIPTION")
[EMAIL PROTECTED](name = "SUBSCRIPTION")
[EMAIL PROTECTED](name = "APP_SUBSCRIPTION")
public class SubscriptionImpl extends UuidEntity implements Serializable,
Subscription {
// ---- STATICS ----
- private static final String COUNT_QUERY = "SELECT COUNT(*) FROM
APP_SUBSCRIPTION";
+ private static final String COUNT_QUERY = "SELECT COUNT(*) FROM
SUBSCRIPTION";
- private static final String FIND_ALL_QUERY = "SELECT s FROM
APP_SUBSCRIPTION s";
+ private static final String FIND_ALL_QUERY = "SELECT s FROM SUBSCRIPTION
s";
- private static final String FIND_BY_NAME_QUERY = "SELECT s FROM
APP_SUBSCRIPTION s WHERE s.host = :host";
+ private static final String FIND_BY_NAME_QUERY = "SELECT s FROM
SUBSCRIPTION s WHERE s.host = :host";
// ---- FIELDS ----
@@ -71,8 +73,8 @@
@OneToOne(targetEntity = ProtocolImpl.class)
private Protocol protocol;
- @JoinColumn(nullable = false)
@ManyToOne(targetEntity = UserImpl.class)
+ @JoinColumn(nullable = false)
private User user;
@Column(nullable = false)
Modified:
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserImpl.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserImpl.java?rev=601031&r1=601030&r2=601031&view=diff
==============================================================================
--- struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserImpl.java
(original)
+++ struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserImpl.java
Tue Dec 4 10:42:34 2007
@@ -28,6 +28,7 @@
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
+import javax.persistence.Table;
import javax.persistence.Transient;
import entity.UuidEntity;
@@ -41,7 +42,8 @@
* The annotation mode is by field.
* </p>
*/
[EMAIL PROTECTED](name = "APP_USER")
[EMAIL PROTECTED](name = "USER")
[EMAIL PROTECTED](name = "APP_USER")
@NamedQueries( {
@NamedQuery(name = User.FIND_ALL, query = UserImpl.FIND_ALL_QUERY),
@NamedQuery(name = User.FIND_BY_NAME, query =
UserImpl.FIND_BY_NAME_QUERY),
@@ -50,11 +52,11 @@
// ---- STATICS ----
- private static final String COUNT_QUERY = "SELECT COUNT(*) FROM APP_USER";
+ private static final String COUNT_QUERY = "SELECT COUNT(*) FROM USER";
- private static final String FIND_ALL_QUERY = "SELECT u FROM APP_USER u";
+ private static final String FIND_ALL_QUERY = "SELECT u FROM USER u";
- private static final String FIND_BY_NAME_QUERY = "SELECT u FROM APP_USER u
WHERE u.username = :username";
+ private static final String FIND_BY_NAME_QUERY = "SELECT u FROM USER u
WHERE u.username = :username";
// --- FIELDS ----
