You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2005/12/21 11:13:37 UTC
svn commit: r358253 - in /maven/continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ resources/
resources/META-INF/plexus/ resources/localization/ webapp/
webapp/navigations/
Author: evenisse
Date: Wed Dec 21 02:13:24 2005
New Revision: 358253
URL: http://svn.apache.org/viewcvs?rev=358253&view=rev
Log:
PR: CONTINUUM-175
Submitted by: Nick Gonzalez
Add "Add Project" screens
Added:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (with props)
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (with props)
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp (with props)
Modified:
maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp
Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?rev=358253&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Wed Dec 21 02:13:24 2005
@@ -0,0 +1,100 @@
+package org.apache.maven.continuum.web.action;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
+
+import com.opensymphony.xwork.ActionSupport;
+
+public class AddMavenOneProjectAction extends ActionSupport {
+ private Continuum continuum;
+
+ private String m1PomUrl;
+
+ private String m1PomFile;
+
+ private String m1Pom = null;
+
+ public String execute() throws IOException, MalformedURLException, ContinuumException
+ {
+ System.out.println("inside");
+
+ if ( !StringUtils.isEmpty( m1PomUrl ) )
+ {
+ m1Pom = m1PomUrl;
+ }
+ else
+ {
+
+ URL url = new URL( "file:/"+m1PomFile);
+ //URL m2PomUrl = getM2PomFileUrl();
+ String content = IOUtil.toString( url.openStream() );
+
+ if ( !StringUtils.isEmpty( content ) )
+ {
+ m1Pom = url.toString();
+ }
+ }
+
+ if ( !StringUtils.isEmpty( m1Pom ) )
+ {
+ if (continuum == null ) System.out.println("shet!!!");
+ ContinuumProjectBuildingResult result = continuum.addMavenOneProject( m1Pom );
+
+ if(result.getWarnings().size() > 0) {
+ addActionMessage(result.getWarnings().toArray().toString());
+ }
+ }
+
+ System.out.println("m2Pom="+m1Pom);
+ Collection coll = continuum.getProjects();
+ Iterator iter = coll.iterator();
+
+ while (iter.hasNext()) {
+
+ Project proj = (Project)iter.next();
+ System.out.println("project "+proj.getId()+": "+proj.getName());
+ }
+ return SUCCESS;
+ }
+
+ public String doDefault()
+ {
+ return INPUT;
+ }
+
+ public String getM1Pom() {
+ return m1Pom;
+ }
+
+ public void setM1Pom(String pom) {
+ m1Pom = pom;
+ }
+
+ public String getM1PomFile() {
+ return m1PomFile;
+ }
+
+ public void setM1PomFile(String pomFile) {
+ m1PomFile = pomFile;
+ }
+
+ public String getM1PomUrl() {
+ return m1PomUrl;
+ }
+
+ public void setM1PomUrl(String pomUrl) {
+ m1PomUrl = pomUrl;
+ }
+
+
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: 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=358253&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Wed Dec 21 02:13:24 2005
@@ -0,0 +1,97 @@
+package org.apache.maven.continuum.web.action;
+
+
+import com.opensymphony.xwork.ActionSupport;
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Iterator;
+
+
+public class AddMavenTwoProjectAction
+ extends ActionSupport
+ {
+ private Continuum continuum;
+
+ private String m2PomUrl;
+
+ private String m2PomFile;
+
+ private String m2Pom = null;
+
+ public String execute() throws IOException, MalformedURLException, ContinuumException
+ {
+ System.out.println("inside");
+
+ if ( !StringUtils.isEmpty( m2PomUrl ) )
+ {
+ m2Pom = m2PomUrl;
+ }
+ else
+ {
+
+ URL url = new URL( "file:/"+m2PomFile);
+ //URL m2PomUrl = getM2PomFileUrl();
+ String content = IOUtil.toString( url.openStream() );
+
+ if ( !StringUtils.isEmpty( content ) )
+ {
+ m2Pom = url.toString();
+ }
+ }
+
+ if ( !StringUtils.isEmpty( m2Pom ) )
+ {
+ if (continuum == null ) System.out.println("shet!!!");
+ ContinuumProjectBuildingResult result = continuum.addMavenTwoProject( m2Pom );
+
+ if(result.getWarnings().size() > 0) {
+ addActionMessage(result.getWarnings().toArray().toString());
+ }
+ }
+
+ System.out.println("m2Pom="+m2Pom);
+ Collection coll = continuum.getProjects();
+ Iterator iter = coll.iterator();
+
+ while (iter.hasNext()) {
+
+ Project proj = (Project)iter.next();
+ System.out.println("project "+proj.getId()+": "+proj.getName());
+ }
+ return SUCCESS;
+ }
+
+ public String doDefault()
+ {
+ return INPUT;
+ }
+
+ public void setM2Pom(String pom) {
+ m2Pom = pom;
+ }
+
+ public String getM2PomFile() {
+ return m2PomFile;
+ }
+
+ public void setM2PomFile(String pomFile){
+ m2PomFile = pomFile;
+ }
+
+ public String getM2PomUrl() {
+ return m2PomUrl;
+ }
+
+ public void setM2PomUrl(String pomUrl) {
+ m2PomUrl = pomUrl;
+ }
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: 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=358253&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Wed Dec 21 02:13:24 2005
@@ -0,0 +1,111 @@
+package org.apache.maven.continuum.web.action;
+
+import java.util.Map;
+
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.model.project.Project;
+
+import com.opensymphony.webwork.ServletActionContext;
+import com.opensymphony.xwork.ActionSupport;
+
+public class AddProjectAction extends ActionSupport{
+
+ private Continuum continuum;
+
+ private Project project;
+
+ private String projectName;
+
+ private String projectVersion;
+
+ private String projectScmUrl;
+
+ private String projectScmUsername;
+
+ private String projectScmPassword;
+
+ private String projectScmTag;
+
+ private String projectType;
+
+ /*public void addParam(String name, Object value) {
+ System.out.println(name+" = "+value);
+ getParams().put(name,value);
+ }*/
+
+ public String execute() throws Exception {
+ project = new Project();
+ project.setName(projectName);
+ project.setVersion(projectVersion);
+ project.setScmUrl(projectScmUrl);
+ project.setScmUsername(projectScmUsername);
+ project.setScmPassword(projectScmPassword);
+ project.setScmTag(projectScmTag);
+
+ continuum.addProject(project, projectType);
+ return SUCCESS;
+ }
+
+ public String doDefault()
+ {
+ setProjectType(ServletActionContext.getRequest().getParameter("projectType"));
+ return INPUT;
+ }
+
+ public String getProjectName() {
+ return projectName;
+ }
+
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
+
+ public String getProjectScmPassword() {
+ return projectScmPassword;
+ }
+
+ public void setProjectScmPassword(String projectScmPassword) {
+ this.projectScmPassword = projectScmPassword;
+ }
+
+ public String getProjectScmTag() {
+ return projectScmTag;
+ }
+
+ public void setProjectScmTag(String projectScmTag) {
+ this.projectScmTag = projectScmTag;
+ }
+
+ public String getProjectScmUrl() {
+ return projectScmUrl;
+ }
+
+ public void setProjectScmUrl(String projectScmUrl) {
+ this.projectScmUrl = projectScmUrl;
+ }
+
+ public String getProjectScmUsername() {
+ return projectScmUsername;
+ }
+
+ public void setProjectScmUsername(String projectScmUsername) {
+ this.projectScmUsername = projectScmUsername;
+ }
+
+ public String getProjectType() {
+ return projectType;
+ }
+
+ public void setProjectType(String projectType) {
+ this.projectType = projectType;
+ }
+
+ public String getProjectVersion() {
+ return projectVersion;
+ }
+
+ public void setProjectVersion(String projectVersion) {
+ this.projectVersion = projectVersion;
+ }
+
+}
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml?rev=358253&r1=358252&r2=358253&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml Wed Dec 21 02:13:24 2005
@@ -45,6 +45,39 @@
</requirement>
</requirements>
</component>
+ <component>
+ <role>com.opensymphony.xwork.Action</role>
+ <role-hint>addMavenTwoProject</role-hint>
+ <implementation>org.apache.maven.continuum.web.action.AddMavenTwoProjectAction</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.continuum.Continuum</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>com.opensymphony.xwork.Action</role>
+ <role-hint>addProject</role-hint>
+ <implementation>org.apache.maven.continuum.web.action.AddProjectAction</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.continuum.Continuum</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>com.opensymphony.xwork.Action</role>
+ <role-hint>addMavenOneProject</role-hint>
+ <implementation>org.apache.maven.continuum.web.action.AddMavenOneProjectAction</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.continuum.Continuum</role>
+ </requirement>
+ </requirements>
+ </component>
<!--
| Components
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=358253&r1=358252&r2=358253&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 02:13:24 2005
@@ -53,3 +53,59 @@
configuration.companyUrl.label = Company URL
configuration.submit.edit = Edit
+// ----------------------------------------------------------------------
+// Page: AddMavenOneProject
+// ----------------------------------------------------------------------
+add.m1.project.page.title = Add Maven 1 Project
+add.m1.project.section.title = Add Maven 1.x Project
+add.m1.project.m1PomUrl.label = M1 POM Url
+add.m1.project.m1PomUrl.message = Enter the URL to the Maven 1 POM
+add.m1.project.m1PomUrl.error = You must enter a valid URL
+add.m1.project.m1PomFile.label = Upload POM
+add.m1.project.m1PomFile.message = Enter the local filename of the Maven 1 POM to upload
+add.m1.project.m1PomFile.error = You must enter a valid URL
+
+// ----------------------------------------------------------------------
+// Page: AddMavenTwoProject
+// ----------------------------------------------------------------------
+add.m2.project.page.title = Add Maven 2 Project
+add.m2.project.section.title = Add Maven 2.0+ Project
+add.m2.project.m2PomUrl.label = POM Url
+add.m2.project.m2PomUrl.message = Enter the URL to the Maven 2 POM
+add.m2.project.m2PomUrl.error = You must enter a valid URL
+add.m2.project.m2PomFile.label = Upload POM
+add.m2.project.m2PomFile.message = Enter the local filename of the Maven 2 POM to upload (works only for a single project without modules).
+add.m2.project.m2PomFile.error = You must enter a valid URL
+
+// ----------------------------------------------------------------------
+// Page: AddProject (ant or shell)
+// ----------------------------------------------------------------------
+add.shell.project.page.title = Add Shell Project
+add.shell.project.section.title = Add Shell Project
+add.ant.project.page.title = Add Ant Project
+add.ant.project.section.title = Add Ant Project
+
+projectName.label = Project Name
+projectName.error = You must provide a project name
+projectName.message = Enter the project name
+
+projectScm.label = Scm
+projectScm.error = You must select an SCM
+projectScm.message = Select an SCM
+
+projectScmUrl.label = Scm Url
+projectScmUrl.error = You must provide an scm url
+projectScmUrl.message = Enter the <a href="http://maven.apache.org/scm/scm-url-format.html">Maven SCM URL</a>
+
+projectScmUsername.label = Scm Username
+projectScmUsername.message = Enter the scm username
+
+projectScmPassword.label = Scm Password
+projectScmPassword.message = Enter the scm password
+
+projectScmTag.label = Scm Branch/Tag
+projectScmTag.message = Enter the scm branch/tag name ( For subversion, tag name must be in scm URL and not in this field )
+
+projectVersion.label = Version
+projectVersion.error = You must provide a version
+projectVersion.message = Enter the version of the project
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=358253&r1=358252&r2=358253&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Wed Dec 21 02:13:24 2005
@@ -27,18 +27,39 @@
class="checkConfigurationAction">
<result name="input">/redirectToContinuumInitialization.jsp</result>
</action>
+
<action name="configuration"
class="configurationAction">
<result name="input">configurationEdit.jsp</result>
<result name="success">configuration.jsp</result>
</action>
+
<action name="login"
class="loginAction">
<result name="input">login.jsp</result>
<result name="success" type="redirect">summary.action</result>
</action>
+
<action name="summary"
class="summaryAction">
+ <result name="success">summary.jsp</result>
+ </action>
+
+ <action name="addMavenTwoProject"
+ class="addMavenTwoProject">
+ <result name="input">addMavenTwoProject.jsp</result>
+ <result name="success">summary.jsp</result>
+ </action>
+
+ <action name="addMavenOneProject"
+ class="addMavenOneProject">
+ <result name="input">addMavenOneProject.jsp</result>
+ <result name="success">summary.jsp</result>
+ </action>
+
+ <action name="addProject"
+ class="addProject">
+ <result name="input">addProject.jsp</result>
<result name="success">summary.jsp</result>
</action>
</package>
Added: 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=358253&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp Wed Dec 21 02:13:24 2005
@@ -0,0 +1,46 @@
+<%@ taglib uri="webwork" prefix="ww" %>
+<ww:i18n name="localization.Continuum">
+<html>
+ <head>
+ <title><ww:text name="add.m1.project.page.title"/></title>
+ </head>
+ <body>
+<div class="app">
+ <div id="axial" class="h3">
+ <h3><ww:text name="add.m1.project.section.title"/></h3>
+ <ww:form method="post" action="addMavenOneProject.action" name="addMavenOneProject" ><!--enctype="multipart/form-data"-->
+ <input type="hidden" name="m1PomFile" value="">
+ <div class="axial">
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr>
+ <th><ww:text name="add.m1.project.m1PomUrl.label"/> </th>
+ <td>
+ <input type="text" name="m1PomUrl" value="" size="100"/>
+ <p><ww:text name="add.m1.project.m1PomUrl.message"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>
+ <strong>OR</strong>
+ </td>
+ </tr>
+ <tr>
+ <th><ww:text name="add.m1.project.m1PomFile.label"/></th>
+ <td >
+ <input type="file" name="m1PomFileBox" value="" size="100" onChange="addMavenOneProject.m1PomFile.value = this.value"/>
+ <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>
+ </div>
+</div>
+ </body>
+</html>
+</ww:i18n>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenOneProject.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: 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=358253&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp Wed Dec 21 02:13:24 2005
@@ -0,0 +1,46 @@
+<%@ taglib uri="webwork" prefix="ww" %>
+<ww:i18n name="localization.Continuum">
+<html>
+ <head>
+ <title><ww:text name="add.m2.project.page.title"/></title>
+ </head>
+ <body>
+<div class="app">
+ <div id="axial" class="h3">
+ <h3><ww:text name="add.m2.project.section.title"/></h3>
+ <ww:form method="post" action="addMavenTwoProject.action" name="addMavenTwoProject" ><!--enctype="multipart/form-data"-->
+ <input type="hidden" name="m2PomFile" value="">
+ <div class="axial">
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr>
+ <th><ww:text name="add.m2.project.m2PomUrl.label"/></th>
+ <td >
+ <input type="text" name="m2PomUrl" value="" size="100"/>
+ <p><ww:text name="add.m2.project.m2PomUrl.message"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>
+ <strong>OR</strong>
+ </td>
+ </tr>
+ <tr>
+ <th><ww:text name="add.m2.project.m2PomFile.label"/></th>
+ <td >
+ <input type="file" name="m2PomFileBox" value="" size="100" onChange="addMavenTwoProject.m2PomFile.value = this.value"/>
+ <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>
+ </div>
+</div>
+ </body>
+</html>
+</ww:i18n>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/addMavenTwoProject.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: 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=358253&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp Wed Dec 21 02:13:24 2005
@@ -0,0 +1,83 @@
+<%@ taglib uri="webwork" prefix="ww" %>
+<ww:i18n name="localization.Continuum">
+<html>
+ <head>
+ <title>
+ <ww:if test="projectType == \"shell\"">
+ <ww:text name="add.shell.project.page.title"/>
+ </ww:if>
+ <ww:else>
+ <ww:text name="add.ant.project.page.title"/>
+ </ww:else>
+ </title>
+ </head>
+ <body>
+
+<div class="app">
+ <div id="axial" class="h3">
+ <h3>
+ <ww:if test="projectType == \"shell\"">
+ <ww:text name="add.shell.project.section.title"/>
+ </ww:if>
+ <ww:else>
+ <ww:text name="add.ant.project.section.title"/>
+ </ww:else>
+ </h3>
+ <ww:form method="post" action="addProject.action">
+ <input type="hidden" name="projectType" value="<ww:property value="projectType"/>">
+ <div class="axial">
+ <table border="1" cellspacing="2" cellpadding="3" width="100%">
+ <tr>
+ <th><ww:text name="projectName.label"/></th>
+ <td >
+ <input type="text" name="projectName" value="" size="100"/>
+ <p><ww:text name="projectName.message"/></p>
+ </td>
+ </tr>
+ <tr>
+ <th><ww:text name="projectVersion.label"/></th>
+ <td >
+ <input type="text" name="projectVersion" value="" size="100"/>
+ <p><ww:text name="projectVersion.message"/></p>
+ </td>
+ </tr>
+ <tr>
+ <th><ww:text name="projectScmUrl.label"/></th>
+ <td >
+ <input type="text" name="projectScmUrl" value="" size="100"/>
+ <p><ww:text name="projectScmUrl.message"/></p>
+ </td>
+ </tr>
+ <tr>
+ <th><ww:text name="projectScmUsername.label"/></th>
+ <td >
+ <input type="text" name="projectScmUsername" value="" size="100"/>
+ <p><ww:text name="projectScmUsername.message"/></p>
+ </td>
+ </tr>
+ <tr>
+ <th><ww:text name="projectScmPassword.label"/></th>
+ <td >
+ <input type="password" name="projectScmPassword" value="" size="100"/>
+ <p><ww:text name="projectScmPassword.message"/></p>
+ </td>
+ </tr>
+ <tr>
+ <th><ww:text name="projectScmTag.label"/></th>
+ <td >
+ <input type="text" name="projectScmTag" value="" size="100"/>
+ <p><ww:text name="projectScmTag.message"/></p>
+ </td>
+ </tr>
+ </table>
+ <div class="functnbar3">
+ <input type="submit" value="Submit"/>
+ <input type="button" value="Cancel" onClick="history.back()"/>
+ </div>
+ </div>
+ </ww:form>
+ </div>
+</div>
+ </body>
+</html>
+</ww:i18n>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/addProject.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp?rev=358253&r1=358252&r2=358253&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp Wed Dec 21 02:13:24 2005
@@ -10,6 +10,21 @@
<a href="<ww:url value="/summary.action"/>">Show Projects</a>
</div>
</div>
+ <div class="label">Add Project</div>
+ <div class="body">
+ <div>
+ <a href="<ww:url value="addMavenTwoProject!default.action"/>">Maven 2.0.x Project</a>
+ </div>
+ <div>
+ <a href="<ww:url value="addMavenOneProject!default.action"/>">Maven 1.x Project</a>
+ </div>
+ <div>
+ <a href="<ww:url value="addProject!default.action"><ww:param name="projectType">ant</ww:param></ww:url>">Ant Project</a>
+ </div>
+ <div>
+ <a href="<ww:url value="addProject!default.action"><ww:param name="projectType">shell</ww:param></ww:url>">Shell Project</a>
+ </div>
+ </div>
</div>
<div id="projectmenu" class="toolgroup">
<div class="label">Administration</div>