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 [30/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-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java Mon Aug 13 04:29:09 2012
@@ -39,15 +39,15 @@ import org.codehaus.plexus.redback.syste
import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.redback.users.UserNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -112,10 +112,10 @@ public class ContinuumXmlRpcServlet
{
XmlRpcServerConfigImpl cfg = (XmlRpcServerConfigImpl) server.getConfig();
cfg.setEnabledForExtensions( true );
- PropertiesHandlerMapping mapping =
- (PropertiesHandlerMapping) lookup( PropertyHandlerMapping.class.getName() );
- mapping.setRequestProcessorFactoryFactory(
- (RequestProcessorFactoryFactory) lookup( RequestProcessorFactoryFactory.class.getName() ) );
+ PropertiesHandlerMapping mapping = (PropertiesHandlerMapping) lookup(
+ PropertyHandlerMapping.class.getName() );
+ mapping.setRequestProcessorFactoryFactory( (RequestProcessorFactoryFactory) lookup(
+ RequestProcessorFactoryFactory.class.getName() ) );
mapping.load();
mapping.setAuthenticationHandler( getAuthenticationHandler() );
server.setHandlerMapping( mapping );
@@ -213,8 +213,8 @@ public class ContinuumXmlRpcServlet
PlexusContainer pc;
try
{
- pc = new DefaultPlexusContainer( "default", keys, "META-INF/plexus/application.xml",
- new ClassWorld( "plexus.core", getClass().getClassLoader() ) );
+ pc = new DefaultPlexusContainer( "default", keys, "META-INF/plexus/application.xml", new ClassWorld(
+ "plexus.core", getClass().getClassLoader() ) );
context.setAttribute( PlexusConstants.PLEXUS_KEY, pc );
}
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java Mon Aug 13 04:29:09 2012
@@ -32,7 +32,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.reflect.Method;
-import java.util.Iterator;
import java.util.Map;
/**
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplStub.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplStub.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplStub.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplStub.java Mon Aug 13 04:29:09 2012
@@ -8,24 +8,24 @@ import org.apache.maven.continuum.xmlrpc
public class ContinuumServiceImplStub
extends ContinuumServiceImpl
-{
+{
protected void checkBuildProjectInGroupAuthorization( String resource )
throws ContinuumException
{
// do nothing
}
-
+
protected void checkViewProjectGroupAuthorization( String resource )
throws ContinuumException
{
// do nothing
}
-
+
protected void buildProjectWithBuildDefinition( int projectId, int buildDefinitionId, BuildTrigger buildTrigger )
{
// do nothing
}
-
+
public org.apache.maven.continuum.model.project.BuildDefinition getBuildDefinition( BuildDefinition buildDef,
org.apache.maven.continuum.model.project.BuildDefinition buildDefinition )
throws ProfileException, ContinuumException
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplTest.java (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/test/java/org/apache/continuum/xmlrpc/server/ContinuumServiceImplTest.java Mon Aug 13 04:29:09 2012
@@ -1,11 +1,5 @@
package org.apache.continuum.xmlrpc.server;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
import org.apache.continuum.configuration.BuildAgentGroupConfiguration;
import org.apache.continuum.model.project.ProjectScmRoot;
@@ -28,6 +22,12 @@ import org.jmock.Mockery;
import org.jmock.integration.junit3.JUnit3Mockery;
import org.jmock.lib.legacy.ClassImposteriser;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class ContinuumServiceImplTest
extends PlexusInSpringTestCase
{
@@ -40,7 +40,7 @@ public class ContinuumServiceImplTest
private DistributedReleaseManager distributedReleaseManager;
private ContinuumReleaseManager releaseManager;
-
+
private DistributedBuildManager distributedBuildManager;
private ConfigurationService configurationService;
@@ -149,17 +149,18 @@ public class ContinuumServiceImplTest
assertEquals( "incomplete-phase", summary.getPhases().get( 0 ) );
assertEquals( "completed-phase", summary.getCompletedPhases().get( 0 ) );
}
-
+
public void testPopulateBuildDefinition()
throws Exception
{
ContinuumServiceImplStub continuumServiceStub = new ContinuumServiceImplStub();
-
+
BuildDefinition buildDef = createBuildDefinition();
- org.apache.maven.continuum.model.project.BuildDefinition buildDefinition = new org.apache.maven.continuum.model.project.BuildDefinition();
-
+ org.apache.maven.continuum.model.project.BuildDefinition buildDefinition =
+ new org.apache.maven.continuum.model.project.BuildDefinition();
+
buildDefinition = continuumServiceStub.getBuildDefinition( buildDef, buildDefinition );
-
+
assertEquals( buildDef.getArguments(), buildDefinition.getArguments() );
assertEquals( buildDef.getBuildFile(), buildDefinition.getBuildFile() );
assertEquals( buildDef.getDescription(), buildDefinition.getDescription() );
@@ -169,34 +170,34 @@ public class ContinuumServiceImplTest
assertEquals( buildDef.isBuildFresh(), buildDefinition.isBuildFresh() );
assertEquals( buildDef.isDefaultForProject(), buildDefinition.isDefaultForProject() );
}
-
+
public void testBuildProjectWithBuildTrigger()
throws Exception
{
final ProjectGroup projectGroup = new ProjectGroup();
projectGroup.setName( "test-group" );
-
+
BuildTrigger buildTrigger = new BuildTrigger();
buildTrigger.setTrigger( ContinuumProjectState.TRIGGER_FORCED );
buildTrigger.setTriggeredBy( "username" );
BuildDefinition buildDef = createBuildDefinition();
buildDef.setId( 1 );
-
+
context.checking( new Expectations()
{
{
atLeast( 1 ).of( continuum ).getProject( project.getId() );
will( returnValue( project ) );
-
+
atLeast( 1 ).of( continuum ).getProjectGroupByProjectId( project.getId() );
will( returnValue( projectGroup ) );
}
- });
-
+ } );
+
int result = continuumService.buildProject( project.getId(), buildDef.getId(), buildTrigger );
assertEquals( 0, result );
-
+
}
public void testGetProjectScmRootByProjectGroup()
@@ -270,29 +271,31 @@ public class ContinuumServiceImplTest
assertEquals( 3, projectScmRoot.getOldState() );
assertEquals( "address1", projectScmRoot.getScmRootAddress() );
}
-
- public void testGetBuildAgentUrl() throws Exception
+
+ public void testGetBuildAgentUrl()
+ throws Exception
{
- context.checking( new Expectations()
+ context.checking( new Expectations()
{
{
one( continuum ).getConfiguration();
will( returnValue( configurationService ) );
-
+
one( configurationService ).isDistributedBuildEnabled();
- will( returnValue ( true ) );
-
+ will( returnValue( true ) );
+
one( distributedBuildManager ).getBuildAgentUrl( 1, 1 );
will( returnValue( "http://localhost:8181/continuum-buildagent/xmlrpc" ) );
}
- });
+ } );
String buildAgentUrl = continuumService.getBuildAgentUrl( 1, 1 );
assertEquals( "http://localhost:8181/continuum-buildagent/xmlrpc", buildAgentUrl );
context.assertIsSatisfied();
}
-
- public void testGetBuildAgentUrlNotSupported() throws Exception
+
+ public void testGetBuildAgentUrlNotSupported()
+ throws Exception
{
context.checking( new Expectations()
{
@@ -305,11 +308,11 @@ public class ContinuumServiceImplTest
}
} );
- try
+ try
{
String buildAgentUrl = continuumService.getBuildAgentUrl( 1, 1 );
- fail ( "ContinuumException is expected to occur here." );
- }
+ fail( "ContinuumException is expected to occur here." );
+ }
catch ( ContinuumException e )
{
; //pass
@@ -317,18 +320,19 @@ public class ContinuumServiceImplTest
context.assertIsSatisfied();
}
- public void testGetNonExistingBuildAgentGroup() throws Exception
+ public void testGetNonExistingBuildAgentGroup()
+ throws Exception
{
- context.checking( new Expectations()
+ context.checking( new Expectations()
{
{
one( continuum ).getConfiguration();
will( returnValue( configurationService ) );
-
+
one( configurationService ).getBuildAgentGroup( "Agent Group Name" );
- will( returnValue ( null ) );
+ will( returnValue( null ) );
}
- });
+ } );
int result = continuumService.removeBuildAgentGroup( "Agent Group Name" );
assertEquals( 0, result );
@@ -338,18 +342,19 @@ public class ContinuumServiceImplTest
public void testRemoveNonExistingBuildAgentGroup()
throws Exception
{
- context.checking( new Expectations()
+ context.checking( new Expectations()
{
{
one( continuum ).getConfiguration();
will( returnValue( configurationService ) );
-
+
one( configurationService ).getBuildAgentGroup( "Agent Group Name" );
- will( returnValue ( null ) );
-
- never( configurationService ).removeBuildAgentGroup( with( any( BuildAgentGroupConfiguration.class ) ) );
+ will( returnValue( null ) );
+
+ never( configurationService ).removeBuildAgentGroup( with( any(
+ BuildAgentGroupConfiguration.class ) ) );
}
- });
+ } );
continuumService.removeBuildAgentGroup( "Agent Group Name" );
context.assertIsSatisfied();
@@ -358,25 +363,25 @@ public class ContinuumServiceImplTest
public void testGetBuildAgentsWithInstallations()
throws Exception
{
- final List<org.apache.continuum.configuration.BuildAgentConfiguration> buildAgents =
+ final List<org.apache.continuum.configuration.BuildAgentConfiguration> buildAgents =
new ArrayList<org.apache.continuum.configuration.BuildAgentConfiguration>();
- org.apache.continuum.configuration.BuildAgentConfiguration buildAgent =
+ org.apache.continuum.configuration.BuildAgentConfiguration buildAgent =
new org.apache.continuum.configuration.BuildAgentConfiguration();
buildAgent.setUrl( "http://localhost:8080/xmlrpc" );
buildAgent.setEnabled( true );
buildAgents.add( buildAgent );
- org.apache.continuum.configuration.BuildAgentConfiguration buildAgent2 =
+ org.apache.continuum.configuration.BuildAgentConfiguration buildAgent2 =
new org.apache.continuum.configuration.BuildAgentConfiguration();
buildAgent2.setUrl( "http://localhost:8181/xmlrpc" );
buildAgent2.setEnabled( false );
buildAgents.add( buildAgent2 );
- final List<org.apache.maven.continuum.model.system.Installation> buildAgentInstallations =
+ final List<org.apache.maven.continuum.model.system.Installation> buildAgentInstallations =
new ArrayList<org.apache.maven.continuum.model.system.Installation>();
- org.apache.maven.continuum.model.system.Installation buildAgentInstallation =
+ org.apache.maven.continuum.model.system.Installation buildAgentInstallation =
new org.apache.maven.continuum.model.system.Installation();
buildAgentInstallation.setInstallationId( 1 );
buildAgentInstallation.setName( "JDK 6" );
@@ -400,7 +405,7 @@ public class ContinuumServiceImplTest
one( distributedBuildManager ).getAvailableInstallations( "http://localhost:8080/xmlrpc" );
will( returnValue( buildAgentInstallations ) );
}
- });
+ } );
List<BuildAgentConfiguration> agents = continuumService.getBuildAgentsWithInstallations();
assertEquals( 1, agents.size() );
BuildAgentConfiguration agent = agents.get( 0 );
@@ -422,14 +427,14 @@ public class ContinuumServiceImplTest
buildDef.setDefaultForProject( true );
buildDef.setGoals( "clean install" );
buildDef.setDescription( "Test Build Definition" );
-
+
return buildDef;
}
private Map<String, Object> getListenerMap()
{
Map<String, Object> map = new HashMap<String, Object>();
-
+
map.put( "release-phases", Arrays.asList( "incomplete-phase" ) );
map.put( "completed-release-phases", Arrays.asList( "completed-phase" ) );
return map;
Modified: continuum/trunk/continuum-xmlrpc/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/pom.xml (original)
+++ continuum/trunk/continuum-xmlrpc/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
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</artifactId>
<groupId>org.apache.continuum</groupId>
Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.continuum</groupId>
@@ -115,19 +116,19 @@ under the License.
<targetJdk>1.5</targetJdk>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
- <inherited>true</inherited>
+ <inherited>true</inherited>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.3</version>
<inherited>true</inherited>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</reporting>
<build>
<pluginManagement>
@@ -244,12 +245,12 @@ under the License.
</manifestEntries>
</archive>
</configuration>
- </plugin>
- <plugin>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
- <inherited>true</inherited>
+ <inherited>true</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -266,18 +267,18 @@ under the License.
<systemProperties>
<property>
<name>JAVA_HOME</name>
- <value>${java.home}</value>
- </property>
+ <value>${java.home}</value>
+ </property>
<property>
<name>M2_HOME</name>
- <value>${maven.home}</value>
- </property>
+ <value>${maven.home}</value>
+ </property>
<property>
<name>plexus.home</name>
<!-- ${project.build.directory} is not evaluated see surefire documentation -->
<!--value>${project.build.directory}</value-->
<value>./target</value>
- </property>
+ </property>
<property>
<name>appserver.base</name>
<value>${basedir}/target/test-classes/</value>
@@ -298,11 +299,11 @@ under the License.
</build>
<modules>
<module>continuum-api</module>
- <module>continuum-base</module>
+ <module>continuum-base</module>
<module>continuum-commons</module>
<module>continuum-security</module>
- <module>continuum-store</module>
- <module>continuum-reports</module>
+ <module>continuum-store</module>
+ <module>continuum-reports</module>
<module>continuum-core</module>
<module>continuum-model</module>
<module>continuum-notifiers</module>
@@ -517,7 +518,7 @@ under the License.
<artifactId>maven-scm-providers-standard</artifactId>
<version>${maven-scm.version}</version>
<type>pom</type>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-local</artifactId>
@@ -527,12 +528,12 @@ under the License.
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-cvs-commons</artifactId>
<version>${maven-scm.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svn-commons</artifactId>
<version>${maven-scm.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-bazaar</artifactId>
@@ -582,7 +583,7 @@ under the License.
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
@@ -659,7 +660,7 @@ under the License.
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-reports</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-core</artifactId>
@@ -1016,7 +1017,7 @@ under the License.
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.1.1</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
@@ -1080,7 +1081,7 @@ under the License.
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4jVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-taskqueue</artifactId>
@@ -1132,17 +1133,17 @@ under the License.
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.4</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
@@ -1301,7 +1302,7 @@ under the License.
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1339,18 +1340,18 @@ under the License.
<artifactId>redback-xmlrpc-security</artifactId>
<version>${redback.version}</version>
</dependency>
-
+
<!-- due to http://jira.codehaus.org/browse/MECLIPSE-472 -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
<version>1.0-alpha-20</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-20</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -1384,7 +1385,7 @@ under the License.
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -1629,7 +1630,7 @@ under the License.
<groupId>velocity</groupId>
<artifactId>velocity-dep</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -1662,7 +1663,7 @@ under the License.
<artifactId>joda-time</artifactId>
<version>1.5.2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-webdav</artifactId>
<version>1.5.0</version>
@@ -1752,7 +1753,7 @@ under the License.
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
Modified: continuum/trunk/src/site/xdoc/credentials.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/src/site/xdoc/credentials.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/src/site/xdoc/credentials.xml (original)
+++ continuum/trunk/src/site/xdoc/credentials.xml Mon Aug 13 04:29:09 2012
@@ -19,8 +19,8 @@
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
<title>Credentials Handling</title>
@@ -33,192 +33,202 @@
<p>This document describes how Continuum should handle credentials for pom retrieval and scm access.</p>
<table>
- <tr>
- <th>Were credentials provided when the project was added?</th>
- <th>Was 'Use cached credentials if available' checked when the project was added?</th>
- <th>Are there Subversion credentials cached for the user running Continuum?</th>
- <th>Were credentials provided during release prepare?</th>
- <th> </th>
- <th>Initial project add</th>
- <th>Scheduled or Forced Build</th>
- <th>Release</th>
- </tr>
- <tr>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td> </td>
- <td>use the provided credentials for the HTTP GET to
- retrieve the POM. Rely on cached credentials for the initial checkout [2].
- Do not store the credentials in the database because the checkbox says we
- should rely on cached credentials.</td>
-
- <td>Rely on the cached credentials [2]</td>
- <td>use the credentials provided during release prepare.
- Avoid caching these credentials. [1]</td>
- </tr>
- <tr>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>Rely on the cached credentials [2]</td>
- </tr>
- <tr>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td> </td>
- <td>"</td>
- <td>Rely on the cached credentials [2]. Will probably fail because they are missing.</td>
- <td>use the credentials provided during release prepare. Avoid caching these credentials. [1]</td>
- </tr>
- <tr>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td>N</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>Rely on the cached credentials [2].</td>
- </tr>
- <tr>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>Y</td>
- <td> </td>
- <td>use the provided credentials for the HTTP GET to
- retrieve the pom and for the initial checkout. Store the credentials in the
- database for later use.</td>
- <td>Use the credentials from the database [3]</td>
- <td>use the credentials provided during release prepare.
- Avoid caching these credentials. [1]</td>
- </tr>
- <tr>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>Rely on the cached credentials [2].</td>
- </tr>
- <tr>
- <td>Y</td>
- <td>N</td>
- <td>N</td>
-
- <td>Y</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>use the credentials provided during release prepare.
- Avoid caching these credentials. [1]</td>
- </tr>
- <tr>
- <td>Y</td>
- <td>N</td>
- <td>N</td>
- <td>N</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>Rely on unauthenticated access to the scm repo</td>
- </tr>
- <tr>
- <td>N</td>
- <td>Y</td>
- <td>Y</td>
- <td>Y</td>
- <td> </td>
- <td>GET the pom and do the initial checkout with no
- credentials</td>
- <td>Rely on cached credentials or unauthenticated access
- to the scm repo [2].</td>
- <td>use the credentials provided during release prepare.
- Avoid caching these credentials. [1]</td>
- </tr>
- <tr>
- <td>N</td>
- <td>Y</td>
- <td>Y</td>
- <td>N</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>Rely on the cached credentials [2].</td>
- </tr>
- <tr>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>Y</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>use the credentials provided during release prepare.
- Avoid caching these credentials. [1]</td>
- </tr>
- <tr>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td>N</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>rely on cached credentials or unauthenticated access to scm [2].</td>
- </tr>
- <tr>
- <td>N</td>
- <td>N</td>
- <td>Y</td>
- <td>Y</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>use the credentials provided during release prepare. Avoid caching these credentials. [1]</td>
- </tr>
- <tr>
- <td>N</td>
- <td>N</td>
- <td>Y</td>
- <td>N</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>Rely on the cached credentials [2]</td>
- </tr>
- <tr>
- <td>N</td>
- <td>N</td>
- <td>N</td>
- <td>Y</td>
- <td> </td>
- <td>"</td>
- <td>"</td>
- <td>use the credentials provided during release prepare.
- Avoid caching these credentials. [1]</td>
- </tr>
- <tr>
- <td>N</td>
- <td>N</td>
- <td>N</td>
- <td>N</td>
- <td> </td>
- <td>"</td>
- <td>Rely on unauthenticated access to the scm repo</td>
- <td>Rely on unauthenticated access to the scm repo</td>
- </tr>
- </table>
+ <tr>
+ <th>Were credentials provided when the project was added?</th>
+ <th>Was 'Use cached credentials if available' checked when the project was added?</th>
+ <th>Are there Subversion credentials cached for the user running Continuum?</th>
+ <th>Were credentials provided during release prepare?</th>
+ <th></th>
+ <th>Initial project add</th>
+ <th>Scheduled or Forced Build</th>
+ <th>Release</th>
+ </tr>
+ <tr>
+ <td>Y</td>
+ <td>Y</td>
+ <td>Y</td>
+ <td>Y</td>
+ <td></td>
+ <td>use the provided credentials for the HTTP GET to
+ retrieve the POM. Rely on cached credentials for the initial checkout [2].
+ Do not store the credentials in the database because the checkbox says we
+ should rely on cached credentials.
+ </td>
+
+ <td>Rely on the cached credentials [2]</td>
+ <td>use the credentials provided during release prepare.
+ Avoid caching these credentials. [1]
+ </td>
+ </tr>
+ <tr>
+ <td>Y</td>
+ <td>Y</td>
+ <td>Y</td>
+ <td>N</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>Rely on the cached credentials [2]</td>
+ </tr>
+ <tr>
+ <td>Y</td>
+ <td>Y</td>
+ <td>N</td>
+ <td>Y</td>
+ <td></td>
+ <td>"</td>
+ <td>Rely on the cached credentials [2]. Will probably fail because they are missing.</td>
+ <td>use the credentials provided during release prepare. Avoid caching these credentials. [1]</td>
+ </tr>
+ <tr>
+ <td>Y</td>
+ <td>Y</td>
+ <td>N</td>
+ <td>N</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>Rely on the cached credentials [2].</td>
+ </tr>
+ <tr>
+ <td>Y</td>
+ <td>N</td>
+ <td>Y</td>
+ <td>Y</td>
+ <td></td>
+ <td>use the provided credentials for the HTTP GET to
+ retrieve the pom and for the initial checkout. Store the credentials in the
+ database for later use.
+ </td>
+ <td>Use the credentials from the database [3]</td>
+ <td>use the credentials provided during release prepare.
+ Avoid caching these credentials. [1]
+ </td>
+ </tr>
+ <tr>
+ <td>Y</td>
+ <td>N</td>
+ <td>Y</td>
+ <td>N</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>Rely on the cached credentials [2].</td>
+ </tr>
+ <tr>
+ <td>Y</td>
+ <td>N</td>
+ <td>N</td>
+
+ <td>Y</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>use the credentials provided during release prepare.
+ Avoid caching these credentials. [1]
+ </td>
+ </tr>
+ <tr>
+ <td>Y</td>
+ <td>N</td>
+ <td>N</td>
+ <td>N</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>Rely on unauthenticated access to the scm repo</td>
+ </tr>
+ <tr>
+ <td>N</td>
+ <td>Y</td>
+ <td>Y</td>
+ <td>Y</td>
+ <td></td>
+ <td>GET the pom and do the initial checkout with no
+ credentials
+ </td>
+ <td>Rely on cached credentials or unauthenticated access
+ to the scm repo [2].
+ </td>
+ <td>use the credentials provided during release prepare.
+ Avoid caching these credentials. [1]
+ </td>
+ </tr>
+ <tr>
+ <td>N</td>
+ <td>Y</td>
+ <td>Y</td>
+ <td>N</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>Rely on the cached credentials [2].</td>
+ </tr>
+ <tr>
+ <td>N</td>
+ <td>Y</td>
+ <td>N</td>
+ <td>Y</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>use the credentials provided during release prepare.
+ Avoid caching these credentials. [1]
+ </td>
+ </tr>
+ <tr>
+ <td>N</td>
+ <td>Y</td>
+ <td>N</td>
+ <td>N</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>rely on cached credentials or unauthenticated access to scm [2].</td>
+ </tr>
+ <tr>
+ <td>N</td>
+ <td>N</td>
+ <td>Y</td>
+ <td>Y</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>use the credentials provided during release prepare. Avoid caching these credentials. [1]</td>
+ </tr>
+ <tr>
+ <td>N</td>
+ <td>N</td>
+ <td>Y</td>
+ <td>N</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>Rely on the cached credentials [2]</td>
+ </tr>
+ <tr>
+ <td>N</td>
+ <td>N</td>
+ <td>N</td>
+ <td>Y</td>
+ <td></td>
+ <td>"</td>
+ <td>"</td>
+ <td>use the credentials provided during release prepare.
+ Avoid caching these credentials. [1]
+ </td>
+ </tr>
+ <tr>
+ <td>N</td>
+ <td>N</td>
+ <td>N</td>
+ <td>N</td>
+ <td></td>
+ <td>"</td>
+ <td>Rely on unauthenticated access to the scm repo</td>
+ <td>Rely on unauthenticated access to the scm repo</td>
+ </tr>
+ </table>
<p>A " (double quote) in a table cell means "same as above".</p>
@@ -233,7 +243,8 @@
<section name="Testing">
<p>Currently the tests for these features tend to be manual since they require access to a secured website
- and/or scm repository. This test is currently disabled: AbstractContinuumProjectBuilderTest.</p>
+ and/or scm repository. This test is currently disabled: AbstractContinuumProjectBuilderTest.
+ </p>
</section>