|
|
9fd07cb |
From a1d0fbb59675906e2a3d84bc6207f536e54dc2c4 Mon Sep 17 00:00:00 2001
|
|
Mat Booth |
aff8928 |
From: Mat Booth <mbooth@apache.org>
|
|
Mat Booth |
aff8928 |
Date: Sun, 25 Aug 2013 14:08:40 +0100
|
|
|
9fd07cb |
Subject: [PATCH 1/2] Port maven-scm to latest version of plexus default
|
|
Mat Booth |
aff8928 |
|
|
Mat Booth |
aff8928 |
---
|
|
|
9fd07cb |
.../org/apache/maven/scm/client/cli/MavenScmCli.java | 10 ++++------
|
|
|
9fd07cb |
.../provider/accurev/cli/AccuRevCommandLineTest.java | 7 +++----
|
|
|
9fd07cb |
.../scm/provider/accurev/cli/AccuRevJUnitUtil.java | 6 +++---
|
|
|
9fd07cb |
.../provider/accurev/cli/WorkSpaceConsumerTest.java | 6 +++---
|
|
|
9fd07cb |
.../accurev/command/AbstractAccuRevCommandTest.java | 8 ++++----
|
|
|
9fd07cb |
.../command/blame/AccuRevBlameCommandTckTest.java | 8 +++-----
|
|
|
9fd07cb |
.../changelog/AccuRevChangeLogCommandTckTest.java | 8 +++-----
|
|
|
9fd07cb |
.../command/checkin/AccuRevCheckInCommandTckTest.java | 7 +++----
|
|
|
9fd07cb |
.../checkout/AccuRevCheckoutCommandTckTest.java | 7 +++----
|
|
|
9fd07cb |
.../command/status/AccuRevStatusCommandTckTest.java | 7 +++----
|
|
|
9fd07cb |
.../accurev/command/tag/AccuRevTagCommandTckTest.java | 7 +++----
|
|
|
9fd07cb |
.../command/update/AccuRevUpdateCommandTckTest.java | 7 +++----
|
|
|
9fd07cb |
.../vss/commands/status/VssStatusConsumerTest.java | 3 ++-
|
|
|
9fd07cb |
.../command/changelog/SvnChangeLogConsumerTest.java | 3 ++-
|
|
|
9fd07cb |
14 files changed, 42 insertions(+), 52 deletions(-)
|
|
Mat Booth |
aff8928 |
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java b/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
|
|
|
9fd07cb |
index 5bff170..c89127b 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-client/src/main/java/org/apache/maven/scm/client/cli/MavenScmCli.java
|
|
Mat Booth |
aff8928 |
@@ -37,7 +37,7 @@ import org.apache.maven.scm.manager.NoSuchScmProviderException;
|
|
|
9fd07cb |
import org.apache.maven.scm.manager.ScmManager;
|
|
|
9fd07cb |
import org.apache.maven.scm.repository.ScmRepository;
|
|
|
9fd07cb |
import org.apache.maven.scm.repository.ScmRepositoryException;
|
|
|
9fd07cb |
-import org.codehaus.plexus.embed.Embedder;
|
|
|
9fd07cb |
+import org.codehaus.plexus.DefaultPlexusContainer;
|
|
|
9fd07cb |
import org.codehaus.plexus.util.StringUtils;
|
|
|
9fd07cb |
|
|
|
9fd07cb |
/**
|
|
Mat Booth |
aff8928 |
@@ -47,7 +47,7 @@ import org.codehaus.plexus.util.StringUtils;
|
|
|
9fd07cb |
*/
|
|
|
9fd07cb |
public class MavenScmCli
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- private Embedder plexus;
|
|
|
9fd07cb |
+ private DefaultPlexusContainer plexus;
|
|
|
9fd07cb |
|
|
|
9fd07cb |
private ScmManager scmManager;
|
|
|
9fd07cb |
|
|
Mat Booth |
aff8928 |
@@ -58,9 +58,7 @@ public class MavenScmCli
|
|
|
9fd07cb |
public MavenScmCli()
|
|
|
9fd07cb |
throws Exception
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- plexus = new Embedder();
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
- plexus.start();
|
|
|
9fd07cb |
+ plexus = new DefaultPlexusContainer();
|
|
|
9fd07cb |
|
|
|
9fd07cb |
scmManager = (ScmManager) plexus.lookup( ScmManager.ROLE );
|
|
|
9fd07cb |
}
|
|
Mat Booth |
aff8928 |
@@ -69,7 +67,7 @@ public class MavenScmCli
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
try
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- plexus.stop();
|
|
|
9fd07cb |
+ plexus.dispose();
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
catch ( Exception ex )
|
|
|
9fd07cb |
{
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
|
|
|
9fd07cb |
index 0cd220f..c9d5987 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLineTest.java
|
|
Mat Booth |
aff8928 |
@@ -39,6 +39,7 @@ import org.apache.maven.scm.ScmTestCase;
|
|
|
9fd07cb |
import org.apache.maven.scm.log.ScmLogger;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.AccuRev;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.AccuRevStat;
|
|
|
9fd07cb |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
|
9fd07cb |
import org.codehaus.plexus.util.Os;
|
|
|
9fd07cb |
import org.codehaus.plexus.util.cli.CommandLineException;
|
|
|
9fd07cb |
import org.codehaus.plexus.util.cli.Commandline;
|
|
Mat Booth |
aff8928 |
@@ -152,11 +153,9 @@ public class AccuRevCommandLineTest
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
|
9fd07cb |
- protected InputStream getCustomConfiguration()
|
|
|
9fd07cb |
- throws Exception
|
|
|
9fd07cb |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
|
|
9fd07cb |
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Test
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java
|
|
|
9fd07cb |
index ff85158..7f5d6d5 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/AccuRevJUnitUtil.java
|
|
Mat Booth |
aff8928 |
@@ -21,8 +21,8 @@ package org.apache.maven.scm.provider.accurev.cli;
|
|
|
9fd07cb |
|
|
|
9fd07cb |
import java.io.BufferedReader;
|
|
|
9fd07cb |
import java.io.IOException;
|
|
|
9fd07cb |
-import java.io.InputStream;
|
|
|
9fd07cb |
import java.io.InputStreamReader;
|
|
|
9fd07cb |
+import java.net.URL;
|
|
|
9fd07cb |
|
|
|
9fd07cb |
import org.apache.maven.scm.log.ScmLogger;
|
|
|
9fd07cb |
import org.apache.maven.scm.manager.ScmManager;
|
|
Mat Booth |
aff8928 |
@@ -63,9 +63,9 @@ public class AccuRevJUnitUtil
|
|
|
9fd07cb |
return new PlexusLogger( logger );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
- public static InputStream getPlexusConfiguration()
|
|
|
9fd07cb |
+ public static URL getPlexusConfiguration()
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.class.getResourceAsStream( "/PlexusTestContainerConfig.xml" );
|
|
|
9fd07cb |
+ return AccuRevJUnitUtil.class.getResource( "/PlexusTestContainerConfig.xml" );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
}
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java
|
|
|
9fd07cb |
index dc950ba..49e060d 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumerTest.java
|
|
Mat Booth |
aff8928 |
@@ -31,6 +31,7 @@ import java.util.Map;
|
|
|
9fd07cb |
import org.apache.maven.scm.ScmTestCase;
|
|
|
9fd07cb |
import org.apache.maven.scm.log.ScmLogger;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.WorkSpace;
|
|
|
9fd07cb |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
|
9fd07cb |
import org.junit.Before;
|
|
|
9fd07cb |
import org.junit.Test;
|
|
|
9fd07cb |
import org.junit.runner.RunWith;
|
|
Mat Booth |
aff8928 |
@@ -44,10 +45,9 @@ public class WorkSpaceConsumerTest
|
|
|
9fd07cb |
private ScmLogger logger;
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
|
9fd07cb |
- protected InputStream getCustomConfiguration()
|
|
|
9fd07cb |
- throws Exception
|
|
|
9fd07cb |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
|
|
9fd07cb |
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Before
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommandTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommandTest.java
|
|
|
9fd07cb |
index 9d7b707..d223928 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommandTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommandTest.java
|
|
Mat Booth |
aff8928 |
@@ -33,6 +33,7 @@ import org.apache.maven.scm.provider.accurev.AccuRevInfo;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.AccuRevScmProviderRepository;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.Stream;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
|
|
9fd07cb |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
|
9fd07cb |
import org.junit.Before;
|
|
|
9fd07cb |
import org.junit.runner.RunWith;
|
|
|
9fd07cb |
import org.mockito.InOrder;
|
|
Mat Booth |
aff8928 |
@@ -45,10 +46,9 @@ public abstract class AbstractAccuRevCommandTest
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
|
9fd07cb |
- protected InputStream getCustomConfiguration()
|
|
|
9fd07cb |
- throws Exception
|
|
|
9fd07cb |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
|
|
9fd07cb |
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Mock
|
|
Mat Booth |
aff8928 |
@@ -98,4 +98,4 @@ public abstract class AbstractAccuRevCommandTest
|
|
|
9fd07cb |
return logger;
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
Mat Booth |
aff8928 |
-}
|
|
Mat Booth |
aff8928 |
\ No newline at end of file
|
|
|
9fd07cb |
+}
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommandTckTest.java
|
|
|
9fd07cb |
index b28d613..a05ca56 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommandTckTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/blame/AccuRevBlameCommandTckTest.java
|
|
Mat Booth |
aff8928 |
@@ -31,6 +31,7 @@ import org.apache.maven.scm.command.blame.BlameScmResult;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.tck.command.blame.BlameCommandTckTest;
|
|
|
9fd07cb |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
|
9fd07cb |
import org.junit.After;
|
|
|
9fd07cb |
import org.junit.Before;
|
|
|
9fd07cb |
import org.junit.Test;
|
|
Mat Booth |
aff8928 |
@@ -45,12 +46,9 @@ public class AccuRevBlameCommandTckTest
|
|
|
9fd07cb |
private AccuRevTckUtil accurevTckTestUtil = new AccuRevTckUtil();
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
|
9fd07cb |
- protected InputStream getCustomConfiguration()
|
|
|
9fd07cb |
- throws Exception
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
|
|
9fd07cb |
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java
|
|
|
9fd07cb |
index d87e277..82b6f2d 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/changelog/AccuRevChangeLogCommandTckTest.java
|
|
|
31abd4c |
@@ -42,6 +42,7 @@ import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.repository.ScmRepository;
|
|
|
9fd07cb |
import org.apache.maven.scm.tck.command.changelog.ChangeLogCommandTckTest;
|
|
|
9fd07cb |
import org.hamcrest.Matchers;
|
|
|
9fd07cb |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
|
9fd07cb |
import org.junit.After;
|
|
|
9fd07cb |
import org.junit.Before;
|
|
|
9fd07cb |
import org.junit.Test;
|
|
Mat Booth |
aff8928 |
@@ -223,11 +224,8 @@ public class AccuRevChangeLogCommandTckTest
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
|
9fd07cb |
- protected InputStream getCustomConfiguration()
|
|
|
9fd07cb |
- throws Exception
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
|
|
9fd07cb |
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
}
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTckTest.java
|
|
|
9fd07cb |
index 9432d35..188b84a 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTckTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkin/AccuRevCheckInCommandTckTest.java
|
|
Mat Booth |
aff8928 |
@@ -25,6 +25,7 @@ import java.io.InputStream;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.tck.command.checkin.CheckInCommandTckTest;
|
|
|
9fd07cb |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
|
9fd07cb |
import org.junit.After;
|
|
|
9fd07cb |
import org.junit.Before;
|
|
|
9fd07cb |
import org.junit.Test;
|
|
Mat Booth |
aff8928 |
@@ -39,11 +40,9 @@ public class AccuRevCheckInCommandTckTest
|
|
|
9fd07cb |
private AccuRevTckUtil accurevTckTestUtil = new AccuRevTckUtil();
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
|
9fd07cb |
- protected InputStream getCustomConfiguration()
|
|
|
9fd07cb |
- throws Exception
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
|
|
9fd07cb |
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckoutCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckoutCommandTckTest.java
|
|
|
9fd07cb |
index 06932e7..6fe9fd2 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckoutCommandTckTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/checkout/AccuRevCheckoutCommandTckTest.java
|
|
Mat Booth |
aff8928 |
@@ -25,6 +25,7 @@ import java.io.InputStream;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest;
|
|
|
9fd07cb |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
|
9fd07cb |
import org.junit.After;
|
|
|
9fd07cb |
import org.junit.Before;
|
|
|
9fd07cb |
import org.junit.Test;
|
|
Mat Booth |
aff8928 |
@@ -44,11 +45,9 @@ public class AccuRevCheckoutCommandTckTest
|
|
|
9fd07cb |
protected AccuRevTckUtil testUtil = new AccuRevTckUtil();
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
|
9fd07cb |
- protected InputStream getCustomConfiguration()
|
|
|
9fd07cb |
- throws Exception
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
|
|
9fd07cb |
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTckTest.java
|
|
|
9fd07cb |
index 8655aa8..5cb4414 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTckTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/status/AccuRevStatusCommandTckTest.java
|
|
Mat Booth |
aff8928 |
@@ -25,6 +25,7 @@ import java.io.InputStream;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.tck.command.status.StatusCommandTckTest;
|
|
|
9fd07cb |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
|
9fd07cb |
import org.junit.After;
|
|
|
9fd07cb |
import org.junit.Before;
|
|
|
9fd07cb |
import org.junit.Test;
|
|
Mat Booth |
aff8928 |
@@ -87,11 +88,9 @@ public class AccuRevStatusCommandTckTest
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
|
9fd07cb |
- protected InputStream getCustomConfiguration()
|
|
|
9fd07cb |
- throws Exception
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
|
|
9fd07cb |
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTckTest.java
|
|
|
9fd07cb |
index b4e14d6..8d5b691 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTckTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/tag/AccuRevTagCommandTckTest.java
|
|
Mat Booth |
aff8928 |
@@ -31,6 +31,7 @@ import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.repository.ScmRepository;
|
|
|
9fd07cb |
import org.apache.maven.scm.tck.command.tag.TagCommandTckTest;
|
|
|
9fd07cb |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
|
9fd07cb |
import org.junit.After;
|
|
|
9fd07cb |
import org.junit.Before;
|
|
|
9fd07cb |
import org.junit.Test;
|
|
Mat Booth |
aff8928 |
@@ -45,11 +46,9 @@ public class AccuRevTagCommandTckTest
|
|
|
9fd07cb |
private AccuRevTckUtil accurevTckTestUtil = new AccuRevTckUtil();
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
|
9fd07cb |
- protected InputStream getCustomConfiguration()
|
|
|
9fd07cb |
- throws Exception
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
|
|
9fd07cb |
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/update/AccuRevUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/update/AccuRevUpdateCommandTckTest.java
|
|
|
9fd07cb |
index 1f8397f..2e7cc51 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/update/AccuRevUpdateCommandTckTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/maven/scm/provider/accurev/command/update/AccuRevUpdateCommandTckTest.java
|
|
Mat Booth |
aff8928 |
@@ -25,6 +25,7 @@ import java.io.InputStream;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.cli.AccuRevJUnitUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.accurev.command.AccuRevTckUtil;
|
|
|
9fd07cb |
import org.apache.maven.scm.tck.command.update.UpdateCommandTckTest;
|
|
|
9fd07cb |
+import org.codehaus.plexus.ContainerConfiguration;
|
|
|
9fd07cb |
import org.junit.After;
|
|
|
9fd07cb |
import org.junit.Before;
|
|
|
9fd07cb |
import org.junit.Test;
|
|
Mat Booth |
aff8928 |
@@ -39,11 +40,9 @@ public class AccuRevUpdateCommandTckTest
|
|
|
9fd07cb |
private AccuRevTckUtil accurevTckTestUtil = new AccuRevTckUtil();
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
|
9fd07cb |
- protected InputStream getCustomConfiguration()
|
|
|
9fd07cb |
- throws Exception
|
|
|
9fd07cb |
-
|
|
|
9fd07cb |
+ protected void customizeContainerConfiguration( ContainerConfiguration containerConfiguration )
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
- return AccuRevJUnitUtil.getPlexusConfiguration();
|
|
|
9fd07cb |
+ containerConfiguration.setContainerConfigurationURL( AccuRevJUnitUtil.getPlexusConfiguration() );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
@Override
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java
|
|
|
9fd07cb |
index 70febdd..b22897f 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java
|
|
Mat Booth |
aff8928 |
@@ -31,6 +31,7 @@ import org.apache.maven.scm.manager.plexus.PlexusLogger;
|
|
|
9fd07cb |
import org.apache.maven.scm.provider.vss.repository.VssScmProviderRepository;
|
|
|
9fd07cb |
import org.apache.maven.scm.repository.ScmRepository;
|
|
|
9fd07cb |
import org.apache.maven.scm.repository.ScmRepositoryException;
|
|
|
9fd07cb |
+import org.codehaus.plexus.DefaultPlexusContainer;
|
|
|
9fd07cb |
import org.codehaus.plexus.util.IOUtil;
|
|
|
9fd07cb |
|
|
|
9fd07cb |
/**
|
|
Mat Booth |
aff8928 |
@@ -50,7 +51,7 @@ public class VssStatusConsumerTest
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
super.setUp();
|
|
|
9fd07cb |
scmManager = getScmManager();
|
|
|
9fd07cb |
- logger = getContainer().getLogger();
|
|
|
9fd07cb |
+ logger = ( (DefaultPlexusContainer) getContainer() ).getLogger();
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
|
9fd07cb |
public void testConsumeLine()
|
|
Mat Booth |
aff8928 |
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
|
|
|
9fd07cb |
index 0c9c455..69b072e 100644
|
|
Mat Booth |
aff8928 |
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
|
|
Mat Booth |
aff8928 |
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumerTest.java
|
|
Mat Booth |
aff8928 |
@@ -24,6 +24,7 @@ import org.apache.maven.scm.ChangeSet;
|
|
|
9fd07cb |
import org.apache.maven.scm.ScmFileStatus;
|
|
|
9fd07cb |
import org.apache.maven.scm.log.DefaultLog;
|
|
|
9fd07cb |
import org.codehaus.plexus.PlexusTestCase;
|
|
|
9fd07cb |
+import org.codehaus.plexus.DefaultPlexusContainer;
|
|
|
9fd07cb |
import org.codehaus.plexus.logging.Logger;
|
|
|
9fd07cb |
import org.junit.Assert;
|
|
|
9fd07cb |
|
|
Mat Booth |
aff8928 |
@@ -57,7 +58,7 @@ public class SvnChangeLogConsumerTest
|
|
|
9fd07cb |
{
|
|
|
9fd07cb |
super.setUp();
|
|
|
9fd07cb |
|
|
|
9fd07cb |
- logger = getContainer().getLogger();
|
|
|
9fd07cb |
+ logger = ( (DefaultPlexusContainer) getContainer() ).getLogger();
|
|
|
9fd07cb |
consumer = new SvnChangeLogConsumer( new DefaultLog(), null );
|
|
|
9fd07cb |
}
|
|
|
9fd07cb |
|
|
Mat Booth |
aff8928 |
--
|
|
|
9fd07cb |
2.17.1
|
|
Mat Booth |
aff8928 |
|