[jboss-svn-commits] JBL Code SVN: r18624 - in labs/jbosslabs/labs-3.0-build: services/credential and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 28 17:03:59 EST 2008
Author: szimano
Date: 2008-02-28 17:03:58 -0500 (Thu, 28 Feb 2008)
New Revision: 18624
Modified:
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/AuthID.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/Binding.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/CustomID.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ProjectID.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/Service.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ServiceRole.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/SuperUsers.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/User.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/UserRole.java
labs/jbosslabs/labs-3.0-build/services/credential/
Log:
jblab-901 serializable and comparable entities in auth
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/AuthID.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/AuthID.java 2008-02-28 19:37:41 UTC (rev 18623)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/AuthID.java 2008-02-28 22:03:58 UTC (rev 18624)
@@ -22,6 +22,8 @@
*/
package org.jboss.labs.core.model.auth;
+import java.io.Serializable;
+
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
import javax.persistence.Entity;
@@ -36,7 +38,7 @@
@Entity
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@DiscriminatorColumn(name = "AUTH_TYPE", discriminatorType = DiscriminatorType.STRING, length = 1)
-public abstract class AuthID {
+public abstract class AuthID implements Serializable, Comparable<AuthID>{
@Id
protected String authId;
@@ -49,4 +51,9 @@
public void setAuthId(String authId) {
this.authId = authId;
}
+
+ public int compareTo(AuthID o) {
+ return this.authId.compareTo(o.getAuthId());
+ }
+
}
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/Binding.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/Binding.java 2008-02-28 19:37:41 UTC (rev 18623)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/Binding.java 2008-02-28 22:03:58 UTC (rev 18624)
@@ -22,6 +22,8 @@
*/
package org.jboss.labs.core.model.auth;
+import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@@ -32,8 +34,13 @@
*
*/
@Entity
-public class Binding {
+public class Binding implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
@Id @GeneratedValue
private long binderId;
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/CustomID.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/CustomID.java 2008-02-28 19:37:41 UTC (rev 18623)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/CustomID.java 2008-02-28 22:03:58 UTC (rev 18624)
@@ -22,6 +22,8 @@
*/
package org.jboss.labs.core.model.auth;
+import java.io.Serializable;
+
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
@@ -35,8 +37,13 @@
@Entity
@DiscriminatorValue(value="C")
-public class CustomID extends AuthID implements Comparable<CustomID> {
+public class CustomID extends AuthID implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
private String description;
private Class<? extends Enum<?>> enumClass;
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ProjectID.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ProjectID.java 2008-02-28 19:37:41 UTC (rev 18623)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ProjectID.java 2008-02-28 22:03:58 UTC (rev 18624)
@@ -22,6 +22,8 @@
*/
package org.jboss.labs.core.model.auth;
+import java.io.Serializable;
+
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
@@ -31,8 +33,13 @@
*/
@Entity
@DiscriminatorValue(value="P")
-public class ProjectID extends AuthID {
+public class ProjectID extends AuthID implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
public ProjectID() { }
public ProjectID(String projectID) {
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/Service.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/Service.java 2008-02-28 19:37:41 UTC (rev 18623)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/Service.java 2008-02-28 22:03:58 UTC (rev 18624)
@@ -23,6 +23,7 @@
package org.jboss.labs.core.model.auth;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -41,8 +42,13 @@
*
*/
@Entity
-public class Service {
+public class Service implements Serializable, Comparable<Service> {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
@Id
private String id;
@@ -132,4 +138,11 @@
public void setGlobalRoles(Set<UserRole> globalRoles) {
this.globalRoles = globalRoles;
}
+
+ /* (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ public int compareTo(Service o) {
+ return id.compareTo(o.getId());
+ }
}
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ServiceRole.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ServiceRole.java 2008-02-28 19:37:41 UTC (rev 18623)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ServiceRole.java 2008-02-28 22:03:58 UTC (rev 18624)
@@ -22,6 +22,8 @@
*/
package org.jboss.labs.core.model.auth;
+import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
@@ -31,8 +33,13 @@
*
*/
@Entity
-public class ServiceRole implements Comparable<ServiceRole> {
+public class ServiceRole implements Comparable<ServiceRole>, Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
@Id
private String id;
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/SuperUsers.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/SuperUsers.java 2008-02-28 19:37:41 UTC (rev 18623)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/SuperUsers.java 2008-02-28 22:03:58 UTC (rev 18624)
@@ -25,6 +25,7 @@
*/
package org.jboss.labs.core.model.auth;
+import java.io.Serializable;
import java.util.Set;
import java.util.TreeSet;
@@ -39,8 +40,13 @@
*/
@Entity
-public class SuperUsers {
+public class SuperUsers implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
@Id
private String id;
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/User.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/User.java 2008-02-28 19:37:41 UTC (rev 18623)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/User.java 2008-02-28 22:03:58 UTC (rev 18624)
@@ -28,13 +28,20 @@
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Version;
+
+import java.io.Serializable;
import java.security.Principal;
import java.util.Set;
import java.util.TreeSet;
@Entity
-public class User implements Principal {
+public class User implements Principal, Serializable, Comparable<User> {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
@Version
private Integer version;
@@ -183,4 +190,11 @@
this.lastName = lastName;
}
+ /* (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ public int compareTo(User o) {
+ return name.compareTo(o.getName());
+ }
+
}
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/UserRole.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/UserRole.java 2008-02-28 19:37:41 UTC (rev 18623)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/UserRole.java 2008-02-28 22:03:58 UTC (rev 18624)
@@ -22,11 +22,18 @@
*/
package org.jboss.labs.core.model.auth;
+import java.io.Serializable;
+
import javax.persistence.Entity;
import javax.persistence.Id;
@Entity
-public class UserRole implements Comparable<UserRole>{
+public class UserRole implements Comparable<UserRole>, Serializable{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
@Id
private String id;
Property changes on: labs/jbosslabs/labs-3.0-build/services/credential
___________________________________________________________________
Name: svn:ignore
- target
.classpath
.project
.settings
agitar
+ target
.classpath
.project
.settings
agitar
.agitator
More information about the jboss-svn-commits
mailing list