You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/08/22 14:59:25 UTC
svn commit: r1160249 - in /maven/indexer/trunk/indexer-core/src:
main/java/org/apache/maven/index/ main/java/org/apache/maven/index/creator/
test/java/org/apache/maven/index/creator/
Author: olamy
Date: Mon Aug 22 12:59:24 2011
New Revision: 1160249
URL: http://svn.apache.org/viewvc?rev=1160249&view=rev
Log:
use a better name OsgiArtifactIndexCreator rather than OSGIArtifactIndexCreator
Added:
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java (contents, props changed)
- copied, changed from r1159159, maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OSGIArtifactIndexCreator.java
maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java (contents, props changed)
- copied, changed from r1159159, maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OSGIArtifactIndexCreatorTest.java
Removed:
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OSGIArtifactIndexCreator.java
maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OSGIArtifactIndexCreatorTest.java
Modified:
maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
Modified: maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java?rev=1160249&r1=1160248&r2=1160249&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java (original)
+++ maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java Mon Aug 22 12:59:24 2011
@@ -31,7 +31,7 @@ import org.apache.maven.index.artifact.G
import org.apache.maven.index.creator.JarFileContentsIndexCreator;
import org.apache.maven.index.creator.MavenPluginArtifactInfoIndexCreator;
import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator;
-import org.apache.maven.index.creator.OSGIArtifactIndexCreator;
+import org.apache.maven.index.creator.OsgiArtifactIndexCreator;
import org.codehaus.plexus.util.StringUtils;
import org.sonatype.aether.util.version.GenericVersionScheme;
import org.sonatype.aether.version.InvalidVersionSpecificationException;
@@ -145,17 +145,17 @@ public class ArtifactInfo
/**
* @since 1.4.2
*/
- public static final String BUNDLE_SYMBOLIC_NAME = OSGIArtifactIndexCreator.FLD_BUNDLE_SYMBOLIC_NAME.getKey();
+ public static final String BUNDLE_SYMBOLIC_NAME = OsgiArtifactIndexCreator.FLD_BUNDLE_SYMBOLIC_NAME.getKey();
/**
* @since 1.4.2
*/
- public static final String BUNDLE_VERSION = OSGIArtifactIndexCreator.FLD_BUNDLE_VERSION.getKey();
+ public static final String BUNDLE_VERSION = OsgiArtifactIndexCreator.FLD_BUNDLE_VERSION.getKey();
/**
* @since 1.4.2
*/
- public static final String BUNDLE_EXPORT_PACKAGE = OSGIArtifactIndexCreator.FLD_BUNDLE_EXPORT_PACKAGE.getKey();
+ public static final String BUNDLE_EXPORT_PACKAGE = OsgiArtifactIndexCreator.FLD_BUNDLE_EXPORT_PACKAGE.getKey();
public static final Comparator<ArtifactInfo> VERSION_COMPARATOR = new VersionComparator();
Copied: maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java (from r1159159, maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OSGIArtifactIndexCreator.java)
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java?p2=maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java&p1=maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OSGIArtifactIndexCreator.java&r1=1159159&r2=1160249&rev=1160249&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OSGIArtifactIndexCreator.java (original)
+++ maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java Mon Aug 22 12:59:24 2011
@@ -58,8 +58,8 @@ import java.util.jar.Manifest;
* @author Olivier Lamy
* @since 4.1.2
*/
-@Component( role = IndexCreator.class, hint = OSGIArtifactIndexCreator.ID )
-public class OSGIArtifactIndexCreator
+@Component( role = IndexCreator.class, hint = OsgiArtifactIndexCreator.ID )
+public class OsgiArtifactIndexCreator
extends AbstractIndexCreator
{
public static final String ID = "osgi-metadatas";
@@ -129,7 +129,7 @@ public class OSGIArtifactIndexCreator
FLD_BUNDLE_DOCURL, FLD_BUNDLE_IMPORT_PACKAGE );
}
- public OSGIArtifactIndexCreator()
+ public OsgiArtifactIndexCreator()
{
super( ID );
}
Propchange: maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/indexer/trunk/indexer-core/src/main/java/org/apache/maven/index/creator/OsgiArtifactIndexCreator.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java (from r1159159, maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OSGIArtifactIndexCreatorTest.java)
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java?p2=maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java&p1=maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OSGIArtifactIndexCreatorTest.java&r1=1159159&r2=1160249&rev=1160249&view=diff
==============================================================================
--- maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OSGIArtifactIndexCreatorTest.java (original)
+++ maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java Mon Aug 22 12:59:24 2011
@@ -40,7 +40,7 @@ import java.util.List;
/**
* @author Olivier Lamy
*/
-public class OSGIArtifactIndexCreatorTest
+public class OsgiArtifactIndexCreatorTest
extends PlexusTestCase
{
protected IndexCreator indexCreator;
@@ -55,7 +55,7 @@ public class OSGIArtifactIndexCreatorTes
{
super.setUp();
- indexCreator = this.lookup( IndexCreator.class, OSGIArtifactIndexCreator.ID );
+ indexCreator = this.lookup( IndexCreator.class, OsgiArtifactIndexCreator.ID );
nexusIndexer = this.lookup( NexusIndexer.class );
}
@@ -126,7 +126,7 @@ public class OSGIArtifactIndexCreatorTes
List<IndexCreator> indexCreators =
Arrays.<IndexCreator>asList( new MinimalArtifactInfoIndexCreator(), new JarFileContentsIndexCreator(),
- new MavenPluginArtifactInfoIndexCreator(), new OSGIArtifactIndexCreator() );
+ new MavenPluginArtifactInfoIndexCreator(), new OsgiArtifactIndexCreator() );
IndexingContext indexingContext =
nexusIndexer.addIndexingContext( INDEX_ID, INDEX_ID, repo, repoIndexDir, "http://www.apache.org",
Propchange: maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/indexer/trunk/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision