You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2008/12/17 04:09:26 UTC
svn commit: r727253 [3/3] - in
/continuum/branches/continuum-distributed-builds: ./
continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/
continuum-builder/
continuum-builder/src/main/java/org/apache/continuum/builder/distribute...
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/continuum/continuum-configuration.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/continuum/continuum-configuration.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/plexus/application.xml?rev=727253&view=auto
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/plexus/application.xml (added)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/plexus/application.xml Tue Dec 16 19:09:22 2008
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+<plexus>
+ <components>
+
+ <!--
+ | Logger manager
+ -->
+ <component>
+ <role>org.codehaus.plexus.logging.LoggerManager</role>
+ <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
+ <lifecycle-handler>basic</lifecycle-handler>
+ </component>
+
+ </components>
+
+ <lifecycle-handler-manager implementation="org.codehaus.plexus.lifecycle.DefaultLifecycleHandlerManager">
+ <default-lifecycle-handler-id>plexus</default-lifecycle-handler-id>
+ <lifecycle-handlers>
+ <lifecycle-handler implementation="org.codehaus.plexus.personality.plexus.PlexusLifecycleHandler">
+ <id>plexus</id>
+ <name>Plexus Lifecycle Handler</name>
+ <begin-segment>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.LogEnablePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.CompositionPhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.ContextualizePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.AutoConfigurePhase"/>
+ <phase implementation="org.codehaus.plexus.registry.RegistryConfigurePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.ServiceablePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.StartPhase"/>
+ </begin-segment>
+ <suspend-segment>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.SuspendPhase"/>
+ </suspend-segment>
+ <resume-segment>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.ResumePhase"/>
+ </resume-segment>
+ <end-segment>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.StopPhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.DisposePhase"/>
+ <phase implementation="org.codehaus.plexus.personality.plexus.lifecycle.phase.LogDisablePhase"/>
+ </end-segment>
+ </lifecycle-handler>
+ </lifecycle-handlers>
+ </lifecycle-handler-manager>
+</plexus>
\ No newline at end of file
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/plexus/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/META-INF/plexus/application.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/applicationContext.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/applicationContext.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/applicationContext.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/applicationContext.xml Tue Dec 16 19:09:22 2008
@@ -9,19 +9,7 @@
<bean id="slaveBuildAgentTransportServer" class="org.apache.continuum.distributed.transport.slave.SlaveBuildAgentTransportServer">
<constructor-arg ref="continuumBuildAgentService"/>
</bean>
-
- <bean id="continuumBuildAgentService" class="org.apache.continuum.buildagent.ContinuumBuildAgentServiceImpl">
- <property name="configurationService" ref="buildAgentConfigurationService"/>
- </bean>
-
- <bean id="buildAgentConfigurationService" class="org.apache.continuum.buildagent.configuration.DefaultConfigurationService">
- <property name="configuration" ref="continuumConfiguration" />
- </bean>
-
- <bean id="continuumConfiguration" class="org.apache.continuum.buildagent.configuration.DefaultContinuumConfiguration">
- <property name="configurationFile" value="file:${appserver.base}/conf/continuum.xml" />
- </bean>
-
+
<bean name="xmlrpcServicesList" class="java.util.ArrayList">
<constructor-arg>
<list>
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/log4j.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/log4j.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/resources/log4j.xml Tue Dec 16 19:09:22 2008
@@ -11,6 +11,9 @@
<logger name="org.apache.continuum.distributed">
<level value="info"/>
</logger>
+ <logger name="org.apache.continuum.buildagent">
+ <level value="info"/>
+ </logger>
<logger name="org.springframework">
<level value="error"/>
</logger>
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/webapp/WEB-INF/web.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/webapp/WEB-INF/web.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/main/webapp/WEB-INF/web.xml Tue Dec 16 19:09:22 2008
@@ -10,10 +10,17 @@
</listener>
<context-param>
+ <param-name>contextClass</param-name>
+ <param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
+ </context-param>
+
+ <context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
classpath*:/META-INF/spring-context.xml
classpath*:/applicationContext.xml
+ classpath*:/META-INF/plexus/components.xml
+ classpath*:/META-INF/plexus/application.xml
</param-value>
</context-param>
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/continuum-distributed-build-transport-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java Tue Dec 16 19:09:22 2008
@@ -96,18 +96,6 @@
}
}
- public void testIsBusy()
- {
- try
- {
- slaveProxy.isBusy().booleanValue();
- }
- catch ( Exception e )
- {
- fail( e.getMessage() );
- }
- }
-
public void testPing()
{
try
Modified: continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/pom.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-distributed-build-transport/pom.xml Tue Dec 16 19:09:22 2008
@@ -16,7 +16,8 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>continuum-distributed-build</artifactId>
<groupId>org.apache.continuum</groupId>
@@ -29,7 +30,7 @@
<modules>
<module>continuum-distributed-build-transport-master</module>
<module>continuum-distributed-build-transport-slave</module>
- <module>continuum-distributed-build-transport-tests</module>
+ <!-- <module>continuum-distributed-build-transport-tests</module> -->
</modules>
<dependencies>
<dependency>
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Tue Dec 16 19:09:22 2008
@@ -21,10 +21,13 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
+import org.apache.continuum.builder.utils.ContinuumBuildConstant;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.configuration.ConfigurationException;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
import org.apache.maven.continuum.web.util.StateGenerator;
import org.apache.struts2.ServletActionContext;
@@ -35,6 +38,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
+import java.util.Map;
/**
@@ -45,6 +49,11 @@
public class BuildResultAction
extends AbstractBuildAction
{
+ /**
+ * @plexus.requirement
+ */
+ private DistributedBuildManager distributedBuildManager;
+
private Project project;
private BuildResult buildResult;
@@ -77,27 +86,47 @@
// check if there are surefire results to display
project = getContinuum().getProject( getProjectId() );
- buildResult = getContinuum().getBuildResult( getBuildId() );
-
- // directory contains files ?
- File surefireReportsDirectory =
- getContinuum().getConfiguration().getTestReportsDirectory( buildId, getProjectId() );
- File[] files = surefireReportsDirectory.listFiles();
- if ( files == null )
+ if ( getContinuum().getConfiguration().isDistributedBuildEnabled() && project.getState() == ContinuumProjectState.BUILDING )
{
+ Map<String, Object> map = distributedBuildManager.getBuildResult( project.getId() );
+
+ if ( map.size() > 0 )
+ {
+ buildResult = ContinuumBuildConstant.getBuildResult( map, null );
+
+ buildOutput = ContinuumBuildConstant.getBuildOutput( map );
+ }
+ changeSet = null;
+
hasSurefireResults = false;
+
+ this.setCanDelete( false );
}
else
{
- hasSurefireResults = files.length > 0;
+ buildResult = getContinuum().getBuildResult( getBuildId() );
+
+ // directory contains files ?
+ File surefireReportsDirectory =
+ getContinuum().getConfiguration().getTestReportsDirectory( buildId, getProjectId() );
+ File[] files = surefireReportsDirectory.listFiles();
+ if ( files == null )
+ {
+ hasSurefireResults = false;
+ }
+ else
+ {
+ hasSurefireResults = files.length > 0;
+ }
+ changeSet = getContinuum().getChangesSinceLastUpdate( getProjectId() );
+
+ buildOutput = getBuildOutputText();
+
+ state = StateGenerator.generate( buildResult.getState(), ServletActionContext.getRequest().getContextPath() );
+
+ this.setCanDelete( this.canRemoveBuildResult( buildResult ) );
}
- changeSet = getContinuum().getChangesSinceLastUpdate( getProjectId() );
-
- buildOutput = getBuildOutputText();
-
- state = StateGenerator.generate( buildResult.getState(), ServletActionContext.getRequest().getContextPath() );
- this.setCanDelete( this.canRemoveBuildResult( buildResult ) );
return SUCCESS;
}
Modified: continuum/branches/continuum-distributed-builds/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/pom.xml?rev=727253&r1=727252&r2=727253&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/pom.xml Tue Dec 16 19:09:22 2008
@@ -582,17 +582,32 @@
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-distributed-build-transport-common</artifactId>
+ <artifactId>continuum-distributed-build-transport-slave-api</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-distributed-build-transport-master</artifactId>
+ <artifactId>continuum-distributed-build-transport-slave-server</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
- <artifactId>continuum-distributed-build-transport-slave</artifactId>
+ <artifactId>continuum-distributed-build-transport-slave-client</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-distributed-build-transport-master-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-distributed-build-transport-master-server</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.continuum</groupId>
+ <artifactId>continuum-distributed-build-transport-master-client</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>