directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-191 - remove cyclic dependencies
Date Sun, 09 Oct 2016 15:56:00 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master fb6cd5cf1 -> 46ccec8e1


FC-191 - remove cyclic dependencies


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

Branch: refs/heads/master
Commit: 46ccec8e161840e986b8f6dced7fe88a228d74fa
Parents: fb6cd5c
Author: Shawn McKinney <smckinney@apache.org>
Authored: Sun Oct 9 10:55:55 2016 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Sun Oct 9 10:55:55 2016 -0500

----------------------------------------------------------------------
 .../core/ldap/LdapConnectionProvider.java       |   2 +-
 .../fortress/core/ldap/LdapDataProvider.java    |   1 +
 .../directory/fortress/core/ldap/LdapUtil.java  | 140 -------------------
 .../directory/fortress/core/rest/RestUtils.java |   2 +-
 .../directory/fortress/core/util/Config.java    |   1 -
 .../fortress/core/util/EncryptUtil.java         | 116 +++++++++++++++
 .../directory/fortress/core/util/LdapUtil.java  | 140 +++++++++++++++++++
 .../fortress/core/util/crypto/EncryptUtil.java  | 117 ----------------
 .../fortress/core/util/crypto/package.html      |  37 -----
 .../fortress/core/EncryptMgrConsole.java        |   2 +-
 10 files changed, 260 insertions(+), 298 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/46ccec8e/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
index 4ded9b6..caf7d90 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
@@ -33,7 +33,7 @@ import org.apache.directory.fortress.core.CfgRuntimeException;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.util.Config;
-import org.apache.directory.fortress.core.util.crypto.EncryptUtil;
+import org.apache.directory.fortress.core.util.EncryptUtil;
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.ldap.client.api.LdapConnectionConfig;
 import org.apache.directory.ldap.client.api.LdapConnectionPool;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/46ccec8e/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 c2b955e..598ff28 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
@@ -69,6 +69,7 @@ import org.apache.directory.fortress.core.model.FortEntity;
 import org.apache.directory.fortress.core.model.Hier;
 import org.apache.directory.fortress.core.model.Relationship;
 import org.apache.directory.fortress.core.util.Config;
+import org.apache.directory.fortress.core.util.LdapUtil;
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/46ccec8e/src/main/java/org/apache/directory/fortress/core/ldap/LdapUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapUtil.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapUtil.java
deleted file mode 100644
index c3942be..0000000
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapUtil.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.core.ldap;
-
-
-
-/**
- * This utility is a singleton and has getters / setters to access properties for filtering
data bound for ldap.
- * It is used by the Config and LdapDataProvider classes to provide escape ldap data to prevent
unauthorized or inadvertent tampering with operations on the server.
- * <p>
- * This class is not thread safe.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public class LdapUtil
-{
-    private boolean ldapfilterSizeFound = false;
-    private int ldapFilterSize = 25;
-    private char[] ldapMetaChars;
-    private String[] ldapReplVals;
-
-    private static volatile LdapUtil INSTANCE = null;
-
-    /**
-     * Provided synchronized access to this.
-     *
-     * @return a reference to singleton instance of this class.
-     */
-    public static LdapUtil getInstance()
-    {
-        if ( INSTANCE == null )
-        {
-            synchronized ( LdapUtil.class )
-            {
-                if ( INSTANCE == null )
-                {
-                    INSTANCE = new LdapUtil();
-                }
-            }
-        }
-        return INSTANCE;
-    }
-
-    /**
-     * The ldap.filter.size specifies the number of entries in the set of ldap filter properties.
-     *
-     * @return true if the property value was found in the fortress configs.
-     */
-    public boolean isLdapfilterSizeFound()
-    {
-        return ldapfilterSizeFound;
-    }
-
-    /**
-     * Associated with fortress.property named ldap.filter.size.  If the size matches the
number of entries found in properties this will be set to 'true'.
-     *
-     * @param ldapfilterSizeFound true indicates the ldap.filter.size prop was set.
-     */
-    public void setLdapfilterSizeFound(boolean ldapfilterSizeFound)
-    {
-        this.ldapfilterSizeFound = ldapfilterSizeFound;
-    }
-
-    /**
-     * Return the number of entries in the filter list. ldap.filter.size
-     *
-     * @return the number of entries in set.
-     */
-    public int getLdapFilterSize()
-    {
-        return ldapFilterSize;
-    }
-
-    /**
-     * Set the number of entries in the filter list. ldap.filter.size
-     *
-     * @param ldapFilterSize corresponds to the number of entries in the ldap filter set.
-     */
-    public void setLdapFilterSize(int ldapFilterSize)
-    {
-        this.ldapFilterSize = ldapFilterSize;
-    }
-
-    /**
-     * Contains the unsafe characters set by fortress.properties named ldap.filter.
-     *
-     * @return the set of unsafe characters.
-     */
-    public char[] getLdapMetaChars()
-    {
-        return ldapMetaChars;
-    }
-
-    /**
-     * Set the unsafe characters by using ldap.filter specified by fortress.properties.
-     *
-     * @param ldapMetaChars contains the set of unsafe chars
-     */
-    public void setLdapMetaChars(char[] ldapMetaChars)
-    {
-        this.ldapMetaChars = ldapMetaChars;
-    }
-
-    /**
-     * Contains the safe replacement characters.
-     *
-     * @return the safe character set.
-     */
-    public String[] getLdapReplVals()
-    {
-        return ldapReplVals;
-    }
-
-    /**
-     * Set the ldap replacement chars.
-     *
-     * @param ldapReplVals contains the set of encoded chars
-     */
-    public void setLdapReplVals(String[] ldapReplVals)
-    {
-        this.ldapReplVals = ldapReplVals;
-    }
-}

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/46ccec8e/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
index af4f496..4ebe7ad 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
@@ -43,7 +43,7 @@ import org.apache.directory.fortress.core.model.FortResponse;
 import org.apache.directory.fortress.core.model.ObjectFactory;
 import org.apache.directory.fortress.core.model.Props;
 import org.apache.directory.fortress.core.util.Config;
