Author: bdaw
Date: 2008-09-20 16:11:57 -0400 (Sat, 20 Sep 2008)
New Revision: 101
Added:
trunk/identity-api/src/main/java/org/jboss/identity/api/
Removed:
trunk/identity-api/src/main/java/org/jboss/identity/api2/
Modified:
trunk/identity-api/src/main/java/org/jboss/identity/api/Group.java
trunk/identity-api/src/main/java/org/jboss/identity/api/GroupType.java
trunk/identity-api/src/main/java/org/jboss/identity/api/Identity.java
trunk/identity-api/src/main/java/org/jboss/identity/api/IdentitySession.java
trunk/identity-api/src/main/java/org/jboss/identity/api/IdentitySessionFactory.java
trunk/identity-api/src/main/java/org/jboss/identity/api/IdentityType.java
trunk/identity-api/src/main/java/org/jboss/identity/api/PersistenceManager.java
trunk/identity-api/src/main/java/org/jboss/identity/api/ProfileManager.java
trunk/identity-api/src/main/java/org/jboss/identity/api/Realm.java
trunk/identity-api/src/main/java/org/jboss/identity/api/RealmManager.java
trunk/identity-api/src/main/java/org/jboss/identity/api/RelationshipManager.java
trunk/identity-api/src/main/java/org/jboss/identity/api/RelationshipType.java
trunk/identity-api/src/main/java/org/jboss/identity/api/Role.java
trunk/identity-api/src/main/java/org/jboss/identity/api/RoleType.java
trunk/identity-api/src/main/java/org/jboss/identity/api/SessionState.java
trunk/identity-api/src/main/java/org/jboss/identity/api/Transaction.java
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEvent.java
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEventBroadcaster.java
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEventEmitter.java
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEventListener.java
trunk/identity-api/src/main/java/org/jboss/identity/api/exception/PersistenceManagerNotFoundException.java
trunk/identity-api/src/main/java/org/jboss/identity/api/exception/SessionNotOpenException.java
trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java
trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentityObject.java
Log:
api2 -> api (step 3/3)
Copied: trunk/identity-api/src/main/java/org/jboss/identity/api (from rev 99,
trunk/identity-api/src/main/java/org/jboss/identity/api2)
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/Group.java
===================================================================
--- trunk/identity-api/src/main/java/org/jboss/identity/api2/Group.java 2008-09-20
20:08:05 UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/Group.java 2008-09-20 20:11:57
UTC (rev 101)
@@ -22,7 +22,7 @@
/**
*
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
/**
* Represents a Group
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/GroupType.java
===================================================================
--- trunk/identity-api/src/main/java/org/jboss/identity/api2/GroupType.java 2008-09-20
20:08:05 UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/GroupType.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
/**
* Type of Group
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/Identity.java
===================================================================
--- trunk/identity-api/src/main/java/org/jboss/identity/api2/Identity.java 2008-09-20
20:08:05 UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/Identity.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
/**
* Represents an Identity
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/IdentitySession.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/IdentitySession.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/IdentitySession.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -19,16 +19,11 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
import org.jboss.identity.exception.IdentityException;
-import java.util.List;
-import java.util.Set;
-import java.util.Collection;
-import java.util.Map;
-
/**
* Expose all identity management operations within a given realm
*
Modified:
trunk/identity-api/src/main/java/org/jboss/identity/api/IdentitySessionFactory.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/IdentitySessionFactory.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/IdentitySessionFactory.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw
Dawidowicz</a>
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/IdentityType.java
===================================================================
--- trunk/identity-api/src/main/java/org/jboss/identity/api2/IdentityType.java 2008-09-20
20:08:05 UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/IdentityType.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
import org.jboss.identity.exception.PolicyValidationException;
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/PersistenceManager.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/PersistenceManager.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/PersistenceManager.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
import org.jboss.identity.exception.IdentityException;
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/ProfileManager.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/ProfileManager.java 2008-09-20
20:08:05 UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/ProfileManager.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
import org.jboss.identity.exception.IdentityException;
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/Realm.java
===================================================================
--- trunk/identity-api/src/main/java/org/jboss/identity/api2/Realm.java 2008-09-20
20:08:05 UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/Realm.java 2008-09-20 20:11:57
UTC (rev 101)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
/**
* <p>The <b>realm</b> under which the various models and policies
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/RealmManager.java
===================================================================
--- trunk/identity-api/src/main/java/org/jboss/identity/api2/RealmManager.java 2008-09-20
20:08:05 UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/RealmManager.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,11 +20,10 @@
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
-import org.jboss.identity.exception.IdentityException;
-import org.jboss.identity.api2.exception.PersistenceManagerNotFoundException;
-import org.jboss.identity.api2.exception.SessionNotOpenException;
+import org.jboss.identity.api.exception.PersistenceManagerNotFoundException;
+import org.jboss.identity.api.exception.SessionNotOpenException;
import java.io.InputStream;
@@ -60,8 +59,8 @@
* @param realmA
* @param realmB
* @param relationshipType
- * @throws org.jboss.identity.api2.exception.PersistenceManagerNotFoundException PM
not set
- * @throws org.jboss.identity.api2.exception.SessionNotOpenException session is not
open
+ * @throws org.jboss.identity.api.exception.PersistenceManagerNotFoundException PM not
set
+ * @throws org.jboss.identity.api.exception.SessionNotOpenException session is not
open
*/
void associate(Realm realmA, Realm realmB, RelationshipType relationshipType)
throws PersistenceManagerNotFoundException, SessionNotOpenException;
Modified:
trunk/identity-api/src/main/java/org/jboss/identity/api/RelationshipManager.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/RelationshipManager.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/RelationshipManager.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
import org.jboss.identity.exception.IdentityException;
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/RelationshipType.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/RelationshipType.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/RelationshipType.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
/**
* Defines a <b>relationship</b> between groups, domains etc
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/Role.java
===================================================================
--- trunk/identity-api/src/main/java/org/jboss/identity/api2/Role.java 2008-09-20 20:08:05
UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/Role.java 2008-09-20 20:11:57
UTC (rev 101)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
/**
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/RoleType.java
===================================================================
--- trunk/identity-api/src/main/java/org/jboss/identity/api2/RoleType.java 2008-09-20
20:08:05 UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/RoleType.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
/**
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/SessionState.java
===================================================================
--- trunk/identity-api/src/main/java/org/jboss/identity/api2/SessionState.java 2008-09-20
20:08:05 UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/SessionState.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
/**
* Current State of the Session
Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/Transaction.java
===================================================================
--- trunk/identity-api/src/main/java/org/jboss/identity/api2/Transaction.java 2008-09-20
20:08:05 UTC (rev 99)
+++ trunk/identity-api/src/main/java/org/jboss/identity/api/Transaction.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2;
+package org.jboss.identity.api;
/**
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw
Dawidowicz</a>
Modified:
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEvent.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/event/IdentityEvent.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEvent.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2.event;
+package org.jboss.identity.api.event;
/**
* @author boleslaw dot dawidowicz at redhat anotherdot com
Modified:
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEventBroadcaster.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/event/IdentityEventBroadcaster.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEventBroadcaster.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,9 +20,8 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
******************************************************************************/
-package org.jboss.identity.api2.event;
+package org.jboss.identity.api.event;
-import org.jboss.identity.api.event.*;
import org.jboss.identity.api.event.IdentityEvent;
/**
Modified:
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEventEmitter.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/event/IdentityEventEmitter.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEventEmitter.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,7 +20,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
******************************************************************************/
-package org.jboss.identity.api2.event;
+package org.jboss.identity.api.event;
import org.jboss.identity.api.event.IdentityEventListener;
Modified:
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEventListener.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/event/IdentityEventListener.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/event/IdentityEventListener.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -20,9 +20,8 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
******************************************************************************/
-package org.jboss.identity.api2.event;
+package org.jboss.identity.api.event;
-import org.jboss.identity.api.event.*;
import org.jboss.identity.api.event.IdentityEvent;
/**
Modified:
trunk/identity-api/src/main/java/org/jboss/identity/api/exception/PersistenceManagerNotFoundException.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/exception/PersistenceManagerNotFoundException.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/exception/PersistenceManagerNotFoundException.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2.exception;
+package org.jboss.identity.api.exception;
import org.jboss.identity.exception.IdentityException;
Modified:
trunk/identity-api/src/main/java/org/jboss/identity/api/exception/SessionNotOpenException.java
===================================================================
---
trunk/identity-api/src/main/java/org/jboss/identity/api2/exception/SessionNotOpenException.java 2008-09-20
20:08:05 UTC (rev 99)
+++
trunk/identity-api/src/main/java/org/jboss/identity/api/exception/SessionNotOpenException.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
*/
-package org.jboss.identity.api2.exception;
+package org.jboss.identity.api.exception;
import org.jboss.identity.exception.IdentityException;
Modified:
trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java
===================================================================
---
trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java 2008-09-20
20:10:05 UTC (rev 100)
+++
trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -21,11 +21,9 @@
*/
package org.jboss.identity.impl.types;
-import java.util.List;
-
import org.jboss.identity.exception.PolicyValidationException;
-import org.jboss.identity.api2.Group;
-import org.jboss.identity.api2.GroupType;
+import org.jboss.identity.api.Group;
+import org.jboss.identity.api.GroupType;
/**
* A simple implementation of group
Modified:
trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentityObject.java
===================================================================
---
trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentityObject.java 2008-09-20
20:10:05 UTC (rev 100)
+++
trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleIdentityObject.java 2008-09-20
20:11:57 UTC (rev 101)
@@ -30,8 +30,8 @@
import org.jboss.identity.spi.model.IdentityObject;
import org.jboss.identity.spi.model.IdentityObjectAttribute;
import org.jboss.identity.spi.model.IdentityObjectType;
-import org.jboss.identity.api2.Group;
-import org.jboss.identity.api2.Role;
+import org.jboss.identity.api.Group;
+import org.jboss.identity.api.Role;
/**