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 16:02:36 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 46ccec8e1 -> 7322d550d


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

Branch: refs/heads/master
Commit: 7322d550d27a2b44a655e16c58ed97a95e8c3921
Parents: 46ccec8
Author: Shawn McKinney <smckinney@apache.org>
Authored: Sun Oct 9 11:02:30 2016 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Sun Oct 9 11:02:30 2016 -0500

----------------------------------------------------------------------
 .../fortress/core/impl/AdminRoleP.java          |  2 +-
 .../directory/fortress/core/impl/RoleP.java     |  2 +-
 .../fortress/core/model/ConstraintUtil.java     |  1 +
 .../core/model/ConstraintValidator.java         | 75 --------------------
 .../fortress/core/util/ConstraintValidator.java | 75 ++++++++++++++++++++
 .../directory/fortress/core/util/VUtil.java     |  1 -
 .../fortress/core/example/ExampleP.java         |  2 +-
 7 files changed, 79 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7322d550/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
index 7d68610..8f9205c 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
@@ -31,7 +31,7 @@ import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.RemoveException;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.model.AdminRole;
-import org.apache.directory.fortress.core.model.ConstraintValidator;
+import org.apache.directory.fortress.core.util.ConstraintValidator;
 import org.apache.directory.fortress.core.model.Graphable;
 import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.model.UserAdminRole;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7322d550/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
index 0b57fed..1c94c7e 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
@@ -29,7 +29,7 @@ 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.ValidationException;
-import org.apache.directory.fortress.core.model.ConstraintValidator;
+import org.apache.directory.fortress.core.util.ConstraintValidator;
 import org.apache.directory.fortress.core.model.Graphable;
 import org.apache.directory.fortress.core.model.Group;
 import org.apache.directory.fortress.core.model.Role;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7322d550/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 35327b7..91d9fee 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
@@ -24,6 +24,7 @@ import java.util.StringTokenizer;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.ValidationException;
 import org.apache.directory.fortress.core.util.Config;
+import org.apache.directory.fortress.core.util.ConstraintValidator;
 import org.apache.directory.fortress.core.util.VUtil;
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7322d550/src/main/java/org/apache/directory/fortress/core/model/ConstraintValidator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/ConstraintValidator.java
b/src/main/java/org/apache/directory/fortress/core/model/ConstraintValidator.java
deleted file mode 100644
index c2e1fba..0000000
--- a/src/main/java/org/apache/directory/fortress/core/model/ConstraintValidator.java
+++ /dev/null
@@ -1,75 +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.model;
-
-import org.apache.directory.fortress.core.ValidationException;
-
-/**
- * This interface provides constraint entity validation.
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-public interface ConstraintValidator
-{
-    /**
-     * Perform simple reasonability check on contraint timeout value.
-     *
-     * @param timeout must be greater than 0 and less than max value for {@link Integer#MAX_VALUE}
-     * @throws org.apache.directory.fortress.core.ValidationException
-     *          in the event value falls out of range.
-     */
-    void timeout( Integer timeout ) throws ValidationException;
-
-    /**
-     * Perform simple reasonability check on contraint beginTime value.
-     *
-     * @param beginTime if set, must be between '0000' and '2400'.
-     * @throws org.apache.directory.fortress.core.ValidationException
-     *          in the event value falls out of range.
-     */
-    void beginTime( String beginTime ) throws ValidationException;
-
-    /**
-     * Perform simple reasonability check on contraint endTime value.
-     * @param endTime if set, must be between '0000' and '2400'.
-     * @throws ValidationException in the event value falls out of range.
-     */
-    void endTime( String endTime ) throws ValidationException;
-
-    /**
-     * Perform simple reasonability check on contraint beginDate value.
-     * @param beginDate if set, must be format 'YYYYMMDD'.
-     * @throws ValidationException in the event value falls out of range.
-     */
-    void beginDate( String beginDate ) throws ValidationException;
-
-    /**
-     * Perform simple reasonability check on contraint endDate value.
-     * @param endDate if set, must be format 'YYYYMMDD'.
-     * @throws ValidationException in the event value falls out of range.
-     */
-    void endDate( String endDate ) throws ValidationException;
-
-    /**
-     * Perform simple reasonability check on contraint dayMask value.
-     * @param dayMask format is '1234567', 1 = Sunday, 2 = Monday, etc.  Any or all of the
'bits' may be left blank.
-     * @throws ValidationException in the event value falls out of range.
-     */
-    void dayMask( String dayMask ) throws ValidationException;
-}

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7322d550/src/main/java/org/apache/directory/fortress/core/util/ConstraintValidator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/ConstraintValidator.java
b/src/main/java/org/apache/directory/fortress/core/util/ConstraintValidator.java
new file mode 100644
index 0000000..404698f
--- /dev/null
+++ b/src/main/java/org/apache/directory/fortress/core/util/ConstraintValidator.java
@@ -0,0 +1,75 @@
+/*
+ *   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.apache.directory.fortress.core.ValidationException;
+
+/**
+ * This interface provides constraint entity validation.
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public interface ConstraintValidator
+{
+    /**
+     * Perform simple reasonability check on contraint timeout value.
+     *
+     * @param timeout must be greater than 0 and less than max value for {@link Integer#MAX_VALUE}
+     * @throws org.apache.directory.fortress.core.ValidationException
+     *          in the event value falls out of range.
+     */
+    void timeout( Integer timeout ) throws ValidationException;
+
+    /**
+     * Perform simple reasonability check on contraint beginTime value.
+     *
+     * @param beginTime if set, must be between '0000' and '2400'.
+     * @throws org.apache.directory.fortress.core.ValidationException
+     *          in the event value falls out of range.
+     */
+    void beginTime( String beginTime ) throws ValidationException;
+
+    /**
+     * Perform simple reasonability check on contraint endTime value.
+     * @param endTime if set, must be between '0000' and '2400'.
+     * @throws ValidationException in the event value falls out of range.
+     */
+    void endTime( String endTime ) throws ValidationException;
+
+    /**
+     * Perform simple reasonability check on contraint beginDate value.
+     * @param beginDate if set, must be format 'YYYYMMDD'.
+     * @throws ValidationException in the event value falls out of range.
+     */
+    void beginDate( String beginDate ) throws ValidationException;
+
+    /**
+     * Perform simple reasonability check on contraint endDate value.
+     * @param endDate if set, must be format 'YYYYMMDD'.
+     * @throws ValidationException in the event value falls out of range.
+     */
+    void endDate( String endDate ) throws ValidationException;
+
+    /**
+     * Perform simple reasonability check on contraint dayMask value.
+     * @param dayMask format is '1234567', 1 = Sunday, 2 = Monday, etc.  Any or all of the
'bits' may be left blank.
+     * @throws ValidationException in the event value falls out of range.
+     */
+    void dayMask( String dayMask ) throws ValidationException;
+}

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7322d550/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/VUtil.java b/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
index 2f748fb..34135d9 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
@@ -36,7 +36,6 @@ import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.ValidationException;
 import org.apache.directory.fortress.core.model.Constraint;
-import org.apache.directory.fortress.core.model.ConstraintValidator;
 import org.apache.directory.fortress.core.model.Group;
 import org.apache.directory.fortress.core.model.ObjectFactory;
 import org.apache.directory.fortress.core.model.Session;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7322d550/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
index 929acf1..36b35df 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleP.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.core.example;
 
-import org.apache.directory.fortress.core.model.ConstraintValidator;
+import org.apache.directory.fortress.core.util.ConstraintValidator;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.SecurityException;


Mime
View raw message