This is an automated email from the ASF dual-hosted git repository.
painter pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
The following commit(s) were added to refs/heads/master by this push:
new a91ea33 Fix references to StringUtil
a91ea33 is described below
commit a91ea331dfe43570b21af4d4b9b1737e76e0c95e
Author: jlpainter <jeff.pain...@gmail.com>
AuthorDate: Thu Oct 25 11:53:46 2018 -0400
Fix references to StringUtil
---
.../src/main/java/flux/modules/actions/FluxLogin.java | 2 +-
.../src/main/java/flux/modules/actions/group/FluxGroupAction.java | 2 +-
.../main/java/flux/modules/actions/permission/FluxPermissionAction.java | 2 +-
.../src/main/java/flux/modules/actions/role/FluxRoleAction.java | 2 +-
.../src/main/java/flux/modules/actions/user/FluxUserAction.java | 2 +-
.../archetype-resources/src/main/java/flux/tools/FluxTool.java | 2 +-
.../archetype-resources/src/main/java/modules/actions/LoginUser.java | 2 +-
.../src/main/java/modules/actions/LoginUserIntake.java | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogin.java
b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogin.java
index 1414adc..198d398 100644
---
a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogin.java
+++
b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/FluxLogin.java
@@ -22,7 +22,7 @@ package ${package}.flux.modules.actions;
*/
import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.fulcrum.security.util.FulcrumSecurityException;
import org.apache.fulcrum.security.util.UnknownEntityException;
import org.apache.turbine.TurbineConstants;
diff --git
a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/group/FluxGroupAction.java
b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/group/FluxGroupAction.java
index a4c8087..deeb355 100644
---
a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/group/FluxGroupAction.java
+++
b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/group/FluxGroupAction.java
@@ -17,12 +17,12 @@ package ${package}.flux.modules.actions.group;
*/
import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.UnknownEntityException;
-import org.apache.fulcrum.yaafi.framework.util.StringUtils;
import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.annotation.TurbineService;
import org.apache.turbine.pipeline.PipelineData;
diff --git
a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/permission/FluxPermissionAction.java
b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/permission/FluxPermissionAction.java
index 08cb22d..c92c914 100644
---
a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/permission/FluxPermissionAction.java
+++
b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/permission/FluxPermissionAction.java
@@ -17,13 +17,13 @@ package ${package}.flux.modules.actions.permission;
*/
import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.entity.Role;
import org.apache.fulcrum.security.torque.om.TurbinePermission;
import org.apache.fulcrum.security.torque.om.TurbinePermissionPeer;
import org.apache.fulcrum.security.util.RoleSet;
-import org.apache.fulcrum.yaafi.framework.util.StringUtils;
import org.apache.torque.criteria.Criteria;
import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.annotation.TurbineService;
diff --git
a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/role/FluxRoleAction.java
b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/role/FluxRoleAction.java
index 9df670b..3e94e9e 100644
---
a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/role/FluxRoleAction.java
+++
b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/role/FluxRoleAction.java
@@ -19,6 +19,7 @@ package ${package}.flux.modules.actions.role;
import java.util.Iterator;
import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.entity.Permission;
@@ -28,7 +29,6 @@ import
org.apache.fulcrum.security.torque.om.TurbineUserGroupRolePeer;
import org.apache.fulcrum.security.util.EntityExistsException;
import org.apache.fulcrum.security.util.PermissionSet;
import org.apache.fulcrum.security.util.UnknownEntityException;
-import org.apache.fulcrum.yaafi.framework.util.StringUtils;
import org.apache.torque.criteria.Criteria;
import org.apache.turbine.annotation.TurbineConfiguration;
import org.apache.turbine.annotation.TurbineService;
diff --git
a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/user/FluxUserAction.java
b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/user/FluxUserAction.java
index 6252f9e..d41db9a 100644
---
a/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/user/FluxUserAction.java
+++
b/src/main/resources/archetype-resources/src/main/java/flux/modules/actions/user/FluxUserAction.java
@@ -16,7 +16,7 @@ package ${package}.flux.modules.actions.user;
* limitations under the License.
*/
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.entity.Group;
diff --git
a/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java
b/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java
index e4002ad..1bb6b70 100644
---
a/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java
+++
b/src/main/resources/archetype-resources/src/main/java/flux/tools/FluxTool.java
@@ -19,7 +19,7 @@ package ${package}.flux.tools;
import java.util.List;
import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.pool.Recyclable;
diff --git
a/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUser.java
b/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUser.java
index b4e1963..52736d4 100644
---
a/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUser.java
+++
b/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUser.java
@@ -20,7 +20,7 @@ package ${package}.modules.actions;
*#
import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.util.FulcrumSecurityException;
diff --git
a/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUserIntake.java
b/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUserIntake.java
index cd5f9f3..85dda64 100644
---
a/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUserIntake.java
+++
b/src/main/resources/archetype-resources/src/main/java/modules/actions/LoginUserIntake.java
@@ -21,7 +21,7 @@ package ${package}.modules.actions;
import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.pool.PoolService;
