continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From epunza...@apache.org
Subject svn commit: r743250 - in /continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/ continuum-core/src/test-poms/ continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m2/ continuum-core/src/test/jav...
Date Wed, 11 Feb 2009 07:10:26 GMT
Author: epunzalan
Date: Wed Feb 11 07:10:25 2009
New Revision: 743250

URL: http://svn.apache.org/viewvc?rev=743250&view=rev
Log:
[CONTINUUM-1726] Added a description field to projects

Modified:
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    continuum/trunk/continuum-core/src/test-poms/pom.xml
    continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m2/TestMavenBuilderHelper.java
    continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
    continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=743250&r1=743249&r2=743250&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
Wed Feb 11 07:10:25 2009
@@ -149,6 +149,12 @@
         continuumProject.setName( getProjectName( mavenProject ) );
 
         // ----------------------------------------------------------------------
+        // Description
+        // ----------------------------------------------------------------------
+
+        continuumProject.setDescription( mavenProject.getDescription() );
+
+        // ----------------------------------------------------------------------
         // SCM Url
         // ----------------------------------------------------------------------
 

Modified: continuum/trunk/continuum-core/src/test-poms/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test-poms/pom.xml?rev=743250&r1=743249&r2=743250&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test-poms/pom.xml (original)
+++ continuum/trunk/continuum-core/src/test-poms/pom.xml Wed Feb 11 07:10:25 2009
@@ -23,6 +23,7 @@
   <artifactId>continuum-project2</artifactId>
   <packaging>jar</packaging>
   <name>Continuum Test Project 2</name>
+  <description>This is a sample pom for test purposes</description>
   <version>1.0</version>
   
   <scm>

Modified: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m2/TestMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m2/TestMavenBuilderHelper.java?rev=743250&r1=743249&r2=743250&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m2/TestMavenBuilderHelper.java
(original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m2/TestMavenBuilderHelper.java
Wed Feb 11 07:10:25 2009
@@ -49,6 +49,7 @@
 
         assertEquals( "plexus", project.getGroupId() );
         assertEquals( "continuum-project2", project.getArtifactId() );
+        assertEquals( "This is a sample pom for test purposes", project.getDescription()
);
         assertNotNull( project.getScm() );
         assertTrue( project.getDependencies().isEmpty() );
         assertTrue( result.getErrors().isEmpty() );

Modified: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java?rev=743250&r1=743249&r2=743250&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
(original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
Wed Feb 11 07:10:25 2009
@@ -107,12 +107,14 @@
 
         assertEquals( "result.projects.length", 1, result.getProjects().size() );
 
-        Project project = (Project) result.getProjects().get( 0 );
+        Project project = result.getProjects().get( 0 );
 
         assertNotNull( project );
 
         assertEquals( "Maven", project.getName() );
 
+        assertEquals( "Java Project Management Tools", project.getDescription() );
+
         assertEquals( "scm:svn:http://svn.apache.org/repos/asf:maven/maven-1/core/trunk/",
project.getScmUrl() );
 
         ProjectNotifier notifier = (ProjectNotifier) project.getNotifiers().get( 0 );

Modified: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java?rev=743250&r1=743249&r2=743250&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
(original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
Wed Feb 11 07:10:25 2009
@@ -233,6 +233,8 @@
 
             assertNotNull( project.getName() );
 
+            assertNotNull( project.getDescription() );
+
             projects.put( project.getName(), project );
         }
 

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=743250&r1=743249&r2=743250&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
Wed Feb 11 07:10:25 2009
@@ -48,6 +48,8 @@
 {
     private String projectName;
 
+    private String projectDescription;
+
     private String projectVersion;
 
     private String projectScmUrl;
@@ -165,6 +167,9 @@
 
         project.setName( projectName.trim() );
 
+        if ( projectDescription != null )
+            project.setDescription( projectDescription.trim() );
+
         project.setVersion( projectVersion.trim() );
 
         project.setScmUrl( projectScmUrl.trim() );
@@ -421,4 +426,12 @@
             return false;
         }
     }
+
+    public String getProjectDescription() {
+        return projectDescription;
+    }
+
+    public void setProjectDescription(String projectDescription) {
+        this.projectDescription = projectDescription;
+    }
 }

Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=743250&r1=743249&r2=743250&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Wed Feb 11 07:10:25 2009
@@ -336,6 +336,9 @@
 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>
 
+projectDescription.label = Description
+projectDescription.message = Enter a description of the project
+
 projectScmUsername.label = Scm Username
 projectScmUsername.message = Enter the scm username
 
@@ -366,6 +369,7 @@
 projectView.page.title = Continuum - Continuum Project
 projectView.section.title = Continuum Project
 projectView.project.name = Project Name
+projectView.project.description = Description
 projectView.project.version = Version
 projectView.project.scmUrl = SCM Url
 projectView.project.scmTag = SCM Branch/Tag

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp?rev=743250&r1=743249&r2=743250&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp Wed Feb 11
07:10:25 2009
@@ -57,6 +57,9 @@
                             <s:textfield label="%{getText('projectName.label')}" name="projectName"
required="true">
                                 <s:param name="desc"><p><s:text name="projectName.message"/></p></s:param>
                             </s:textfield>
+                            <s:textfield label="%{getText('projectDescription.label')}"
name="projectDescription">
+                                <s:param name="desc"><p><s:text name="projectDescription.message"/></p></s:param>
+                            </s:textfield>
                             <s:textfield label="%{getText('projectVersion.label')}" name="projectVersion"
required="true">
                                 <s:param name="desc"><p><s:text name="projectVersion.message"/></p></s:param>
                             </s:textfield>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=743250&r1=743249&r2=743250&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Wed Feb 11
07:10:25 2009
@@ -40,6 +40,7 @@
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
             <c1:data label="%{getText('projectView.project.name')}" name="project.name"/>
+            <c1:data label="%{getText('projectView.project.description')}" name="project.description"/>
             <c1:data label="%{getText('projectView.project.version')}" name="project.version"/>
             <c1:data label="%{getText('projectView.project.scmUrl')}" name="project.scmUrl"/>
             <c1:data label="%{getText('projectView.project.scmTag')}" name="project.scmTag"/>



Mime
View raw message