continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r451714 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ConfigurationAction.java resources/localization/Continuum.properties webapp/configuration.jsp webapp/configurationEdit.jsp
Date Sun, 01 Oct 2006 05:18:44 GMT
Author: brett
Date: Sat Sep 30 22:18:43 2006
New Revision: 451714

URL: http://svn.apache.org/viewvc?view=rev&rev=451714
Log:
[CONTINUUM-914] add back configuration for the deployment repository directory

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java?view=diff&rev=451714&r1=451713&r2=451714
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
Sat Sep 30 22:18:43 2006
@@ -21,6 +21,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.configuration.ConfigurationStoringException;
 import org.apache.maven.continuum.model.system.ContinuumUser;
@@ -29,9 +30,9 @@
 import org.apache.maven.continuum.store.ContinuumStore;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.xwork.Preparable;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -42,8 +43,12 @@
  *   role-hint="configuration"
  */
 public class ConfigurationAction
-    extends ContinuumActionSupport
+    extends PlexusActionSupport
 {
+    /**
+     * @plexus.requirement
+     */
+    private Continuum continuum;
 
     /**
      * @plexus.requirement
@@ -66,6 +71,8 @@
 
     private String buildOutputDirectory;
 
+    private String deploymentRepositoryDirectory;
+
     private String baseUrl;
 
     private String companyLogo;
@@ -74,11 +81,6 @@
 
     private String companyUrl;
 
-    public void prepare()
-    {
-
-    }
-    
     public String save()
         throws ConfigurationStoringException, ContinuumStoreException
     {
@@ -94,7 +96,7 @@
 
         store.addUser( adminUser );
 
-        ConfigurationService configuration = getContinuum().getConfiguration();
+        ConfigurationService configuration = continuum.getConfiguration();
 
         if ( guestAccountEnabled )
         {
@@ -115,6 +117,8 @@
 
         configuration.setBuildOutputDirectory( new File( buildOutputDirectory ) );
 
+        configuration.setDeploymentRepositoryDirectory( new File( deploymentRepositoryDirectory
) );
+
         configuration.setUrl( baseUrl );
 
         configuration.setCompanyLogo( companyLogo );
@@ -138,7 +142,7 @@
 
     private void setConfiguration()
     {
-        ConfigurationService configuration = getContinuum().getConfiguration();
+        ConfigurationService configuration = continuum.getConfiguration();
 
         guestAccountEnabled = configuration.isGuestAccountEnabled();
 
@@ -232,6 +236,16 @@
     public void setWorkingDirectory( String workingDirectory )
     {
         this.workingDirectory = workingDirectory;
+    }
+
+    public String getDeploymentRepositoryDirectory()
+    {
+        return deploymentRepositoryDirectory;
+    }
+
+    public void setDeploymentRepositoryDirectory( String deploymentRepositoryDirectory )
+    {
+        this.deploymentRepositoryDirectory = deploymentRepositoryDirectory;
     }
 
     public String getBuildOutputDirectory()

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=451714&r1=451713&r2=451714
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Sat Sep 30 22:18:43 2006
@@ -98,6 +98,7 @@
 configuration.guest.value = Guest user is <strong style="color: green;">{0}</strong>
 configuration.workingDirectory.label = Working Directory
 configuration.buildOutputDirectory.label = Build Output Directory
+configuration.deploymentRepositoryDirectory.label = Deployment Repository Directory
 configuration.baseUrl.label = Base URL
 configuration.companyName.label = Company Name
 configuration.companyLogo.label = Company Logo
@@ -106,6 +107,7 @@
 configuration.guest.message = Enable/Disable login as guest
 configuration.workingDirectory.message = Enter the working directory of the Continuum web
application
 configuration.buildOutputDirectory.message = Enter the build output directory of the Continuum
web application
+configuration.deploymentRepositoryDirectory.message = Enter the deployment repository directory
of the Continuum web application
 configuration.baseUrl.message = Enter the base URL for the Continuum web application
 configuration.companyName.message = Enter the company name
 configuration.companyLogo.message = Enter the company logo

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp?view=diff&rev=451714&r1=451713&r2=451714
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/configuration.jsp Sat Sep 30 22:18:43
2006
@@ -23,6 +23,7 @@
             </c1:data>
             <c1:data label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"/>
             <c1:data label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"/>
+            <c1:data label="%{getText('configuration.deploymentRepositoryDirectory.label')}"
name="deploymentRepositoryDirectory"/>
             <c1:data label="%{getText('configuration.baseUrl.label')}" name="baseUrl"/>
             <c1:data label="%{getText('configuration.companyName.label')}" name="companyName"/>
             <c1:data label="%{getText('configuration.companyLogo.label')}" name="companyLogo"/>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp?view=diff&rev=451714&r1=451713&r2=451714
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/configurationEdit.jsp Sat Sep 30
22:18:43 2006
@@ -62,6 +62,10 @@
               <ww:param name="desc"><p><ww:text name="configuration.buildOutputDirectory.message"/></p></ww:param>
             </ww:textfield>
 
+            <ww:textfield label="%{getText('configuration.deploymentRepositoryDirectory.label')}"
name="deploymentRepositoryDirectory">
+              <ww:param name="desc"><p><ww:text name="configuration.deploymentRepositoryDirectory.message"/></p></ww:param>
+            </ww:textfield>
+
             <ww:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl"
required="true">
               <ww:param name="desc"><p><ww:text name="configuration.baseUrl.message"/></p></ww:param>
             </ww:textfield>



Mime
View raw message