[MRM-1362] Add simple 'CRUD' pages for project-level metadata along with a "generic...

o added validation for adding new properties

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
index eed67d57171f1f6e163f46ba369b2e890c9f4e2e..373c3eaff8746b0db19ad356d738af0601dce3c2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
@@ -305,9 +305,9 @@ public class ShowArtifactAction
     
     public String addMetadataProperty()
     {
-        ProjectVersionMetadata projectMetadata = getProjectVersionMetadata();
-        String errorMsg = null;      
+        String errorMsg = null;
         
+        ProjectVersionMetadata projectMetadata = getProjectVersionMetadata();
         if( projectMetadata == null )
         {
             addActionError( errorMsg != null ? errorMsg : "Artifact not found" );
@@ -323,6 +323,13 @@ public class ShowArtifactAction
             genericMetadata = projectMetadata.getFacet( GenericMetadataFacet.FACET_ID ).toProperties();
         }
         
+        if( propertyName == null || "".equals( propertyName.trim() ) || propertyValue == null || "".equals( propertyValue.trim() ) )
+        {
+            model = projectMetadata;            
+            addActionError( errorMsg != null ? errorMsg : "Property Name and Property Value are required." );
+            return INPUT;
+        }
+        
         genericMetadata.put( propertyName, propertyValue );
         
         GenericMetadataFacet genericMetadataFacet = new GenericMetadataFacet();

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 1da4912a894ba4b196ad537610a8bf5877d5f07b..4cf08c2cedfe6ab4c053fba279c7c937d9d98dff 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
@@ -223,7 +223,8 @@
     </action>
 
     <action name="addMetadataProperty" class="showArtifactAction" method="addMetadataProperty">      
-      <result>/WEB-INF/jsp/showArtifact.jsp</result>
+      <result name="input">/WEB-INF/jsp/showArtifact.jsp</result>
+      <result name="success">/WEB-INF/jsp/showArtifact.jsp</result>
     </action>
 
     <action name="deleteMetadataEntry" class="showArtifactAction" method="deleteMetadataEntry">

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectMetadata.jspf b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectMetadata.jspf
index 65f3be1f7f63724bcd96adecb13b4c3a23b45336..da2937721b3d659f58a8fc1e97f39fa6ee0069f4 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectMetadata.jspf
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectMetadata.jspf
@@ -23,7 +23,7 @@
 <%@ taglib prefix="archiva"   uri="/WEB-INF/taglib.tld" %>
 
 <div> 
-
+ 
   <div>
     <s:form action="addMetadataProperty" namespace="/" method="post" validate="true" theme="simple">    
       <s:hidden name="groupId" value="%{groupId}" />
@@ -67,5 +67,19 @@
     </c:if>  
   </div>
   
+  
+  <p>
+    <s:if test="hasActionMessages()">
+      <div id="messages">
+        <s:actionmessage/>
+      </div>
+    </s:if>
+    <s:if test="hasActionErrors()">
+      <div id="messages">
+        <s:actionerror/>
+      </div>
+    </s:if>
+  </p>
+  
   <%-- <archiva:project-metadata object="${projectMetadata}" groupId="${groupId}" artifactId="${artifactId}" version="${version}" /> --%>
 </div>