You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jv...@apache.org on 2005/06/20 08:49:11 UTC
svn commit: r191404 - in /maven/continuum/trunk/continuum-web/src/main/resources/forms: antProject.xml continuumProject.xml mavenOneProject.xml mavenTwoProject.xml shellProject.xml uploadMavenOneProject.xml uploadMavenTwoProject.xml

Author: jvanzyl
Date: Sun Jun 19 23:49:10 2005
New Revision: 191404

URL: http://svn.apache.org/viewcvs?rev=191404&view=rev
Log:
o adding upload forms for the m1/m2 POMs

Added:
    maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenOneProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenTwoProject.xml
Modified:
    maven/continuum/trunk/continuum-web/src/main/resources/forms/antProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml
    maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/antProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/antProject.xml?rev=191404&r1=191403&r2=191404&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/antProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/antProject.xml Sun Jun 19 23:49:10 2005
@@ -22,6 +22,7 @@
     <title-key>project.title.add</title-key>
     <action>addEntity</action>
     <view>Summary.vm</view>
+    <view-on-failure>Add.vm</view-on-failure>
     <expression>addAntProject(#entity)</expression>
   </add>
 
@@ -30,6 +31,7 @@
     <title-key>project.title.update</title-key>
     <action>updateEntity</action>
     <view>Summary.vm</view>
+    <view-on-failure>Edit.vm</view-on-failure>
     <expression>updateAntProject(#entity)</expression>
   </update>
 

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml?rev=191404&r1=191403&r2=191404&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/continuumProject.xml Sun Jun 19 23:49:10 2005
@@ -145,7 +145,7 @@
          | Only show the result pages if there are builds to show and if the project is in a state
          | of ok, failed, error.
          -->
-        <enable>getState() == 4 || ( getBuilds().size > 0 &amp;&amp; ( getState() == 2 || getState() == 3 ) )</enable>
+        <enable>getState() == 4 || ( getBuilds() != null &amp;&amp; getBuilds().size > 0 &amp;&amp; ( getState() == 2 || getState() == 3 ) )</enable>
       </operation>
       <operation>
         <name>Edit</name>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml?rev=191404&r1=191403&r2=191404&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml Sun Jun 19 23:49:10 2005
@@ -22,6 +22,7 @@
     <title-key>project.title.add</title-key>
     <action>addEntity</action>
     <view>Summary.vm</view>
+    <view-on-failure>Add.vm</view-on-failure>
     <expression>addMavenOneProject(#entity)</expression>
   </add>
 
@@ -30,6 +31,7 @@
     <title-key>project.title.update</title-key>
     <action>updateEntity</action>
     <view>Summary.vm</view>
+    <view-on-failure>Edit.vm</view-on-failure>
     <expression>updateMavenOneProject(#entity)</expression>
   </update>
 

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml?rev=191404&r1=191403&r2=191404&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml Sun Jun 19 23:49:10 2005
@@ -22,6 +22,7 @@
     <title-key>project.title.add</title-key>
     <action>addEntity</action>
     <view>Summary.vm</view>
+    <view-on-failure>Add.vm</view-on-failure>
     <expression>addMavenTwoProject(#entity)</expression>
   </add>
 
@@ -30,6 +31,7 @@
     <title-key>project.title.update</title-key>
     <action>updateEntity</action>
     <view>Summary.vm</view>
+    <view-on-failure>Edit.vm</view-on-failure>
     <expression>updateMavenTwoProject(#entity)</expression>
   </update>
 

Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml?rev=191404&r1=191403&r2=191404&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml Sun Jun 19 23:49:10 2005
@@ -26,6 +26,7 @@
     <title-key>project.title.add</title-key>
     <action>addEntity</action>
     <view>Summary.vm</view>
+    <view-on-failure>Add.vm</view-on-failure>
     <expression>addShellProject(#entity)</expression>
   </add>
 
@@ -34,6 +35,7 @@
     <title-key>project.title.update</title-key>
     <action>updateEntity</action>
     <view>Summary.vm</view>
+    <view-on-failure>Edit.vm</view-on-failure>
     <expression>updateShellProject(#entity)</expression>
   </update>
 

Added: maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenOneProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenOneProject.xml?rev=191404&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenOneProject.xml (added)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenOneProject.xml Sun Jun 19 23:49:10 2005
@@ -0,0 +1,41 @@
+<form>
+  <id>uploadMavenOneProject</id>
+  <source-role>org.apache.maven.continuum.Continuum</source-role>
+  <attributes>
+    <multipart>true</multipart>
+  </attributes>
+  <elements>
+    <!--
+    TODO: we're going to have to move away from dotted properties because it confuses OGNL i.e #project.foo
+    isn't used as a string literal. OGNL looks for a project reference which will be null.
+    -->
+    <element>
+      <id>m1PomUrl</id>
+      <validators>
+        <validator>
+          <id>required</id>
+          <error-message-key>empty.error</error-message-key>
+        </validator>
+      </validators>
+      <expression>scmUrl</expression>
+      <type>upload</type>
+    </element>
+  </elements>
+
+  <!-- Add -->
+  <add>
+    <title-key>project.title.add</title-key>
+    <action>callMethod</action>
+    <view>Summary.vm</view>
+    <expression>addMavenOneProject(#m1PomUrl)</expression>
+  </add>
+
+  <!-- Update -->
+  <update>
+    <title-key>project.title.update</title-key>
+    <action>updateEntity</action>
+    <view>Summary.vm</view>
+    <expression>updateMavenOneProject(#entity)</expression>
+  </update>
+
+</form>

Added: maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenTwoProject.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenTwoProject.xml?rev=191404&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenTwoProject.xml (added)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/uploadMavenTwoProject.xml Sun Jun 19 23:49:10 2005
@@ -0,0 +1,36 @@
+<form>
+  <id>uploadMavenTwoProject</id>
+  <source-role>org.apache.maven.continuum.Continuum</source-role>
+  <attributes>
+    <multipart>true</multipart>
+  </attributes>
+  <elements>
+    <element>
+      <id>m2PomUrl</id>
+      <validators>
+        <validator>
+          <id>required</id>
+          <error-message-key>empty.error</error-message-key>
+        </validator>
+      </validators>
+      <type>upload</type>
+    </element>
+  </elements>
+
+  <!-- Add -->
+  <add>
+    <title-key>project.title.add</title-key>
+    <action>callMethod</action>
+    <view>Summary.vm</view>
+    <expression>addMavenTwoProject(#m2PomUrl)</expression>
+  </add>
+
+  <!-- Update -->
+  <update>
+    <title-key>project.title.update</title-key>
+    <action>updateEntity</action>
+    <view>Summary.vm/fid/continuumProject</view>
+    <expression>updateMavenTwoProject(#entity)</expression>
+  </update>
+
+</form>