From: Maria Odea B. Ching <oching@apache.org>
Date: Fri, 6 May 2011 07:28:34 +0000 (+0000)
Subject: [MRM-1457] disable dependency tree by default in 1.3.x to prevent cpu usage problems
X-Git-Tag: archiva-1.3.5^2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=58fe8440e4f038cf0ca790a3175b248975a2c856;p=archiva.git

[MRM-1457] disable dependency tree by default in 1.3.x to prevent cpu usage problems


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.3.x@1100112 13f79535-47bb-0310-9956-ffa450edef68
---

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 301d2c555..88dc1f312 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
@@ -228,9 +228,11 @@
       <result>/WEB-INF/jsp/showArtifact.jsp</result>
     </action>
 
+    <!-- disabled for now to avoid too much cpu usage (see MRM-1457)
     <action name="showArtifactDependencyTree" class="showArtifactAction" method="dependencyTree">
       <result>/WEB-INF/jsp/artifact/dependencyTree.jsp</result>
     </action>
+    -->
 
   </package>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
index 218c5ab53..bd737cd41 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
@@ -97,6 +97,8 @@
         </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Dependencies</my:currentWWUrl>
+
+      <%-- disabled for now to avoid too much cpu usage (see MRM-1457)
       <c:set var="url">
         <s:url action="showArtifactDependencyTree">
           <s:param name="groupId" value="%{groupId}"/>
@@ -105,6 +107,8 @@
         </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Dependency Tree</my:currentWWUrl>
+      --%>
+
       <c:set var="url">
         <s:url action="showArtifactDependees">
           <s:param name="groupId" value="%{groupId}"/>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
index cce8069f4..b912092bf 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
@@ -93,6 +93,8 @@
         </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Dependencies</my:currentWWUrl>
+
+      <%-- disabled for now to avoid too much cpu usage (see MRM-1457)
       <c:set var="url">
         <s:url action="showArtifactDependencyTree">
           <s:param name="groupId" value="%{groupId}"/>
@@ -101,6 +103,8 @@
         </s:url>
       </c:set>
       <my:currentWWUrl url="${url}">Dependency Tree</my:currentWWUrl>
+      --%>
+
       <c:set var="url">
         <s:url action="showArtifactDependees">
           <s:param name="groupId" value="%{groupId}"/>