directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [1/4] directory-fortress-enmasse git commit: FC-109 - use new package structure
Date Tue, 02 Jun 2015 21:11:20 GMT
Repository: directory-fortress-enmasse
Updated Branches:
  refs/heads/1.0-RC41 [created] f4fdeaa7f


http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f4fdeaa7/src/main/java/org/apache/directory/fortress/rest/PswdPolicyMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/PswdPolicyMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/PswdPolicyMgrImpl.java
index 5dce451..6635d8d 100644
--- a/src/main/java/org/apache/directory/fortress/rest/PswdPolicyMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/PswdPolicyMgrImpl.java
@@ -22,9 +22,9 @@ package org.apache.directory.fortress.rest;
 import org.apache.directory.fortress.core.PwPolicyMgr;
 import org.apache.directory.fortress.core.PwPolicyMgrFactory;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.rbac.PwPolicy;
-import org.apache.directory.fortress.core.rest.FortRequest;
-import org.apache.directory.fortress.core.rest.FortResponse;
+import org.apache.directory.fortress.core.model.PwPolicy;
+import org.apache.directory.fortress.core.model.FortRequest;
+import org.apache.directory.fortress.core.model.FortResponse;
 import org.apache.log4j.Logger;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f4fdeaa7/src/main/java/org/apache/directory/fortress/rest/ReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/ReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/ReviewMgrImpl.java
index 40609b5..1d585b5 100644
--- a/src/main/java/org/apache/directory/fortress/rest/ReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/ReviewMgrImpl.java
@@ -19,19 +19,19 @@
  */
 package org.apache.directory.fortress.rest;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.ReviewMgr;
 import org.apache.directory.fortress.core.ReviewMgrFactory;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.PermObj;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.SDSet;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserRole;
-import org.apache.directory.fortress.core.rest.FortRequest;
-import org.apache.directory.fortress.core.rest.FortResponse;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.PermObj;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.SDSet;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
+import org.apache.directory.fortress.core.model.FortRequest;
+import org.apache.directory.fortress.core.model.FortResponse;
 import org.apache.log4j.Logger;
 
 import java.util.List;
@@ -121,7 +121,7 @@ class ReviewMgrImpl extends AbstractMgrImpl
             PermObj inObj = (PermObj) request.getEntity();
             List<PermObj> objs = null;
             
-            if ( VUtil.isNotNullOrEmpty( inObj.getOu() ) )
+            if ( StringUtils.isNotEmpty( inObj.getOu() ) )
             {
                 objs = reviewMgr.findPermObjs( new OrgUnit( inObj.getOu(), OrgUnit.Type.PERM
) );
             }
@@ -232,7 +232,7 @@ class ReviewMgrImpl extends AbstractMgrImpl
             {
                 List<User> retUsers;
                 
-                if ( VUtil.isNotNullOrEmpty( inUser.getOu() ) )
+                if ( StringUtils.isNotEmpty( inUser.getOu() ) )
                 {
                     retUsers = reviewMgr.findUsers( new OrgUnit( inUser.getOu(), OrgUnit.Type.USER
) );
                 }
@@ -293,7 +293,7 @@ class ReviewMgrImpl extends AbstractMgrImpl
             ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId()
);
             reviewMgr.setAdmin( request.getSession() );
             
-            if ( VUtil.isNotNullOrEmpty( request.getValue() ) )
+            if ( StringUtils.isNotEmpty( request.getValue() ) )
             {
                 String userId = request.getValue();
                 List<String> retRoles = reviewMgr.assignedRoles( userId );

http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f4fdeaa7/src/main/java/org/apache/directory/fortress/rest/overview.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/overview.html b/src/main/java/org/apache/directory/fortress/rest/overview.html
index 18a6be7..2fc85a5 100755
--- a/src/main/java/org/apache/directory/fortress/rest/overview.html
+++ b/src/main/java/org/apache/directory/fortress/rest/overview.html
@@ -39,7 +39,7 @@ compliant Java Servlets container.
 enforced using <A HREF="https://symas.com/javadocs/sentry/">Fortress Realm</A>
which itself
 uses declarative <A HREF="http://docs.oracle.com/javaee/5/tutorial/doc/bnbwk.html">Java
EE Security</A> and <A
         HREF="http://static.springsource.org/spring-security/site/">Spring Security</A>
policy hooks that are wired to
-connect back to the <A HREF="org.apache.directory.fortress.core/rbac/package-summary.html">Fortress</A>
<A
+connect back to the <A HREF="org.apache.directory.fortress.core.model/package-summary.html">Fortress</A>
<A
         HREF="http://en.wikipedia.org/wiki/Role-based_access_control">RBAC</A> component.
 
 Fortress Rest is a <a href="http://java.sun.com/developer/technicalArticles/tools/webapps_1/">Java
Web program</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f4fdeaa7/src/test/java/org/apache/directory/fortress/rest/EmTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/rest/EmTest.java b/src/test/java/org/apache/directory/fortress/rest/EmTest.java
index 58b797f..5014647 100644
--- a/src/test/java/org/apache/directory/fortress/rest/EmTest.java
+++ b/src/test/java/org/apache/directory/fortress/rest/EmTest.java
@@ -27,7 +27,7 @@ import java.net.URL;
 
 import org.apache.directory.fortress.core.RestException;
 import org.apache.directory.fortress.core.GlobalErrIds;
-import org.apache.directory.fortress.core.rest.FortResponse;
+import org.apache.directory.fortress.core.model.FortResponse;
 import org.apache.directory.fortress.core.rest.HttpIds;
 import org.apache.directory.fortress.core.rest.RestUtils;
 import org.apache.commons.httpclient.HttpClient;


Mime
View raw message