[jboss-identity-commits] JBoss Identity SVN: r76 - in trunk: identity-impl and 7 other directories.

Author: anil.saldhana(a)jboss.com Date: 2008-09-11 14:58:16 -0400 (Thu, 11 Sep 2008) New Revision: 76 Modified: trunk/identity-api/.classpath trunk/identity-impl/.classpath trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObject.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectRelationship.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectRelationshipType.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectType.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FileBasedIdentityStore.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentity.java trunk/identity-impl/src/test/java/org/jboss/test/identity/impl/portal/PortalIdentityManager.java trunk/identity-impl/src/test/java/org/jboss/test/identity/impl/test/portal/JPAModelTestCase.java trunk/identity-model/.classpath trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObject.java trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectAttribute.java trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectType.java Log: fix eclipse Modified: trunk/identity-api/.classpath =================================================================== --- trunk/identity-api/.classpath 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-api/.classpath 2008-09-11 18:58:16 UTC (rev 76) @@ -3,5 +3,6 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/identity-model"/> + <classpathentry combineaccessrules="false" kind="src" path="/identity-common"/> <classpathentry kind="output" path="target/eclipse-classes"/> </classpath> Modified: trunk/identity-impl/.classpath =================================================================== --- trunk/identity-impl/.classpath 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-impl/.classpath 2008-09-11 18:58:16 UTC (rev 76) @@ -4,7 +4,10 @@ <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/identity-api"/> + <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> + <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/identity-model"/> - <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> + <classpathentry combineaccessrules="false" kind="src" path="/identity-common"/> + <classpathentry combineaccessrules="false" kind="src" path="/identity-spi"/> <classpathentry kind="output" path="target/eclipse-classes"/> </classpath> Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObject.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObject.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObject.java 2008-09-11 18:58:16 UTC (rev 76) @@ -22,23 +22,21 @@ package org.jboss.identity.impl.model; -import org.jboss.identity.model.core.IdentityObject; -import org.jboss.identity.model.core.IdentityObjectAttribute; -import org.jboss.identity.exception.PolicyValidationException; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Id; import javax.persistence.GeneratedValue; -import javax.persistence.Column; +import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; -import java.util.List; -import java.util.Set; -import java.util.HashSet; -import java.util.Map; -import java.util.HashMap; +import javax.persistence.Table; +import org.jboss.identity.exception.PolicyValidationException; +import org.jboss.identity.model.core.IdentityObject; + /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectRelationship.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectRelationship.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectRelationship.java 2008-09-11 18:58:16 UTC (rev 76) @@ -22,15 +22,15 @@ package org.jboss.identity.impl.model; -import org.jboss.identity.model.core.IdentityObjectRelationship; -import org.jboss.identity.model.core.IdentityObjectRelationshipType; - import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.GeneratedValue; import javax.persistence.ManyToOne; +import javax.persistence.Table; +import org.jboss.identity.model.core.IdentityObjectRelationship; +import org.jboss.identity.model.core.IdentityObjectRelationshipType; + /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectRelationshipType.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectRelationshipType.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectRelationshipType.java 2008-09-11 18:58:16 UTC (rev 76) @@ -22,14 +22,14 @@ package org.jboss.identity.impl.model; -import org.jboss.identity.model.core.IdentityObjectRelationshipType; - +import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import javax.persistence.Table; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.Column; +import org.jboss.identity.model.core.IdentityObjectRelationshipType; + /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectType.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectType.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/model/JPAIdentityObjectType.java 2008-09-11 18:58:16 UTC (rev 76) @@ -22,14 +22,14 @@ package org.jboss.identity.impl.model; -import org.jboss.identity.model.core.IdentityObjectType; - +import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; import javax.persistence.Table; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.Column; +import org.jboss.identity.model.core.IdentityObjectType; + /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FileBasedIdentityStore.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FileBasedIdentityStore.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/store/FileBasedIdentityStore.java 2008-09-11 18:58:16 UTC (rev 76) @@ -28,16 +28,13 @@ import java.util.Map; import java.util.Set; - +import org.jboss.identity.exception.IdentityException; import org.jboss.identity.impl.types.SimpleIdentity; -import org.jboss.identity.model.core.IdentityObjectType; import org.jboss.identity.model.core.IdentityObject; import org.jboss.identity.model.core.IdentityObjectRelationshipType; -import org.jboss.identity.api.Group; -import org.jboss.identity.exception.IdentityException; -import org.jboss.identity.spi.store.IdentityStore; +import org.jboss.identity.model.core.IdentityObjectType; import org.jboss.identity.spi.store.FeaturesDescription; -import org.jboss.identity.spi.store.AttributeStore; +import org.jboss.identity.spi.store.IdentityStore; /** * File Based Identity Store @@ -48,10 +45,8 @@ { //TODO: Handle file semantics - private List<IdentityObject> identities = new ArrayList<IdentityObject>(); + private List<IdentityObject> identities = new ArrayList<IdentityObject>(); - private List<Group> groups = new ArrayList<Group>(); - public void addAttributes(IdentityObject identity, Map<String, String[]> attributes) throws IdentityException { Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentity.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentity.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentity.java 2008-09-11 18:58:16 UTC (rev 76) @@ -23,15 +23,15 @@ import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Set; -import java.util.Map; +import org.jboss.identity.api.Group; +import org.jboss.identity.api.Role; +import org.jboss.identity.exception.PolicyValidationException; +import org.jboss.identity.model.core.IdentityObject; import org.jboss.identity.model.core.IdentityObjectAttribute; -import org.jboss.identity.api.Role; import org.jboss.identity.model.core.IdentityObjectType; -import org.jboss.identity.model.core.IdentityObject; -import org.jboss.identity.api.Group; -import org.jboss.identity.exception.PolicyValidationException; /** Modified: trunk/identity-impl/src/test/java/org/jboss/test/identity/impl/portal/PortalIdentityManager.java =================================================================== --- trunk/identity-impl/src/test/java/org/jboss/test/identity/impl/portal/PortalIdentityManager.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-impl/src/test/java/org/jboss/test/identity/impl/portal/PortalIdentityManager.java 2008-09-11 18:58:16 UTC (rev 76) @@ -21,7 +21,6 @@ */ package org.jboss.test.identity.impl.portal; -import java.io.InputStream; //import org.jboss.identity.api.exception.IdentityException; //import org.jboss.identity.api.managers.IdentityManager; Modified: trunk/identity-impl/src/test/java/org/jboss/test/identity/impl/test/portal/JPAModelTestCase.java =================================================================== --- trunk/identity-impl/src/test/java/org/jboss/test/identity/impl/test/portal/JPAModelTestCase.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-impl/src/test/java/org/jboss/test/identity/impl/test/portal/JPAModelTestCase.java 2008-09-11 18:58:16 UTC (rev 76) @@ -22,20 +22,21 @@ package org.jboss.test.identity.impl.test.portal; -import junit.framework.TestCase; +import java.sql.Connection; +import java.sql.DriverManager; +import java.util.logging.Logger; +import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityManager; import javax.persistence.Persistence; import javax.persistence.Query; -import java.util.logging.Logger; -import java.sql.Connection; -import java.sql.DriverManager; +import junit.framework.TestCase; + import org.jboss.identity.impl.model.JPAIdentityObject; +import org.jboss.identity.impl.model.JPAIdentityObjectRelationship; +import org.jboss.identity.impl.model.JPAIdentityObjectRelationshipType; import org.jboss.identity.impl.model.JPAIdentityObjectType; -import org.jboss.identity.impl.model.JPAIdentityObjectRelationshipType; -import org.jboss.identity.impl.model.JPAIdentityObjectRelationship; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> Modified: trunk/identity-model/.classpath =================================================================== --- trunk/identity-model/.classpath 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-model/.classpath 2008-09-11 18:58:16 UTC (rev 76) @@ -5,5 +5,6 @@ <classpathentry kind="src" path="src/main/test/resources"/> <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry combineaccessrules="false" kind="src" path="/identity-common"/> <classpathentry kind="output" path="target/eclipse-classes"/> </classpath> Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObject.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObject.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObject.java 2008-09-11 18:58:16 UTC (rev 76) @@ -22,12 +22,11 @@ package org.jboss.identity.model.core; -import org.jboss.identity.exception.PolicyValidationException; - -import java.util.List; -import java.util.Set; import java.util.Map; +import java.util.Set; +import org.jboss.identity.exception.PolicyValidationException; + /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @author Anil.Saldhana(a)redhat.com Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectAttribute.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectAttribute.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectAttribute.java 2008-09-11 18:58:16 UTC (rev 76) @@ -21,8 +21,6 @@ */ package org.jboss.identity.model.core; -import java.util.Set; - /** * An attribute of an identity * @author Anil.Saldhana(a)redhat.com @@ -31,5 +29,4 @@ */ public interface IdentityObjectAttribute { - } \ No newline at end of file Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectType.java 2008-09-11 18:57:53 UTC (rev 75) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/core/IdentityObjectType.java 2008-09-11 18:58:16 UTC (rev 76) @@ -21,9 +21,6 @@ */ package org.jboss.identity.model.core; -import java.util.List; - - /** * @author Anil.Saldhana(a)redhat.com * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>