continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r548732 [3/3] - in /maven/continuum/trunk: ./ continuum-api/src/main/java/org/apache/maven/continuum/ continuum-api/src/main/java/org/apache/maven/continuum/installation/ continuum-api/src/main/java/org/apache/maven/continuum/profile/ conti...
Date Tue, 19 Jun 2007 14:04:17 GMT
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?view=diff&rev=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Tue Jun 19 07:04:13 2007
@@ -19,19 +19,21 @@
  * under the License.
  */
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.Schedule;
+import org.apache.maven.continuum.model.system.Profile;
+import org.apache.maven.continuum.profile.ProfileException;
 import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
 import org.apache.maven.continuum.web.exception.ContinuumActionException;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 /**
  * BuildDefinitionAction:
  *
@@ -66,12 +68,14 @@
 
     private Map schedules;
 
-    private Map profiles;
+    private List profiles;
 
     private boolean groupBuildDefinition = false;
 
     private String projectGroupName = "";
 
+    private int profileId;
+
     public void prepare()
         throws Exception
     {
@@ -94,7 +98,7 @@
         // todo: missing from continuum, investigate
         if ( profiles == null )
         {
-            profiles = new HashMap();
+            profiles = this.getContinuum().getProfileService().getAllProfiles();
         }
 
     }
@@ -145,6 +149,11 @@
                 buildFresh = buildDefinition.isBuildFresh();
                 scheduleId = buildDefinition.getSchedule().getId();
                 defaultBuildDefinition = buildDefinition.isDefaultForProject();
+                Profile profile = buildDefinition.getProfile();
+                if ( profile != null )
+                {
+                    profileId = profile.getId();
+                }
             }
             else
             {
@@ -180,7 +189,7 @@
     }
 
     public String saveBuildDefinition()
-        throws ContinuumException
+        throws ContinuumException, ProfileException
     {
         if ( projectId != 0 && !groupBuildDefinition )
         {
@@ -193,7 +202,7 @@
     }
 
     public String saveToProject()
-        throws ContinuumException
+        throws ContinuumException, ProfileException
     {
 
         try
@@ -226,7 +235,7 @@
     }
 
     public String saveToGroup()
-        throws ContinuumException
+        throws ContinuumException, ProfileException
     {
         try
         {
@@ -322,7 +331,7 @@
     }
 
     private BuildDefinition getBuildDefinitionFromInput()
-        throws ContinuumActionException
+        throws ContinuumActionException, ProfileException
     {
 
         Schedule schedule;
@@ -349,7 +358,14 @@
         buildDefinition.setBuildFresh( buildFresh );
         buildDefinition.setDefaultForProject( defaultBuildDefinition );
         buildDefinition.setSchedule( schedule );
-
+        if ( profileId != -1 )
+        {
+            Profile profile = getContinuum().getProfileService().getProfile( profileId );
+            if ( profile != null )
+            {
+                buildDefinition.setProfile( profile );
+            }
+        }
         return buildDefinition;
     }
 
@@ -473,12 +489,12 @@
         this.schedules = schedules;
     }
 
-    public Map getProfiles()
+    public List getProfiles()
     {
         return profiles;
     }
 
-    public void setProfiles( Map profiles )
+    public void setProfiles( List profiles )
     {
         this.profiles = profiles;
     }
@@ -509,5 +525,15 @@
         }
 
         return projectGroupName;
+    }
+
+    public int getProfileId()
+    {
+        return profileId;
+    }
+
+    public void setProfileId( int profileId )
+    {
+        this.profileId = profileId;
     }
 }

Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java?view=auto&rev=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java Tue Jun 19 07:04:13 2007
@@ -0,0 +1,217 @@
+package org.apache.maven.continuum.web.action.admin;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import org.apache.maven.continuum.installation.InstallationService;
+import org.apache.maven.continuum.model.system.Installation;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+
+import com.opensymphony.xwork.Preparable;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+/**
+ * @author <a href="mailto:olamy@codehaus.org">olamy</a>
+ * @since 14 juin 07
+ * @version $Id$
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="installation"
+ */
+public class InstallationAction
+    extends ContinuumActionSupport
+    implements Preparable
+{
+
+    /**
+     * @plexus.requirement role-hint="default"
+     */
+    private InstallationService installationService;
+
+    private List<Installation> installations;
+
+    private Installation installation;
+
+    private Map typesLabels;
+
+    private List types;
+
+    private boolean varNameUpdatable = true;
+
+    private boolean nameUpdatable = true;
+
+    // -----------------------------------------------------
+    // Webwork methods
+    // -----------------------------------------------------
+
+    public void prepare()
+        throws Exception
+    {
+        super.prepare();
+    }
+
+    public String list()
+        throws Exception
+    {
+        this.installations = installationService.getAllInstallations();
+        return SUCCESS;
+    }
+
+    public String edit()
+        throws Exception
+    {
+        this.installation = installationService.getInstallation( installation.getName() );
+
+        if ( this.installation != null )
+        {
+            this.nameUpdatable = false;
+            // we can update env var name only with env var type
+            if ( !InstallationService.ENVVAR_TYPE.equals( this.installation.getType() ) )
+            {
+                this.varNameUpdatable = false;
+            }
+        }
+        return SUCCESS;
+    }
+
+    public String input()
+        throws Exception
+    {
+        return INPUT;
+    }
+
+    public String save()
+        throws Exception
+    {
+        Installation installationToSave = installationService.getInstallation( this.installation.getName() );
+        if ( installationToSave == null )
+        {
+            installationService.add( installation );
+        }
+        else
+        {
+            installationToSave.setName( installation.getName() );
+            installationToSave.setVarName( installation.getVarName() );
+            installationToSave.setVarValue( installation.getVarValue() );
+            installationService.update( installationToSave );
+        }
+        this.installations = installationService.getAllInstallations();
+        return SUCCESS;
+    }
+
+    public String delete()
+        throws Exception
+    {
+        Installation installationToDelete = installationService.getInstallation( installation.getName() );
+        installationService.delete( installationToDelete );
+        this.installations = installationService.getAllInstallations();
+        return SUCCESS;
+    }
+
+    // -----------------------------------------------------
+    // getter/setters
+    // -----------------------------------------------------
+    public List<Installation> getInstallations()
+    {
+        return installations;
+    }
+
+    public void setInstallations( List<Installation> installations )
+    {
+        this.installations = installations;
+    }
+
+    public Installation getInstallation()
+    {
+        return installation;
+    }
+
+    public void setInstallation( Installation installation )
+    {
+        this.installation = installation;
+    }
+
+    public Map getTypesLabels()
+    {
+        if ( this.typesLabels == null )
+        {
+            this.typesLabels = new LinkedHashMap<String, String>();
+            ResourceBundle resourceBundle = getTexts( "localization/Continuum" );
+            this.typesLabels.put( InstallationService.JDK_TYPE, resourceBundle
+                .getString( "installation.jdk.type.label" ) );
+            this.typesLabels.put( InstallationService.MAVEN2_TYPE, resourceBundle
+                .getString( "installation.maven2.type.label" ) );
+            this.typesLabels.put( InstallationService.MAVEN1_TYPE, resourceBundle
+                .getString( "installation.maven1.type.label" ) );
+            this.typesLabels.put( InstallationService.ANT_TYPE, resourceBundle
+                .getString( "installation.ant.type.label" ) );
+            this.typesLabels.put( InstallationService.ENVVAR_TYPE, resourceBundle
+                .getString( "installation.envvar.type.label" ) );
+        }
+        return typesLabels;
+    }
+
+    public void setTypesLabels( Map typesLabels )
+    {
+        this.typesLabels = typesLabels;
+    }
+
+    public boolean isVarNameUpdatable()
+    {
+        return varNameUpdatable;
+    }
+
+    public void setVarNameUpdatable( boolean varNameUpdatable )
+    {
+        this.varNameUpdatable = varNameUpdatable;
+    }
+
+    public List getTypes()
+    {
+        if ( this.types == null )
+        {
+            this.types = new ArrayList();
+            this.types.add( InstallationService.JDK_TYPE );
+            this.types.add( InstallationService.MAVEN2_TYPE );
+            this.types.add( InstallationService.MAVEN1_TYPE );
+            this.types.add( InstallationService.ANT_TYPE );
+            this.types.add( InstallationService.ENVVAR_TYPE );
+
+        }
+        return types;
+    }
+
+    public void setTypes( List types )
+    {
+        this.types = types;
+    }
+
+    public boolean isNameUpdatable()
+    {
+        return nameUpdatable;
+    }
+
+    public void setNameUpdatable( boolean nameUpdatable )
+    {
+        this.nameUpdatable = nameUpdatable;
+    }
+
+}

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

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?view=auto&rev=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Tue Jun 19 07:04:13 2007
@@ -0,0 +1,255 @@
+package org.apache.maven.continuum.web.action.admin;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.maven.continuum.installation.InstallationService;
+import org.apache.maven.continuum.model.system.Installation;
+import org.apache.maven.continuum.model.system.Profile;
+import org.apache.maven.continuum.profile.ProfileService;
+import org.apache.maven.continuum.web.action.ContinuumActionSupport;
+import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import org.codehaus.plexus.util.StringUtils;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+/**
+ * @author <a href="mailto:olamy@codehaus.org">olamy</a>
+ * @since 7 juin 07
+ * @version $Id$
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="profileAdministration"
+ */
+public class ProfileAction
+    extends ContinuumActionSupport
+
+{
+    /**
+     * @plexus.requirement role-hint="default"
+     */
+    private ProfileService profileService;
+
+    /**
+     * @plexus.requirement role-hint="default"
+     */
+    private InstallationService installationService;
+
+    private List profiles;
+
+    private Profile profile;
+
+    private String installationName;
+
+    private List<Installation> allInstallations;
+
+    private List<Installation> profileInstallations;
+
+    // -------------------------------------------------------
+    //  Webwork Methods
+    // -------------------------------------------------------
+
+    public String input()
+        throws Exception
+    {
+        this.allInstallations = installationService.getAllInstallations();
+        return INPUT;
+    }
+
+    public String list()
+        throws Exception
+    {
+        this.profiles = profileService.getAllProfiles();
+        return SUCCESS;
+    }
+
+    public String edit()
+        throws Exception
+    {
+        if ( getLogger().isDebugEnabled() )
+        {
+            getLogger().debug( "edit profile with id " + profile.getId() );
+        }
+        this.profile = profileService.getProfile( profile.getId() );
+        return SUCCESS;
+    }
+
+    public String save()
+        throws Exception
+    {
+        Profile stored = profileService.getProfile( profile.getId() );
+        if ( stored == null )
+        {
+            profileService.addProfile( profile );
+        }
+        else
+        {
+            //profileToStore.setName( profile.getName() );
+            profileService.updateProfile( profile );
+        }
+        this.profiles = profileService.getAllProfiles();
+        return SUCCESS;
+    }
+
+    public String delete()
+        throws Exception
+    {
+        profileService.deleteProfile( profile.getId() );
+        this.profiles = profileService.getAllProfiles();
+        return SUCCESS;
+    }
+
+    public String addInstallation()
+        throws Exception
+    {
+        Installation installation = installationService.getInstallation( this.installationName );
+        if ( InstallationService.JDK_TYPE.equals( installation.getType() ) )
+        {
+            profileService.setJdkInProfile( profile, installation );
+        }
+        else if ( InstallationService.MAVEN1_TYPE.equals( installation.getType() )
+            || InstallationService.MAVEN2_TYPE.equals( installation.getType() )
+            || InstallationService.ANT_TYPE.equals( installation.getType() ) )
+        {
+            profileService.setBuilderInProfile( profile, installation );
+        }
+        else
+        {
+            profileService.addEnvVarInProfile( profile, installation );
+        }
+        this.profile = profileService.getProfile( profile.getId() );
+        return SUCCESS;
+    }
+
+    public String removeInstallation()
+        throws Exception
+    {
+
+        Installation installation = installationService.getInstallation( this.installationName );
+        Profile stored = profileService.getProfile( profile.getId() );
+        if ( InstallationService.JDK_TYPE.equals( installation.getType() ) )
+        {
+            stored.setJdk( null );
+        }
+        else if ( InstallationService.MAVEN1_TYPE.equals( installation.getType() )
+            || InstallationService.MAVEN2_TYPE.equals( installation.getType() )
+            || InstallationService.ANT_TYPE.equals( installation.getType() ) )
+        {
+            stored.setBuilder( null );
+        }
+        else
+        {
+            // remove one
+            // TODO move this in ProfileService
+            List<Installation> storedEnvVars = stored.getEnvironmentVariables();
+            List<Installation> newEnvVars = new ArrayList<Installation>();
+            for ( Iterator<Installation> iterator = storedEnvVars.iterator(); iterator.hasNext(); )
+            {
+                Installation storedInstallation = iterator.next();
+                if ( !StringUtils.equals( storedInstallation.getName(), installation.getName() ) )
+                {
+                    newEnvVars.add( storedInstallation );
+                }
+            }
+            stored.setEnvironmentVariables( newEnvVars );
+        }
+        profileService.updateProfile( stored );
+        this.profile = profileService.getProfile( profile.getId() );
+        return SUCCESS;
+    }
+
+    // -------------------------------------------------------
+    // Webwork setter/getter
+    // -------------------------------------------------------
+
+    public List getProfiles()
+    {
+        return profiles;
+    }
+
+    public void setProfiles( List profiles )
+    {
+        this.profiles = profiles;
+    }
+
+    public Profile getProfile()
+    {
+        return profile;
+    }
+
+    public void setProfile( Profile profile )
+    {
+        this.profile = profile;
+    }
+
+    public List<Installation> getAllInstallations()
+        throws Exception
+    {
+        if ( this.allInstallations == null )
+        {
+            this.allInstallations = installationService.getAllInstallations();
+        }
+        return allInstallations;
+    }
+
+    public void setAllInstallations( List<Installation> allInstallations )
+    {
+        this.allInstallations = allInstallations;
+    }
+
+    public List<Installation> getProfileInstallations()
+    {
+        if (this.profile != null)
+        {
+        if ( this.profileInstallations == null )
+        {
+            this.profileInstallations = new ArrayList<Installation>();
+            if ( this.profile.getJdk() != null )
+            {
+                this.profileInstallations.add( this.profile.getJdk() );
+            }
+            if ( this.profile.getBuilder() != null )
+            {
+                this.profileInstallations.add( this.profile.getBuilder() );
+            }
+            if ( this.profile.getEnvironmentVariables() != null && !this.profile.getEnvironmentVariables().isEmpty() )
+            {
+                this.profileInstallations.addAll( this.profile.getEnvironmentVariables() );
+            }
+        }
+        return profileInstallations;
+        }
+        return Collections.EMPTY_LIST;
+    }
+
+    public void setProfileInstallations( List<Installation> profileInstallations )
+    {
+        this.profileInstallations = profileInstallations;
+    }
+
+    public String getInstallationName()
+    {
+        return installationName;
+    }
+
+    public void setInstallationName( String installationName )
+    {
+        this.installationName = installationName;
+    }
+}

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

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?view=diff&rev=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Tue Jun 19 07:04:13 2007
@@ -54,6 +54,8 @@
     private List groupBuildDefinitionSummaries = new ArrayList();
 
     private List allBuildDefinitionSummaries = new ArrayList();
