Author: evenisse
Date: Wed Dec 21 15:00:09 2005
New Revision: 358410

URL: http://svn.apache.org/viewcvs?rev=358410&view=rev
Log:
clean up

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteProject.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=358410&r1=358409&r2=358410&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Wed Dec 21 15:00:09 2005
@@ -61,13 +61,11 @@
                 }
                 catch ( MalformedURLException e )
                 {
-                    System.out.println( "aaa" );
                     return INPUT;
                 }
             }
             else
             {
-                System.out.println( "bbb" );
                 return INPUT;
             }
         }
@@ -80,7 +78,6 @@
         }
         catch ( ContinuumException e )
         {
-            System.out.println( "ccc" );
             return INPUT;
         }
         

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=358410&r1=358409&r2=358410&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Wed Dec 21 15:00:09 2005
@@ -80,8 +80,6 @@
 
     public String doDefault()
     {
-        setProjectType( ServletActionContext.getRequest().getParameter( "projectType" ) );        
-
         return INPUT;
     }
 

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=358410&r1=358409&r2=358410&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Wed Dec 21 15:00:09 2005
@@ -7,6 +7,7 @@
 enabled = Enabled
 disabled = Disabled
 cancel = Cancel
+submit = Submit
 
 // ----------------------------------------------------------------------
 // Page: Top

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp?rev=358410&r1=358409&r2=358410&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp Wed Dec 21 15:00:09 2005
@@ -27,17 +27,17 @@
         <tr>
             <th><ww:text name="add.m1.project.m1PomFile.label"/></th>
             <td >
-                <input type="file" name="m1PomFile" value="" size="100"/>
+                <ww:file name="m1PomFile" value="" size="100"/>
                 <p><ww:text name="add.m1.project.m1PomFile.message"/></p>
             </td>
         </tr>
         </table>
-    <div class="functnbar3">
-    <input type="submit" value="Submit"/>
-    <input type="button" name="Cancel" value="Cancel" onClick="history.back()"/>
-    </div>
-    </ww:form>
+        <div class="functnbar3">
+            <input type="submit" value="<ww:text name="delete.submit"/>"/>
+            <input type="button" name="Cancel" value="<ww:text name="cancel"/>" onClick="history.back()"/>
+        </div>
         </div>
+    </ww:form>
     </div>
 </div>
     </body>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp?rev=358410&r1=358409&r2=358410&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp Wed Dec 21 15:00:09 2005
@@ -27,17 +27,17 @@
         <tr>
             <th><ww:text name="add.m2.project.m2PomFile.label"/></th>
             <td >
-                <input type="file" name="m2PomFile" value="" size="100"/>
+                <ww:file name="m2PomFile" value="" size="100"/>
                 <p><ww:text name="add.m2.project.m2PomFile.message"/></p>
             </td>
         </tr>
         </table>
-    <div class="functnbar3">
-    <input type="submit" value="Submit"/>
-    <input type="button" name="Cancel" value="Cancel" onClick="history.back()"/>
-    </div>
-    </ww:form>
+        <div class="functnbar3">
+            <input type="submit" value="<ww:text name="delete.submit"/>"/>
+            <input type="button" name="Cancel" value="<ww:text name="cancel"/>" onClick="history.back()"/>
+        </div>
         </div>
+    </ww:form>
     </div>
 </div>
     </body>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp?rev=358410&r1=358409&r2=358410&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp Wed Dec 21 15:00:09 2005
@@ -71,8 +71,8 @@
         </tr>                                                                                                                
         </table>
         <div class="functnbar3">
-        <input type="submit" value="Submit"/>
-        <input type="button" value="Cancel" onClick="history.back()"/>
+            <input type="submit" value="<ww:text name="submit"/>"/>
+            <input type="button" value="<ww:text name="cancel"/>" onClick="history.back()"/>
         </div>
         </div>
     </ww:form>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteProject.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteProject.jsp?rev=358410&r1=358409&r2=358410&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteProject.jsp Wed Dec 21 15:00:09 2005
@@ -15,12 +15,15 @@
                     <ww:param><ww:property value="projectName"/></ww:param>
                 </ww:text>
             </strong>
-            <ww:form action="deleteProject.action" method="post">
-                <ww:hidden name="projectId"/>
-                <ww:submit value="%{getText('delete.submit')}"/>
-            </ww:form>
           </p>
         </div>
+        <ww:form action="deleteProject.action" method="post">
+            <ww:hidden name="projectId"/>
+            <div class="functnbar3">
+            <input type="submit" value="<ww:text name="delete.submit"/>"/>
+            <input type="button" name="Cancel" value="<ww:text name="cancel"/>" onClick="history.back()"/>
+            </div>
+        </ww:form>
       </div>
     </body>
   </ww:i18n>