directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cp...@apache.org
Subject [30/43] directory-fortress-core git commit: fixing issues from merge
Date Thu, 06 Oct 2016 17:49:47 GMT
fixing issues from merge


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/7a8d7852
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/7a8d7852
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/7a8d7852

Branch: refs/heads/master
Commit: 7a8d78526659c80737e4b721c20d45d0671e25f5
Parents: 6e9a7dd
Author: clp207 <clp207@psu.edu>
Authored: Thu May 5 12:56:09 2016 -0400
Committer: clp207 <clp207@psu.edu>
Committed: Thu May 5 12:56:09 2016 -0400

----------------------------------------------------------------------
 .../apache/directory/fortress/core/impl/PermDAO.java   | 10 ----------
 .../apache/directory/fortress/core/impl/UserDAO.java   |  2 +-
 .../directory/fortress/core/model/RoleConstraint.java  | 13 +++++++------
 .../org/apache/directory/fortress/core/util/VUtil.java |  2 +-
 .../fortress/core/impl/FortressJUnitTest.java          |  4 ----
 .../fortress/core/impl/ReviewMgrImplTest.java          |  2 +-
 6 files changed, 10 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7a8d7852/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
index cb0c5cb..1a7f242 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
@@ -48,29 +48,19 @@ import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.RemoveException;
 import org.apache.directory.fortress.core.UpdateException;
-<<<<<<< HEAD
-import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
-=======
 import org.apache.directory.fortress.core.ldap.LdapDataProvider;
->>>>>>> master
 import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.model.ObjectFactory;
 import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.model.PermObj;
 import org.apache.directory.fortress.core.model.Permission;
-<<<<<<< HEAD
 import org.apache.directory.fortress.core.model.PermissionAttribute;
 import org.apache.directory.fortress.core.model.PermissionAttributeSet;
-=======
->>>>>>> master
 import org.apache.directory.fortress.core.model.PropUtil;
 import org.apache.directory.fortress.core.model.Role;
 import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.model.User;
-<<<<<<< HEAD
-=======
 import org.apache.directory.fortress.core.util.Config;
->>>>>>> master
 import org.apache.directory.ldap.client.api.LdapConnection;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7a8d7852/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
index 926a1a7..0d917a6 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
@@ -2591,7 +2591,7 @@ final class UserDAO extends LdapDataProvider
             for ( String raw : roles )
             {
             	//get role name
-            	String roleName = raw.substring(0, raw.indexOf( GlobalIds.DELIMITER )).toUpperCase();
+            	String roleName = raw.substring(0, raw.indexOf( Config.getInstance().getDelimiter()
)).toUpperCase();
             	
             	//if already found, add to user role
             	if(uRoles.containsKey(roleName)){

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7a8d7852/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java b/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
index 96f9984..77df7db 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
@@ -21,7 +21,7 @@ package org.apache.directory.fortress.core.model;
 
 import java.io.Serializable;
 
-import org.apache.directory.fortress.core.GlobalIds;
+import org.apache.directory.fortress.core.util.Config;
 
 public class RoleConstraint implements Serializable {
 
@@ -65,16 +65,17 @@ public class RoleConstraint implements Serializable {
 	
 	//BANK_USER$seq$0type$filter$ecomm.merchant.id$AccountId=12345&WithdrawLimit=500
 	public String getRawData(UserRole uRole){
-        StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();        
+        String delimeter = Config.getInstance().getDelimiter();
         
         sb.append(uRole.getName());        
-        sb.append( GlobalIds.DELIMITER );
+        sb.append( delimeter );
         sb.append(RC_TYPE_NAME);
-        sb.append( GlobalIds.DELIMITER );
+        sb.append( delimeter );
         sb.append(constraintType);
-        sb.append( GlobalIds.DELIMITER );
+        sb.append( delimeter );
         sb.append(paSetName);
-        sb.append( GlobalIds.DELIMITER );
+        sb.append( delimeter );
         sb.append(value);
         
         return sb.toString();

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7a8d7852/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/VUtil.java b/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
index 31c4315..a6c684a 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
@@ -696,6 +696,6 @@ public final class VUtil implements ConstraintValidator
             throw new ValidationException( GlobalErrIds.PERM_ATTRIBUTE_SET_NOT_FOUND, error
);
         }
 
-        RegExUtil.safeText( value );
+        RegExUtil.getInstance().safeText( value );
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7a8d7852/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
b/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
index 5b692ec..e495ab1 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/FortressJUnitTest.java
@@ -23,11 +23,7 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-<<<<<<< HEAD
-import org.apache.directory.fortress.core.GlobalIds;
-=======
 import org.apache.directory.fortress.core.util.Config;
->>>>>>> master
 
 /**
  * This JUnit test class drives all of the Fortress Administration APIs contained within
{@link AdminMgrImplTest},

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7a8d7852/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
b/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
index d9a9c4d..7ecd7b1 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
@@ -209,7 +209,7 @@ public class ReviewMgrImplTest extends TestCase
     		Permission pop = PermTestData.getOp( obj, op );
 
     		Permission entity = reviewMgr.readPermission(pop);
-    		assertEquals(paSetName, entity.getPaSetName());
+    		assertTrue(paSetName, entity.getPaSets().contains(paSetName));
     		
     		LOG.debug( "readPASetFromPermission name [" + paSetName + "] successful" );
     	}


Mime
View raw message