Author: jvanzyl
Date: Sun Apr 17 20:57:31 2005
New Revision: 161720
URL: http://svn.apache.org/viewcvs?view=rev&rev=161720
Log: (empty)
Modified:
maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.java
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
maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Login.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/navigations/Menu.vm
Modified:
maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.java
URL:
http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.java?view=diff&r1=161719&r2=161720
==============================================================================
---
maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.java
(original)
+++
maven/continuum/trunk/continuum-web/src/main/java/org/codehaus/continuum/web/tool/ContinuumStateContentGenerator.java
Sun Apr 17 20:57:31 2005
@@ -16,6 +16,8 @@
int state = p.getState();
+ System.out.println( "state = " + state );
+
if ( state == 1 )
{
return "New";
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?view=diff&r1=161719&r2=161720
==============================================================================
---
maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml
(original)
+++
maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenOneProject.xml
Sun Apr 17 20:57:31 2005
@@ -5,12 +5,6 @@
<lookup-expression>getMavenOneProject(#id)</lookup-expression>
<elements>
<element>
- <id>project.pomUrl</id>
- <validator>default</validator>
- <expression>scmUrl</expression>
- <type>text</type>
- </element>
- <element>
<id>project.goals</id>
<validator>default</validator>
<expression>goals</expression>
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?view=diff&r1=161719&r2=161720
==============================================================================
---
maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml
(original)
+++
maven/continuum/trunk/continuum-web/src/main/resources/forms/mavenTwoProject.xml
Sun Apr 17 20:57:31 2005
@@ -5,12 +5,6 @@
<lookup-expression>getMavenTwoProject(#id)</lookup-expression>
<elements>
<element>
- <id>project.pomUrl</id>
- <validator>default</validator>
- <expression>scmUrl</expression>
- <type>text</type>
- </element>
- <element>
<id>project.phase</id>
<validator>default</validator>
<expression>goals</expression>
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?view=diff&r1=161719&r2=161720
==============================================================================
---
maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml
(original)
+++
maven/continuum/trunk/continuum-web/src/main/resources/forms/shellProject.xml
Sun Apr 17 20:57:31 2005
@@ -7,12 +7,17 @@
<element>
<id>project.executable</id>
<validator>required</validator>
- <message-key>project.executable.message</message-key>
- <label-key>project.executable.label</label-key>
- <error-message-key>project.executable.error</error-message-key>
<expression>executable</expression>
<type>text</type>
</element>
+ <!--
+ <element>
+ <id>project.arguments</id>
+ <validator>default</validator>
+ <expression>arguments</expression>
+ <type>text</type>
+ </element>
+ -->
</elements>
<!-- Add -->
Modified:
maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
URL:
http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties?view=diff&r1=161719&r2=161720
==============================================================================
---
maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
(original)
+++
maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
Sun Apr 17 20:57:31 2005
@@ -41,7 +41,25 @@
project.scmUrl.error = You must provide an scm url
project.scmUrl.message = Enter the Maven SCM url
-project.pomUrl.label = POM Url
+// ----------------------------------------------------------------------
+// Maven 1
+// ----------------------------------------------------------------------
+
+m1PomUrl.label = M1 POM Url
+m1PomUrl.message = Enter the URL to the Maven 1 POM
+
+project.goals.label = Goals
+project.goals.message = Enter the goals to execute (default: jar:install)
+
+// ----------------------------------------------------------------------
+// Maven 2
+// ----------------------------------------------------------------------
+
+m2PomUrl.label = M2 POM Url
+m2PomUrl.message = Enter the URL to the Maven 2 POM
+
+project.phase.label = Phase/Goals
+project.phase.message = Enter the phase or goals to execute (default: install)
// ----------------------------------------------------------------------
// Ant Project
@@ -64,12 +82,9 @@
project.version.message = Enter the version of the project
// ----------------------------------------------------------------------
-//
+// Shell project
// ----------------------------------------------------------------------
-org.codehaus.continuum.project.state.new=new
-org.codehaus.continuum.project.state.ok=ok
-org.codehaus.continuum.project.state.failed=failed
-org.codehaus.continuum.project.state.error=error
-org.codehaus.continuum.project.state.building=building
-org.codehaus.continuum.project.state.signaled=build signaled
+project.arguments.label = Arguments
+project.arguments.message = Enter shell script arguments, if any
+project.arguments.error =
\ No newline at end of file
Modified:
maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Login.vm
URL:
http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Login.vm?view=diff&r1=161719&r2=161720
==============================================================================
---
maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Login.vm
(original)
+++
maven/continuum/trunk/continuum-web/src/main/resources/templates/layouts/Login.vm
Sun Apr 17 20:57:31 2005
@@ -45,7 +45,6 @@
<table border="0" cellspacing="0" cellpadding="4" width="100%" id="main">
<tr valign="top">
<td id="leftcol" width="20%">
- ##parse("navigations/Menu.vm")
</td>
<td>
<div id="bodycol">
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?view=diff&r1=161719&r2=161720
==============================================================================
---
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 Apr 17 20:57:31 2005
@@ -9,8 +9,8 @@
<div id="projecttools" class="toolgroup">
<div class="label">Add Project</div>
<div class="body">
- <div><a href="$link.setPage('mavenTwoProject.form')">M2 Project</a></div>
- <div><a href="$link.setPage('mavenOneProject.form')">M1 Project</a></div>
+ <div><a href="$link.setPage('addMavenTwoProject.form')">M2
Project</a></div>
+ <div><a href="$link.setPage('addMavenOneProject.form')">M1
Project</a></div>
<div><a href="$link.setPage('antProject.form')">Ant Project</a></div>
<div><a href="$link.setPage('shellProject.form')">Shell Project</a></div>
</div>
