Author: ogusakov
Date: Tue Sep 9 14:36:18 2008
New Revision: 693625
URL: http://svn.apache.org/viewvc?rev=693625&view=rev
Log:
it's start Nexus once with soft restarts between tests. Auth still crashes, but
works fine with a standalone Nexus
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties
(props changed)
- copied unchanged from r693178,
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties
Modified:
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
maven/sandbox/trunk/mercury/mercury-pom/pom.xml
Modified:
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java?rev=693625&r1=693624&r2=693625&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/src/test/java/org/apache/maven/mercury/crypto/pgp/PgpStreamVerifierTest.java
Tue Sep 9 14:36:18 2008
@@ -35,7 +35,6 @@
PgpStreamVerifierFactory svf;
PgpStreamVerifier sv;
-
protected void setUp()
throws Exception
Modified:
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java?rev=693625&r1=693624&r2=693625&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
Tue Sep 9 14:36:18 2008
@@ -39,12 +39,6 @@
public abstract class AbstractRepositoryWriterM2Test
extends PlexusTestCase
{
- public static final String TEST_NEXUS_ROLE = ForkedAppBooter.ROLE;
- public static final String TEST_NEXUS_HINT = "NexusForkedAppBooter";
-
- PlexusContainer plexus;
- ForkedAppBooter nexusForkedAppBooter;
-
Repository repo;
File targetDirectory;
@@ -77,17 +71,14 @@
File f;
File artifactBinary;
+
+ static PlexusContainer plexus;
- /** current test works with snapshots */
- abstract void setReleases() throws MalformedURLException;
+ /** current test works with snapshots
+ * @throws Exception */
+ abstract void setReleases() throws Exception;
/** current test works with releases */
- abstract void setSnapshots() throws MalformedURLException;
-
- protected boolean needNexus = false;
-
- protected String nexusTestUrl = "http://127.0.0.1:8091/nexus";;
- protected String nexusTestUser = "admin";
- protected String nexusTestPass = "admin123";
+ abstract void setSnapshots() throws Exception;
@Override
@@ -96,6 +87,9 @@
{
super.setUp();
+ if( plexus == null )
+ plexus = getContainer();
+
pgpF = new PgpStreamVerifierFactory(
new StreamVerifierAttributes(
PgpStreamVerifierFactory.DEFAULT_EXTENSION, false, true )
, getClass().getResourceAsStream( publicKeyFile )
@@ -110,33 +104,20 @@
artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
FileUtil.writeRawData( artifactBinary, getClass().getResourceAsStream(
"/maven-core-2.0.9.jar" ) );
-
- plexus = getContainer();
- if( needNexus )
- {
- nexusForkedAppBooter = (ForkedAppBooter)plexus.lookup( TEST_NEXUS_ROLE,
TEST_NEXUS_HINT );
- nexusForkedAppBooter.start();
- NexusClient client = new NexusRestClient();
- client.connect( nexusTestUrl, nexusTestUser, nexusTestPass );
- if( !client.isNexusStarted( true ) )
- {
- fail("Cannot start Nexus");
- }
- client.disconnect();
- }
}
+
@Override
protected void tearDown()
throws Exception
{
super.tearDown();
- if( nexusForkedAppBooter != null )
- {
- nexusForkedAppBooter.stop();
- nexusForkedAppBooter = null;
- }
+// if( nexusForkedAppBooter != null )
+// {
+// nexusForkedAppBooter.stop();
+// nexusForkedAppBooter = null;
+// }
}
public void testWriteArtifact()
Modified:
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java?rev=693625&r1=693624&r2=693625&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
Tue Sep 9 14:36:18 2008
@@ -16,6 +16,14 @@
import org.apache.maven.mercury.transport.api.Credentials;
import org.apache.maven.mercury.transport.api.Server;
import org.apache.maven.mercury.util.FileUtil;
+import org.codehaus.plexus.PlexusContainer;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.sonatype.appbooter.ForkedAppBooter;
+import org.sonatype.appbooter.ctl.AppBooterServiceException;
+import org.sonatype.nexus.client.NexusClient;
+import org.sonatype.nexus.client.NexusClientException;
+import org.sonatype.nexus.client.NexusConnectionException;
+import org.sonatype.nexus.client.rest.NexusRestClient;
/**
*
@@ -27,28 +35,35 @@
public class RemoteRepositoryWriterM2NexusTest
extends AbstractRepositoryWriterM2Test
{
+ protected boolean needNexus = false;
+
String nexusReleasesTestDir =
"./target/nexus-webapp-1.0.0/runtime/work/storage/releases";
- String nexusReleasesTestUrl = nexusTestUrl+"/content/repositories/releases";
+ String nexusReleasesTestUrl =
Nexus.nexusTestUrl+"/content/repositories/releases";
String nexusSnapshotsTestDir =
"./target/nexus-webapp-1.0.0/runtime/work/storage/snapshots";
- String nexusSnapshotsTestUrl =
nexusTestUrl+"/content/repositories/snapshots";
+ String nexusSnapshotsTestUrl =
Nexus.nexusTestUrl+"/content/repositories/snapshots";
+
//------------------------------------------------------------------------------
@Override
void setReleases()
- throws MalformedURLException
+ throws Exception
{
+ Nexus.stop();
targetDirectory = new File(nexusReleasesTestDir);
FileUtil.delete( new File( targetDirectory, "org" ) );
server.setURL( new URL(nexusReleasesTestUrl) );
+ Nexus.start( plexus );
}
//------------------------------------------------------------------------------
@Override
void setSnapshots()
- throws MalformedURLException
+ throws Exception
{
+ Nexus.stop();
targetDirectory = new File( nexusSnapshotsTestDir );
FileUtil.delete( new File( targetDirectory, "org" ) );
server.setURL( new URL( nexusSnapshotsTestUrl ) );
+ Nexus.start( plexus );
}
//------------------------------------------------------------------------------
@Override
@@ -63,7 +78,7 @@
query = new ArrayList<ArtifactBasicMetadata>();
- Credentials user = new Credentials( nexusTestUser, nexusTestPass );
+ Credentials user = new Credentials( Nexus.nexusTestUser,
Nexus.nexusTestPass );
server = new Server( "nexusTest", new URL(nexusSnapshotsTestUrl), false,
false, user );
Modified: maven/sandbox/trunk/mercury/mercury-pom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-pom/pom.xml?rev=693625&r1=693624&r2=693625&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-pom/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-pom/pom.xml Tue Sep 9 14:36:18 2008
@@ -191,6 +191,34 @@
</profiles>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/Messages.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/Messages.properties</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>false</filtering>
+ </testResource>
+ </testResources>
+
<plugins>
<plugin>
@@ -213,10 +241,6 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
- <includes>
- <include>**/*.java</include>
- <include>**/*.properties</include>
- </includes>
</configuration>
</plugin>
Propchange:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/Messages.properties
------------------------------------------------------------------------------
svn:mergeinfo =
