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 2014/06/23 09:20:49 UTC
svn commit: r1604703 - in /continuum/trunk:
continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/
continuum-model/src/main/mdo/ continuum-webapp-test/ continuum-webapp/
continuum-webapp/src/ma...
Author: brett
Date: Mon Jun 23 07:20:49 2014
New Revision: 1604703
URL: http://svn.apache.org/r1604703
Log:
whitespace fixes
Modified:
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
continuum/trunk/continuum-model/src/main/mdo/continuum.xml
continuum/trunk/continuum-webapp-test/pom.xml
continuum/trunk/continuum-webapp/pom.xml
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java?rev=1604703&r1=1604702&r2=1604703&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java Mon Jun 23 07:20:49 2014
@@ -178,7 +178,7 @@ public class BuildProjectTaskExecutor
actionContext.put( ContinuumBuildAgentUtil.KEY_ENVIRONMENTS, getEnvironments(
buildContext.getBuildDefinitionId(), getInstallationType( buildContext ) ) );
- // CONTINUUM-2391
+ // CONTINUUM-2391
if ( buildContext.getLocalRepository() != null )
{
List<LocalRepository> localRepos = buildAgentConfigurationService.getLocalRepositories();
Modified: continuum/trunk/continuum-model/src/main/mdo/continuum.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/src/main/mdo/continuum.xml?rev=1604703&r1=1604702&r2=1604703&view=diff
==============================================================================
--- continuum/trunk/continuum-model/src/main/mdo/continuum.xml (original)
+++ continuum/trunk/continuum-model/src/main/mdo/continuum.xml Mon Jun 23 07:20:49 2014
@@ -861,7 +861,7 @@
for ( java.util.Iterator i = files.iterator(); i.hasNext(); )
{
ChangeFile file = (ChangeFile) i.next();
-
+
if (file != null)
{
result.append( file ).append( "\n" );
Modified: continuum/trunk/continuum-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/pom.xml?rev=1604703&r1=1604702&r2=1604703&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/pom.xml (original)
+++ continuum/trunk/continuum-webapp-test/pom.xml Mon Jun 23 07:20:49 2014
@@ -146,7 +146,7 @@
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server</artifactId>
<version>${selenium.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=1604703&r1=1604702&r2=1604703&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Mon Jun 23 07:20:49 2014
@@ -69,8 +69,7 @@
<!-- Some versions of maven-war-plugin (snapshots) have this incorrectly defaulted to true.
Specifically setting this to false to avoid accidental jar file creation. -->
<archiveClasses>false</archiveClasses>
- <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**
- </dependentWarExcludes>
+ <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**</dependentWarExcludes>
</configuration>
</plugin>
<plugin>
@@ -167,12 +166,12 @@
<source>1.5</source>
<warSourceDirectory>${project.build.directory}/${project.build.finalName}/</warSourceDirectory>
<injectString><![CDATA[<!-- [jspc-maven-plugin:post-compiled-jsps-as-servlets] -->]]></injectString>
- <!--
+ <!--
Uncomment outputWebXml if you want the generated web.xml to
be placed in the working directory that the war:war mojo uses.
-->
- <!--
- <outputWebXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</outputWebXml>
+ <!--
+ <outputWebXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</outputWebXml>
-->
</configuration>
</plugin>
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=1604703&r1=1604702&r2=1604703&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java Mon Jun 23 07:20:49 2014
@@ -578,11 +578,11 @@ public class ContinuumActionSupport
{
return getSecuritySystem().getUserManager().findUser( principal );
}
-
+
/**
- * Convenience method to determine whether a build is a maven build. We could call the static method directly,
+ * Convenience method to determine whether a build is a maven build. We could call the static method directly,
* but for struts2 validator access, we would need to enable static method invocation.
- *
+ *
* @param buildType
* @return true if the build type is will result in a maven 1 or 2+ build.
*/
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=1604703&r1=1604702&r2=1604703&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 Jun 23 07:20:49 2014
@@ -45,7 +45,7 @@
</bean>
<!-- to run builds in a chroot jail environment
- note this is not secure yet, see http://jira.codehaus.org/browse/CONTINUUM-1731
+ note this is not secure yet, see http://jira.codehaus.org/browse/CONTINUUM-1731
<bean name="chrootJailDirectory" class="java.io.File">
<constructor-arg value="/home/jail"/>
</bean>