+    
+    //profileName
 
     public String summarizeForProject()
     {
@@ -138,7 +140,6 @@
         return summaryList;
     }
 
-
     private List gatherGroupBuildDefinitionSummaries( int projectGroupId )
         throws ContinuumException
     {
@@ -170,7 +171,10 @@
         bds.setScheduleName( bd.getSchedule().getName() );
         bds.setIsDefault( bd.isDefaultForProject() );
         bds.setIsBuildFresh( bd.isBuildFresh() );
-
+        if ( bd.getProfile() != null )
+        {
+            bds.setProfileName( bd.getProfile().getName() );
+        }
         return bds;
     }
 

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=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Tue Jun 19 07:04:13 2007
@@ -64,6 +64,8 @@
 menu.administration = Administration
 menu.administration.configuration = Configuration
 menu.administration.appearance = Appearance
+menu.administration.profile = Profiles
+menu.administration.installations = Installations
 menu.administration.schedules = Schedules
 menu.administration.users = Users
 menu.administration.userGroups = User Groups
@@ -300,6 +302,7 @@
 projectView.buildDefinition.buildFile = Build File
 projectView.buildDefinition.profile = Profile
 projectView.buildDefinition.schedule = Schedule
+buildDefinition.profile.label = Profile
 projectView.buildDefinition.from = From
 projectView.buildDefinition.default = Default
 projectView.buildDefinition.buildFresh = Build Fresh
