directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [2/5] directory-fortress-core git commit: changed method name to have List isntead of 's'
Date Sat, 09 Jan 2016 00:15:05 GMT
changed method name to have List isntead of 's'


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/830acefb
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/830acefb
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/830acefb

Branch: refs/heads/master
Commit: 830acefbb6b99df94e3424f652fd9a8571b4bf19
Parents: 463c791
Author: clp207 <clp207@psu.edu>
Authored: Tue Jan 5 13:12:31 2016 -0500
Committer: clp207 <clp207@psu.edu>
Committed: Fri Jan 8 14:51:37 2016 -0500

----------------------------------------------------------------------
 .../org/apache/directory/fortress/core/impl/AdminRoleDAO.java    | 4 ++--
 .../org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java | 4 ++--
 src/main/java/org/apache/directory/fortress/core/impl/UserP.java | 4 ++--
 .../java/org/apache/directory/fortress/core/model/AdminRole.java | 4 ++--
 .../org/apache/directory/fortress/core/model/Administrator.java  | 4 ++--
 .../org/apache/directory/fortress/core/model/UserAdminRole.java  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index 49a3d17..4df4aa0 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -676,8 +676,8 @@ final class AdminRoleDAO extends ApacheDsDataProvider
         entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
         entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
         entity.setOccupants( getAttributes( le, ROLE_OCCUPANT ) );
-        entity.setOsPs( getAttributeSet( le, ROLE_OSP ) );
-        entity.setOsUs( getAttributeSet( le, ROLE_OSU ) );
+        entity.setOsPList( getAttributeSet( le, ROLE_OSP ) );
+        entity.setOsUList( getAttributeSet( le, ROLE_OSU ) );
         entity.setName( getAttribute( le, SchemaConstants.CN_AT ) );
         unloadTemporal( le, entity );
         entity.setRoleRangeRaw( getAttribute( le, ROLE_RANGE ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
index 8a9e45c..b690ebd 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
@@ -146,8 +146,8 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
                 UserAdminRole chgRole = new UserAdminRole();
                 chgRole.setName(role.getName());
                 chgRole.setUserId(ue.getUserId());
-                chgRole.setOsPs(role.getOsP());
-                chgRole.setOsUs(role.getOsU());
+                chgRole.setOsPList(role.getOsP());
+                chgRole.setOsUList(role.getOsU());
                 uaRoles.remove(chgRole);
                 ConstraintUtil.copy( re, chgRole );
                 uaRoles.add(chgRole);

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
index 0a1ce88..f00b8fe 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
@@ -881,7 +881,7 @@ final class UserP
         trgR.setBeginRange(srcR.getBeginRange());
         trgR.setEndRange(srcR.getEndRange());
         // copy the user and perm pools:
-        trgR.setOsPs(srcR.getOsP());
-        trgR.setOsUs(srcR.getOsU());
+        trgR.setOsPList(srcR.getOsP());
+        trgR.setOsUList(srcR.getOsU());
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
index ad39bc8..e320bec 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
@@ -313,7 +313,7 @@ public class AdminRole extends Role implements Administrator
      * @param osPs is a List of type String containing Perm OU.  This maps to 'ftOSP' attribute
on 'ftPools' aux object class.
      */
     @Override
-    public void setOsPs( Set<String> osPs )
+    public void setOsPList( Set<String> osPs )
     {
         this.osPs = osPs;
     }
@@ -354,7 +354,7 @@ public class AdminRole extends Role implements Administrator
      * @param osUs is a List of type String containing User OU.  This maps to 'ftOSU' attribute
on 'ftPools' aux object class.
      */
     @Override
-    public void setOsUs( Set<String> osUs )
+    public void setOsUList( Set<String> osUs )
     {
         this.osUs = osUs;
     }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
index 55db8e8..67871ec 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
@@ -45,7 +45,7 @@ public interface Administrator
      *
      * @param osPs is a List of type String containing Perm OU.  This maps to 'ftOSP' attribute
on 'ftPools' aux object class.
      */
-    void setOsPs( Set<String> osPs );
+    void setOsPList( Set<String> osPs );
 
 
     /**
@@ -69,7 +69,7 @@ public interface Administrator
      *
      * @param osUs is a List of type String containing User OU.  This maps to 'ftOSU' attribute
on 'ftPools' aux object class.
      */
-    void setOsUs( Set<String> osUs );
+    void setOsUList( Set<String> osUs );
 
 
     /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
index 4bb60e4..7ed6d6e 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
@@ -425,7 +425,7 @@ public class UserAdminRole extends UserRole implements Administrator
      * @param osPs is a List of type String containing Perm OU.  This maps to 'ftARC' attribute
on 'ftUserAttrs' aux object class.
      */
     @Override
-    public void setOsPs( Set<String> osPs )
+    public void setOsPList( Set<String> osPs )
     {
         this.osPs = osPs;
     }
@@ -466,7 +466,7 @@ public class UserAdminRole extends UserRole implements Administrator
      * @param osUs is a List of type String containing User OU.  This maps to 'ftARC' attribute
on 'ftUserAttrs' aux object class.
      */
     @Override
-    public void setOsUs( Set<String> osUs )
+    public void setOsUList( Set<String> osUs )
     {
         this.osUs = osUs;
     }


Mime
View raw message