FC-105 - break package cycle
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgr.java b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgr.java
index 65b6ea0..a460f38 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgr.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgr.java
@@ -26,7 +26,6 @@
import org.apache.directory.fortress.core.rbac.Role;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.realm.tomcat.TcPrincipal;
/**
* This interface is for components that use Websphere and Tomcat Container SPI's to provide
@@ -226,7 +225,7 @@
/**
* Determine if given Role is contained within User's Tomcat Principal object. This method does not need to hit
- * the ldap server as the User's activated Roles are loaded into {@link org.apache.directory.fortress.realm.tomcat.TcPrincipal#setContext(java.util.HashMap)}
+ * the ldap server as the User's activated Roles are loaded into {@link TcPrincipal#setContext(java.util.HashMap)}
*
* @param principal Contains User's Tomcat RBAC Session data that includes activated Roles.
* @param roleName Maps to {@link org.apache.directory.fortress.core.rbac.Role#name}.
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java
index 03b10c4..0190d01 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java
@@ -40,7 +40,6 @@
import org.apache.directory.fortress.core.rbac.User;
import org.apache.directory.fortress.core.rbac.Role;
import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.realm.tomcat.TcPrincipal;
import org.apache.directory.fortress.core.util.attr.VUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcPrincipal.java b/impl/src/main/java/org/apache/directory/fortress/realm/TcPrincipal.java
similarity index 98%
rename from impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcPrincipal.java
rename to impl/src/main/java/org/apache/directory/fortress/realm/TcPrincipal.java
index 6c392ce..3f484b8 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcPrincipal.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/TcPrincipal.java
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.fortress.realm.tomcat;
+package org.apache.directory.fortress.realm;
import java.io.Serializable;
import java.security.Principal;
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TC7AccessMgrFascade.java b/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TC7AccessMgrFascade.java
index 72ed031..d820dd9 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TC7AccessMgrFascade.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TC7AccessMgrFascade.java
@@ -79,7 +79,7 @@
/**
* Determine if given Role is contained within User's Tomcat Principal object. This method does not need to hit
- * the ldap server as the User's activated Roles are loaded into {@link org.apache.directory.fortress.realm.tomcat.TcPrincipal#setContext(java.util.HashMap)}
+ * the ldap server as the User's activated Roles are loaded into {@link org.apache.directory.fortress.realm.TcPrincipal#setContext(java.util.HashMap)}
*
* @param principal Contains User's Tomcat RBAC Session data that includes activated Roles.
* @param role Maps to {@code org.apache.directory.fortress.core.rbac.Role#name}.
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgrImpl.java b/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgrImpl.java
index bdfa6f5..e2e1f6d 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgrImpl.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgrImpl.java
@@ -23,6 +23,7 @@
import org.apache.directory.fortress.core.util.attr.VUtil;
import org.apache.directory.fortress.realm.J2eePolicyMgr;
import org.apache.directory.fortress.realm.J2eePolicyMgrFactory;
+import org.apache.directory.fortress.realm.TcPrincipal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