@@ -572,3 +575,42 @@
 userGroup.name.message = Enter the user group name
 userGroup.description.label = Description
 userGroup.description.message = Enter the description
+
+# ----------------------------------------------------------------------
+# Page: Profiles List
+# ----------------------------------------------------------------------
+profilesList.page.title= Build Profiles
+
+# ----------------------------------------------------------------------
+# Page: Profile Edit
+# ----------------------------------------------------------------------
+profile.page.title= Continuum - Build Profile
+profile.section.title = Profile
+profile.name.label= Profile Name
+profile.jdk.name.label = Jdk name
+profile.jdk.name.message = The JDK name
+profile.jdk.path.label = Jdk path
+profile.jdk.path.message = The JDK Path (JAVA_HOME value)
+
+# ----------------------------------------------------------------------
+# Page: Installations List
+# ----------------------------------------------------------------------
+installationsList.page.title = Installations
+installationsList.section.title = Installations
+
+# ----------------------------------------------------------------------
+# Page: Installation Edit
+# ----------------------------------------------------------------------
+installation.page.title = Continuum - Installation
+installation.section.title = Continuum - Installation
+installation.name.label = Name
+installation.type.label = Type
+installation.value.label = Value/Path
+installation.varName.label = Environment Variable Name (only needed for type Environment Variable)
+installation.jdk.type.label = JDK
+installation.maven2.type.label = Maven 2
+installation.maven1.type.label = Maven 1
+installation.envvar.type.label = Environment Variable
+installation.ant.type.label = ANT
+
+

