You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/08/13 06:29:28 UTC
svn commit: r1372260 [26/30] - in /continuum/trunk: ./ continuum-api/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/
continuum-api/src/main/java/org/a...
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
@@ -32,6 +29,9 @@ import org.apache.maven.continuum.web.mo
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* BuildDefinitionSummaryAction:
*
@@ -49,7 +49,7 @@ public class BuildDefinitionSummaryActio
private String projectGroupName;
private int projectId;
-
+
// Allow dont remove default group build definition in project list
private int defaultGroupDefinitionId;
@@ -107,7 +107,8 @@ public class BuildDefinitionSummaryActio
for ( Project project : (List<Project>) projectGroup.getProjects() )
{
- projectBuildDefinitionSummaries.addAll( gatherProjectBuildDefinitionSummaries( project.getId(), projectGroupId ) );
+ projectBuildDefinitionSummaries.addAll( gatherProjectBuildDefinitionSummaries( project.getId(),
+ projectGroupId ) );
}
@@ -146,7 +147,7 @@ public class BuildDefinitionSummaryActio
{
defaultGroupDefinitionId = bds.getId();
}
-
+
if ( containsDefaultBDForProject )
{
bds.setIsDefault( false );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java Mon Aug 13 04:29:09 2012
@@ -22,10 +22,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
import org.apache.continuum.web.util.GenerateRecipentNotifier;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Project;
@@ -37,6 +33,10 @@ import org.apache.maven.continuum.web.mo
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
/**
* Component Action that prepares and provides Project Group Notifier and
* Project Notifier summaries.
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AbstractNotifierEditActionSupport.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.Map;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.web.action.ContinuumActionSupport;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
+import java.util.Map;
+
/**
* Common base class that consolidates the common properties used by extending
* <code>XXXEditAction</code> implementations and defines a contract expected of
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,12 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.model.project.ProjectNotifier;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Action that edits a {@link ProjectNotifier} of type 'IRC' from the
* specified {@link ProjectGroup}.
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,11 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
+import org.apache.maven.continuum.model.project.ProjectNotifier;
+
import java.util.HashMap;
import java.util.Map;
-import org.apache.maven.continuum.model.project.ProjectNotifier;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Action that edits a {@link ProjectNotifier} of type 'Jabber' from the
* specified {@link ProjectGroup}.
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Action that edits a {@link ProjectNotifier} of type 'Jabber' from the
* specified {@link Project}.
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,14 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
import org.codehaus.plexus.util.StringUtils;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Action that edits a {@link ProjectNotifier} of type 'Mail' from the
* specified {@link ProjectGroup}.
@@ -57,9 +57,9 @@ public class MailGroupNotifierEditAction
committers = Boolean.parseBoolean( configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) );
}
- if (StringUtils.isNotEmpty(configuration.get(AbstractContinuumNotifier.DEVELOPER_FIELD)))
+ if ( StringUtils.isNotEmpty( configuration.get( AbstractContinuumNotifier.DEVELOPER_FIELD ) ) )
{
- developers = Boolean.parseBoolean(configuration.get(AbstractContinuumNotifier.DEVELOPER_FIELD));
+ developers = Boolean.parseBoolean( configuration.get( AbstractContinuumNotifier.DEVELOPER_FIELD ) );
}
}
@@ -74,7 +74,7 @@ public class MailGroupNotifierEditAction
configuration.put( AbstractContinuumNotifier.COMMITTER_FIELD, String.valueOf( committers ) );
- configuration.put(AbstractContinuumNotifier.DEVELOPER_FIELD, String.valueOf(developers));
+ configuration.put( AbstractContinuumNotifier.DEVELOPER_FIELD, String.valueOf( developers ) );
notifier.setConfiguration( configuration );
}
@@ -104,7 +104,7 @@ public class MailGroupNotifierEditAction
return developers;
}
- public void setDevelopers(boolean developers)
+ public void setDevelopers( boolean developers )
{
this.developers = developers;
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,14 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
import org.codehaus.plexus.util.StringUtils;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Action that edits a {@link ProjectNotifier} of type 'Mail' from the
* specified {@link Project}.
@@ -57,9 +57,9 @@ public class MailProjectNotifierEditActi
committers = Boolean.parseBoolean( configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) );
}
- if (StringUtils.isNotEmpty(configuration.get(AbstractContinuumNotifier.DEVELOPER_FIELD)))
+ if ( StringUtils.isNotEmpty( configuration.get( AbstractContinuumNotifier.DEVELOPER_FIELD ) ) )
{
- developers = Boolean.parseBoolean(configuration.get(AbstractContinuumNotifier.DEVELOPER_FIELD));
+ developers = Boolean.parseBoolean( configuration.get( AbstractContinuumNotifier.DEVELOPER_FIELD ) );
}
}
@@ -74,7 +74,7 @@ public class MailProjectNotifierEditActi
configuration.put( AbstractContinuumNotifier.COMMITTER_FIELD, String.valueOf( committers ) );
- configuration.put(AbstractContinuumNotifier.DEVELOPER_FIELD, String.valueOf(developers));
+ configuration.put( AbstractContinuumNotifier.DEVELOPER_FIELD, String.valueOf( developers ) );
notifier.setConfiguration( configuration );
}
@@ -104,7 +104,7 @@ public class MailProjectNotifierEditActi
return developers;
}
- public void setDevelopers(boolean developers)
+ public void setDevelopers( boolean developers )
{
this.developers = developers;
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Action that edits a {@link ProjectNotifier} of type 'MSN' from the
* specified {@link ProjectGroup}.
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Action that edits a {@link ProjectNotifier} of type 'MSN' from the
* specified {@link Project}.
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,12 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.model.project.ProjectNotifier;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Action that edits a {@link ProjectNotifier} of type 'Wagon' from the
* specified {@link ProjectGroup}.
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,12 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectNotifier;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Action that edits a {@link ProjectNotifier} of type 'Wagon' from the
* specified {@link Project}.
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/AppareanceConfiguration.java Mon Aug 13 04:29:09 2012
@@ -18,14 +18,14 @@
*/
package org.apache.maven.continuum.web.appareance;
-import java.io.IOException;
-
import org.codehaus.plexus.registry.RegistryException;
+import java.io.IOException;
+
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 10 nov. 07
* @version $Id$
+ * @since 10 nov. 07
*/
public interface AppareanceConfiguration
{
@@ -38,11 +38,11 @@ public interface AppareanceConfiguration
throws IOException;
/**
- * If no user configuration a default one will be user
+ * If no user configuration a default one will be user
* with Apache copyright content
- *
+ *
* @return htmlFooter
*/
public String getFooter();
-
+
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/appareance/DefaultAppareanceConfiguration.java Mon Aug 13 04:29:09 2012
@@ -18,11 +18,6 @@
*/
package org.apache.maven.continuum.web.appareance;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Calendar;
-
import org.apache.continuum.web.appearance.ContinuumAppearance;
import org.apache.continuum.web.appearance.io.xpp3.ContinuumAppearanceModelsXpp3Reader;
import org.apache.continuum.web.appearance.io.xpp3.ContinuumAppearanceModelsXpp3Writer;
@@ -36,6 +31,11 @@ import org.jsoup.safety.Whitelist;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Calendar;
+
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
* @version $Id$
@@ -82,7 +82,7 @@ public class DefaultAppareanceConfigurat
catch ( XmlPullParserException e )
{
log.warn( "skip XmlPullParserException reading appearance file " + APPEARANCE_FILE_NAME + ", msg " +
- e.getMessage() );
+ e.getMessage() );
}
}
if ( StringUtils.isEmpty( this.footer ) )
@@ -138,7 +138,7 @@ public class DefaultAppareanceConfigurat
private File getAppearanceConfigurationFile()
{
- return new File(
- System.getProperty( "appserver.base" ) + File.separator + "conf" + File.separator + APPEARANCE_FILE_NAME );
+ return new File( System.getProperty( "appserver.base" ) + File.separator + "conf" + File.separator +
+ APPEARANCE_FILE_NAME );
}
}
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/checks/security/RoleProfileEnvironmentCheck.java Mon Aug 13 04:29:09 2012
@@ -28,7 +28,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
/**
@@ -62,7 +61,7 @@ public class RoleProfileEnvironmentCheck
Collection<ProjectGroup> projectGroups = continuum.getAllProjectGroups();
- for ( ProjectGroup group: projectGroups )
+ for ( ProjectGroup group : projectGroups )
{
// gets the role, making it if it doesn't exist
//TODO: use continuum.executeAction( "add-assignable-roles", context ); or something like that to avoid code duplication
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,11 @@ package org.apache.maven.continuum.web.c
* under the License.
*/
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.components.UIBean;
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/util/WorkingCopyContentGenerator.java Mon Aug 13 04:29:09 2012
@@ -19,6 +19,8 @@ package org.apache.maven.continuum.web.u
* under the License.
*/
+import org.codehaus.plexus.util.StringUtils;
+
import java.io.File;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -26,8 +28,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
-import org.codehaus.plexus.util.StringUtils;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -104,8 +104,8 @@ public class WorkingCopyContentGenerator
}
else
{
- userDirectory =
- f.getParentFile().getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
+ userDirectory = f.getParentFile().getAbsolutePath().substring(
+ basedir.getAbsolutePath().length() + 1 );
}
userDirectory = StringUtils.replace( userDirectory, "\\", "/" );
@@ -116,8 +116,8 @@ public class WorkingCopyContentGenerator
imagesBaseUrl ).append( "file.gif\"> <a href=\"" ).append( baseUrl ).append(
urlParamSeparator ).append( "userDirectory=" ).append( userDirectory ).append( "&file=" ).append(
fileName ).append( "\">" ).append( fileName ).append( "</a></td><td width=\"1%\">" ).append(
- getReadableFileSize( f.length() ) ).append( "</td><td width=\"1%\">" ).append(
- getFormattedDate( f.lastModified() ) ).append( "</td>\n" );
+ getReadableFileSize( f.length() ) ).append( "</td><td width=\"1%\">" ).append( getFormattedDate(
+ f.lastModified() ) ).append( "</td>\n" );
buf.append( "</tr>\n" );
odd = !odd;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java Mon Aug 13 04:29:09 2012
@@ -21,7 +21,6 @@ package org.apache.maven.continuum.web.v
import com.opensymphony.xwork2.validator.ValidationException;
import com.opensymphony.xwork2.validator.validators.ValidatorSupport;
-
import org.apache.maven.continuum.execution.ExecutorConfigurator;
import org.apache.maven.continuum.installation.InstallationException;
import org.apache.maven.continuum.installation.InstallationService;
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java Mon Aug 13 04:29:09 2012
@@ -20,13 +20,6 @@ package org.apache.maven.continuum.web.v
*/
import com.opensymphony.xwork2.ActionContext;
-
-import java.util.HashMap;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
-
import org.apache.maven.continuum.security.ContinuumRoleConstants;
import org.apache.maven.continuum.web.model.ProjectSummary;
import org.apache.struts2.views.util.UrlHelper;
@@ -41,6 +34,11 @@ import org.extremecomponents.table.bean.
import org.extremecomponents.table.cell.DisplayCell;
import org.extremecomponents.table.core.TableModel;
+import java.util.HashMap;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
+
/**
* Used in Summary view
*
@@ -142,8 +140,8 @@ public class BuildCell
ActionContext context = ActionContext.getContext();
PlexusContainer container = (PlexusContainer) context.getApplication().get( PlexusConstants.PLEXUS_KEY );
- SecuritySession securitySession =
- (SecuritySession) context.getSession().get( SecuritySystemConstants.SECURITY_SESSION_KEY );
+ SecuritySession securitySession = (SecuritySession) context.getSession().get(
+ SecuritySystemConstants.SECURITY_SESSION_KEY );
try
{
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildStatusCell.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildStatusCell.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildStatusCell.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildStatusCell.java Mon Aug 13 04:29:09 2012
@@ -41,8 +41,8 @@ public class BuildStatusCell
String success = StateGenerator.generate( ContinuumProjectState.OK, tableModel.getContext().getContextPath() );
- String failed =
- StateGenerator.generate( ContinuumProjectState.FAILED, tableModel.getContext().getContextPath() );
+ String failed = StateGenerator.generate( ContinuumProjectState.FAILED,
+ tableModel.getContext().getContextPath() );
String error = StateGenerator.generate( ContinuumProjectState.ERROR, tableModel.getContext().getContextPath() );
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java Mon Aug 13 04:29:09 2012
@@ -20,9 +20,6 @@ package org.apache.maven.continuum.web.v
*/
import com.opensymphony.xwork2.ActionContext;
-
-import java.util.HashMap;
-
import org.apache.continuum.model.project.ProjectScmRoot;
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.security.ContinuumRoleConstants;
@@ -41,6 +38,8 @@ import org.extremecomponents.table.bean.
import org.extremecomponents.table.cell.DisplayCell;
import org.extremecomponents.table.core.TableModel;
+import java.util.HashMap;
+
/**
* Used in Summary view
*
@@ -68,8 +67,8 @@ public class StateCell
case ContinuumProjectState.UPDATING:
case ContinuumProjectState.CHECKING_OUT:
{
- String state =
- StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath() );
+ String state = StateGenerator.generate( project.getState(),
+ tableModel.getContext().getContextPath() );
if ( project.getLatestBuildId() != -1 && !StateGenerator.NEW.equals( state ) &&
project.getState() != ContinuumProjectState.UPDATING )
@@ -105,8 +104,8 @@ public class StateCell
case ContinuumProjectState.UPDATED:
case ContinuumProjectState.ERROR:
{
- String state =
- StateGenerator.generate( projectScmRoot.getState(), tableModel.getContext().getContextPath() );
+ String state = StateGenerator.generate( projectScmRoot.getState(),
+ tableModel.getContext().getContextPath() );
if ( !StateGenerator.NEW.equals( state ) )
{
@@ -172,8 +171,8 @@ public class StateCell
ActionContext context = ActionContext.getContext();
PlexusContainer container = (PlexusContainer) context.getApplication().get( PlexusConstants.PLEXUS_KEY );
- SecuritySession securitySession =
- (SecuritySession) context.getSession().get( SecuritySystemConstants.SECURITY_SESSION_KEY );
+ SecuritySession securitySession = (SecuritySession) context.getSession().get(
+ SecuritySystemConstants.SECURITY_SESSION_KEY );
try
{
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/buildresults/StateCell.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,14 @@ package org.apache.maven.continuum.web.v
* under the License.
*/
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
-
import org.apache.maven.continuum.web.util.StateGenerator;
import org.extremecomponents.table.bean.Column;
import org.extremecomponents.table.cell.DisplayCell;
import org.extremecomponents.table.core.TableModel;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.PageContext;
+
/**
* Used in BuildResults
*
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java Mon Aug 13 04:29:09 2012
@@ -22,6 +22,7 @@ package org.apache.maven.continuum.web.v
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.views.jsp.ui.TextareaTag;
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -29,11 +30,8 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
-
import javax.servlet.jsp.JspException;
-import org.apache.struts2.views.jsp.ui.TextareaTag;
-
/**
* First attempt at creating a date tag for the webwork framework. The tag will
* format a date by using either a specified format attribute, or by falling
@@ -147,8 +145,8 @@ public class DateTag
if ( globalFormat != null )
{
- msg =
- new SimpleDateFormat( globalFormat, ActionContext.getContext().getLocale() ).format( date );
+ msg = new SimpleDateFormat( globalFormat, ActionContext.getContext().getLocale() ).format(
+ date );
}
else
{
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/IfBuildTypeEnabledTag.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/IfBuildTypeEnabledTag.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/IfBuildTypeEnabledTag.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/IfBuildTypeEnabledTag.java Mon Aug 13 04:29:09 2012
@@ -1,16 +1,13 @@
package org.apache.maven.continuum.web.view.jsp.ui;
-import javax.annotation.Resource;
-import javax.servlet.jsp.JspTagException;
-import javax.servlet.jsp.jstl.core.ConditionalTagSupport;
-
import org.apache.maven.continuum.Continuum;
-import org.apache.maven.continuum.configuration.ConfigurationService;
-import org.codehaus.plexus.redback.users.UserManager;
import org.codehaus.plexus.spring.PlexusToSpringUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.jstl.core.ConditionalTagSupport;
+
/**
* ifBuildTypeEnabledTag:
*
@@ -29,8 +26,9 @@ public class IfBuildTypeEnabledTag
protected boolean condition()
throws JspTagException
{
-
- ApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext( pageContext.getServletContext() );
+
+ ApplicationContext applicationContext = WebApplicationContextUtils.getRequiredWebApplicationContext(
+ pageContext.getServletContext() );
this.setContinuum( (Continuum) applicationContext.getBean( PlexusToSpringUtils.buildSpringId( Continuum.ROLE,
"default" ) ) );
@@ -43,7 +41,7 @@ public class IfBuildTypeEnabledTag
{
return continuum.getConfiguration().isDistributedBuildEnabled();
}
-
+
// left out 'parallel' buildType checking for cyclomatic complexity's sake :)
return !continuum.getConfiguration().isDistributedBuildEnabled();
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,14 @@ package org.apache.maven.continuum.web.v
* under the License.
*/
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.ognl.OgnlValueStack;
+import com.opensymphony.xwork2.util.ValueStack;
import org.apache.maven.continuum.web.components.SubmitCancel;
import org.apache.struts2.components.Component;
import org.apache.struts2.views.jsp.ui.AbstractUITag;
-import com.opensymphony.xwork2.ognl.OgnlValueStack;
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -55,10 +54,10 @@ public class SubmitCancelTag
{
this.cancel = cancel;
}
-
+
public Component getBean( ValueStack valueStack, HttpServletRequest request, HttpServletResponse response )
{
return new SubmitCancel( valueStack, request, response );
}
-
+
}
Modified: continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo (original)
+++ continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo Mon Aug 13 04:29:09 2012
@@ -41,7 +41,7 @@
<multiplicity>*</multiplicity>
</association>
</field>
- <field>
+ <field>
<name>groupSummarys</name>
<version>1.0.0+</version>
<description></description>
@@ -51,7 +51,7 @@
<multiplicity>*</multiplicity>
</association>
</field>
- <field>
+ <field>
<name>buildDefinitionSummarys</name>
<version>1.0.0+</version>
<description></description>
@@ -204,7 +204,7 @@
<description>name of the project group</description>
<type>String</type>
</field>
- <field>
+ <field>
<name>groupId</name>
<version>1.0.0+</version>
<required>false</required>
@@ -240,7 +240,7 @@
<type>String</type>
</field>
<field>
- <name>nextScheduledBuild</name>
+ <name>nextScheduledBuild</name>
<version>1.0.0+</version>
<required>false</required>
<description>timestamp for the next scheduled build</description>
@@ -396,7 +396,7 @@
<required>true</required>
<description>id of the profile for build definition</description>
<type>int</type>
- </field>
+ </field>
<field>
<name>description</name>
<version>1.0.0+</version>
@@ -408,20 +408,20 @@
<version>1.0.0+</version>
<type>String</type>
<description>type of the buid defintion</description>
- </field>
+ </field>
<field>
<name>alwaysBuild</name>
<version>1.0.0+</version>
<type>boolean</type>
<defaultValue>false</defaultValue>
<description>true if the build had to be forced even if there is no scm change</description>
- </field>
+ </field>
</fields>
</class>
<class>
<name>NotifierSummary</name>
<version>1.0.0+</version>
- <fields>
+ <fields>
<field>
<name>id</name>
<version>1.0.0+</version>
@@ -493,7 +493,7 @@
<type>boolean</type>
</field>
</fields>
- </class>
+ </class>
<class>
<name>PrepareBuildSummary</name>
<version>1.0.0+</version>
Modified: continuum/trunk/continuum-webapp/src/main/resources/META-INF/continuum/continuum-configuration.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/META-INF/continuum/continuum-configuration.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/META-INF/continuum/continuum-configuration.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/META-INF/continuum/continuum-configuration.xml Mon Aug 13 04:29:09 2012
@@ -21,9 +21,9 @@
<configuration>
<system/>
- <jndi prefix="java:comp/env" config-optional="true"/>
+ <jndi prefix="java:comp/env" config-optional="true"/>
<xml fileName="${appserver.base}/conf/continuum.xml" config-optional="true"
config-forceCreate="true" config-name="org.apache.continuum"/>
<xml fileName="${user.home}/.m2/continuum.xml" config-optional="true"
- config-forceCreate="true" config-name="org.apache.continuum.user"/>
+ config-forceCreate="true" config-name="org.apache.continuum.user"/>
</configuration>
Modified: continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Mon Aug 13 04:29:09 2012
@@ -33,11 +33,12 @@
<properties fileName="${appserver.base}/conf/security.properties" config-optional="true"
config-at="org.codehaus.plexus.redback"/>
<!-- Defaults -->
- <properties fileName="org/apache/maven/continuum/security.properties" config-at="org.codehaus.plexus.redback"/>
+ <properties fileName="org/apache/maven/continuum/security.properties"
+ config-at="org.codehaus.plexus.redback"/>
</properties>
</configuration>
</component>
-
+
<!--
| The mail notifier
@@ -70,7 +71,7 @@
<role>org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator</role>
<field-name>reportTestSuiteGenerator</field-name>
<role-hint>default</role-hint>
- </requirement>
+ </requirement>
</requirements>
<configuration>
<from-mailbox></from-mailbox>
@@ -93,8 +94,11 @@
"[continuum] BUILD ${state}: ${project.name}, Build Def - ${build.buildDefinition.description}"
results in "[continuum] BUILD SUCCESSFUL: Hello World, Build Def - Nightly Test Build"
-->
- <buildSubjectFormat>[continuum] BUILD ${state}: ${project.projectGroup.name} - ${project.name} - ${build.buildDefinition.description}</buildSubjectFormat>
- <prepareBuildSubjectFormat>[continuum] PREPARE BUILD ${state}: ${projectScmRoot.projectGroup.name}</prepareBuildSubjectFormat>
+ <buildSubjectFormat>[continuum] BUILD ${state}: ${project.projectGroup.name} - ${project.name} -
+ ${build.buildDefinition.description}
+ </buildSubjectFormat>
+ <prepareBuildSubjectFormat>[continuum] PREPARE BUILD ${state}: ${projectScmRoot.projectGroup.name}
+ </prepareBuildSubjectFormat>
<includeBuildSummary>true</includeBuildSummary>
<includeTestSummary>true</includeTestSummary>
<includeBuildOutput>false</includeBuildOutput>
@@ -103,7 +107,7 @@
Setting this propery will make Continuum send all emails to
this address instead the address specified in the project
configuration
- -->
+ -->
<toOverride></toOverride>
</configuration>
</component>
@@ -226,12 +230,12 @@
<name>org.jpox.rdbms.stringDefaultLength</name>
<value>255</value>
</property>
-<!--
- <property>
- <name>org.jpox.identifier.case</name>
- <value>PreserveCase</value>
- </property>
--->
+ <!--
+ <property>
+ <name>org.jpox.identifier.case</name>
+ <value>PreserveCase</value>
+ </property>
+ -->
</otherProperties>
</configuration>
</component>
@@ -290,13 +294,13 @@
<name>org.jpox.autoCreateColumns</name>
<value>true</value>
</property>
-
-<!--
- <property>
- <name>org.jpox.identifier.case</name>
- <value>PreserveCase</value>
- </property>
--->
+
+ <!--
+ <property>
+ <name>org.jpox.identifier.case</name>
+ <value>PreserveCase</value>
+ </property>
+ -->
</otherProperties>
</configuration>
</component>
@@ -386,30 +390,30 @@
</requirement>
</requirements>
</component-->
-
+
<!--
-
- this component manages the mapping of attributes in ldap to user information in redback. To configure the mapping, you can add the following properties in your security.properties
- ============================================================
- ldap.config.mapper.attribute.email=mail
- ldap.config.mapper.attribute.fullname=givenName
- ldap.config.mapper.attribute.password=userPassword
- ldap.config.mapper.attribute.user.id=cn
- ldap.config.mapper.attribute.user.base.dn=
- ldap.config.mapper.attribute.user.object.class=inetOrgPerson
- ldap.config.mapper.attribute.user.filter=(attributeName=value)
- ============================================================
+ this component manages the mapping of attributes in ldap to user information in redback. To configure the mapping, you can add the following properties in your security.properties
+ ============================================================
+ ldap.config.mapper.attribute.email=mail
+ ldap.config.mapper.attribute.fullname=givenName
+ ldap.config.mapper.attribute.password=userPassword
+ ldap.config.mapper.attribute.user.id=cn
+ ldap.config.mapper.attribute.user.base.dn=
+ ldap.config.mapper.attribute.user.object.class=inetOrgPerson
+ ldap.config.mapper.attribute.user.filter=(attributeName=value)
+ ============================================================
+
+
+ * email-attribute - The name of the attribute on a user that contains the email address
+ * full-name-attribute - The name of the attribute on a user that contains the users fullName
+ * password-attribute - The name of the attribute containing the users password, used for the authentiction using the user manager and not the ldap bind authenticator
+ * user-id-attribute - The name of the attribute containing the users userId, most commonly cn or sn.
+ * user-base-dn - The base dn that will be subtree searched for users.
+ * user-object-class - the objectClass used in the ldap server for indentifying users, most commonly inetOrgPerson.
+ -->
- * email-attribute - The name of the attribute on a user that contains the email address
- * full-name-attribute - The name of the attribute on a user that contains the users fullName
- * password-attribute - The name of the attribute containing the users password, used for the authentiction using the user manager and not the ldap bind authenticator
- * user-id-attribute - The name of the attribute containing the users userId, most commonly cn or sn.
- * user-base-dn - The base dn that will be subtree searched for users.
- * user-object-class - the objectClass used in the ldap server for indentifying users, most commonly inetOrgPerson.
- -->
-
<!-- component>
<role>org.codehaus.plexus.redback.common.ldap.UserMapper</role>
<role-hint>ldap</role-hint>
@@ -428,14 +432,14 @@
</requirement>
</requirements>
</component-->
-
+
<!--
If caching is desired to improve performance then make uncomment this and make sure the following configuration parameter is in the security.properties
user.manager.impl=cached
-->
-
+
<!-- component>
<role>org.codehaus.plexus.redback.users.UserManager</role>
<role-hint>cached</role-hint>
@@ -454,7 +458,7 @@
</requirement>
</requirements>
</component-->
-
+
<!--
if using the user manager authenticator to authenticate the user and not the ldap bind authenticator make sure
@@ -466,7 +470,7 @@
in the security.properties
-->
-
+
<!-- component>
<role>org.codehaus.plexus.redback.policy.UserSecurityPolicy</role>
<role-hint>default</role-hint>
Modified: continuum/trunk/continuum-webapp/src/main/resources/ehcache.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/ehcache.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/ehcache.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/ehcache.xml Mon Aug 13 04:29:09 2012
@@ -1,94 +1,94 @@
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <diskStore path="java.io.tmpdir" />
+<ehcache>
+ <diskStore path="java.io.tmpdir"/>
<!-- make default cache very short lived -->
<defaultCache
- maxElementsInMemory="100"
- maxElementsOnDisk="0"
- eternal="false"
- overflowToDisk="false"
- timeToIdleSeconds="300"
- timeToLiveSeconds="600"
- memoryStoreEvictionPolicy="LFU" />
+ maxElementsInMemory="100"
+ maxElementsOnDisk="0"
+ eternal="false"
+ overflowToDisk="false"
+ timeToIdleSeconds="300"
+ timeToLiveSeconds="600"
+ memoryStoreEvictionPolicy="LFU"/>
<!--
cache Redback classes longer to avoid a lot of SQL queries
See REDBACK-227
-->
<cache name="org.codehaus.plexus.redback.rbac.jdo.JdoOperation"
- maxElementsInMemory="10000"
- maxElementsOnDisk="0"
- eternal="false"
- overflowToDisk="false"
- timeToIdleSeconds="1800"
- timeToLiveSeconds="14400"
- memoryStoreEvictionPolicy="LFU" />
+ maxElementsInMemory="10000"
+ maxElementsOnDisk="0"
+ eternal="false"
+ overflowToDisk="false"
+ timeToIdleSeconds="1800"
+ timeToLiveSeconds="14400"
+ memoryStoreEvictionPolicy="LFU"/>
<cache name="org.codehaus.plexus.redback.rbac.jdo.JdoPermission"
- maxElementsInMemory="10000"
- maxElementsOnDisk="0"
- eternal="false"
- overflowToDisk="false"
- timeToIdleSeconds="1800"
- timeToLiveSeconds="14400"
- memoryStoreEvictionPolicy="LFU" />
+ maxElementsInMemory="10000"
+ maxElementsOnDisk="0"
+ eternal="false"
+ overflowToDisk="false"
+ timeToIdleSeconds="1800"
+ timeToLiveSeconds="14400"
+ memoryStoreEvictionPolicy="LFU"/>
<cache name="org.codehaus.plexus.redback.rbac.jdo.JdoResource"
- maxElementsInMemory="10000"
- maxElementsOnDisk="0"
- eternal="false"
- overflowToDisk="false"
- timeToIdleSeconds="1800"
- timeToLiveSeconds="14400"
- memoryStoreEvictionPolicy="LFU" />
+ maxElementsInMemory="10000"
+ maxElementsOnDisk="0"
+ eternal="false"
+ overflowToDisk="false"
+ timeToIdleSeconds="1800"
+ timeToLiveSeconds="14400"
+ memoryStoreEvictionPolicy="LFU"/>
<cache name="org.codehaus.plexus.redback.rbac.jdo.JdoRole"
- maxElementsInMemory="10000"
- maxElementsOnDisk="0"
- eternal="false"
- overflowToDisk="false"
- timeToIdleSeconds="1800"
- timeToLiveSeconds="14400"
- memoryStoreEvictionPolicy="LFU" />
+ maxElementsInMemory="10000"
+ maxElementsOnDisk="0"
+ eternal="false"
+ overflowToDisk="false"
+ timeToIdleSeconds="1800"
+ timeToLiveSeconds="14400"
+ memoryStoreEvictionPolicy="LFU"/>
<cache name="org.codehaus.plexus.redback.rbac.jdo.JdoUserAssignment"
- maxElementsInMemory="10000"
- maxElementsOnDisk="0"
- eternal="false"
- overflowToDisk="false"
- timeToIdleSeconds="300"
- timeToLiveSeconds="600"
- memoryStoreEvictionPolicy="LFU" />
+ maxElementsInMemory="10000"
+ maxElementsOnDisk="0"
+ eternal="false"
+ overflowToDisk="false"
+ timeToIdleSeconds="300"
+ timeToLiveSeconds="600"
+ memoryStoreEvictionPolicy="LFU"/>
<!--
cache Continuum classes
-->
<cache name="org.apache.maven.continuum.model.project.Project.buildResults"
- maxElementsInMemory="10000"
- maxElementsOnDisk="0"
- eternal="false"
- overflowToDisk="false"
- timeToIdleSeconds="300"
- timeToLiveSeconds="600"
- memoryStoreEvictionPolicy="LFU" />
+ maxElementsInMemory="10000"
+ maxElementsOnDisk="0"
+ eternal="false"
+ overflowToDisk="false"
+ timeToIdleSeconds="300"
+ timeToLiveSeconds="600"
+ memoryStoreEvictionPolicy="LFU"/>
<cache name="org.apache.maven.continuum.model.project.BuildResult"
- maxElementsInMemory="10000"
- maxElementsOnDisk="0"
- eternal="false"
- overflowToDisk="false"
- timeToIdleSeconds="300"
- timeToLiveSeconds="600"
- memoryStoreEvictionPolicy="LFU" />
+ maxElementsInMemory="10000"
+ maxElementsOnDisk="0"
+ eternal="false"
+ overflowToDisk="false"
+ timeToIdleSeconds="300"
+ timeToLiveSeconds="600"
+ memoryStoreEvictionPolicy="LFU"/>
+
-
<cache name="org.apache.continuum.model.release.ContinuumReleaseResult"
- maxElementsInMemory="10000"
- maxElementsOnDisk="0"
- eternal="false"
- overflowToDisk="false"
- timeToIdleSeconds="300"
- timeToLiveSeconds="600"
- memoryStoreEvictionPolicy="LFU" />
+ maxElementsInMemory="10000"
+ maxElementsOnDisk="0"
+ eternal="false"
+ overflowToDisk="false"
+ timeToIdleSeconds="300"
+ timeToLiveSeconds="600"
+ memoryStoreEvictionPolicy="LFU"/>
</ehcache>
Modified: continuum/trunk/continuum-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/log4j.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/log4j.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/log4j.xml Mon Aug 13 04:29:09 2012
@@ -22,75 +22,75 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="rolling" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="file" value="${appserver.base}/logs/continuum.log" />
- <param name="append" value="true" />
- <param name="datePattern" value="'.'yyyy-MM-dd" />
+ <param name="file" value="${appserver.base}/logs/continuum.log"/>
+ <param name="append" value="true"/>
+ <param name="datePattern" value="'.'yyyy-MM-dd"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
</layout>
</appender>
<appender name="continuumAuditlog" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="file" value="${appserver.base}/logs/continuum-audit.log" />
- <param name="append" value="true" />
- <param name="datePattern" value="'.'yyyy-MM-dd" />
+ <param name="file" value="${appserver.base}/logs/continuum-audit.log"/>
+ <param name="append" value="true"/>
+ <param name="datePattern" value="'.'yyyy-MM-dd"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %X{security.currentUser} - %m%n"/>
</layout>
</appender>
<appender name="redbackAuditLog" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="file" value="${appserver.base}/logs/continuum-security-audit.log" />
- <param name="append" value="true" />
- <param name="datePattern" value="'.'yyyy-MM-dd" />
+ <param name="file" value="${appserver.base}/logs/continuum-security-audit.log"/>
+ <param name="append" value="true"/>
+ <param name="datePattern" value="'.'yyyy-MM-dd"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %X{redback.currentUser} - %m%n"/>
</layout>
</appender>
-
- <logger name="org.apache.continuum.web.util.AuditLog" additivity="false">
- <level value="info" />
- <appender-ref ref="continuumAuditlog" />
- </logger>
-
- <logger name="org.codehaus.plexus.redback.struts2.action.AuditEvent" additivity="false">
- <level value="info" />
- <appender-ref ref="redbackAuditLog" />
- </logger>
-
-<!--
- <logger name="org.apache.maven">
- <level value="info"/>
- </logger>
-
- <logger name="org.apache.continuum">
- <level value="info" />
- </logger>
-
- <logger name="org.codehaus.plexus.redback">
- <level value="info"/>
- </logger>
-
- <logger name="org.codehaus.plexus.mailsender.MailSender">
- <level value="info"/>
- </logger>
-
- <logger name="org.quartz">
- <level value="info"/>
- </logger>
- <logger name="org.apache.jasper">
+ <logger name="org.apache.continuum.web.util.AuditLog" additivity="false">
<level value="info"/>
+ <appender-ref ref="continuumAuditlog"/>
</logger>
- <logger name="com.opensymphony.xwork">
+ <logger name="org.codehaus.plexus.redback.struts2.action.AuditEvent" additivity="false">
<level value="info"/>
+ <appender-ref ref="redbackAuditLog"/>
</logger>
- <logger name="org.codehaus.plexus.PlexusContainer">
- <level value="info"/>
- </logger>
--->
+ <!--
+ <logger name="org.apache.maven">
+ <level value="info"/>
+ </logger>
+
+ <logger name="org.apache.continuum">
+ <level value="info" />
+ </logger>
+
+ <logger name="org.codehaus.plexus.redback">
+ <level value="info"/>
+ </logger>
+
+ <logger name="org.codehaus.plexus.mailsender.MailSender">
+ <level value="info"/>
+ </logger>
+
+ <logger name="org.quartz">
+ <level value="info"/>
+ </logger>
+
+ <logger name="org.apache.jasper">
+ <level value="info"/>
+ </logger>
+
+ <logger name="com.opensymphony.xwork">
+ <level value="info"/>
+ </logger>
+
+ <logger name="org.codehaus.plexus.PlexusContainer">
+ <level value="info"/>
+ </logger>
+ -->
<!-- squelch noisy objects (for now) -->
<logger name="org.apache.commons">
@@ -141,7 +141,7 @@
<logger name="org.codehaus.plexus.component.manager.ClassicSingletonComponentManager">
<level value="error"/>
</logger>
-
+
<logger name="org.springframework.beans.factory.xml.XmlBeanDefinitionReader">
<level value="error"/>
</logger>
@@ -155,8 +155,8 @@
</logger>
<root>
- <priority value="info" />
- <appender-ref ref="rolling" />
+ <priority value="info"/>
+ <appender-ref ref="rolling"/>
</root>
</log4j:configuration>
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgent-validation.xml Mon Aug 13 04:29:09 2012
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
<!DOCTYPE validators PUBLIC
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgentGroup-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgentGroup-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgentGroup-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/BuildAgentAction-saveBuildAgentGroup-validation.xml Mon Aug 13 04:29:09 2012
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
<!DOCTYPE validators PUBLIC
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction-saveDistributedPurgeConfig-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction-saveDistributedPurgeConfig-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction-saveDistributedPurgeConfig-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/DistributedPurgeConfigurationAction-saveDistributedPurgeConfig-validation.xml Mon Aug 13 04:29:09 2012
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
<!DOCTYPE validators PUBLIC
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/LocalRepositoryAction-saveRepository-validation.xml Mon Aug 13 04:29:09 2012
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
<!DOCTYPE validators PUBLIC
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/continuum/web/action/admin/PurgeConfigurationAction-savePurgeConfig-validation.xml Mon Aug 13 04:29:09 2012
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
<!DOCTYPE validators PUBLIC
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml Mon Aug 13 04:29:09 2012
@@ -49,7 +49,7 @@
<field name="delay">
<field-validator type="regex">
<param name="expression"><![CDATA[([0-9])]]></param>
- <message key="schedule.delay.invalid"/>
+ <message key="schedule.delay.invalid"/>
</field-validator>
</field>
<validator type="cronexpression">
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/UserManagementAction-saveUser-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/UserManagementAction-saveUser-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/UserManagementAction-saveUser-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/UserManagementAction-saveUser-validation.xml Mon Aug 13 04:29:09 2012
@@ -44,7 +44,8 @@
</field>
<validator type="expression">
<param name="expression">
- password.equals(passwordTwo)</param>
+ password.equals(passwordTwo)
+ </param>
<message key="user.passwordTwo.nomatch"/>
</validator>
</validators>
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml Mon Aug 13 04:29:09 2012
@@ -27,10 +27,10 @@
<message key="ircNotifier.host.required"/>
</field-validator>
<field-validator type="regex">
- <param name="trim">true</param>
- <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
- <message key="ircNotifier.host.invalid" />
- </field-validator>
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
+ <message key="ircNotifier.host.invalid"/>
+ </field-validator>
</field>
<field name="port">
<field-validator type="int">
@@ -44,9 +44,9 @@
<message key="ircNotifier.channel.required"/>
</field-validator>
<field-validator type="regex">
- <param name="trim">true</param>
- <param name="expression"><![CDATA[[a-zA-Z0-9_.#-]*]]></param>
- <message key="ircNotifier.channel.invalid" />
- </field-validator>
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.#-]*]]></param>
+ <message key="ircNotifier.channel.invalid"/>
+ </field-validator>
</field>
</validators>
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml Mon Aug 13 04:29:09 2012
@@ -27,10 +27,10 @@
<message key="ircNotifier.host.required"/>
</field-validator>
<field-validator type="regex">
- <param name="trim">true</param>
- <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
- <message key="ircNotifier.host.invalid" />
- </field-validator>
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
+ <message key="ircNotifier.host.invalid"/>
+ </field-validator>
</field>
<field name="port">
<field-validator type="int">
@@ -44,9 +44,9 @@
<message key="ircNotifier.channel.required"/>
</field-validator>
<field-validator type="regex">
- <param name="trim">true</param>
- <param name="expression"><![CDATA[[a-zA-Z0-9_.#-]*]]></param>
- <message key="ircNotifier.channel.invalid" />
- </field-validator>
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.#-]*]]></param>
+ <message key="ircNotifier.channel.invalid"/>
+ </field-validator>
</field>
</validators>
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml Mon Aug 13 04:29:09 2012
@@ -50,11 +50,11 @@
</field-validator>
</field>
<field name="domainName">
- <field-validator type="regex">
- <param name="trim">true</param>
- <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
- <message key="jabberNotifier.domain.invalid" />
- </field-validator>
+ <field-validator type="regex">
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
+ <message key="jabberNotifier.domain.invalid"/>
+ </field-validator>
</field>
<field name="address">
<field-validator type="requiredstring">
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml Mon Aug 13 04:29:09 2012
@@ -50,11 +50,11 @@
</field-validator>
</field>
<field name="domainName">
- <field-validator type="regex">
- <param name="trim">true</param>
- <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
- <message key="jabberNotifier.domain.invalid" />
- </field-validator>
+ <field-validator type="regex">
+ <param name="trim">true</param>
+ <param name="expression"><![CDATA[[a-zA-Z0-9_.:\\/-]*]]></param>
+ <message key="jabberNotifier.domain.invalid"/>
+ </field-validator>
</field>
<field name="address">
<field-validator type="requiredstring">
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml Mon Aug 13 04:29:09 2012
@@ -26,15 +26,16 @@
<field-validator type="expression">
<param name="expression">
! (
- ( address.trim() eq "")
- and
- ( committers eq "" )
- )
+ ( address.trim() eq "")
+ and
+ ( committers eq "" )
+ )
</param>
<message key="mailNotifier.address.required"/>
</field-validator>
<field-validator type="regex">
- <param name="expression"><![CDATA[(^[_A-Za-z0-9-\&]+[\&_A-Za-z0-9-+]*(\.[_A-Za-z0-9-+\&]+)*@([A-Za-z0-9-\&])+(\.[A-Za-z0-9-]+)*((\.[A-Za-z0-9]{2,})|(\.[A-Za-z0-9]{2,}\.[A-Za-z0-9]{2,}))$)]]></param>
+ <param name="expression">
+ <![CDATA[(^[_A-Za-z0-9-\&]+[\&_A-Za-z0-9-+]*(\.[_A-Za-z0-9-+\&]+)*@([A-Za-z0-9-\&])+(\.[A-Za-z0-9-]+)*((\.[A-Za-z0-9]{2,})|(\.[A-Za-z0-9]{2,}\.[A-Za-z0-9]{2,}))$)]]></param>
<message key="mailNotifier.address.invalid"/>
</field-validator>
</field>
Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml Mon Aug 13 04:29:09 2012
@@ -24,17 +24,18 @@
<validators>
<field name="address">
<field-validator type="expression">
- <param name="expression">
+ <param name="expression">
! (
- ( address.trim() eq "" )
- and
- ( committers eq "" )
- )
- </param>
- <message key="mailNotifier.address.required"/>
+ ( address.trim() eq "" )
+ and
+ ( committers eq "" )
+ )
+ </param>
+ <message key="mailNotifier.address.required"/>
</field-validator>
<field-validator type="regex">
- <param name="expression"><![CDATA[(^[_A-Za-z0-9-\&]+[\&_A-Za-z0-9-+]*(\.[_A-Za-z0-9-+\&]+)*@([A-Za-z0-9-\&])+(\.[A-Za-z0-9-]+)*((\.[A-Za-z0-9]{2,})|(\.[A-Za-z0-9]{2,}\.[A-Za-z0-9]{2,}))$)]]></param>
+ <param name="expression">
+ <![CDATA[(^[_A-Za-z0-9-\&]+[\&_A-Za-z0-9-+]*(\.[_A-Za-z0-9-+\&]+)*@([A-Za-z0-9-\&])+(\.[A-Za-z0-9-]+)*((\.[A-Za-z0-9]{2,})|(\.[A-Za-z0-9]{2,}\.[A-Za-z0-9]{2,}))$)]]></param>
<message key="mailNotifier.address.invalid"/>
</field-validator>
</field>
Modified: continuum/trunk/continuum-webapp/src/main/resources/validators.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/validators.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/validators.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/validators.xml Mon Aug 13 04:29:09 2012
@@ -17,8 +17,8 @@
~ under the License.
-->
<!DOCTYPE validators PUBLIC
- "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
- "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
+ "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
+ "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
<validators>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml Mon Aug 13 04:29:09 2012
@@ -25,23 +25,23 @@
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<bean id="loggerManager" class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager"
- init-method="initialize"/>
+ init-method="initialize"/>
- <bean id="propertyConfigurer"
- class="org.codehaus.plexus.spring.PlexusServletContextPropertyPlaceholderConfigurer">
+ <bean id="propertyConfigurer"
+ class="org.codehaus.plexus.spring.PlexusServletContextPropertyPlaceholderConfigurer">
<property name="locations">
<list>
<value>classpath:plexus.properties</value>
</list>
- </property>
+ </property>
<!-- ignore if plexus.properties not found -->
<property name="ignoreResourceNotFound">
<value>true</value>
- </property>
+ </property>
<!-- ignore if a interpolated key not exists -->
<property name="ignoreUnresolvablePlaceholders">
<value>true</value>
- </property>
+ </property>
</bean>
<!-- to run builds in a chroot jail environment
@@ -55,20 +55,21 @@
<bean id="mailSession" class="org.springframework.jndi.JndiObjectFactoryBean">
<property name="jndiName" value="java:comp/env/mail/Session">
</property>
- </bean>
-
+ </bean>
+
<bean name="mailSender#continuum" class="org.springframework.mail.javamail.JavaMailSenderImpl">
<property name="session" ref="mailSession"/>
- </bean>
-
+ </bean>
+
<bean name="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
<property name="session" ref="mailSession"/>
- </bean>
-
- <bean id="masterBuildAgentTransportServer" class="org.apache.continuum.distributed.transport.master.MasterBuildAgentTransportServer">
+ </bean>
+
+ <bean id="masterBuildAgentTransportServer"
+ class="org.apache.continuum.distributed.transport.master.MasterBuildAgentTransportServer">
<constructor-arg ref="distributedBuildService"/>
</bean>
-
+
<bean name="xmlrpcServicesList" class="java.util.ArrayList">
<constructor-arg>
<list>
@@ -98,7 +99,7 @@
class="org.codehaus.redback.xmlrpc.service.ResourceServiceImpl">
<constructor-arg ref="rBACManager#cached"/>
</bean>
-
+
<bean name="redbackUserService" lazy-init="true" scope="singleton"
class="org.codehaus.redback.xmlrpc.service.UserServiceImpl">
<constructor-arg ref="userManager#cached"/>
@@ -119,22 +120,22 @@
<bean name="redbackXmlRpcAuthenticator" class="org.codehaus.redback.xmlrpc.security.XmlRpcAuthenticator">
<constructor-arg ref="securitySystem"/>
</bean>
-
+
<!-- triggers -->
<bean id="continuumBuildTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
- <property name="jobDetail" ref="continuumBuildJob" />
- <property name="cronExpression" value="0 * * * * ?" />
+ <property name="jobDetail" ref="continuumBuildJob"/>
+ <property name="cronExpression" value="0 * * * * ?"/>
</bean>
-
- <!-- scheduler -->
+
+ <!-- scheduler -->
<bean id="schedulerFactoryBean" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
<property name="triggers">
<list>
- <ref bean="continuumBuildTrigger" />
+ <ref bean="continuumBuildTrigger"/>
</list>
</property>
- <property name="schedulerName" value="Continuum Scheduler" />
- <property name="waitForJobsToCompleteOnShutdown" value="true" />
+ <property name="schedulerName" value="Continuum Scheduler"/>
+ <property name="waitForJobsToCompleteOnShutdown" value="true"/>
<property name="quartzProperties">
<props>
<prop key="org.quartz.threadPool.class">org.quartz.simpl.SimpleThreadPool</prop>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/continuum.tld Mon Aug 13 04:29:09 2012
@@ -18,7 +18,8 @@
~ under the License.
-->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+ "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
<taglib>
<tlibversion>1.1</tlibversion>
<jspversion>1.2</jspversion>
@@ -66,7 +67,7 @@
<name>valueLink</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
- </attribute>
+ </attribute>
</tag>
<tag>
@@ -130,7 +131,7 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
-
+
<tag>
<name>ifBuildTypeEnabled</name>
<tagclass>org.apache.maven.continuum.web.view.jsp.ui.IfBuildTypeEnabledTag</tagclass>