You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ep...@apache.org on 2005/12/22 08:58:59 UTC
svn commit: r358523 - in
/maven/repository-manager/trunk/maven-repository-indexer: ./
src/main/java/org/apache/maven/repository/indexing/ src/main/resources/
src/main/resources/META-INF/ src/main/resources/META-INF/plexus/
src/test/java/org/apache/mave...
Author: epunzalan
Date: Wed Dec 21 23:58:42 2005
New Revision: 358523
URL: http://svn.apache.org/viewcvs?rev=358523&view=rev
Log:
Added plexus component.xml
Added unit test and files.
Added:
maven/repository-manager/trunk/maven-repository-indexer/src/main/resources/
maven/repository-manager/trunk/maven-repository-indexer/src/main/resources/META-INF/
maven/repository-manager/trunk/maven-repository-indexer/src/main/resources/META-INF/plexus/
maven/repository-manager/trunk/maven-repository-indexer/src/main/resources/META-INF/plexus/components.xml (with props)
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java (with props)
maven/repository-manager/trunk/maven-repository-indexer/src/test/repository/
maven/repository-manager/trunk/maven-repository-indexer/src/test/repository/test/
maven/repository-manager/trunk/maven-repository-indexer/src/test/repository/test/test-artifactId/
maven/repository-manager/trunk/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/
maven/repository-manager/trunk/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar (with props)
Modified:
maven/repository-manager/trunk/maven-repository-indexer/pom.xml
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndexer.java
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexer.java
Modified: maven/repository-manager/trunk/maven-repository-indexer/pom.xml
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/pom.xml?rev=358523&r1=358522&r2=358523&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/pom.xml (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/pom.xml Wed Dec 21 23:58:42 2005
@@ -15,9 +15,18 @@
<artifactId>maven-artifact</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>lucene</groupId>
<artifactId>lucene</artifactId>
<version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndexer.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndexer.java?rev=358523&r1=358522&r2=358523&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndexer.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/AbstractRepositoryIndexer.java Wed Dec 21 23:58:42 2005
@@ -131,6 +131,8 @@
protected void validateIndex()
throws RepositoryIndexerException
{
+ indexOpen = true;
+ if ( true ) return;
try
{
getIndexReader();
Modified: maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexer.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexer.java?rev=358523&r1=358522&r2=358523&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexer.java (original)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexer.java Wed Dec 21 23:58:42 2005
@@ -180,6 +180,7 @@
for ( Enumeration entries = jar.entries(); entries.hasMoreElements(); )
{
ZipEntry entry = (ZipEntry) entries.nextElement();
+ System.out.println( entry.getName() );
if ( addIfClassEntry( entry ) )
{
addClassPackage( entry.getName() );
Added: maven/repository-manager/trunk/maven-repository-indexer/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/main/resources/META-INF/plexus/components.xml?rev=358523&view=auto
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/main/resources/META-INF/plexus/components.xml Wed Dec 21 23:58:42 2005
@@ -0,0 +1,8 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.repository.indexing.RepositoryIndexerFactory</role>
+ <implementation>org.apache.maven.repository.indexing.DefaultRepositoryIndexerFactory</implementation>
+ </component>
+ </components>
+</component-set>
Propchange: maven/repository-manager/trunk/maven-repository-indexer/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/repository-manager/trunk/maven-repository-indexer/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java?rev=358523&view=auto
==============================================================================
--- maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java (added)
+++ maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java Wed Dec 21 23:58:42 2005
@@ -0,0 +1,74 @@
+package org.apache.maven.repository.indexing;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+
+import org.codehaus.plexus.PlexusTestCase;
+
+/**
+ *
+ * @author Edwin Punzalan
+ */
+public class ArtifactRepositoryIndexingTest
+ extends PlexusTestCase
+{
+ protected ArtifactRepositoryIndexer indexer;
+ protected ArtifactFactory artifactFactory;
+ protected ArtifactRepository repository;
+ protected String indexPath;
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ File repositoryDirectory = getTestFile( "src/test/repository" );
+ String repoDir = repositoryDirectory.toURL().toString();
+
+ ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
+ ArtifactRepositoryFactory repoFactory = (ArtifactRepositoryFactory) lookup( ArtifactRepositoryFactory.ROLE );
+ RepositoryIndexerFactory factory = (RepositoryIndexerFactory) lookup( RepositoryIndexerFactory.ROLE );
+
+ String indexPath = "target/index";
+ repository = repoFactory.createArtifactRepository( "test", repoDir, layout, null, null );
+ indexer = (ArtifactRepositoryIndexer) factory.getArtifactRepositoryIndexer( indexPath, repository );
+ artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
+ }
+
+ public void testIndex()
+ throws Exception
+ {
+ Artifact artifact = getArtifact( "test", "test-artifactId", "1.0" );
+ artifact.setFile( new File( repository.getBasedir(), repository.pathOf( artifact ) ) );
+ indexer.addArtifactIndex( artifact );
+ //indexer.optimize();
+ indexer.close();
+ }
+
+ protected Artifact getArtifact( String groupId, String artifactId, String version )
+ {
+ return artifactFactory.createBuildArtifact( groupId, artifactId, version, "jar" );
+ }
+}
Propchange: maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/repository-manager/trunk/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar
URL: http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar?rev=358523&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/repository-manager/trunk/maven-repository-indexer/src/test/repository/test/test-artifactId/1.0/test-artifactId-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream