continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r480123 - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ continuum-webapp/src...
Date Tue, 28 Nov 2006 16:40:33 GMT
Author: evenisse
Date: Tue Nov 28 08:40:29 2006
New Revision: 480123

URL: http://svn.apache.org/viewvc?view=rev&rev=480123
Log:
Add projects groups list in add maven1 project screen

Modified:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?view=diff&rev=480123&r1=480122&r2=480123
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
(original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
Tue Nov 28 08:40:29 2006
@@ -199,6 +199,14 @@
     ContinuumProjectBuildingResult addMavenTwoProject( String metadataUrl )
         throws ContinuumException;
 
+    /**
+     * Add a Maven 2 project to the list of projects.
+     *
+     * @param metadataUrl url of the pom.xml
+     * @param projectGroupId id of the project group to use
+     * @return a holder with the projects, project groups and errors occurred during the
project adding
+     * @throws ContinuumException
+     */
     ContinuumProjectBuildingResult addMavenTwoProject( String metadataUrl, int projectGroupId
)
         throws ContinuumException;
 
@@ -211,6 +219,17 @@
      */
    ContinuumProjectBuildingResult addMavenOneProject( String metadataUrl )
         throws ContinuumException;
+
+    /**
+     * Add a Maven 1 project to the list of projects.
+     *
+     * @param metadataUrl url of the project.xml
+     * @param projectGroupId id of the project group to use
+     * @return a holder with the projects, project groups and errors occurred during the
project adding
+     * @throws ContinuumException
+     */
+    ContinuumProjectBuildingResult addMavenOneProject( String metadataUrl, int projectGroupId
)
+         throws ContinuumException;
 
     void updateProject( Project project )
         throws ContinuumException;

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?view=diff&rev=480123&r1=480122&r2=480123
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Tue Nov 28 08:40:29 2006
@@ -1008,6 +1008,12 @@
         return executeAddProjectsFromMetadataActivity( metadataUrl, MavenOneContinuumProjectBuilder.ID
);
     }
 
+    public ContinuumProjectBuildingResult addMavenOneProject( String metadataUrl, int projectGroupId
)
+        throws ContinuumException
+    {
+        return executeAddProjectsFromMetadataActivity( metadataUrl, MavenOneContinuumProjectBuilder.ID,
projectGroupId );
+    }
+
     // ----------------------------------------------------------------------
     // Maven 2.x projects
     // ----------------------------------------------------------------------

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?view=diff&rev=480123&r1=480122&r2=480123
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
Tue Nov 28 08:40:29 2006
@@ -39,7 +39,7 @@
     protected ContinuumProjectBuildingResult doExecute( String pomUrl, int selectedProjectGroup
)
         throws ContinuumException
     {
-        return getContinuum().addMavenOneProject( pomUrl );
+        return getContinuum().addMavenOneProject( pomUrl, selectedProjectGroup );
     }
 
     /**

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=480123&r1=480122&r2=480123
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Tue Nov 28 08:40:29 2006
@@ -18,7 +18,7 @@
 back = Back
 workingCopy = Working Copy
 builds = Builds
-info = Project Informations
+info = Project Information
 or = OR
 
 # ----------------------------------------------------------------------
@@ -177,11 +177,14 @@
 add.m1.project.page.title = Continuum - 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.username.label = Username
+add.m1.project.m1PomUrl.password.label = Password
+add.m1.project.m1PomUrl.message = Enter the URL to the Maven 1 POM. Provide the username
and password if it is a secured resource.
 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
+add.m1.project.projectGroup = Project Group
 
 # ----------------------------------------------------------------------
 # Page: AddMavenTwoProject

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp?view=diff&rev=480123&r1=480122&r2=480123
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
Tue Nov 28 08:40:29 2006
@@ -22,7 +22,21 @@
                         <table>
                           <tbody>
                             <ww:textfield label="%{getText('add.m1.project.m1PomUrl.label')}"
name="m1PomUrl">
-                                <ww:param name="desc"><p><ww:text name="add.m1.project.m1PomUrl.message"/></p></ww:param>
+                                <ww:param name="desc">
+                                <table cellspacing="0" cellpadding="0">
+                                  <tbody>
+                                    <tr>
+                                      <td><ww:text name="add.m1.project.m1PomUrl.username.label"/>:
</td>
+                                      <td><input type="text" name="username" size="20"
id="addMavenOneProject_username"/><td>
+                                    </tr>  
+                                    <tr>
+                                      <td><ww:text name="add.m1.project.m1PomUrl.password.label"/>:
</td>
+                                      <td><input type="password" name="password"
size="20" id="addMavenOneProject_password"/><td>
+                                    </tr>  
+                                  </tbody>
+                                </table>  
+                                  <p><ww:text name="add.m1.project.m1PomUrl.message"/></p>
+                                </ww:param>
                             </ww:textfield>
                             <ww:label>
                               <ww:param name="after"><strong><ww:text name="or"/></strong></ww:param>
@@ -30,6 +44,14 @@
                             <ww:file label="%{getText('add.m1.project.m1PomFile.label')}"
name="m1PomFile">
                                 <ww:param name="desc"><p><ww:text name="add.m1.project.m1PomFile.message"/></p></ww:param>
                             </ww:file>
+                            <ww:if test="disableGroupSelection == true">
+                              <ww:hidden name="selectedProjectGroup"/>
+                              <ww:hidden name="disableGroupSelection"/>
+                              <ww:textfield label="%{getText('add.m1.project.projectGroup')}"
name="projectGroupName" disabled="true"/>
+                            </ww:if>
+                            <ww:else>
+                              <ww:select label="%{getText('add.m1.project.projectGroup')}"
name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
+                            </ww:else>
                           </tbody>
                         </table>
                         <div class="functnbar3">



Mime
View raw message