continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r358423 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/ resources/META-INF/plexus/ resources/localization/ webapp/
Date Thu, 22 Dec 2005 00:11:52 GMT
Author: evenisse
Date: Wed Dec 21 16:11:41 2005
New Revision: 358423

URL: http://svn.apache.org/viewcvs?rev=358423&view=rev
Log:
Add project view

Added:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
  (with props)
    maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp   (with props)
Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
    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/deleteProject.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=358423&r1=358422&r2=358423&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
Wed Dec 21 16:11:41 2005
@@ -26,7 +26,7 @@
 import java.util.Map;
 
 /**
- * @author Nick Gonzalez
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
  */
 public class BuildProjectAction

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?rev=358423&r1=358422&r2=358423&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
Wed Dec 21 16:11:41 2005
@@ -22,7 +22,7 @@
 import com.opensymphony.xwork.ActionSupport;
 
 /**
- * @author Nick Gonzalez
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
  */
 public class DeleteProjectAction

Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=358423&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
Wed Dec 21 16:11:41 2005
@@ -0,0 +1,65 @@
+package org.apache.maven.continuum.web.action;
+
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.Project;
+
+import com.opensymphony.xwork.ActionSupport;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public class ProjectViewAction
+    extends ActionSupport
+{
+    private Continuum continuum;
+
+    private Project project;
+
+    private int projectId;
+
+    public String execute()
+    {
+        try
+        {
+            project = continuum.getProjectWithAllDetails( projectId );
+        }
+        catch ( ContinuumException e )
+        {
+            addActionMessage( "Can't get project informations (id=" + projectId + ") : "
+ e.getMessage() );
+
+            e.printStackTrace();
+
+            return ERROR;
+        }
+
+        return SUCCESS;
+    }
+
+    public void setProjectId( int projectId )
+    {
+        this.projectId = projectId;
+    }
+
+    public Project getProject()
+    {
+        return project;
+    }
+}
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.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=358423&r1=358422&r2=358423&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 16:11:41 2005
@@ -100,6 +100,17 @@
         </requirement>
       </requirements>
     </component>
+    <component>
+      <role>com.opensymphony.xwork.Action</role>
+      <role-hint>projectView</role-hint>
+      <implementation>org.apache.maven.continuum.web.action.ProjectViewAction</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=358423&r1=358422&r2=358423&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 16:11:41 2005
@@ -72,7 +72,7 @@
 // ----------------------------------------------------------------------
 // Page: AddMavenOneProject
 // ----------------------------------------------------------------------
-add.m1.project.page.title = Add Maven 1 Project
+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
@@ -84,7 +84,7 @@
 // ----------------------------------------------------------------------
 // Page: AddMavenTwoProject
 // ----------------------------------------------------------------------
-add.m2.project.page.title = Add Maven 2 Project
+add.m2.project.page.title = Continuum - 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
@@ -96,7 +96,7 @@
 // ----------------------------------------------------------------------
 // Page: AddProject (ant or shell)
 // ----------------------------------------------------------------------
-add.shell.project.page.title = Add Shell Project
+add.shell.project.page.title = Continuum - 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
@@ -129,6 +129,22 @@
 // ----------------------------------------------------------------------
 // Page: DeleteProject
 // ----------------------------------------------------------------------
-delete.page.title = Delete Continuum Project
+delete.page.title = Continuum - Delete Continuum Project
+delete.section.title = Delete Continuum Project
 delete.confirmation.message = Are you sure you want to delete the project "{0}"?
 delete.submit = Delete
+
+// ----------------------------------------------------------------------
+// Page: ProjectView
+// ----------------------------------------------------------------------
+projectView.page.title = Continuum - Continuum Project
+projectView.section.title = Continuum Project
+projectView.project.name = Project Name
+projectView.project.version = Version
+projectView.project.scmUrl = Scm Url
+projectView.project.group = Group
+projectView.buildDefinitions = Build Definitions
+projectView.notifiers = Notifiers
+projectView.dependencies = Dependencies
+projectView.usedBy= Used By
+projectView.developers = Developers

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=358423&r1=358422&r2=358423&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 16:11:41
2005
@@ -77,5 +77,10 @@
                 class="buildProject">
             <result name="success" type="redirect">summary.action</result>
         </action>
+
+        <action name="projectView"
+                class="projectView">
+            <result name="success">projectView.jsp</result>
+        </action>
     </package>
 </xwork>

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=358423&r1=358422&r2=358423&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 16:11:41
2005
@@ -6,7 +6,7 @@
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="delete.page.title"/></h3>
+        <h3><ww:text name="delete.section.title"/></h3>
 
         <div class="warningmessage">
           <p>

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp?rev=358423&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp Wed Dec 21 16:11:41
2005
@@ -0,0 +1,44 @@
+<%@ taglib uri="webwork" prefix="ww" %>
+<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<html>
+  <ww:i18n name="localization.Continuum">
+    <head>
+        <title><ww:text name="projectView.page.title"/></title>
+    </head>
+    <body>
+      <div id="h3">
+        <h3><ww:text name="projectView.section.title"/></h3>
+            
+        <div class="axial">
+          <table border="1" cellspacing="2" cellpadding="3" width="100%">
+            <tr class="b">
+              <th><ww:text name="projectView.project.name"/></th>
+              <td><ww:property value="project.name"/></td>
+            </tr>
+            <tr class="a">
+              <th><ww:text name="projectView.project.version"/></th>
+              <td><ww:property value="project.version"/></td>
+            </tr>
+            <tr class="b">
+              <th><ww:text name="projectView.project.scmUrl"/></th>
+              <td><ww:property value="project.scmUrl"/></td>
+            </tr>
+            <tr class="a">
+              <th><ww:text name="projectView.project.group"/></th>
+              <td><ww:property value="project.projectGroup.name"/></td>
+            </tr>
+          </table>
+        </div>
+
+        <h3><ww:text name="projectView.buildDefinitions"/></h3>
+            
+        <h3><ww:text name="projectView.notifiers"/></h3>
+            
+        <h3><ww:text name="projectView.dependencies"/></h3>
+            
+        <h3><ww:text name="projectView.developers"/></h3>
+            
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp?rev=358423&r1=358422&r2=358423&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp Wed Dec 21 16:11:41
2005
@@ -17,7 +17,7 @@
           <ec:row highlightRow="true">
             <ec:column property="state" title="&nbsp;" cell="org.apache.maven.continuum.web.view.StateCell"/>
             <ec:column property="name">
-                <a href="TO_BE_DEFINE">${pageScope.project.name}</a>
+                <a href="${pageContext.request.contextPath}/projectView.action?projectId=${pageScope.project.id}">${pageScope.project.name}</a>
             </ec:column>
             <ec:column property="version"/>
             <ec:column property="buildNumber" title="summary.projectTable.build" cell="org.apache.maven.continuum.web.view.BuildCell"/>



Mime
View raw message