You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/09/09 00:21:09 UTC
svn commit: r693300 - in /maven/sandbox/trunk/mercury: mercury-it/
mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/
mercury-util/src/main/java/org/apache/maven/mercury/util/
Author: ogusakov
Date: Mon Sep 8 15:21:03 2008
New Revision: 693300
URL: http://svn.apache.org/viewvc?rev=693300&view=rev
Log:
added nexus-client to enable checking Nexus status.
Modified:
maven/sandbox/trunk/mercury/mercury-it/pom.xml
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-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
Modified: maven/sandbox/trunk/mercury/mercury-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/pom.xml?rev=693300&r1=693299&r2=693300&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-it/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-it/pom.xml Mon Sep 8 15:21:03 2008
@@ -14,6 +14,8 @@
<plexus.appbooter.version>1.4</plexus.appbooter.version>
<plexus.container.version>1.0-alpha-47</plexus.container.version>
<nexus.version>1.0.0</nexus.version>
+ <nexus.client.version>1.1.0-SNAPSHOT</nexus.client.version>
+ <jetty.version>7.0.0pre3</jetty.version>
<nexus-security-enabled>false</nexus-security-enabled>
@@ -193,6 +195,28 @@
<version>${plexus.appbooter.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-rest-client-java</artifactId>
+ <version>${nexus.client.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-servlet-tester</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+
</dependencies>
</project>
\ No newline at end of file
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=693300&r1=693299&r2=693300&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 Mon Sep 8 15:21:03 2008
@@ -3,9 +3,12 @@
import java.io.File;
import java.net.MalformedURLException;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import junit.framework.Assert;
+
import org.apache.maven.mercury.artifact.Artifact;
import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
import org.apache.maven.mercury.artifact.DefaultArtifact;
@@ -22,6 +25,9 @@
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusTestCase;
import org.sonatype.appbooter.ForkedAppBooter;
+import org.sonatype.nexus.client.NexusClient;
+import org.sonatype.nexus.client.rest.NexusRestClient;
+import org.sonatype.nexus.rest.model.RepositoryListResource;
/**
*
@@ -77,6 +83,12 @@
/** 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";
+
@Override
protected void setUp()
@@ -100,9 +112,19 @@
FileUtil.writeRawData( artifactBinary, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
plexus = getContainer();
- nexusForkedAppBooter = (ForkedAppBooter)plexus.lookup( TEST_NEXUS_ROLE, TEST_NEXUS_HINT );
- nexusForkedAppBooter.start();
+ 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
@@ -110,7 +132,11 @@
throws Exception
{
super.tearDown();
- nexusForkedAppBooter.stop();
+ 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=693300&r1=693299&r2=693300&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 Mon Sep 8 15:21:03 2008
@@ -27,17 +27,11 @@
public class RemoteRepositoryWriterM2NexusTest
extends AbstractRepositoryWriterM2Test
{
-// String nexusReleasesTestDir = "/app/nexus/storage/test";
-// String nexusReleasesTestUrl = "http://127.0.0.1:8081/nexus/content/repositories/test";
-
String nexusReleasesTestDir = "./target/nexus-webapp-1.0.0/runtime/work/storage/releases";
- String nexusReleasesTestUrl = "http://127.0.0.1:8091/nexus/content/repositories/releases";
+ String nexusReleasesTestUrl = nexusTestUrl+"/content/repositories/releases";
String nexusSnapshotsTestDir = "./target/nexus-webapp-1.0.0/runtime/work/storage/snapshots";
- String nexusSnapshotsTestUrl = "http://127.0.0.1:8091/nexus/content/repositories/snapshots";
-
- String nexusTestUser = "admin";
- String nexusTestPass = "admin123";
+ String nexusSnapshotsTestUrl = nexusTestUrl+"/content/repositories/snapshots";
//------------------------------------------------------------------------------
@Override
void setReleases()
@@ -61,6 +55,8 @@
protected void setUp()
throws Exception
{
+ needNexus = true;
+
super.setUp();
mdProcessor = new MetadataProcessorMock();
Modified: maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java?rev=693300&r1=693299&r2=693300&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java (original)
+++ maven/sandbox/trunk/mercury/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java Mon Sep 8 15:21:03 2008
@@ -79,17 +79,20 @@
}
File [] kids = fromFile.listFiles();
- for( File kid : kids )
+ if( kids != null )
{
- if( kid.isDirectory() )
+ for( File kid : kids )
{
- File newDir = new File( toFile, kid.getName());
- newDir.mkdirs();
-
- copy( kid, newDir, false );
+ if( kid.isDirectory() )
+ {
+ File newDir = new File( toFile, kid.getName());
+ newDir.mkdirs();
+
+ copy( kid, newDir, false );
+ }
+ else
+ copyFile( kid, toFile );
}
- else
- copyFile( kid, toFile );
}
}