if available display project packaging

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1301617 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index fee8faf8f4ac6dacfc52654a67daf0b1e9fe1579..a0606ba00f469ca185a98a69558c2b6bdf5173a4 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -444,12 +444,29 @@ $(function() {
           }):[data.dependencies];
         projectVersionMetadata.dependencies=dependencies;
       }
-      $.log("projectVersionMetadata.issueManagement.system:"+(projectVersionMetadata.issueManagement?projectVersionMetadata.issueManagement.system:"null"));
+      // maven facet currently only for packaging
+      if(data.facetList){
+        if( $.isArray(data.facetList)){
+          for (var i=0;i<data.facetList.length;i++){
+            if(data.facetList[i].facetId=='org.apache.archiva.metadata.repository.storage.maven2.project'){
+              projectVersionMetadata.mavenFacet=new MavenFacet(data.facetList[i].packaging);
+            }
+          }
+        } else {
+          if(data.facetList.facetId=='org.apache.archiva.metadata.repository.storage.maven2.project'){
+            projectVersionMetadata.mavenFacet=new MavenFacet(data.facetList.packaging);
+          }
+        }
+      }
       return projectVersionMetadata;
     }
     return null;
   }
 
+  MavenFacet=function(packaging){
+    this.packaging=packaging;
+  }
+
   ProjectVersionMetadata=function(id,url,name,description,organization,issueManagement,scm,ciManagement,licenses,
                                   mailingLists,dependencies,incomplete){
     // private String id;
@@ -488,6 +505,8 @@ $(function() {
     //private boolean incomplete;
     this.incomplete=incomplete;
 
+    this.mavenFacet=null;
+
   }
 
   Organization=function(name,url){

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
index d8350274eeb05e040fa4adc32f8e03af8111921f..d6cab20152e8001b36bab04865f9bbdf8b712e3c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
@@ -114,6 +114,12 @@
               <th>${$.i18n.prop('browse.artifact.description')}</th>
               <td>${projectVersionMetadata.description}</td>
             </tr>
+            {{if projectVersionMetadata.mavenFacet}}
+            <tr>
+              <th>${$.i18n.prop('browse.artifact.packaging')}</th>
+              <td>${projectVersionMetadata.mavenFacet.packaging}</td>
+            </tr>
+            {{/if}}
             {{if projectVersionMetadata.organization}}
             <tr>
               <th>${$.i18n.prop('browse.artifact.organization.name')}</th>