svn commit: r1302830 - in /archiva/trunk/archiva-modules/archiva-web: archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java archiva-webapp-js/src/main/webapp/js/archiva/search.js

[olamy]

Author: olamy
Date: Tue Mar 20 10:34:51 2012
New Revision: 1302830

URL: http://svn.apache.org/viewvc?rev=1302830&view=rev
Log:
fix detail view for packaging and parent

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1302830&r1=1302829&r2=1302830&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
 Tue Mar 20 10:34:51 2012
@@ -300,25 +300,6 @@ public class DefaultBrowseService
                     }
                 }
             }
-            if ( versionMetadata == null )
-            {
-                return null;
-            }
-
-            MavenProjectFacet mavenFacet = new MavenProjectFacet();
-            mavenFacet.setGroupId( groupId );
-            mavenFacet.setArtifactId( artifactId );
-            versionMetadata.addFacet( mavenFacet );
-            MavenProjectFacet versionMetadataMavenFacet =
-                (MavenProjectFacet) versionMetadata.getFacet( 
MavenProjectFacet.FACET_ID );
-            if ( versionMetadataMavenFacet != null )
-            {
-                if ( mavenFacet.getPackaging() != null && 
!StringUtils.equalsIgnoreCase( mavenFacet.getPackaging(),
-                                                                               
          versionMetadataMavenFacet.getPackaging() ) )
-                {
-                    mavenFacet.setPackaging( null );
-                }
-            }
 
             return versionMetadata;
         }

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1302830&r1=1302829&r2=1302830&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
 Tue Mar 20 10:34:51 2012
@@ -185,6 +185,7 @@ $(function() {
           mainContent.find("#browse_breadcrumb" ).show();
           mainContent.find("#browse_breadcrumb" ).html(mediumSpinnerImg());
           var 
metadataUrl="restServices/archivaServices/browseService/projectVersionMetadata/"+encodeURIComponent(groupId)+"/"+encodeURIComponent(artifactId);
+          metadataUrl+="/"+encodeURIComponent(version);
           var selectedRepo=getSelectedBrowsingRepository();
           if (selectedRepo){
             metadataUrl+="?repositoryId="+encodeURIComponent(selectedRepo);