moved to nexus 2.1.x

mkristian · Aug 7, 2012 · 98c1d67 · 98c1d67
1 parent dadca67
commit 98c1d67
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/nexus-ruby-plugin/pom.xml b/nexus-ruby-plugin/pom.xml
@@ -21,7 +21,8 @@
     <jruby-plugins-version>0.26.0</jruby-plugins-version>
     <gem.includeOpenSSL>false</gem.includeOpenSSL>
     <!-- Set the Nexus version here, against which you build the plugin -->
-    <nexus-version>1.9.2</nexus-version>
+    <nexus-version>2.1.1</nexus-version>   
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
   <repositories>

diff --git a/...uby-plugin/src/main/java/org/sonatype/nexus/plugins/ruby/DefaultRubyRepositoryHelper.java b/...uby-plugin/src/main/java/org/sonatype/nexus/plugins/ruby/DefaultRubyRepositoryHelper.java
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.maven.index.artifact.Gav;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.building.FileModelSource;
 import org.apache.maven.model.building.ModelBuildingException;
@@ -16,6 +15,7 @@
 import org.sonatype.nexus.proxy.item.StorageFileItem;
 import org.sonatype.nexus.proxy.maven.MavenRepository;
 import org.sonatype.nexus.proxy.maven.MetadataLocator;
+import org.sonatype.nexus.proxy.maven.gav.Gav;
 import org.sonatype.nexus.proxy.storage.local.fs.DefaultFSLocalRepositoryStorage;
 
 import de.saumya.mojo.gems.ArtifactCoordinates;

diff --git a/nexus-ruby-plugin/src/main/java/org/sonatype/nexus/plugins/ruby/RubyHostedRepository.java b/nexus-ruby-plugin/src/main/java/org/sonatype/nexus/plugins/ruby/RubyHostedRepository.java
@@ -1,7 +1,9 @@
 package org.sonatype.nexus.plugins.ruby;
 
+import org.sonatype.nexus.plugins.RepositoryType;
 import org.sonatype.nexus.proxy.repository.HostedRepository;
 
+@RepositoryType( pathPrefix="rubygems" )
 public interface RubyHostedRepository
     extends RubyRepository, HostedRepository
 {

diff --git a/...gin/src/main/java/org/sonatype/nexus/plugins/ruby/proxy/RubyFSLocalRepositoryStorage.java b/...gin/src/main/java/org/sonatype/nexus/plugins/ruby/proxy/RubyFSLocalRepositoryStorage.java
@@ -4,23 +4,35 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import javax.inject.Inject;
+
 import org.codehaus.plexus.component.annotations.Component;
+import org.sonatype.nexus.mime.MimeSupport;
 import org.sonatype.nexus.plugins.ruby.shadow.Maven2RubyGemShadowRepository;
 import org.sonatype.nexus.proxy.ItemNotFoundException;
 import org.sonatype.nexus.proxy.LocalStorageException;
 import org.sonatype.nexus.proxy.ResourceStoreRequest;
 import org.sonatype.nexus.proxy.item.AbstractStorageItem;
 import org.sonatype.nexus.proxy.item.DefaultStorageCollectionItem;
 import org.sonatype.nexus.proxy.item.DefaultStorageFileItem;
+import org.sonatype.nexus.proxy.item.LinkPersister;
 import org.sonatype.nexus.proxy.item.StorageItem;
 import org.sonatype.nexus.proxy.repository.Repository;
 import org.sonatype.nexus.proxy.storage.local.LocalRepositoryStorage;
 import org.sonatype.nexus.proxy.storage.local.fs.DefaultFSLocalRepositoryStorage;
+import org.sonatype.nexus.proxy.storage.local.fs.FSPeer;
 import org.sonatype.nexus.proxy.storage.local.fs.FileContentLocator;
+import org.sonatype.nexus.proxy.wastebasket.Wastebasket;
 
 @Component( role = LocalRepositoryStorage.class, hint = DefaultFSLocalRepositoryStorage.PROVIDER_STRING )
 public class RubyFSLocalRepositoryStorage extends DefaultFSLocalRepositoryStorage implements LocalRepositoryStorage{
 
+    @Inject
+    public RubyFSLocalRepositoryStorage(Wastebasket wastebasket,
+            LinkPersister linkPersister, MimeSupport mimeSupport, FSPeer fsPeer) {
+        super(wastebasket, linkPersister, mimeSupport, fsPeer);
+    }
+
     @Override
     public File getFileFromBase( Repository repository,
             ResourceStoreRequest request, File repoBase )