You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2017/04/28 12:57:04 UTC
[1/2] directory-fortress-core git commit: throw method not supported
exception rather return null
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 59157250d -> 49ca32520
throw method not supported exception rather return null
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/d42482c4
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/d42482c4
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/d42482c4
Branch: refs/heads/master
Commit: d42482c48183f20db902ca0f94a221c62b4418d6
Parents: 5915725
Author: Shawn McKinney <sm...@apache.org>
Authored: Sat Feb 4 08:03:10 2017 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sat Feb 4 08:03:10 2017 -0600
----------------------------------------------------------------------
.../fortress/core/rest/PropertyMgrRestImpl.java | 16 +++++++++-------
.../fortress/core/impl/PropertyMgrImplTest.java | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d42482c4/src/main/java/org/apache/directory/fortress/core/rest/PropertyMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/PropertyMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/PropertyMgrRestImpl.java
index cb39abc..d9d3915 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/PropertyMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/PropertyMgrRestImpl.java
@@ -26,6 +26,9 @@ import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.model.FortEntity;
import org.apache.directory.fortress.core.model.Session;
+/**
+ * TODO: implement me...
+ */
public class PropertyMgrRestImpl implements PropertyMgr
{
@@ -33,42 +36,41 @@ public class PropertyMgrRestImpl implements PropertyMgr
public FortEntity add( FortEntity entity, Properties props ) throws SecurityException
{
// TODO Auto-generated method stub
- return null;
+ throw new UnsupportedOperationException( "not implemented" );
}
@Override
public FortEntity update( FortEntity entity, Properties props ) throws SecurityException
{
// TODO Auto-generated method stub
- return null;
+ throw new UnsupportedOperationException( "not implemented" );
}
@Override
public void delete( FortEntity entity, Properties props ) throws SecurityException
{
// TODO Auto-generated method stub
-
+ throw new UnsupportedOperationException( "not implemented" );
}
@Override
public Properties get( FortEntity entity ) throws SecurityException
{
// TODO Auto-generated method stub
- return null;
+ throw new UnsupportedOperationException( "not implemented" );
}
@Override
public void setAdmin( Session session )
{
// TODO Auto-generated method stub
-
+ throw new UnsupportedOperationException( "not implemented" );
}
@Override
public void setContextId( String contextId )
{
// TODO Auto-generated method stub
-
+ throw new UnsupportedOperationException( "not implemented" );
}
-
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d42482c4/src/test/java/org/apache/directory/fortress/core/impl/PropertyMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/PropertyMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/PropertyMgrImplTest.java
index a3307c0..35ece45 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/PropertyMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/PropertyMgrImplTest.java
@@ -84,8 +84,8 @@ public class PropertyMgrImplTest extends TestCase
for(String[] propArray : propArrays){
propertyMgr.add( entity, getProperty( propArray ) );
-
Properties newAddedProps = propertyMgr.get( entity );
+ assertNotNull( newAddedProps );
assertEquals( propArray[1], newAddedProps.getProperty( propArray[0] ) );
}
}
[2/2] directory-fortress-core git commit: code comments clearly
describe that the truststore is now found on classpath and not fully
qualified.
Posted by sm...@apache.org.
code comments clearly describe that the truststore is now found on classpath and not fully qualified.
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/49ca3252
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/49ca3252
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/49ca3252
Branch: refs/heads/master
Commit: 49ca3252076f6d5679f74b8e920a4d7a2ca8b9a6
Parents: d42482c
Author: Shawn McKinney <sm...@apache.org>
Authored: Thu Apr 27 22:45:01 2017 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Thu Apr 27 22:45:01 2017 -0500
----------------------------------------------------------------------
build.properties.example | 2 +-
slapd.properties.example | 2 +-
.../fortress/core/ldap/LdapClientTrustStoreManager.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/49ca3252/build.properties.example
----------------------------------------------------------------------
diff --git a/build.properties.example b/build.properties.example
index 255c2dd..23d3282 100644
--- a/build.properties.example
+++ b/build.properties.example
@@ -58,7 +58,7 @@ ldap.port=10389
#ldap.host=fortressdemo2.com
#ldap.port=10636
#enable.ldap.ssl.debug=true
-# The trust store is picked up off the classpath:
+# The trust store is picked up off the classpath i.e. fortress-home/config:
#trust.store=mytruststore
#trust.store.password=changeit
#trust.store.set.prop=true
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/49ca3252/slapd.properties.example
----------------------------------------------------------------------
diff --git a/slapd.properties.example b/slapd.properties.example
index 9463c1a..8ca4384 100644
--- a/slapd.properties.example
+++ b/slapd.properties.example
@@ -84,7 +84,7 @@ log.ops=logops bind writes compare
#ldap.host=fortressdemo2.com
#ldap.port=10636
#enable.ldap.ssl.debug=true
-# The trust store is picked up off the classpath:
+# The trust store is picked up off the classpath i.e. fortress-home/config:
#trust.store=mytruststore
#trust.store.password=changeit
#trust.store.set.prop=true
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/49ca3252/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
index 8bf224d..040ca07 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
@@ -68,7 +68,7 @@ public final class LdapClientTrustStoreManager implements X509TrustManager, Seri
/**
* Constructor used by connection configuration utility to load trust store manager.
*
- * @param trustStoreFile contains fully qualified name of trust store file.
+ * @param trustStoreFile contains name of trust store file.
* @param trustStorePw contains the password for trust store
* @param trustStoreFormat contains the format for trust store
* @param isExamineValidity boolean var determines if certificate will be examined for valid dates on load.
@@ -82,7 +82,7 @@ public final class LdapClientTrustStoreManager implements X509TrustManager, Seri
throw new CfgRuntimeException( GlobalErrIds.FT_CONFIG_JSSE_TRUSTSTORE_NULL,
"LdapClientTrustStoreManager constructor : input file name is null" );
}
- // contains the fully-qualified file name of a valid JSSE TrustStore on local file system:
+ // contains the file name of a valid JSSE TrustStore found on classpath:
this.trustStoreFile = trustStoreFile;
// the password to the JSSE TrustStore:
this.trustStorePw = trustStorePw.clone();
@@ -282,7 +282,7 @@ public final class LdapClientTrustStoreManager implements X509TrustManager, Seri
InputStream result = ResourceUtil.getInputStream(trustStoreFile);
if (null == result)
{
- throw new CertificateException("LdapClientTrustStoreManager.getTrustStoreInputStream file does not exist" );
+ throw new CertificateException("LdapClientTrustStoreManager.getTrustStoreInputStream file does not exist on fortress classpath" );
}
return result;
}