Added: maven/continuum/trunk/continuum-webapp/src/main/resources/template/profile/select.ftl
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/template/profile/select.ftl?view=auto&rev=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/template/profile/select.ftl (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/template/profile/select.ftl Tue Jun 19 07:04:13 2007
@@ -0,0 +1 @@
+<#include "/${parameters.templateDir}/simple/select.ftl" />

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Tue Jun 19 07:04:13 2007
@@ -457,7 +457,7 @@
     <action name="configureAppearance" class="configureAppearance" method="input">
       <result name="input">/WEB-INF/jsp/admin/appearance.jsp</result>
     </action>
-
+	  
     <action name="editAppearance" class="configureAppearance" method="input">
       <result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
     </action>
@@ -481,6 +481,69 @@
         <param name="namespace">/admin</param>
       </result>
     </action>
+      
+    <!--
+       Profile actions 
+    -->      
+      
+    <action name="profilesList" class="profileAdministration" method="list">
+      <result name="success">/WEB-INF/jsp/admin/profilesList.jsp</result>
+    </action>   
+      
+    <action name="addProfile" class="profileAdministration">
+      <result name="input">/WEB-INF/jsp/admin/editProfile.jsp</result>   
+    </action>
+        
+    <action name="editProfile" class="profileAdministration">
+      <result name="input">/WEB-INF/jsp/admin/editProfile.jsp</result>
+      <result name="success">/WEB-INF/jsp/admin/editProfile.jsp</result>
+    </action>
+      
+    <action name="deleteProfile" class="profileAdministration" method="delete">
+      <result name="success">/WEB-INF/jsp/admin/profilesList.jsp</result>
+      <result name="success">/WEB-INF/jsp/admin/profilesList.jsp</result>
+    </action>        
+      
+    <action name="saveProfile" class="profileAdministration" method="save">
+      <result name="success">/WEB-INF/jsp/admin/profilesList.jsp</result>
+      <result name="input">/WEB-INF/jsp/admin/editProfile.jsp</result>
+    </action>
+      
+    <action name="addInstallationProfile" class="profileAdministration" method="addInstallation">
+      <result name="success">/WEB-INF/jsp/admin/editProfile.jsp</result>
+      <result name="input">/WEB-INF/jsp/admin/editProfile.jsp</result>        
+    </action>  
+    
+    <action name="removeProfileInstallation" class="profileAdministration" method="removeInstallation">
+      <result name="success">/WEB-INF/jsp/admin/editProfile.jsp</result>
+      <result name="input">/WEB-INF/jsp/admin/editProfile.jsp</result>        
+    </action>
+      
+    <!--
+       Installation actions 
+    -->  
+    <action name="installationsList" class="installation" method="list">
+      <result name="success">/WEB-INF/jsp/admin/installationsList.jsp</result>
+    </action>   
+      
+    <action name="addInstallation" class="installation" method="add">
+      <result name="input">/WEB-INF/jsp/admin/editInstallation.jsp</result>
+    </action>       
+      
+    <action name="editInstallation" class="installation" method="edit">
+      <result name="success">/WEB-INF/jsp/admin/editInstallation.jsp</result>
+        <result name="input">/WEB-INF/jsp/admin/editInstallation.jsp</result>    
+    </action>
+      
+    <action name="saveInstallation" class="installation" method="save">
+      <result name="input">/WEB-INF/jsp/admin/editInstallation.jsp</result>
+      <result name="success">/WEB-INF/jsp/admin/installationsList.jsp</result>
+    </action> 
+    <action name="deleteInstallation" class="installation" method="delete">
+      <result name="input">/WEB-INF/jsp/admin/installationsList.jsp</result>
+      <result name="success">/WEB-INF/jsp/admin/installationsList.jsp</result>
+    </action>             
+      
   </package>
 
   <package name="component" extends="default">

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp?view=diff&rev=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp Tue Jun 19 07:04:13 2007
@@ -73,7 +73,8 @@
                               <ww:textfield label="%{getText('add.m2.project.projectGroup')}" name="projectGroupName" disabled="true"/>
                             </ww:if>
                             <ww:else>
-                              <ww:select label="%{getText('add.m2.project.projectGroup')}" name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
+                              <ww:select label="%{getText('add.m2.project.projectGroup')}" name="selectedProjectGroup" 
+                                         list="projectGroups" listKey="id" listValue="name"/>
                             </ww:else>
                           </tbody>
                         </table>

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp?view=auto&rev=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp Tue Jun 19 07:04:13 2007
@@ -0,0 +1,83 @@
+<%--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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.
+  --%>
+
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+<ww:i18n name="localization.Continuum">
+  <head>
+    <title>
+      <ww:text name="installation.page.title"/>
+    </title>
+  </head>
+
+  <body>
+  <div id="axial" class="h3">
+    <h3>
+      <ww:text name="installation.section.title"/>
+    </h3>
+
+    <ww:form action="saveInstallation!save" method="post">
+
+      <ww:if test="hasActionErrors()">
+        <h3>Action Error</h3>
+      </ww:if>
+      <p>
+        <ww:actionerror/>
+      </p>
+
+      <div class="axial">
+
+        <table>
+          <tbody>
+            <ww:if test="nameUpdatable">
+          
+              <ww:textfield label="%{getText('installation.name.label')}" name="installation.name"
+                            required="true"/>
+
+            </ww:if>
+            <ww:else>
+              <ww:textfield label="%{getText('installation.name.label')}" name="installation.name"
+                            required="true" readonly="true"/>            
+            </ww:else>
+           
+            <ww:select label="%{getText('installation.type.label')}" name="installation.type" list="typesLabels" />
+
+            <ww:if test="varNameUpdatable">
+              <ww:textfield label="%{getText('installation.varName.label')}" name="installation.varName" required="true" />
+            </ww:if>
+            <ww:else>
+              <ww:textfield label="%{getText('installation.varName.label')}" name="installation.varName" required="true" readonly="true"/>
+            </ww:else>
+            <ww:textfield label="%{getText('installation.value.label')}" name="installation.varValue"
+                          required="true"/>
+
+
+          </tbody>
+        </table>
+        <div class="functnbar3">
+          <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+        </div>
+
+      </div>
+    </ww:form>
+  </div>
+  </body>
+</ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?view=auto&rev=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp Tue Jun 19 07:04:13 2007
@@ -0,0 +1,115 @@
+<%--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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.
+  --%>
+
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<html>
+<ww:i18n name="localization.Continuum">
+  <head>
+    <title>
+      <ww:text name="profile.page.title"/>
+    </title>
+  </head>
+
+  <body>
+    <div id="axial" class="h3">
+      <h3>
+        <ww:text name="profile.section.title"/>
+      </h3>
+
+      <div class="axial">
+        <ww:if test="hasActionErrors()">
+          <h3>Action Error</h3>
+        </ww:if>
+        <p>
+          <ww:actionerror/>
+        </p>      
+      </div>
+      <table>
+      <tr><td>
+      <ww:form action="saveProfile!save" method="post">
+
+        <div class="axial">
+
+          <table>
+            <tbody>
+              <ww:hidden name="profile.id" />
+              <ww:textfield label="%{getText('profile.name.label')}" name="profile.name"
+                            required="true" />
+            </tbody>
+          </table>
+          <div class="functnbar3">
+            <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+          </div>
+          
+        </div>
+      </ww:form>
+      </td></tr>
+      <tr><td>
+      <ww:form action="addInstallationProfile!addInstallation.action" method="get">
+        <div class="axial">
+          <table width="100%">
+            <tbody>
+              <ww:hidden name="profile.id" />
+              <tr>
+                <td>
+                  <ec:table items="profileInstallations"
+                            var="profileInstallation"
+                            showExports="false"
+                            showPagination="false"
+                            showStatusBar="false"
+                            sortable="false"
+                            filterable="false"
+                            width="100%"
+                            autoIncludeParameters="false">
+                    <ec:row highlightRow="true">
+                      <ec:column property="nameEdit" title="Name" style="white-space: nowrap" width="50%">
+                        <a href="editInstallation!edit.action?installation.name=<c:out value="${profileInstallation.name}"/>">
+                          <c:out value="${profileInstallation.name}"/>
+                        </a>
+                         (<c:out value="${profileInstallation.varValue}"/>)
+                      </ec:column>
+                      <ec:column property="type" title="Type" style="white-space: nowrap" width="49%"/>
+                      <ec:column property="id" title="&nbsp;" width="1%">
+                        <a href="removeProfileInstallation!removeInstallation.action?profile.id=<c:out value="${profile.id}"/>&installationName=<c:out value="${profileInstallation.name}"/>">
+                          <img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0" />
+                        </a>                    
+                      </ec:column>        
+                    </ec:row>
+                  </ec:table>                
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <div class="functnbar3">
+            <!-- can't use default profile to display this select -->
+            <ww:select theme="profile" name="installationName" list="allInstallations" listKey="name" listValue="name" />
+            <ww:submit value="%{getText('add')}"/>
+          </div>
+        </div>              
+      
+      </ww:form>
+      </td></tr>
+      </table>
+    </div>
+  </body>
+</ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp?view=auto&rev=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp Tue Jun 19 07:04:13 2007
@@ -0,0 +1,69 @@
+<%--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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.
+  --%>
+
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
+
+<html>
+<ww:i18n name="localization.Continuum">
+  <head>
+    <title><ww:text name="installationsList.page.title"/></title>
+  </head>
+  
+  <div id="h3">
+    <h3>
+      <ww:text name="installationsList.section.title"/>
+    </h3>  
+  
+    <ec:table items="installations"
+              var="installation"
+              showExports="false"
+              showPagination="false"
+              showStatusBar="false"
+              sortable="false"
+              filterable="false">
+      <ec:row highlightRow="true">
+        <ec:column property="name" title="Name" style="white-space: nowrap" />
+        <ec:column property="type" title="Type" style="white-space: nowrap" />
+        <ec:column property="varName" title="Env Var Name" style="white-space: nowrap" />
+        <ec:column property="varValue" title="Value/Path" style="white-space: nowrap" />
+        
+        <ec:column property="id" title="&nbsp;" width="1%">
+          <a href="editInstallation!edit.action?installation.name=<c:out value="${installation.name}"/>">
+            <img src="<ww:url value='/images/edit.gif'/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" />
+          </a>  
+        </ec:column>   
+        <ec:column property="id" title="&nbsp;" width="1%">
+          <a href="deleteInstallation!delete.action?installation.name=<c:out value="${installation.name}"/>">
+            <img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0" />
+          </a>  
+        </ec:column>             
+      </ec:row>
+    </ec:table>  
+    <div class="functnbar3">
+      <ww:form action="addInstallation!input.action" method="post">
+        <ww:submit value="%{getText('add')}"/>
+      </ww:form>
+    </div>  
+  
+  </div>
+  
+</ww:i18n>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?view=auto&rev=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Tue Jun 19 07:04:13 2007
@@ -0,0 +1,77 @@
+<%--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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.
+  --%>
+
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
+
+<html>
+<ww:i18n name="localization.Continuum">
+  <head>
+    <title><ww:text name="profilesList.page.title"/></title>
+  </head>
+  
+  <div id="h3">
+  
+    <ec:table items="profiles"
+              var="profile"
+              showExports="false"
+              showPagination="false"
+              showStatusBar="false"
+              sortable="false"
+              filterable="false">
+      <ec:row highlightRow="true">
+        <ec:column property="name" title="Name" style="white-space: nowrap" />
+        <ec:column property="Installations" title="Installations" style="white-space: nowrap">
+          <ul>
+            <c:if test='${profile.jdk != null}'>
+              <li><c:out value="${profile.jdk.name}"/> (<c:out value="${profile.jdk.type}"/>)</li>
+            </c:if>
+            <c:if test='${profile.builder != null}'>
+              <li><c:out value="${profile.builder.name}"/> (<c:out value="${profile.builder.type}"/>)</li>
+            </c:if>
+            <c:if test='${profile.environmentVariables != null}'>
+              <c:forEach var="envVar" items="${profile.environmentVariables}"> 
+                <li><c:out value="${envVar.name}" /></li>
+              </c:forEach>
+            </c:if>
+          <ul>
+        </ec:column>
+        <ec:column property="id" title="&nbsp;" width="1%">
+          <a href="editProfile!edit.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
+            <img src="<ww:url value='/images/edit.gif'/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" />
+          </a>                    
+        </ec:column>
+        <ec:column property="id" title="&nbsp;" width="1%">
+          <a href="deleteProfile!delete.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
+            <img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0" />
+          </a>                    
+        </ec:column>        
+      </ec:row>
+    </ec:table>  
+    <div class="functnbar3">
+      <ww:form action="addProfile!input.action" method="post">
+        <ww:submit value="%{getText('add')}"/>
+      </ww:form>
+    </div>    
+  
+  </div>
+  
+</ww:i18n>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?view=diff&rev=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp Tue Jun 19 07:04:13 2007
@@ -30,7 +30,7 @@
         <h3><ww:text name="buildDefinition.section.title"/></h3>
 
         <div class="axial">
-          <ww:form action="saveBuildDefinition" method="post" validate="true">
+          <ww:form action="saveBuildDefinition" method="get" validate="true">
             <c:choose>
             
               <c:when test="${!empty actionErrors}">
@@ -73,6 +73,8 @@
                       <ww:checkbox label="%{getText('buildDefinition.defaultForProject.label')}"  name="defaultBuildDefinition" value="defaultBuildDefinition" fieldValue="true"/>
                     </ww:else>
                     <ww:select label="%{getText('buildDefinition.schedule.label')}" name="scheduleId" list="schedules"/>
+                    <ww:select label="%{getText('buildDefinition.profile.label')}" name="profileId" list="profiles" listValue="name" 
+                               listKey="id" headerKey="-1" headerValue=""/>
                   </tbody>
                 </table>
                 <div class="functnbar3">

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?view=diff&rev=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Tue Jun 19 07:04:13 2007
@@ -38,7 +38,6 @@
       <ec:column property="goals" title="projectView.buildDefinition.goals"/>
       <ec:column property="arguments" title="projectView.buildDefinition.arguments"/>
       <ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
-      <!-- ec:column property="profile" title="projectView.buildDefinition.profile"/ -->
       <ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
         <redback:ifAuthorized permission="continuum-manage-schedules">
           <ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
@@ -50,6 +49,7 @@
           ${pageScope.buildDefinitionSummary.scheduleName}
         </redback:elseAuthorized>
       </ec:column>
+      <ec:column property="profileName" title="projectView.buildDefinition.profile"/>      
       <ec:column property="from" title="projectView.buildDefinition.from"/>
       <ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
       <ec:column property="isDefault" title="projectView.buildDefinition.default"/>
@@ -68,7 +68,7 @@
       <ec:column property="editActions" title="&nbsp;" width="1%">
         <center>
         <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
+          <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/" includeParams="none">
             <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
             <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
           </ww:url>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?view=diff&rev=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Tue Jun 19 07:04:13 2007
@@ -35,7 +35,6 @@
       <ec:column property="goals" title="projectView.buildDefinition.goals"/>
       <ec:column property="arguments" title="projectView.buildDefinition.arguments"/>
       <ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
-      <ec:column property="profile" title="projectView.buildDefinition.profile"/>
       <ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
         <redback:ifAuthorized permission="continuum-manage-schedules">
           <ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
@@ -47,6 +46,7 @@
           ${pageScope.buildDefinitionSummary.scheduleName}
         </redback:elseAuthorized>
       </ec:column>
+      <ec:column property="profileName" title="projectView.buildDefinition.profile"/>
       <ec:column property="from" title="projectView.buildDefinition.from"/>
       <ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
       <ec:column property="isDefault" title="projectView.buildDefinition.default"/>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?view=diff&rev=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp Tue Jun 19 07:04:13 2007
@@ -42,7 +42,7 @@
 
       <ec:column property="state" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
       <ec:column property="name" title="summary.projectTable.name" width="48%">
-        <ww:url id="projectUrl" action="projectView" namespace="/">
+        <ww:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
           <ww:param name="projectId" value="${project.id}"/>
         </ww:url>
         <ww:a href="%{projectUrl}">${pageScope.project.name}</ww:a>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?view=diff&rev=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Tue Jun 19 07:04:13 2007
@@ -109,6 +109,18 @@
               <ww:text name="menu.administration.appearance"/>
             </ww:a>
           </div>
+          <ww:url id="configurationUrl" action="profilesList" namespace="/admin" method="list" includeParams="none"/>
+          <div class="body">
+            <ww:a href="%{configurationUrl}">
+              <ww:text name="menu.administration.profile"/>
+            </ww:a>
+          </div>     
+          <ww:url id="configurationUrl" action="installationsList" namespace="/admin" method="list" includeParams="none"/>
+          <div class="body">
+            <ww:a href="%{configurationUrl}">
+              <ww:text name="menu.administration.installations"/>
+            </ww:a>
+          </div>               
         </redback:ifAuthorized>
         <redback:ifAuthorized permission="continuum-manage-users">
           <ww:url id="userListUrl" action="userlist" namespace="/security" includeParams="none"/>

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/pom.xml?view=diff&rev=548732&r1=548731&r2=548732
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Tue Jun 19 07:04:13 2007
@@ -456,7 +456,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>1.4</version>
+        <version>1.4.3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>



Mime
View raw message