-import org.apache.directory.fortress.core.util.crypto.EncryptUtil;
+import org.apache.directory.fortress.core.util.EncryptUtil;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/46ccec8e/src/main/java/org/apache/directory/fortress/core/util/Config.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/Config.java b/src/main/java/org/apache/directory/fortress/core/util/Config.java
index 79c316b..fa3159e 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/Config.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/Config.java
@@ -33,7 +33,6 @@ import org.apache.directory.fortress.core.ConfigMgrFactory;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.ldap.LdapUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/46ccec8e/src/main/java/org/apache/directory/fortress/core/util/EncryptUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/EncryptUtil.java b/src/main/java/org/apache/directory/fortress/core/util/EncryptUtil.java
new file mode 100755
index 0000000..a26aa5c
--- /dev/null
+++ b/src/main/java/org/apache/directory/fortress/core/util/EncryptUtil.java
@@ -0,0 +1,116 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.fortress.core.util;
+
+import org.jasypt.util.text.BasicTextEncryptor;
+
+/**
+ * Contains a simple wrapper for Jasypt open source encryption APIs, see <a href="http://www.jasypt.org/">Jasypt</a>.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public final class EncryptUtil
+{
+    private BasicTextEncryptor textEncryptor;
+    private static final String CRYPTO_PROP = "crypto.prop";
+    
+    private static volatile EncryptUtil INSTANCE = null; 
+    
+    public static EncryptUtil getInstance() {
+        if(INSTANCE == null) {
+            synchronized (EncryptUtil.class) {
+                if(INSTANCE == null){
+        	        INSTANCE = new EncryptUtil();
+                }
+            }
+        }
+        return INSTANCE;
+    }
+    
+    private void init()
+    {
+        textEncryptor = new BasicTextEncryptor();
+        textEncryptor.setPassword(Config.getInstance().getProperty(CRYPTO_PROP, "adlfarerovcja;39
d"));
+    }
+
+    /**
+     * Private constructor
+     *
+     */
+    private EncryptUtil()
+    {
+        init();
+    }
+
+    /**
+     * This wraps {@link #encrypt(String)} method.  Will return an encrypted value to standard
out using System.out.println().
+     * It can be used for ad-hoc encryption of vars {@code fortress.properties} bound.
+     * @param args contains a single String to {@link #encrypt(String)}.
+     */
+    public static void main(String[] args)
+    {
+        if(args[0] != null && args[0].length() > 0)
+        {
+            String encryptedValue = EncryptUtil.getInstance().encrypt(args[0]);
+            System.out.println("Encrypted value=" + encryptedValue);
+        }
+    }
+
+
+    /**
+     * Returns 'true' if the property {@code crypto.prop} has a value set in fortress cfg.
 If this value
+     * is 'false', Fortress will assume LDAP password in cfg file are clear text.
+     *
+     * @return boolean
+     */
+    public static boolean isEnabled()
+    {
+        boolean result = false;
+        if(Config.getInstance().getProperty(CRYPTO_PROP)!= null && !Config.getInstance().getProperty(CRYPTO_PROP).equals("${crypto.prop}"))
+        {
+            result = true;
+        }
+        return result;
+    }
+
+
+    /**
+     * Encrypt a value using Jasypt utility.
+     *
+     * @param clearText contains the text to be encrypted.
+     * @return String containing encrypted text.
+     */
+    public String encrypt(String clearText)
+    {
+        return textEncryptor.encrypt(clearText);
+    }
+
+    /**
+     * Decrypt a value using Jasypt utility.
+     *
+     * @param encryptedText contains the text to be decrypted.
+     * @return String containing decrypted text.
+     */
+    public String decrypt(String encryptedText)
+    {
+        return textEncryptor.decrypt(encryptedText);
+    }
+}
+

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/46ccec8e/src/main/java/org/apache/directory/fortress/core/util/LdapUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/LdapUtil.java b/src/main/java/org/apache/directory/fortress/core/util/LdapUtil.java
new file mode 100644
index 0000000..9950fd2
--- /dev/null
+++ b/src/main/java/org/apache/directory/fortress/core/util/LdapUtil.java
@@ -0,0 +1,140 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.fortress.core.util;
+
+
+
+/**
+ * This utility is a singleton and has getters / setters to access properties for filtering
data bound for ldap.
+ * It is used by the Config and LdapDataProvider classes to provide escape ldap data to prevent
unauthorized or inadvertent tampering with operations on the server.
+ * <p>
+ * This class is not thread safe.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class LdapUtil
+{
+    private boolean ldapfilterSizeFound = false;
+    private int ldapFilterSize = 25;
+    private char[] ldapMetaChars;
+    private String[] ldapReplVals;
+
+    private static volatile LdapUtil INSTANCE = null;
+
+    /**
+     * Provided synchronized access to this.
+     *
+     * @return a reference to singleton instance of this class.
+     */
+    public static LdapUtil getInstance()
+    {
+        if ( INSTANCE == null )
+        {
+            synchronized ( LdapUtil.class )
+            {
+                if ( INSTANCE == null )
+                {
+                    INSTANCE = new LdapUtil();
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    /**
+     * The ldap.filter.size specifies the number of entries in the set of ldap filter properties.
+     *
+     * @return true if the property value was found in the fortress configs.
+     */
+    public boolean isLdapfilterSizeFound()
+    {
+        return ldapfilterSizeFound;
+    }
+
+    /**
+     * Associated with fortress.property named ldap.filter.size.  If the size matches the
number of entries found in properties this will be set to 'true'.
+     *
+     * @param ldapfilterSizeFound true indicates the ldap.filter.size prop was set.
+     */
+    public void setLdapfilterSizeFound(boolean ldapfilterSizeFound)
+    {
+        this.ldapfilterSizeFound = ldapfilterSizeFound;
+    }
+
+    /**
+     * Return the number of entries in the filter list. ldap.filter.size
+     *
+     * @return the number of entries in set.
+     */
+    public int getLdapFilterSize()
+    {
+        return ldapFilterSize;
+    }
+
+    /**
+     * Set the number of entries in the filter list. ldap.filter.size
+     *
+     * @param ldapFilterSize corresponds to the number of entries in the ldap filter set.
+     */
+    public void setLdapFilterSize(int ldapFilterSize)
+    {
+        this.ldapFilterSize = ldapFilterSize;
+    }
+
+    /**
+     * Contains the unsafe characters set by fortress.properties named ldap.filter.
+     *
+     * @return the set of unsafe characters.
+     */
+    public char[] getLdapMetaChars()
+    {
+        return ldapMetaChars;
+    }
+
+    /**
+     * Set the unsafe characters by using ldap.filter specified by fortress.properties.
+     *
+     * @param ldapMetaChars contains the set of unsafe chars
+     */
+    public void setLdapMetaChars(char[] ldapMetaChars)
+    {
+        this.ldapMetaChars = ldapMetaChars;
+    }
+
+    /**
+     * Contains the safe replacement characters.
+     *
+     * @return the safe character set.
+     */
+    public String[] getLdapReplVals()
+    {
+        return ldapReplVals;
+    }
+
+    /**
+     * Set the ldap replacement chars.
+     *
+     * @param ldapReplVals contains the set of encoded chars
+     */
+    public void setLdapReplVals(String[] ldapReplVals)
+    {
+        this.ldapReplVals = ldapReplVals;
+    }
+}

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/46ccec8e/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
b/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
deleted file mode 100755
index bf5d516..0000000
--- a/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
- */
-package org.apache.directory.fortress.core.util.crypto;
-
-import org.apache.directory.fortress.core.util.Config;
-import org.jasypt.util.text.BasicTextEncryptor;
-
-/**
- * Contains a simple wrapper for Jasypt open source encryption APIs, see <a href="http://www.jasypt.org/">Jasypt</a>.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public final class EncryptUtil
-{
-    private BasicTextEncryptor textEncryptor;
-    private static final String CRYPTO_PROP = "crypto.prop";
-    
-    private static volatile EncryptUtil INSTANCE = null; 
-    
-    public static EncryptUtil getInstance() {
-        if(INSTANCE == null) {
-            synchronized (EncryptUtil.class) {
-                if(INSTANCE == null){
-        	        INSTANCE = new EncryptUtil();
-                }
-            }
-        }
-        return INSTANCE;
-    }
-    
-    private void init()
-    {
-        textEncryptor = new BasicTextEncryptor();
-        textEncryptor.setPassword(Config.getInstance().getProperty(CRYPTO_PROP, "adlfarerovcja;39
d"));
-    }
-
-    /**
-     * Private constructor
-     *
-     */
-    private EncryptUtil()
-    {
-        init();
-    }
-
-    /**
-     * This wraps {@link #encrypt(String)} method.  Will return an encrypted value to standard
out using System.out.println().
-     * It can be used for ad-hoc encryption of vars {@code fortress.properties} bound.
-     * @param args contains a single String to {@link #encrypt(String)}.
-     */
-    public static void main(String[] args)
-    {
-        if(args[0] != null && args[0].length() > 0)
-        {
-            String encryptedValue = EncryptUtil.getInstance().encrypt(args[0]);
-            System.out.println("Encrypted value=" + encryptedValue);
-        }
-    }
-
-
-    /**
-     * Returns 'true' if the property {@code crypto.prop} has a value set in fortress cfg.
 If this value
-     * is 'false', Fortress will assume LDAP password in cfg file are clear text.
-     *
-     * @return boolean
-     */
-    public static boolean isEnabled()
-    {
-        boolean result = false;
-        if(Config.getInstance().getProperty(CRYPTO_PROP)!= null && !Config.getInstance().getProperty(CRYPTO_PROP).equals("${crypto.prop}"))
-        {
-            result = true;
-        }
-        return result;
-    }
-
-
-    /**
-     * Encrypt a value using Jasypt utility.
-     *
-     * @param clearText contains the text to be encrypted.
-     * @return String containing encrypted text.
-     */
-    public String encrypt(String clearText)
-    {
-        return textEncryptor.encrypt(clearText);
-    }
-
-    /**
-     * Decrypt a value using Jasypt utility.
-     *
-     * @param encryptedText contains the text to be decrypted.
-     * @return String containing decrypted text.
-     */
-    public String decrypt(String encryptedText)
-    {
-        return textEncryptor.decrypt(encryptedText);
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/46ccec8e/src/main/java/org/apache/directory/fortress/core/util/crypto/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/crypto/package.html b/src/main/java/org/apache/directory/fortress/core/util/crypto/package.html
deleted file mode 100755
index a6d0029..0000000
--- a/src/main/java/org/apache/directory/fortress/core/util/crypto/package.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing,
- *   software distributed under the License is distributed on an
- *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *   KIND, either express or implied.  See the License for the
- *   specific language governing permissions and limitations
- *   under the License.
- *
--->
-<html>
-<head>
-    <title>Package Documentation for org.apache.directory.fortress.core.util.crypto</title>
-</head>
-<body>
-<p>
-    This package uses <a href="http://www.jasypt.org/">Jasypt</a> to provide
basic encryption/decryption functionality
-    of textual data.
-    The Main function on {@code EncryptUtil} class is called by the {@code encrypt} Ant target
and can be used to
-    encrypt ad-hoc data including ldap server configuration passwords bound for {@code fortress.properties}
file.
-</p>
-
-<p>
-    The <b>org.apache.directory.fortress.core.util.crypto</b> package contains
utilities to perform basic crypto
-    functions on text.
-</p>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/46ccec8e/src/test/java/org/apache/directory/fortress/core/EncryptMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/EncryptMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/EncryptMgrConsole.java
index 11d50d0..6c3980b 100755
--- a/src/test/java/org/apache/directory/fortress/core/EncryptMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/EncryptMgrConsole.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.core;
 
-import org.apache.directory.fortress.core.util.crypto.EncryptUtil;
+import org.apache.directory.fortress.core.util.EncryptUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 


Mime
View raw message