From 6db9840439ad9ca02cd824300eed4244244fc6e1 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 12 Apr 2012 16:10:30 +0000 Subject: [PATCH] fix compilation failure due to package change git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1325345 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/redback/configuration/UserConfiguration.java | 4 ++-- .../redback/struts2/action/admin/SystemInfoAction.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java index 138bfa540..ab9683503 100644 --- a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java +++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java @@ -19,12 +19,12 @@ package org.apache.archiva.redback.configuration; * under the License. */ +import org.apache.archiva.redback.components.registry.Registry; +import org.apache.archiva.redback.components.registry.RegistryException; import org.codehaus.plexus.evaluator.DefaultExpressionEvaluator; import org.codehaus.plexus.evaluator.EvaluatorException; import org.codehaus.plexus.evaluator.ExpressionEvaluator; import org.codehaus.plexus.evaluator.sources.SystemPropertyExpressionSource; -import org.codehaus.plexus.registry.Registry; -import org.codehaus.plexus.registry.RegistryException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java index 5fd104446..76422e894 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java @@ -19,6 +19,7 @@ package org.apache.archiva.redback.struts2.action.admin; * under the License. */ +import org.apache.archiva.redback.components.registry.Registry; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.Resource; import org.apache.commons.beanutils.PropertyUtils; @@ -26,7 +27,6 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.archiva.redback.struts2.action.AbstractSecurityAction; import org.apache.archiva.redback.system.SecuritySystem; -import org.codehaus.plexus.registry.Registry; import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.role.RoleConstants; -- 2.39.5