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-core git commit: FC-109 - move utils
Date Tue, 02 Jun 2015 17:01:45 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/1.0-RC41 947b19f91 -> 0e307ed65


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0e307ed6/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
index ee7745b..f6aeb99 100755
--- a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.core;
 
 
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.rbac.TestUtils;
@@ -29,7 +30,7 @@ import org.apache.directory.fortress.core.model.Permission;
 import org.apache.directory.fortress.core.model.Role;
 import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserRole;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.VUtil;
 import org.apache.directory.fortress.core.util.time.Constraint;
 
 import java.util.ArrayList;
@@ -479,7 +480,7 @@ class ReviewMgrConsole
         if ( address != null )
         {
             System.out.println( label );
-            if ( VUtil.isNotNullOrEmpty( address.getAddresses() ) )
+            if ( ObjUtil.isNotNullOrEmpty( address.getAddresses() ) )
             {
                 for ( String addr : address.getAddresses() )
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0e307ed6/src/test/java/org/apache/directory/fortress/core/ant/TestAddOrgunit.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ant/TestAddOrgunit.java b/src/test/java/org/apache/directory/fortress/core/ant/TestAddOrgunit.java
index 10e6923..b9ec511 100644
--- a/src/test/java/org/apache/directory/fortress/core/ant/TestAddOrgunit.java
+++ b/src/test/java/org/apache/directory/fortress/core/ant/TestAddOrgunit.java
@@ -21,7 +21,7 @@ package org.apache.directory.fortress.core.ant;
 
 
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.ldap.container.OrganizationalUnit;
+import org.apache.directory.fortress.core.model.OrganizationalUnit;
 import org.apache.directory.fortress.core.ldap.container.OrganizationalUnitP;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0e307ed6/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
index 2df4fcb..dd33a4c 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
@@ -20,7 +20,7 @@
 package org.apache.directory.fortress.core.example;
 
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.VUtil;
 
 /**
  * Object provides example of Fortress API.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0e307ed6/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
index be5e515..3672af4 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.example;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.VUtil;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0e307ed6/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java b/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
index fecf02d..62b00c3 100644
--- a/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
@@ -27,7 +27,7 @@ import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
 import org.apache.directory.fortress.core.ant.Addgroup;
-import org.apache.directory.fortress.core.ldap.group.Group;
+import org.apache.directory.fortress.core.model.Group;
 import org.apache.directory.fortress.core.ldap.group.GroupMgr;
 import org.apache.directory.fortress.core.ldap.group.GroupMgrFactory;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0e307ed6/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
index 4b624ee..0ba9471 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
@@ -35,7 +35,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.model.Address;
 import org.apache.directory.fortress.core.model.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.VUtil;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.fortress.core.util.time.Constraint;
 
 
@@ -6369,7 +6370,7 @@ public class UserTestData extends TestCase
     {
         List<String> expected = getEmails( usr );
 
-        if ( VUtil.isNotNullOrEmpty( expected ) )
+        if ( ObjUtil.isNotNullOrEmpty( expected ) )
         {
             assertNotNull( UserTestData.class.getName() + ".assertEmail null for user: "
+ getUserId( usr ), emails );
 
@@ -6719,7 +6720,7 @@ public class UserTestData extends TestCase
 
         getElements( props, szInput, PROPS_COL );
 
-        if ( VUtil.isNotNullOrEmpty( props ) )
+        if ( ObjUtil.isNotNullOrEmpty( props ) )
         {
             properties = new Properties();
 


Mime
View raw message