You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by cp...@apache.org on 2016/05/05 13:49:20 UTC
[03/15] directory-fortress-core git commit: refactored to not use
static initialization blocks
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
index 35da4f9..4c47e5e 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
@@ -112,19 +112,9 @@ public abstract class LdapDataProvider
private static final String ENABLE_LDAP_STARTTLS = "enable.ldap.starttls";
- private static final boolean IS_SSL = (
- Config.getProperty( GlobalIds.ENABLE_LDAP_SSL ) != null &&
- Config.getProperty( GlobalIds.ENABLE_LDAP_SSL ).equalsIgnoreCase( "true" ) &&
- Config.getProperty( GlobalIds.TRUST_STORE ) != null &&
- Config.getProperty( GlobalIds.TRUST_STORE_PW ) != null );
-
- private static final boolean IS_SET_TRUST_STORE_PROP = (
- IS_SSL &&
- Config.getProperty( GlobalIds.SET_TRUST_STORE_PROP ) != null &&
- Config.getProperty( GlobalIds.SET_TRUST_STORE_PROP ).equalsIgnoreCase( "true" ) );
-
- private static final boolean IS_SSL_DEBUG = ( ( Config.getProperty( GlobalIds.ENABLE_LDAP_SSL_DEBUG ) != null ) && ( Config
- .getProperty( GlobalIds.ENABLE_LDAP_SSL_DEBUG ).equalsIgnoreCase( "true" ) ) );
+ private boolean IS_SSL;
+ private boolean IS_SET_TRUST_STORE_PROP;
+ private boolean IS_SSL_DEBUG;
/**
* The Admin connection pool
@@ -146,43 +136,62 @@ public abstract class LdapDataProvider
private static final char[] LDAP_META_CHARS = loadLdapEscapeChars();
private static final String[] LDAP_REPL_VALS = loadValidLdapVals();
- static
+ public LdapDataProvider(){
+ init();
+ }
+
+ private void init()
{
- String host = Config.getProperty( GlobalIds.LDAP_HOST, "localhost" );
- int port = Config.getInt( GlobalIds.LDAP_PORT, 389 );
- int min = Config.getInt( GlobalIds.LDAP_ADMIN_POOL_MIN, 1 );
- int max = Config.getInt( GlobalIds.LDAP_ADMIN_POOL_MAX, 10 );
- int logmin = Config.getInt( LDAP_LOG_POOL_MIN, 1 );
- int logmax = Config.getInt( LDAP_LOG_POOL_MAX, 10 );
+ IS_SSL = (
+ Config.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL ) != null &&
+ Config.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL ).equalsIgnoreCase( "true" ) &&
+ Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) != null &&
+ Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) != null );
+
+ IS_SET_TRUST_STORE_PROP = (
+ IS_SSL &&
+ Config.getInstance().getProperty( GlobalIds.SET_TRUST_STORE_PROP ) != null &&
+ Config.getInstance().getProperty( GlobalIds.SET_TRUST_STORE_PROP ).equalsIgnoreCase( "true" ) );
+
+ IS_SSL_DEBUG = ( ( Config.getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL_DEBUG ) != null ) && ( Config
+ .getInstance().getProperty( GlobalIds.ENABLE_LDAP_SSL_DEBUG ).equalsIgnoreCase( "true" ) ) );
+
+
+ String host = Config.getInstance().getProperty( GlobalIds.LDAP_HOST, "localhost" );
+ int port = Config.getInstance().getInt( GlobalIds.LDAP_PORT, 389 );
+ int min = Config.getInstance().getInt( GlobalIds.LDAP_ADMIN_POOL_MIN, 1 );
+ int max = Config.getInstance().getInt( GlobalIds.LDAP_ADMIN_POOL_MAX, 10 );
+ int logmin = Config.getInstance().getInt( LDAP_LOG_POOL_MIN, 1 );
+ int logmax = Config.getInstance().getInt( LDAP_LOG_POOL_MAX, 10 );
LOG.info( "LDAP POOL: host=[{}], port=[{}], min=[{}], max=[{}]", host, port, min, max );
if ( IS_SET_TRUST_STORE_PROP )
{
LOG.info( "Set JSSE truststore properties in Apache LDAP client:" );
- LOG.info( "javax.net.ssl.trustStore: {}", Config.getProperty( GlobalIds.TRUST_STORE ) );
+ LOG.info( "javax.net.ssl.trustStore: {}", Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) );
LOG.info( "javax.net.debug: {}", IS_SSL_DEBUG );
- System.setProperty( "javax.net.ssl.trustStore", Config.getProperty( GlobalIds.TRUST_STORE ) );
- System.setProperty( "javax.net.ssl.trustStorePassword", Config.getProperty( GlobalIds.TRUST_STORE_PW ) );
+ System.setProperty( "javax.net.ssl.trustStore", Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) );
+ System.setProperty( "javax.net.ssl.trustStorePassword", Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) );
System.setProperty( "javax.net.debug", Boolean.valueOf( IS_SSL_DEBUG ).toString() );
}
LdapConnectionConfig config = new LdapConnectionConfig();
config.setLdapHost( host );
config.setLdapPort( port );
- config.setName( Config.getProperty( GlobalIds.LDAP_ADMIN_POOL_UID, "" ) );
+ config.setName( Config.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_UID, "" ) );
config.setUseSsl( IS_SSL );
//config.setTrustManagers( new NoVerificationTrustManager() );
- if(Config.getBoolean(ENABLE_LDAP_STARTTLS, false)){
+ if(Config.getInstance().getBoolean(ENABLE_LDAP_STARTTLS, false)){
config.setUseTls(true);
}
- if ( IS_SSL && StringUtils.isNotEmpty( Config.getProperty( GlobalIds.TRUST_STORE ) )
- && StringUtils.isNotEmpty( Config.getProperty( GlobalIds.TRUST_STORE_PW ) ) )
+ if ( IS_SSL && StringUtils.isNotEmpty( Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) )
+ && StringUtils.isNotEmpty( Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) ) )
{
// validate certificates but allow self-signed certs if within this truststore:
- config.setTrustManagers( new LdapClientTrustStoreManager( Config.getProperty( GlobalIds.TRUST_STORE ), Config.getProperty( GlobalIds.TRUST_STORE_PW )
+ config.setTrustManagers( new LdapClientTrustStoreManager( Config.getInstance().getProperty( GlobalIds.TRUST_STORE ), Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW )
.toCharArray(), null,
true ) );
}
@@ -190,11 +199,11 @@ public abstract class LdapDataProvider
String adminPw;
if ( EncryptUtil.isEnabled() )
{
- adminPw = EncryptUtil.decrypt( Config.getProperty( GlobalIds.LDAP_ADMIN_POOL_PW ) );
+ adminPw = EncryptUtil.getInstance().decrypt( Config.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_PW ) );
}
else
{
- adminPw = Config.getProperty( GlobalIds.LDAP_ADMIN_POOL_PW );
+ adminPw = Config.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_PW );
}
config.setCredentials( adminPw );
@@ -249,28 +258,28 @@ public abstract class LdapDataProvider
LdapConnectionConfig logConfig = new LdapConnectionConfig();
logConfig.setLdapHost( host );
logConfig.setLdapPort( port );
- logConfig.setName( Config.getProperty( GlobalIds.LDAP_ADMIN_POOL_UID, "" ) );
+ logConfig.setName( Config.getInstance().getProperty( GlobalIds.LDAP_ADMIN_POOL_UID, "" ) );
logConfig.setUseSsl( IS_SSL );
- if ( IS_SSL && StringUtils.isNotEmpty( Config.getProperty( GlobalIds.TRUST_STORE ) )
- && StringUtils.isNotEmpty( Config.getProperty( GlobalIds.TRUST_STORE_PW ) ) )
+ if ( IS_SSL && StringUtils.isNotEmpty( Config.getInstance().getProperty( GlobalIds.TRUST_STORE ) )
+ && StringUtils.isNotEmpty( Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ) ) )
{
// validate certificates but allow self-signed certs if within this truststore:
- logConfig.setTrustManagers( new LdapClientTrustStoreManager( Config.getProperty( GlobalIds.TRUST_STORE ),
- Config.getProperty( GlobalIds.TRUST_STORE_PW ).toCharArray(),
+ logConfig.setTrustManagers( new LdapClientTrustStoreManager( Config.getInstance().getProperty( GlobalIds.TRUST_STORE ),
+ Config.getInstance().getProperty( GlobalIds.TRUST_STORE_PW ).toCharArray(),
null, true ) );
}
- logConfig.setName( Config.getProperty( LDAP_LOG_POOL_UID, "" ) );
+ logConfig.setName( Config.getInstance().getProperty( LDAP_LOG_POOL_UID, "" ) );
String logPw;
if ( EncryptUtil.isEnabled() )
{
- logPw = EncryptUtil.decrypt( Config.getProperty( LDAP_LOG_POOL_PW ) );
+ logPw = EncryptUtil.getInstance().decrypt( Config.getInstance().getProperty( LDAP_LOG_POOL_PW ) );
}
else
{
- logPw = Config.getProperty( LDAP_LOG_POOL_PW );
+ logPw = Config.getInstance().getProperty( LDAP_LOG_POOL_PW );
}
logConfig.setCredentials( logPw );
poolFactory = new ValidatingPoolableLdapConnectionFactory( logConfig );
@@ -292,13 +301,13 @@ public abstract class LdapDataProvider
*/
protected String getRootDn( String contextId, String root )
{
- String szDn = Config.getProperty( root );
+ String szDn = Config.getInstance().getProperty( root );
// The contextId must not be null, or "HOME" or "null"
if ( StringUtils.isNotEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) && !contextId
.equals( GlobalIds.HOME ) )
{
- int idx = szDn.indexOf( Config.getProperty( GlobalIds.SUFFIX ) );
+ int idx = szDn.indexOf( Config.getInstance().getProperty( GlobalIds.SUFFIX ) );
if ( idx > 0 )
{
// Found. The DN is ,ou=<contextId>,
@@ -334,11 +343,11 @@ public abstract class LdapDataProvider
.equals( GlobalIds.HOME ) )
{
dn.append( SchemaConstants.OU_AT ).append( "=" ).append( contextId ).append( "," +
- "" ).append( Config.getProperty( GlobalIds.SUFFIX ) );
+ "" ).append( Config.getInstance().getProperty( GlobalIds.SUFFIX ) );
}
else
{
- dn.append( Config.getProperty( GlobalIds.SUFFIX ) );
+ dn.append( Config.getInstance().getProperty( GlobalIds.SUFFIX ) );
}
return dn.toString();
}
@@ -425,7 +434,7 @@ public abstract class LdapDataProvider
{
COUNTERS.incrementAdd();
- if ( !GlobalIds.IS_AUDIT_DISABLED && ( entity != null ) && ( entity.getAdminSession() != null ) )
+ if ( !GlobalIds.getInstance().IS_AUDIT_DISABLED && ( entity != null ) && ( entity.getAdminSession() != null ) )
{
if ( StringUtils.isNotEmpty( entity.getAdminSession().getInternalUserId() ) )
{
@@ -686,7 +695,7 @@ public abstract class LdapDataProvider
*/
private void audit( List<Modification> mods, FortEntity entity )
{
- if ( !GlobalIds.IS_AUDIT_DISABLED && ( entity != null ) && ( entity.getAdminSession() != null ) )
+ if ( !GlobalIds.getInstance().IS_AUDIT_DISABLED && ( entity != null ) && ( entity.getAdminSession() != null ) )
{
if ( StringUtils.isNotEmpty( entity.getAdminSession().getInternalUserId() ) )
{
@@ -1336,7 +1345,7 @@ public abstract class LdapDataProvider
throw new LdapException( error );
}
- if ( GlobalIds.LDAP_FILTER_SIZE_FOUND )
+ if ( GlobalIds.getInstance().LDAP_FILTER_SIZE_FOUND )
{
value = escapeLDAPSearchFilter( value );
}
@@ -1513,7 +1522,7 @@ public abstract class LdapDataProvider
*/
private static char[] loadLdapEscapeChars()
{
- if ( !GlobalIds.LDAP_FILTER_SIZE_FOUND )
+ if ( !GlobalIds.getInstance().LDAP_FILTER_SIZE_FOUND )
{
return null;
}
@@ -1523,7 +1532,7 @@ public abstract class LdapDataProvider
for ( int i = 1;; i++ )
{
String prop = GlobalIds.LDAP_FILTER + i;
- String value = Config.getProperty( prop );
+ String value = Config.getInstance().getProperty( prop );
if ( value == null )
{
@@ -1542,7 +1551,7 @@ public abstract class LdapDataProvider
*/
private static String[] loadValidLdapVals()
{
- if ( !GlobalIds.LDAP_FILTER_SIZE_FOUND )
+ if ( !GlobalIds.getInstance().LDAP_FILTER_SIZE_FOUND )
{
return null;
}
@@ -1552,7 +1561,7 @@ public abstract class LdapDataProvider
for ( int i = 1;; i++ )
{
String prop = GlobalIds.LDAP_SUB + i;
- String value = Config.getProperty( prop );
+ String value = Config.getInstance().getProperty( prop );
if ( value == null )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java b/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java
index bde06a4..ab8300a 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java
@@ -19,13 +19,13 @@
*/
package org.apache.directory.fortress.core.model;
+import java.util.StringTokenizer;
+
import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.ValidationException;
import org.apache.directory.fortress.core.util.VUtil;
-import java.util.StringTokenizer;
-
/**
* Utilities to copy constraints attributes between entities.
*
@@ -134,7 +134,7 @@ public class ConstraintUtil
{
if ( StringUtils.isNotEmpty( inputString ) )
{
- StringTokenizer tkn = new StringTokenizer( inputString, GlobalIds.DELIMITER, true );
+ StringTokenizer tkn = new StringTokenizer( inputString, GlobalIds.getInstance().DELIMITER, true );
if ( tkn.countTokens() > 0 )
{
int count = tkn.countTokens();
@@ -143,11 +143,11 @@ public class ConstraintUtil
for ( int i = 0; i < count; i++ )
{
String szValue = tkn.nextToken();
- if ( szValue.equals( GlobalIds.DELIMITER ) && !previousTokenWasDelimiter )
+ if ( szValue.equals( GlobalIds.getInstance().DELIMITER ) && !previousTokenWasDelimiter )
{
previousTokenWasDelimiter = true;
}
- else if ( szValue.equals( GlobalIds.DELIMITER ) )
+ else if ( szValue.equals( GlobalIds.getInstance().DELIMITER ) )
{
previousTokenWasDelimiter = true;
index++;
@@ -210,56 +210,56 @@ public class ConstraintUtil
{
StringBuilder sb = new StringBuilder();
sb.append( constraint.getName() );
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( constraint.getTimeout() != null )
{
sb.append( constraint.getTimeout() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( constraint.getBeginTime() != null )
{
sb.append( constraint.getBeginTime() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( constraint.getEndTime() != null )
{
sb.append( constraint.getEndTime() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( constraint.getBeginDate() != null )
{
sb.append( constraint.getBeginDate() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( constraint.getEndDate() != null )
{
sb.append( constraint.getEndDate() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( constraint.getBeginLockDate() != null )
{
sb.append( constraint.getBeginLockDate() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( constraint.getEndLockDate() != null )
{
sb.append( constraint.getEndLockDate() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( constraint.getDayMask() != null )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/model/PropUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PropUtil.java b/src/main/java/org/apache/directory/fortress/core/model/PropUtil.java
index 8764db6..0c0916e 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/PropUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PropUtil.java
@@ -19,12 +19,12 @@
*/
package org.apache.directory.fortress.core.model;
-import org.apache.directory.fortress.core.GlobalIds;
-
import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
+import org.apache.directory.fortress.core.GlobalIds;
+
/**
* Utilities to convert to/from property formats.
*
@@ -91,7 +91,7 @@ public final class PropUtil
*/
public static Properties getProperties( String inputString, char separator )
{
- return getProperties( inputString, separator, GlobalIds.DELIMITER );
+ return getProperties( inputString, separator, GlobalIds.getInstance().DELIMITER );
}
/**
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/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 7b3b557..e7a6d31 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
@@ -162,7 +162,7 @@ public class UserAdminRole extends UserRole implements Administrator
{
if ( ( szRawData != null ) && ( szRawData.length() > 0 ) )
{
- String[] tokens = StringUtils.splitPreserveAllTokens( szRawData, GlobalIds.DELIMITER );
+ String[] tokens = StringUtils.splitPreserveAllTokens( szRawData, GlobalIds.getInstance().DELIMITER );
for ( int i = 0; i < tokens.length; i++ )
{
if ( StringUtils.isNotEmpty( tokens[i] ) )
@@ -248,37 +248,37 @@ public class UserAdminRole extends UserRole implements Administrator
String szRole;
StringBuilder sb = new StringBuilder();
sb.append( name );
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
sb.append( this.getTimeout() );
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( this.getBeginTime() != null )
{
sb.append( this.getBeginTime() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( this.getEndTime() != null )
{
sb.append( this.getEndTime() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( this.getBeginDate() != null )
{
sb.append( this.getBeginDate() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( this.getEndDate() != null )
{
sb.append( this.getEndDate() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( this.getBeginLockDate() != null )
{
@@ -286,14 +286,14 @@ public class UserAdminRole extends UserRole implements Administrator
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( this.getEndLockDate() != null )
{
sb.append( this.getEndLockDate() );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( this.getDayMask() != null )
{
@@ -304,7 +304,7 @@ public class UserAdminRole extends UserRole implements Administrator
{
for ( String org : this.getOsUSet() )
{
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
sb.append( U );
sb.append( GlobalIds.PROP_SEP );
sb.append( org );
@@ -315,7 +315,7 @@ public class UserAdminRole extends UserRole implements Administrator
{
for ( String org : this.getOsPSet() )
{
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
sb.append( P );
sb.append( GlobalIds.PROP_SEP );
sb.append( org );
@@ -323,7 +323,7 @@ public class UserAdminRole extends UserRole implements Administrator
}
if ( StringUtils.isNotEmpty( this.getRoleRangeRaw() ) )
{
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
sb.append( R );
sb.append( GlobalIds.PROP_SEP );
sb.append( this.getRoleRangeRaw() );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
index 86d277d..efb59d5 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
@@ -152,7 +152,7 @@ public class UserRole extends FortEntity implements Serializable, Constraint
{
if ( ( szRawData != null ) && ( szRawData.length() > 0 ) )
{
- String[] tokens = StringUtils.splitPreserveAllTokens( szRawData, GlobalIds.DELIMITER );
+ String[] tokens = StringUtils.splitPreserveAllTokens( szRawData, GlobalIds.getInstance().DELIMITER );
for ( int i = 0; i < tokens.length; i++ )
{
if ( StringUtils.isNotEmpty( tokens[i] ) )
@@ -214,51 +214,51 @@ public class UserRole extends FortEntity implements Serializable, Constraint
StringBuilder sb = new StringBuilder();
sb.append( name );
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
sb.append( timeout );
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( beginTime != null )
{
sb.append( beginTime );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( endTime != null )
{
sb.append( endTime );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( beginDate != null )
{
sb.append( beginDate );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( endDate != null )
{
sb.append( endDate );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( beginLockDate != null )
{
sb.append( beginLockDate );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( endLockDate != null )
{
sb.append( endLockDate );
}
- sb.append( GlobalIds.DELIMITER );
+ sb.append( GlobalIds.getInstance().DELIMITER );
if ( dayMask != null )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
index cdf32fe..8fbfcb9 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
@@ -19,23 +19,23 @@
*/
package org.apache.directory.fortress.core.rest;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
import org.apache.directory.fortress.core.AccessMgr;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.model.FortRequest;
-import org.apache.directory.fortress.core.model.FortResponse;
import org.apache.directory.fortress.core.impl.AccessMgrImpl;
import org.apache.directory.fortress.core.impl.Manageable;
+import org.apache.directory.fortress.core.model.FortRequest;
+import org.apache.directory.fortress.core.model.FortResponse;
import org.apache.directory.fortress.core.model.Permission;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.model.User;
import org.apache.directory.fortress.core.model.UserRole;
import org.apache.directory.fortress.core.util.VUtil;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
/**
* Implementation class that performs runtime access control operations on data objects of type Fortress entities
* This object performs runtime access control operations on objects that are provisioned RBAC entities
@@ -94,7 +94,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
request.setContextId(this.contextId);
request.setEntity(new User(userId, password));
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.RBAC_AUTHN);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_AUTHN);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -123,11 +123,11 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
String szResponse;
if(isTrusted)
{
- szResponse = RestUtils.post(szRequest, HttpIds.RBAC_CREATE_TRUSTED);
+ szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_CREATE_TRUSTED);
}
else
{
- szResponse = RestUtils.post(szRequest, HttpIds.RBAC_CREATE);
+ szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_CREATE);
}
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
@@ -156,7 +156,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
request.setSession(session);
request.setEntity(perm);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.RBAC_AUTHZ);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_AUTHZ);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -184,7 +184,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
request.setContextId(this.contextId);
request.setSession(session);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.RBAC_PERMS);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_PERMS);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -212,7 +212,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
request.setContextId(this.contextId);
request.setSession(session);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.RBAC_ROLES);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_ROLES);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -240,7 +240,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
request.setContextId(this.contextId);
request.setSession(session);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.RBAC_AUTHZ_ROLES);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_AUTHZ_ROLES);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -272,7 +272,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
request.setSession(session);
request.setEntity(role);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.RBAC_ADD);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_ADD);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -300,7 +300,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
request.setSession(session);
request.setEntity(role);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.RBAC_DROP);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_DROP);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -326,7 +326,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
request.setContextId(this.contextId);
request.setSession(session);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.RBAC_USERID);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_USERID);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -355,7 +355,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
request.setContextId(this.contextId);
request.setSession(session);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.RBAC_USER);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_USER);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
index f22f6f5..c3d0540 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
@@ -21,8 +21,9 @@ package org.apache.directory.fortress.core.rest;
import org.apache.directory.fortress.core.AdminMgr;
-import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.GlobalErrIds;
+import org.apache.directory.fortress.core.SecurityException;
+import org.apache.directory.fortress.core.impl.Manageable;
import org.apache.directory.fortress.core.model.FortRequest;
import org.apache.directory.fortress.core.model.FortResponse;
import org.apache.directory.fortress.core.model.PermGrant;
@@ -33,7 +34,6 @@ import org.apache.directory.fortress.core.model.RoleRelationship;
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.impl.Manageable;
import org.apache.directory.fortress.core.util.VUtil;
@@ -95,7 +95,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.USER_ADD );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_ADD );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -125,7 +125,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.USER_DISABLE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_DISABLE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -150,7 +150,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.USER_DELETE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_DELETE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -176,7 +176,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.USER_UPDATE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_UPDATE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -208,7 +208,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.USER_CHGPW );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_CHGPW );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -233,7 +233,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.USER_LOCK );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_LOCK );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -258,7 +258,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.USER_UNLOCK );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_UNLOCK );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -285,7 +285,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.USER_RESET );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_RESET );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -323,7 +323,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_ADD );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_ADD );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -353,7 +353,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_DELETE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DELETE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -379,7 +379,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_UPDATE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_UPDATE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -409,7 +409,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_ASGN );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_ASGN );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -434,7 +434,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_DEASGN );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DEASGN );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -460,7 +460,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.PERM_ADD );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_ADD );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -491,7 +491,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.PERM_UPDATE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_UPDATE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -521,7 +521,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.PERM_DELETE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.PERM_DELETE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -547,7 +547,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.OBJ_ADD );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.OBJ_ADD );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -578,7 +578,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.OBJ_UPDATE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.OBJ_UPDATE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -608,7 +608,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.OBJ_DELETE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.OBJ_DELETE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -640,7 +640,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_GRANT );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_GRANT );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -672,7 +672,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_REVOKE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_REVOKE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -704,7 +704,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.USER_GRANT );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_GRANT );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -736,7 +736,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.USER_REVOKE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.USER_REVOKE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -765,7 +765,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_DESC );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DESC );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -794,7 +794,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_ASC );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_ASC );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -823,7 +823,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_ADDINHERIT );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_ADDINHERIT );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -852,7 +852,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.ROLE_DELINHERIT );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.ROLE_DELINHERIT );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() != 0 )
{
@@ -878,7 +878,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.SSD_ADD );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_ADD );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -908,7 +908,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.SSD_UPDATE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_UPDATE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -941,7 +941,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.SSD_ADD_MEMBER );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_ADD_MEMBER );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -974,7 +974,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.SSD_DEL_MEMBER );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_DEL_MEMBER );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -1005,7 +1005,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.SSD_DELETE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_DELETE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -1037,7 +1037,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.SSD_CARD_UPDATE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.SSD_CARD_UPDATE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -1068,7 +1068,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.DSD_ADD );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_ADD );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -1098,7 +1098,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.DSD_UPDATE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_UPDATE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -1131,7 +1131,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.DSD_ADD_MEMBER );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_ADD_MEMBER );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -1164,7 +1164,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.DSD_DEL_MEMBER );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_DEL_MEMBER );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -1195,7 +1195,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.DSD_DELETE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_DELETE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
@@ -1227,7 +1227,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
request.setSession( adminSess );
}
String szRequest = RestUtils.marshal( request );
- String szResponse = RestUtils.post( szRequest, HttpIds.DSD_CARD_UPDATE );
+ String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.DSD_CARD_UPDATE );
FortResponse response = RestUtils.unmarshall( szResponse );
if ( response.getErrorCode() == 0 )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
index 9d5c01b..bd1a5f6 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
@@ -19,21 +19,21 @@
*/
package org.apache.directory.fortress.core.rest;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.directory.fortress.core.AuditMgr;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.SecurityException;
+import org.apache.directory.fortress.core.impl.Manageable;
import org.apache.directory.fortress.core.model.AuthZ;
import org.apache.directory.fortress.core.model.Bind;
import org.apache.directory.fortress.core.model.FortRequest;
import org.apache.directory.fortress.core.model.FortResponse;
-import org.apache.directory.fortress.core.impl.Manageable;
import org.apache.directory.fortress.core.model.Mod;
import org.apache.directory.fortress.core.model.UserAudit;
import org.apache.directory.fortress.core.util.VUtil;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* This class performs searches across <a href="http://www.openldap.org/">OpenLDAP</a>'s slapd access log using HTTP access
* to En Masse REST server. The access log events are
@@ -126,7 +126,7 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.AUDIT_UAUTHZS);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_UAUTHZS);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -162,7 +162,7 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.AUDIT_AUTHZS);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_AUTHZS);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -198,7 +198,7 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.AUDIT_BINDS);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_BINDS);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -234,7 +234,7 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.AUDIT_SESSIONS);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_SESSIONS);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -270,7 +270,7 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.AUDIT_MODS);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_MODS);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -306,7 +306,7 @@ public class AuditMgrRestImpl extends Manageable implements AuditMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.AUDIT_INVLD);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.AUDIT_INVLD);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
index 845c827..b3e51ee 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
@@ -19,16 +19,16 @@
*/
package org.apache.directory.fortress.core.rest;
+import java.util.Properties;
+
+import org.apache.directory.fortress.core.ConfigMgr;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.ConfigMgr;
import org.apache.directory.fortress.core.model.FortRequest;
import org.apache.directory.fortress.core.model.FortResponse;
import org.apache.directory.fortress.core.model.Props;
import org.apache.directory.fortress.core.util.VUtil;
-import java.util.Properties;
-
/**
* This Manager impl supplies CRUD methods used to manage properties stored within the ldap directory using HTTP access to En Masse REST server.
* The Fortress config nodes are used to remotely share Fortress client specific properties between processes.
@@ -60,7 +60,7 @@ public class ConfigMgrRestImpl implements ConfigMgr
request.setEntity(inProps);
request.setValue(name);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.CFG_ADD);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.CFG_ADD);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -89,7 +89,7 @@ public class ConfigMgrRestImpl implements ConfigMgr
request.setEntity(inProps);
request.setValue(name);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.CFG_UPDATE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.CFG_UPDATE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -114,7 +114,7 @@ public class ConfigMgrRestImpl implements ConfigMgr
FortRequest request = new FortRequest();
request.setValue(name);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.CFG_DELETE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.CFG_DELETE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -136,7 +136,7 @@ public class ConfigMgrRestImpl implements ConfigMgr
request.setEntity(inProps);
request.setValue(name);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.CFG_DELETE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.CFG_DELETE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -156,7 +156,7 @@ public class ConfigMgrRestImpl implements ConfigMgr
FortRequest request = new FortRequest();
request.setValue(name);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.CFG_READ);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.CFG_READ);
FortResponse response = RestUtils.unmarshall(szResponse);
Props props;
if (response.getErrorCode() == 0)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
index 9c8d9ca..557b444 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
@@ -19,23 +19,23 @@
*/
package org.apache.directory.fortress.core.rest;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.apache.directory.fortress.core.DelAccessMgr;
import org.apache.directory.fortress.core.GlobalErrIds;
+import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.model.FortRequest;
import org.apache.directory.fortress.core.model.FortResponse;
-import org.apache.directory.fortress.core.model.RolePerm;
-import org.apache.directory.fortress.core.model.UserAdminRole;
-import org.apache.directory.fortress.core.DelAccessMgr;
import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.RolePerm;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserAdminRole;
import org.apache.directory.fortress.core.model.UserRole;
-import org.apache.directory.fortress.core.model.Role;
import org.apache.directory.fortress.core.util.VUtil;
-import org.apache.directory.fortress.core.SecurityException;
-
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
/**
* This class implements the ARBAC02 DelAccessMgr interface for performing runtime delegated access control operations on objects that are provisioned Fortress ARBAC entities
@@ -81,7 +81,7 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
request.setSession(session);
request.setEntity(uRole);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ADMIN_ASSIGN);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ADMIN_ASSIGN);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -115,7 +115,7 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
request.setSession(session);
request.setEntity(uRole);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ADMIN_DEASSIGN);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ADMIN_DEASSIGN);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -151,7 +151,7 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
request.setSession(session);
request.setEntity(context);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ADMIN_GRANT);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ADMIN_GRANT);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -187,7 +187,7 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
request.setSession(session);
request.setEntity(context);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ADMIN_REVOKE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ADMIN_REVOKE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -221,7 +221,7 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
request.setSession(session);
request.setEntity(perm);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ADMIN_AUTHZ);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ADMIN_AUTHZ);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -252,7 +252,7 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
request.setSession(session);
request.setEntity(role);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ADMIN_ADD);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ADMIN_ADD);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -281,7 +281,7 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
request.setSession(session);
request.setEntity(role);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ADMIN_DROP);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ADMIN_DROP);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -308,7 +308,7 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
request.setContextId(this.contextId);
request.setSession(session);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ADMIN_ROLES);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ADMIN_ROLES);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -337,7 +337,7 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
request.setContextId(this.contextId);
request.setSession(session);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ADMIN_AUTHZ_ROLES);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ADMIN_AUTHZ_ROLES);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -369,7 +369,7 @@ public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccess
request.setContextId(this.contextId);
request.setSession(session);
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ADMIN_PERMS);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ADMIN_PERMS);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
index 08963d3..73a016d 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
@@ -20,12 +20,13 @@
package org.apache.directory.fortress.core.rest;
import org.apache.directory.fortress.core.DelAdminMgr;
+import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.SecurityException;
+import org.apache.directory.fortress.core.impl.Manageable;
import org.apache.directory.fortress.core.model.AdminRole;
import org.apache.directory.fortress.core.model.AdminRoleRelationship;
import org.apache.directory.fortress.core.model.FortRequest;
import org.apache.directory.fortress.core.model.FortResponse;
-import org.apache.directory.fortress.core.impl.Manageable;
import org.apache.directory.fortress.core.model.OrgUnit;
import org.apache.directory.fortress.core.model.OrgUnitRelationship;
import org.apache.directory.fortress.core.model.PermGrant;
@@ -33,7 +34,6 @@ import org.apache.directory.fortress.core.model.PermObj;
import org.apache.directory.fortress.core.model.Permission;
import org.apache.directory.fortress.core.model.User;
import org.apache.directory.fortress.core.model.UserAdminRole;
-import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.util.VUtil;
@@ -74,7 +74,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_ADD);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_ADD);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -104,7 +104,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_DELETE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_DELETE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -130,7 +130,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_UPDATE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_UPDATE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -160,7 +160,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_ASGN);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_ASGN);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -185,7 +185,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_DEASGN);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_DEASGN);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -211,7 +211,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ORG_ADD);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_ADD);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -242,7 +242,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ORG_UPDATE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_UPDATE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -273,7 +273,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ORG_DELETE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_DELETE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -309,7 +309,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ORG_DESC);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_DESC);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -339,7 +339,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ORG_ASC);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_ASC);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -370,7 +370,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ORG_ADDINHERIT);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_ADDINHERIT);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -401,7 +401,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ORG_DELINHERIT);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_DELINHERIT);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -431,7 +431,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_DESC);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_DESC);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -461,7 +461,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_ASC);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_ASC);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -491,7 +491,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_ADDINHERIT);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_ADDINHERIT);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -521,7 +521,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_DELINHERIT);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_DELINHERIT);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -548,7 +548,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.PERM_ADD);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_ADD);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -580,7 +580,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.PERM_UPDATE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_UPDATE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -611,7 +611,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.PERM_DELETE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.PERM_DELETE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -638,7 +638,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.OBJ_ADD);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.OBJ_ADD);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -670,7 +670,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.OBJ_UPDATE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.OBJ_UPDATE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -701,7 +701,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.OBJ_DELETE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.OBJ_DELETE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -733,7 +733,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ROLE_GRANT);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_GRANT);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -765,7 +765,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ROLE_REVOKE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ROLE_REVOKE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -797,7 +797,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.USER_GRANT);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_GRANT);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
@@ -829,7 +829,7 @@ public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.USER_REVOKE);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_REVOKE);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() != 0)
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/908a0734/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
index 0012075..fb1f1f0 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
@@ -73,7 +73,7 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_READ);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_READ);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -104,7 +104,7 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_SEARCH);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_SEARCH);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -135,7 +135,7 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ARLE_ASGNED);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ARLE_ASGNED);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -166,7 +166,7 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.USER_ASGNED_ADMIN);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.USER_ASGNED_ADMIN);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -202,7 +202,7 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ORG_READ);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_READ);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{
@@ -234,7 +234,7 @@ public class DelReviewMgrRestImpl extends Manageable implements DelReviewMgr
request.setSession(adminSess);
}
String szRequest = RestUtils.marshal(request);
- String szResponse = RestUtils.post(szRequest, HttpIds.ORG_SEARCH);
+ String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.ORG_SEARCH);
FortResponse response = RestUtils.unmarshall(szResponse);
if (response.getErrorCode() == 0)
{