svn commit: r1137917 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main: java/org/apache/maven/archiva/web/tags/ webapp/WEB-INF/jsp/include/

[oching]

Author: oching
Date: Tue Jun 21 09:21:10 2011
New Revision: 1137917

URL: http://svn.apache.org/viewvc?rev=1137917&view=rev
Log:
o fixed npe in dependency tree on artifact browse by adding the nodevar 
attribute dependencytree page
o removed PlexusTagUtil and lookup the dependency tree component in the tag 
using the webappcontext

Removed:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java
Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java?rev=1137917&r1=1137916&r2=1137917&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java
 Tue Jun 21 09:21:10 2011
@@ -44,7 +44,7 @@ import java.util.List;
  * @version $Id$
  *          plexus.component 
role="org.apache.maven.archiva.web.tags.DependencyTree"
  */
-@Service
+@Service( "dependencyTree" )
 public class DependencyTree
 {
     private Logger log = LoggerFactory.getLogger( DependencyTree.class );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java?rev=1137917&r1=1137916&r2=1137917&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java
 Tue Jun 21 09:21:10 2011
@@ -19,13 +19,14 @@ package org.apache.maven.archiva.web.tag
  * under the License.
  */
 
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.IteratorUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.common.ArchivaException;
 import org.apache.maven.archiva.web.tags.DependencyTree.TreeEntry;
-import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.springframework.beans.BeansException;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -113,9 +114,12 @@ public class DependencyTreeTag
         DependencyTree deptree;
         try
         {
-            deptree = (DependencyTree) PlexusTagUtil.lookup( pageContext, 
DependencyTree.class );
+            WebApplicationContext webApplicationContext =
+                WebApplicationContextUtils.getRequiredWebApplicationContext( 
pageContext.getServletContext() );
+
+            deptree = ( DependencyTree ) webApplicationContext.getBean( 
"dependencyTree" );
         }
-        catch ( PlexusSisuBridgeException e )
+        catch ( BeansException e )
         {
             throw new JspException( "Unable to lookup DependencyTree: " + 
e.getMessage(), e );
         }

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf?rev=1137917&r1=1137916&r2=1137917&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf
 Tue Jun 21 09:21:10 2011
@@ -22,7 +22,7 @@
 <%@ taglib prefix="archiva" uri="/WEB-INF/taglib.tld" %>
 
 <archiva:dependency-tree groupId="${groupId}" artifactId="${artifactId}" 
version="${version}"
-                         modelVersion="${model.version}">
+                         modelVersion="${model.version}" nodevar="node">
   <my:showArtifactLink groupId="${node.groupId}" 
artifactId="${node.artifactId}"
                        version="${node.version}"/>
 </archiva:dependency-tree>