diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2011-05-06 07:28:34 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2011-05-06 07:28:34 +0000 |
| commit | 58fe8440e4f038cf0ca790a3175b248975a2c856 (patch) | |
| tree | c3b8754c6f92d8eb56eda05bd8ce0c1cc2856827 | |
| parent | 1d63d95e52a3586e179163de006e4431ba299f1d (diff) | |
| download | archiva-58fe8440e4f038cf0ca790a3175b248975a2c856.tar.gz archiva-58fe8440e4f038cf0ca790a3175b248975a2c856.zip | |
[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
3 files changed, 10 insertions, 0 deletions
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}"/> |