You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/02/12 09:24:07 UTC
[maven-indexer] branch MINDEXER-137-align-example-package created (now 84c0c2f)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch MINDEXER-137-align-example-package
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git.
at 84c0c2f [MINDEXER-137] Align example packages to core
This branch includes the following new commits:
new 84c0c2f [MINDEXER-137] Align example packages to core
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-indexer] 01/01: [MINDEXER-137] Align example packages to core
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch MINDEXER-137-align-example-package
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit 84c0c2fb69ffcbb00e70309d42e0096f2e514ecd
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sat Feb 12 10:23:01 2022 +0100
[MINDEXER-137] Align example packages to core
The examples packages used o.a.m.indexER vs o.a.m.index of core.
---
https://issues.apache.org/jira/browse/MINDEXER-137
---
.../sample-war/1.0-SNAPSHOT/maven-metadata.xml | 2 +-
.../indexer/test/sample-war/maven-metadata.xml | 2 +-
indexer-examples/indexer-examples-basic/pom.xml | 12 +++----
.../examples/BasicUsageExample.java | 41 +++++++++++++++-------
.../examples/BasicUsageExampleTest.java | 2 +-
.../examples/indexing/IndexerConfiguration.java | 2 +-
.../examples/indexing/RepositoryIndexManager.java | 2 +-
.../examples/indexing/RepositoryIndexer.java | 2 +-
.../indexing/RepositoryIndexerFactory.java | 2 +-
.../examples/indexing/SearchRequest.java | 2 +-
.../examples/indexing/SearchResults.java | 2 +-
.../examples/services/ArtifactIndexingService.java | 6 ++--
.../services/impl/ArtifactIndexingServiceImpl.java | 12 +++----
.../META-INF/spring/maven-indexer-context.xml | 2 +-
.../examples/SimpleArtifactGenerator.java | 2 +-
.../examples/SpringUsageExampleTest.java | 8 ++---
.../examples/boot/RepositoryBooter.java | 8 ++---
.../META-INF/spring/indexer-examples-context.xml | 12 +++----
.../src/test/resources/logback.xml | 4 +--
pom.xml | 2 +-
20 files changed, 72 insertions(+), 55 deletions(-)
diff --git a/indexer-core/src/test/mindexer-35/org/apache/maven/indexer/test/sample-war/1.0-SNAPSHOT/maven-metadata.xml b/indexer-core/src/test/mindexer-35/org/apache/maven/indexer/test/sample-war/1.0-SNAPSHOT/maven-metadata.xml
index c7e86e7..512916e 100644
--- a/indexer-core/src/test/mindexer-35/org/apache/maven/indexer/test/sample-war/1.0-SNAPSHOT/maven-metadata.xml
+++ b/indexer-core/src/test/mindexer-35/org/apache/maven/indexer/test/sample-war/1.0-SNAPSHOT/maven-metadata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata modelVersion="1.1.0">
- <groupId>org.apache.maven.indexer.test</groupId>
+ <groupId>org.apache.maven.index.test</groupId>
<artifactId>sample-war</artifactId>
<version>1.0-SNAPSHOT</version>
<versioning>
diff --git a/indexer-core/src/test/mindexer-35/org/apache/maven/indexer/test/sample-war/maven-metadata.xml b/indexer-core/src/test/mindexer-35/org/apache/maven/indexer/test/sample-war/maven-metadata.xml
index 7806fa6..a695755 100644
--- a/indexer-core/src/test/mindexer-35/org/apache/maven/indexer/test/sample-war/maven-metadata.xml
+++ b/indexer-core/src/test/mindexer-35/org/apache/maven/indexer/test/sample-war/maven-metadata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
- <groupId>org.apache.maven.indexer.test</groupId>
+ <groupId>org.apache.maven.index.test</groupId>
<artifactId>sample-war</artifactId>
<versioning>
<versions>
diff --git a/indexer-examples/indexer-examples-basic/pom.xml b/indexer-examples/indexer-examples-basic/pom.xml
index b8add58..1842cbf 100644
--- a/indexer-examples/indexer-examples-basic/pom.xml
+++ b/indexer-examples/indexer-examples-basic/pom.xml
@@ -49,12 +49,17 @@ under the License.
UNWORKABLE! -->
<dependencies>
- <!-- For search app in general -->
+ <!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven.indexer</groupId>
@@ -86,11 +91,6 @@ under the License.
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
diff --git a/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/indexer/examples/BasicUsageExample.java b/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/index/examples/BasicUsageExample.java
similarity index 91%
rename from indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/indexer/examples/BasicUsageExample.java
rename to indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/index/examples/BasicUsageExample.java
index b0cd9eb..7d79508 100644
--- a/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/indexer/examples/BasicUsageExample.java
+++ b/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/index/examples/BasicUsageExample.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples;
+package org.apache.maven.index.examples;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -82,8 +82,7 @@ public class BasicUsageExample
public static void main( String[] args )
throws Exception
{
- final BasicUsageExample basicUsageExample = new BasicUsageExample();
- basicUsageExample.perform();
+ new BasicUsageExample().perform();
}
// ==
@@ -225,14 +224,14 @@ public class BasicUsageExample
// Search for all GAVs with known G and A and having version greater than V
final GenericVersionScheme versionScheme = new GenericVersionScheme();
- final String versionString = "1.5.0";
+ final String versionString = "3.1.0";
final Version version = versionScheme.parseVersion( versionString );
// construct the query for known GA
final Query groupIdQ =
- indexer.constructQuery( MAVEN.GROUP_ID, new SourcedSearchExpression( "org.sonatype.nexus" ) );
+ indexer.constructQuery( MAVEN.GROUP_ID, new SourcedSearchExpression( "org.apache.maven" ) );
final Query artifactIdQ =
- indexer.constructQuery( MAVEN.ARTIFACT_ID, new SourcedSearchExpression( "nexus-api" ) );
+ indexer.constructQuery( MAVEN.ARTIFACT_ID, new SourcedSearchExpression( "maven-plugin-api" ) );
final BooleanQuery query = new BooleanQuery.Builder()
.add( groupIdQ, Occur.MUST )
@@ -262,7 +261,7 @@ public class BasicUsageExample
};
System.out.println(
- "Searching for all GAVs with G=org.sonatype.nexus and nexus-api and having V greater than 1.5.0" );
+ "Searching for all GAVs with org.apache.maven:maven-plugin-api having V greater than 3.1.0" );
final IteratorSearchRequest request =
new IteratorSearchRequest( query, Collections.singletonList( centralContext ), versionFilter );
final IteratorSearchResponse response = indexer.searchIterator( request );
@@ -276,23 +275,23 @@ public class BasicUsageExample
// Searching for some artifact
Query gidQ =
indexer.constructQuery( MAVEN.GROUP_ID, new SourcedSearchExpression( "org.apache.maven.indexer" ) );
- Query aidQ = indexer.constructQuery( MAVEN.ARTIFACT_ID, new SourcedSearchExpression( "indexer-artifact" ) );
+ Query aidQ = indexer.constructQuery( MAVEN.ARTIFACT_ID, new SourcedSearchExpression( "indexer-core" ) );
BooleanQuery bq = new BooleanQuery.Builder()
.add( gidQ, Occur.MUST )
.add( aidQ, Occur.MUST )
.build();
- searchAndDump( indexer, "all artifacts under GA org.apache.maven.indexer:indexer-artifact", bq );
+ searchAndDump( indexer, "all artifacts under GA org.apache.maven.indexer:indexer-core", bq );
// Searching for some main artifact
bq = new BooleanQuery.Builder()
.add( gidQ, Occur.MUST )
.add( aidQ, Occur.MUST )
-// .add( indexer.constructQuery( MAVEN.CLASSIFIER, new SourcedSearchExpression( "*" ) ), Occur.MUST_NOT )
+ .add( indexer.constructQuery( MAVEN.CLASSIFIER, new SourcedSearchExpression( "*" ) ), Occur.MUST_NOT )
.build();
- searchAndDump( indexer, "main artifacts under GA org.apache.maven.indexer:indexer-artifact", bq );
+ searchAndDump( indexer, "main artifacts under GA org.apache.maven.indexer:indexer-core", bq );
// doing sha1 search
searchAndDump( indexer, "SHA1 7ab67e6b20e5332a7fb4fdf2f019aec4275846c2",
@@ -316,7 +315,7 @@ public class BasicUsageExample
new SourcedSearchExpression( "org.apache.maven.plugins" ) ), Occur.MUST )
.build();
- searchGroupedAndDump( indexer, "all \"canonical\" maven plugins", bq, new GAGrouping() );
+ searchGroupedAndDumpFlat( indexer, "all \"canonical\" maven plugins", bq, new GAGrouping() );
// doing search for all archetypes latest versions
searchGroupedAndDump( indexer, "all maven archetypes (latest versions)",
@@ -347,6 +346,24 @@ public class BasicUsageExample
private static final int MAX_WIDTH = 60;
+ public void searchGroupedAndDumpFlat( Indexer nexusIndexer, String descr, Query q, Grouping g )
+ throws IOException
+ {
+ System.out.println( "Searching for " + descr );
+
+ GroupedSearchResponse response = nexusIndexer.searchGrouped( new GroupedSearchRequest( q, g, centralContext ) );
+
+ for ( Map.Entry<String, ArtifactInfoGroup> entry : response.getResults().entrySet() )
+ {
+ ArtifactInfo ai = entry.getValue().getArtifactInfos().iterator().next();
+ System.out.println( "* " + ai.getGroupId() + ":" + ai.getArtifactId() + ":" + ai.getVersion() );
+ }
+
+ System.out.println( "------" );
+ System.out.println( "Total record hits: " + response.getTotalHitsCount() );
+ System.out.println();
+ }
+
public void searchGroupedAndDump( Indexer nexusIndexer, String descr, Query q, Grouping g )
throws IOException
{
diff --git a/indexer-examples/indexer-examples-basic/src/test/java/org/apache/maven/indexer/examples/BasicUsageExampleTest.java b/indexer-examples/indexer-examples-basic/src/test/java/org/apache/maven/index/examples/BasicUsageExampleTest.java
similarity index 95%
rename from indexer-examples/indexer-examples-basic/src/test/java/org/apache/maven/indexer/examples/BasicUsageExampleTest.java
rename to indexer-examples/indexer-examples-basic/src/test/java/org/apache/maven/index/examples/BasicUsageExampleTest.java
index 30b6d88..13d5dff 100644
--- a/indexer-examples/indexer-examples-basic/src/test/java/org/apache/maven/indexer/examples/BasicUsageExampleTest.java
+++ b/indexer-examples/indexer-examples-basic/src/test/java/org/apache/maven/index/examples/BasicUsageExampleTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples;
+package org.apache.maven.index.examples;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/IndexerConfiguration.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/IndexerConfiguration.java
similarity index 97%
rename from indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/IndexerConfiguration.java
rename to indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/IndexerConfiguration.java
index 2cb0f01..3f399c4 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/IndexerConfiguration.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/IndexerConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples.indexing;
+package org.apache.maven.index.examples.indexing;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexManager.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/RepositoryIndexManager.java
similarity index 98%
rename from indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexManager.java
rename to indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/RepositoryIndexManager.java
index b8627c9..13a34c9 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexManager.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/RepositoryIndexManager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples.indexing;
+package org.apache.maven.index.examples.indexing;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexer.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/RepositoryIndexer.java
similarity index 99%
rename from indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexer.java
rename to indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/RepositoryIndexer.java
index d5a2209..31a6a93 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexer.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/RepositoryIndexer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples.indexing;
+package org.apache.maven.index.examples.indexing;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexerFactory.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/RepositoryIndexerFactory.java
similarity index 98%
rename from indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexerFactory.java
rename to indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/RepositoryIndexerFactory.java
index 40918f4..ad25623 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/RepositoryIndexerFactory.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/RepositoryIndexerFactory.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples.indexing;
+package org.apache.maven.index.examples.indexing;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/SearchRequest.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/SearchRequest.java
similarity index 96%
rename from indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/SearchRequest.java
rename to indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/SearchRequest.java
index 31fd0a6..d3fa840 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/SearchRequest.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/SearchRequest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples.indexing;
+package org.apache.maven.index.examples.indexing;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/SearchResults.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/SearchResults.java
similarity index 96%
rename from indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/SearchResults.java
rename to indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/SearchResults.java
index 2e2f1af..aac77be 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/indexing/SearchResults.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/indexing/SearchResults.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples.indexing;
+package org.apache.maven.index.examples.indexing;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/services/ArtifactIndexingService.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/services/ArtifactIndexingService.java
similarity index 89%
rename from indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/services/ArtifactIndexingService.java
rename to indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/services/ArtifactIndexingService.java
index 5358cca..b15f04e 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/services/ArtifactIndexingService.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/services/ArtifactIndexingService.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples.services;
+package org.apache.maven.index.examples.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,8 @@ package org.apache.maven.indexer.examples.services;
*/
import org.apache.lucene.queryparser.classic.ParseException;
-import org.apache.maven.indexer.examples.indexing.SearchRequest;
-import org.apache.maven.indexer.examples.indexing.SearchResults;
+import org.apache.maven.index.examples.indexing.SearchRequest;
+import org.apache.maven.index.examples.indexing.SearchResults;
import java.io.File;
import java.io.IOException;
diff --git a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/services/impl/ArtifactIndexingServiceImpl.java b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/services/impl/ArtifactIndexingServiceImpl.java
similarity index 93%
rename from indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/services/impl/ArtifactIndexingServiceImpl.java
rename to indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/services/impl/ArtifactIndexingServiceImpl.java
index 5adb1cf..80164d7 100644
--- a/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/indexer/examples/services/impl/ArtifactIndexingServiceImpl.java
+++ b/indexer-examples/indexer-examples-spring/src/main/java/org/apache/maven/index/examples/services/impl/ArtifactIndexingServiceImpl.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples.services.impl;
+package org.apache.maven.index.examples.services.impl;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,11 +21,11 @@ package org.apache.maven.indexer.examples.services.impl;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.maven.index.ArtifactInfo;
-import org.apache.maven.indexer.examples.indexing.RepositoryIndexManager;
-import org.apache.maven.indexer.examples.indexing.RepositoryIndexer;
-import org.apache.maven.indexer.examples.indexing.SearchRequest;
-import org.apache.maven.indexer.examples.indexing.SearchResults;
-import org.apache.maven.indexer.examples.services.ArtifactIndexingService;
+import org.apache.maven.index.examples.indexing.RepositoryIndexManager;
+import org.apache.maven.index.examples.indexing.RepositoryIndexer;
+import org.apache.maven.index.examples.indexing.SearchRequest;
+import org.apache.maven.index.examples.indexing.SearchResults;
+import org.apache.maven.index.examples.services.ArtifactIndexingService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/indexer-examples/indexer-examples-spring/src/main/resources/META-INF/spring/maven-indexer-context.xml b/indexer-examples/indexer-examples-spring/src/main/resources/META-INF/spring/maven-indexer-context.xml
index 2cd5841..21e845b 100644
--- a/indexer-examples/indexer-examples-spring/src/main/resources/META-INF/spring/maven-indexer-context.xml
+++ b/indexer-examples/indexer-examples-spring/src/main/resources/META-INF/spring/maven-indexer-context.xml
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
- <context:component-scan base-package="org.apache.maven.indexer.examples"/>
+ <context:component-scan base-package="org.apache.maven.index.examples"/>
<!-- This context contains the maven-indexer beans and the configuration of the indexing. -->
diff --git a/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/indexer/examples/SimpleArtifactGenerator.java b/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/index/examples/SimpleArtifactGenerator.java
similarity index 99%
rename from indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/indexer/examples/SimpleArtifactGenerator.java
rename to indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/index/examples/SimpleArtifactGenerator.java
index 2c7e60b..1182c18 100644
--- a/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/indexer/examples/SimpleArtifactGenerator.java
+++ b/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/index/examples/SimpleArtifactGenerator.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples;
+package org.apache.maven.index.examples;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/indexer/examples/SpringUsageExampleTest.java b/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/index/examples/SpringUsageExampleTest.java
similarity index 97%
rename from indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/indexer/examples/SpringUsageExampleTest.java
rename to indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/index/examples/SpringUsageExampleTest.java
index 8c055a7..7ebd34d 100644
--- a/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/indexer/examples/SpringUsageExampleTest.java
+++ b/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/index/examples/SpringUsageExampleTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples;
+package org.apache.maven.index.examples;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,9 +26,9 @@ import java.util.Collection;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.maven.index.ArtifactInfo;
-import org.apache.maven.indexer.examples.indexing.SearchRequest;
-import org.apache.maven.indexer.examples.indexing.SearchResults;
-import org.apache.maven.indexer.examples.services.ArtifactIndexingService;
+import org.apache.maven.index.examples.indexing.SearchRequest;
+import org.apache.maven.index.examples.indexing.SearchResults;
+import org.apache.maven.index.examples.services.ArtifactIndexingService;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.junit.Before;
import org.junit.Test;
diff --git a/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/indexer/examples/boot/RepositoryBooter.java b/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/index/examples/boot/RepositoryBooter.java
similarity index 94%
rename from indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/indexer/examples/boot/RepositoryBooter.java
rename to indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/index/examples/boot/RepositoryBooter.java
index aa2bd40..5e2b7a2 100644
--- a/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/indexer/examples/boot/RepositoryBooter.java
+++ b/indexer-examples/indexer-examples-spring/src/test/java/org/apache/maven/index/examples/boot/RepositoryBooter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.indexer.examples.boot;
+package org.apache.maven.index.examples.boot;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +19,9 @@ package org.apache.maven.indexer.examples.boot;
* under the License.
*/
-import org.apache.maven.indexer.examples.indexing.RepositoryIndexManager;
-import org.apache.maven.indexer.examples.indexing.RepositoryIndexer;
-import org.apache.maven.indexer.examples.indexing.RepositoryIndexerFactory;
+import org.apache.maven.index.examples.indexing.RepositoryIndexManager;
+import org.apache.maven.index.examples.indexing.RepositoryIndexer;
+import org.apache.maven.index.examples.indexing.RepositoryIndexerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/indexer-examples/indexer-examples-spring/src/test/resources/META-INF/spring/indexer-examples-context.xml b/indexer-examples/indexer-examples-spring/src/test/resources/META-INF/spring/indexer-examples-context.xml
index e0a2cf7..a51511d 100644
--- a/indexer-examples/indexer-examples-spring/src/test/resources/META-INF/spring/indexer-examples-context.xml
+++ b/indexer-examples/indexer-examples-spring/src/test/resources/META-INF/spring/indexer-examples-context.xml
@@ -24,20 +24,20 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
- <context:component-scan base-package="org.apache.maven.indexer.examples"/>
+ <context:component-scan base-package="org.apache.maven.index.examples"/>
- <bean id="indexerConfiguration" class="org.apache.maven.indexer.examples.indexing.IndexerConfiguration">
+ <bean id="indexerConfiguration" class="org.apache.maven.index.examples.indexing.IndexerConfiguration">
<constructor-arg name="indexer" ref="indexer"/>
<constructor-arg name="indexers" ref="indexers"/>
<constructor-arg name="scanner" ref="scanner"/>
</bean>
- <bean id="repositoryIndexerFactory" class="org.apache.maven.indexer.examples.indexing.RepositoryIndexerFactory"/>
+ <bean id="repositoryIndexerFactory" class="org.apache.maven.index.examples.indexing.RepositoryIndexerFactory"/>
- <bean id="repositoryIndexManager" class="org.apache.maven.indexer.examples.indexing.RepositoryIndexManager"/>
+ <bean id="repositoryIndexManager" class="org.apache.maven.index.examples.indexing.RepositoryIndexManager"/>
- <bean id="artifactIndexingService" class="org.apache.maven.indexer.examples.services.impl.ArtifactIndexingServiceImpl"/>
+ <bean id="artifactIndexingService" class="org.apache.maven.index.examples.services.impl.ArtifactIndexingServiceImpl"/>
- <bean id="repositoryBooter" class="org.apache.maven.indexer.examples.boot.RepositoryBooter"/>
+ <bean id="repositoryBooter" class="org.apache.maven.index.examples.boot.RepositoryBooter"/>
</beans>
diff --git a/indexer-examples/indexer-examples-spring/src/test/resources/logback.xml b/indexer-examples/indexer-examples-spring/src/test/resources/logback.xml
index a27f7b5..0348ce5 100644
--- a/indexer-examples/indexer-examples-spring/src/test/resources/logback.xml
+++ b/indexer-examples/indexer-examples-spring/src/test/resources/logback.xml
@@ -25,8 +25,8 @@
</appender>
<logger name="org.springframework" level="ERROR" />
- <logger name="org.apache.maven.indexer.examples.indexing" level="DEBUG" />
- <logger name="org.apache.maven.indexer.examples.boot" level="ERROR" />
+ <logger name="org.apache.maven.index.examples.indexing" level="DEBUG" />
+ <logger name="org.apache.maven.index.examples.boot" level="ERROR" />
<root level="ERROR">
<appender-ref ref="stdout" />
diff --git a/pom.xml b/pom.xml
index a345e3a..9e8570f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -436,7 +436,7 @@ under the License.
</group>
<group>
<title>Indexer Examples</title>
- <packages>org.apache.maven.indexer.examples*</packages>
+ <packages>org.apache.maven.index.examples*</packages>
</group>
</groups>
</configuration>