continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r191408 - in /maven/continuum/trunk/continuum-web/src/main: java/org/apache/maven/continuum/web/action/ java/org/apache/maven/continuum/web/context/ java/org/apache/maven/continuum/web/tool/ java/org/apache/maven/continuum/web/validation/ r...
Date Mon, 20 Jun 2005 06:51:58 GMT
Author: jvanzyl
Date: Sun Jun 19 23:51:57 2005
New Revision: 191408

URL: http://svn.apache.org/viewcvs?rev=191408&view=rev
Log: (empty)

Modified:
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Login.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/Scalar.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/View.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/ViewContextPopulator.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java
    maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/continuum-web/src/main/resources/templates/CommonMacros.vm
    maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Call.java
Sun Jun 19 23:51:57 2005
@@ -18,7 +18,7 @@
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
  */
 public class Call
 {

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/CallApplicationModel.java
Sun Jun 19 23:51:57 2005
@@ -28,7 +28,7 @@
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id: Login.java,v 1.1 2005/04/01 00:11:34 jvanzyl Exp $
+ * @version $Id$
  */
 public class CallApplicationModel
     extends AbstractAction

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Login.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Login.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Login.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/action/Login.java
Sun Jun 19 23:51:57 2005
@@ -23,7 +23,7 @@
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id: Login.java,v 1.1 2005/04/01 00:11:34 jvanzyl Exp $
+ * @version $Id$
  */
 public class Login
     extends AbstractAction

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/Scalar.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/Scalar.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/Scalar.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/Scalar.java
Sun Jun 19 23:51:57 2005
@@ -18,7 +18,7 @@
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id: Scalar.java,v 1.1 2005/04/01 00:11:34 jvanzyl Exp $
+ * @version $Id$
  */
 public class Scalar
 {

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/View.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/View.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/View.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/View.java
Sun Jun 19 23:51:57 2005
@@ -20,7 +20,7 @@
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id: View.java,v 1.1 2005/04/01 00:11:34 jvanzyl Exp $
+ * @version $Id$
  */
 public class View
 {

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/ViewContextPopulator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/ViewContextPopulator.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/ViewContextPopulator.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/context/ViewContextPopulator.java
Sun Jun 19 23:51:57 2005
@@ -22,7 +22,7 @@
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id: ViewContextPopulator.java,v 1.1 2005/04/01 00:11:34 jvanzyl Exp $
+ * @version $Id$
  */
 public interface ViewContextPopulator
 {

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
Sun Jun 19 23:51:57 2005
@@ -25,7 +25,7 @@
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id: StateContentGenerator.java,v 1.1 2005/04/04 14:05:38 jvanzyl Exp $
+ * @version $Id$
  */
 public class ContinuumStateContentGenerator
     extends AbstractLogEnabled

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/CssTool.java
Sun Jun 19 23:51:57 2005
@@ -19,7 +19,7 @@
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id: CssTool.java,v 1.2 2005/04/06 14:10:38 trygvis Exp $
+ * @version $Id$
  */
 public class CssTool
 {

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormToolException.java
Sun Jun 19 23:51:57 2005
@@ -18,7 +18,7 @@
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
- * @version $Id:$
+ * @version $Id$
  */
 public class FormToolException
     extends Exception

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java
Sun Jun 19 23:51:57 2005
@@ -147,7 +147,13 @@
         }
         catch ( OgnlException e )
         {
-            throw new FormToolException( "Cannot evaluate enable expression: " + operation.getEnable()
+ " on " + item );
+            getLogger().error( "Cannot evaluate enable expression: " + operation.getEnable()
+ " on " + item, e );
+
+            // ----------------------------------------------------------------------
+            // If there is an error evaluating the expression we'll protect
+            // ----------------------------------------------------------------------
+
+            return false;
         }
     }
 

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java
(original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/validation/ScmUrlValidator.java
Sun Jun 19 23:51:57 2005
@@ -25,7 +25,7 @@
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id: ScmUrlValidator.java,v 1.1 2005/04/06 14:10:38 trygvis Exp $
+ * @version $Id$
  */
 public class ScmUrlValidator
     extends AbstractValidator

Modified: maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml
Sun Jun 19 23:51:57 2005
@@ -8,8 +8,14 @@
      -->
     <component>
       <role>org.codehaus.plexus.summit.resolver.Resolver</role>
-      <role-hint>new</role-hint>
-      <implementation>org.codehaus.plexus.summit.resolver.NewResolver</implementation>
+      <role-hint>classic</role-hint>
+      <implementation>org.codehaus.plexus.summit.resolver.ClassicResolver</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.summit.renderer.Renderer</role>
+          <role-hint>velocity</role-hint>
+        </requirement>
+      </requirements>
       <configuration>
         <initial-view>Summary.vm</initial-view>
         <default-view>Default.vm</default-view>
@@ -28,17 +34,20 @@
       <implementation>org.codehaus.plexus.summit.pipeline.SummitPipeline</implementation>
       <lifecycle-handler>plexus-configurable</lifecycle-handler>
       <configuration>
+        <!-- This indicates that we do not wanted pages cached on the client side -->
         <nocache>true</nocache>
         <valves>
-          <valve>org.apache.maven.continuum.web.pipeline.valve.ContinuumViewContextValve</valve>
           <!--
           <valve>org.apache.maven.continuum.web.pipeline.valve.LoginValve</valve>
           -->
+          <!-- This is required because actions may need to put things in the context
-->
+          <valve>org.apache.maven.continuum.web.pipeline.valve.ContinuumViewContextValve</valve>
           <valve>org.codehaus.plexus.summit.pipeline.valve.ActionValve</valve>
           <valve>org.codehaus.plexus.summit.pipeline.valve.DetermineTargetValve</valve>
           <valve>org.apache.maven.continuum.web.pipeline.valve.ContinuumViewContextPopulatorValve</valve>
-          <valve>org.codehaus.plexus.summit.pipeline.valve.ResolverValve</valve>
           <valve>org.codehaus.plexus.summit.pull.PullToolValve</valve>
+          <valve>org.apache.maven.continuum.web.pipeline.valve.FormicaValve</valve>
+          <valve>org.codehaus.plexus.summit.pipeline.valve.ResolverValve</valve>
           <valve>org.codehaus.plexus.summit.pipeline.valve.DisplayValve</valve>
         </valves>
       </configuration>
@@ -88,7 +97,7 @@
           </tool>
           <tool>
             <name>formtool</name>
-            <role>formicatool</role>
+            <role>org.apache.maven.continuum.web.tool.FormicaTool</role>
             <scope>global</scope>
           </tool>
         </tools>
@@ -109,7 +118,7 @@
     </component>
 
     <component>
-      <role>formicatool</role>
+      <role>org.apache.maven.continuum.web.tool.FormicaTool</role>
       <implementation>org.apache.maven.continuum.web.tool.FormicaTool</implementation>
       <instantiation-strategy>per-lookup</instantiation-strategy>
       <requirements>
@@ -130,6 +139,7 @@
       <implementation>org.apache.maven.continuum.web.context.DefaultViewContextPopulator</implementation>
       <configuration>
         <views>
+          <!-- Start Forms Views -->
           <view>
             <id>Summary</id>
             <scalars>
@@ -143,6 +153,7 @@
               </scalar>
             </scalars>
           </view>
+          <!-- End Forms Views -->
           <view>
             <id>ProjectBuilds</id>
             <scalars>
@@ -199,6 +210,20 @@
       <role>org.codehaus.plexus.summit.pipeline.valve.Valve</role>
       <role-hint>org.apache.maven.continuum.web.pipeline.valve.ContinuumViewContextValve</role-hint>
       <implementation>org.apache.maven.continuum.web.pipeline.valve.ContinuumViewContextValve</implementation>
+    </component>
+
+    <component>
+      <role>org.codehaus.plexus.summit.pipeline.valve.Valve</role>
+      <role-hint>org.apache.maven.continuum.web.pipeline.valve.FormicaValve</role-hint>
+      <implementation>org.apache.maven.continuum.web.pipeline.valve.FormicaValve</implementation>
+      <configuration>
+        <default-form-id>continuumProject</default-form-id>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.web.tool.FormicaTool</role>
+        </requirement>
+      </requirements>
     </component>
 
     <component>

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/CommonMacros.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/CommonMacros.vm?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/CommonMacros.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/CommonMacros.vm Sun Jun
19 23:51:57 2005
@@ -8,6 +8,8 @@
   #set ( $elementData = $formtool.getElementData( $form, $element, $item, $data ) )
   #if ( $element.type == "text" )
     #text( $element $elementData )
+  #elseif ( $element.type == "upload" )
+    #upload( $element $elementData )
   #end
   <p>$i18n.getString( $element.messageKey )</p>
 </td>
@@ -35,6 +37,10 @@
 
 #macro ( textarea $element $elementData )
 <input type="text" name="$element.id" value="$elementData" size="40"/>
+#end
+
+#macro ( upload $element $elementData )
+<input type="file" name="$element.id" value="$elementData" size="40"/>
 #end
 
 #macro ( password $element $elementData )

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm?rev=191408&r1=191407&r2=191408&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm Sun
Jun 19 23:51:57 2005
@@ -9,10 +9,21 @@
  <div id="projecttools" class="toolgroup">
   <div class="label">Add Project</div>
   <div class="body">
-    <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'addMavenTwoProject')">M2
Project</a></div>
-    <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'addMavenOneProject')">M1
Project</a></div>
-    <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'antProject')">Ant
Project</a></div>
-    <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'shellProject')">Shell
Project</a></div>
+    <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'addMavenTwoProject')">Add
M2 Project</a></div>
+    <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'uploadMavenTwoProject')">Upload
M2 Project</a></div>
+    <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'addMavenOneProject')">Add
M1 Project</a></div>
+    <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'uploadMavenOneProject')">Upload
M1 Project</a></div>
+    <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'antProject')">Add
Ant Project</a></div>
+    <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'shellProject')">Add
Shell Project</a></div>
   </div>
  </div>
+
+  <div id="projecttools" class="toolgroup">
+   <div class="label">Import Project</div>
+   <div class="body">
+     <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'importCruiseControlProject')">CC
Project</a></div>
+     <div><a href="$link.setPage('Add.vm').addPathInfo( 'fid', 'uploadCruiseControlProject')">Upload
CC Project</a></div>
+   </div>
+  </div>
+
 </div>



Mime
View raw message