From 214bb1f70e4bb84a2186a9f7da35a9643995e20f Mon Sep 17 00:00:00 2001
From: "Maria Odea B. Ching" <oching@apache.org>
Date: Sun, 1 Aug 2010 04:39:49 +0000
Subject: [PATCH] [MRM-980] move merge jsps inside admin dir

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@981149 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-web/archiva-webapp/src/main/resources/struts.xml  | 4 ++--
 .../src/main/webapp/WEB-INF/jsp/{ => admin}/mergeAction.jsp   | 0
 .../webapp/WEB-INF/jsp/{ => admin}/mergeExcludeConflicts.jsp  | 0
 .../jsp/{mergeActionResults.jsp => admin/mergeResults.jsp}    | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/{ => admin}/mergeAction.jsp (100%)
 rename archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/{ => admin}/mergeExcludeConflicts.jsp (100%)
 rename archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/{mergeActionResults.jsp => admin/mergeResults.jsp} (100%)

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
index 5379220ff..434310a11 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
@@ -361,8 +361,8 @@
 
 
     <action name="merge" class="mergeAction" method="getConflicts">
-      <result name="CONFLICTS">/WEB-INF/jsp/mergeExcludeConflicts.jsp</result>
-      <result name="success">/WEB-INF/jsp/mergeActionResults.jsp</result>
+      <result name="CONFLICTS">/WEB-INF/jsp/admin/mergeExcludeConflicts.jsp</result>
+      <result name="success">/WEB-INF/jsp/admin/mergeResults.jsp</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeAction.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeAction.jsp
similarity index 100%
rename from archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeAction.jsp
rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeAction.jsp
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeExcludeConflicts.jsp
similarity index 100%
rename from archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp
rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeExcludeConflicts.jsp
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeActionResults.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeResults.jsp
similarity index 100%
rename from archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeActionResults.jsp
rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeResults.jsp
-- 
2.39.5