Author: oching
Date: Fri May 6 07:28:34 2011
New Revision: 1100112
URL: http://svn.apache.org/viewvc?rev=1100112&view=rev
Log:
[MRM-1457] disable dependency tree by default in 1.3.x to prevent cpu usage
problems
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml?rev=1100112&r1=1100111&r2=1100112&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
Fri May 6 07:28:34 2011
@@ -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>
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp?rev=1100112&r1=1100111&r2=1100112&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
Fri May 6 07:28:34 2011
@@ -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}"/>
Modified:
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp?rev=1100112&r1=1100111&r2=1100112&view=diff
==============================================================================
---
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
(original)
+++
archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
Fri May 6 07:28:34 2011
@@ -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}"/>
