Author: olamy
Date: Thu Apr 12 16:10:30 2012
New Revision: 1325345
URL: http://svn.apache.org/viewvc?rev=1325345&view=rev
Log:
fix compilation failure due to package change
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java?rev=1325345&r1=1325344&r2=1325345&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
Thu Apr 12 16:10:30 2012
@@ -19,12 +19,12 @@ package org.apache.archiva.redback.confi
* 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;
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java?rev=1325345&r1=1325344&r2=1325345&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
Thu Apr 12 16:10:30 2012
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.strut
* 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.StringEsc
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;
