You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/07/29 21:30:04 UTC
[maven-indexer] branch MINDEXER-117 updated (4a54f5f -> 1b3d9ce)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MINDEXER-117
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git.
discard 4a54f5f [MINDEXER-117] Integration test for index temporary directory
discard 6c2609f [MINDEXER-117] ability to set index temp directory for index update
add 005bc5e [MINDEXER-118] Eliminate use of deprecated Lucene API - Field
new 044e0d3 [MINDEXER-117] ability to set index temp directory for index update
new 1b3d9ce [MINDEXER-117] Integration test for index temporary directory
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4a54f5f)
\
N -- N -- N refs/heads/MINDEXER-117 (1b3d9ce)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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.
Summary of changes:
.../org/apache/maven/index/ArtifactContext.java | 9 +--
.../org/apache/maven/index/ArtifactInfoRecord.java | 8 +-
.../apache/maven/index/DefaultIndexerEngine.java | 8 +-
.../java/org/apache/maven/index/IndexerField.java | 90 ++++++++++------------
.../org/apache/maven/index/OneLineFragmenter.java | 11 ---
.../index/context/DefaultIndexingContext.java | 14 ++--
.../org/apache/maven/index/context/IndexUtils.java | 8 +-
.../index/creator/JarFileContentsIndexCreator.java | 6 +-
.../MavenPluginArtifactInfoIndexCreator.java | 6 +-
.../creator/MinimalArtifactInfoIndexCreator.java | 39 +++++-----
.../index/creator/OsgiArtifactIndexCreator.java | 41 +++++-----
.../maven/index/updater/IndexDataReader.java | 21 +++--
.../maven/index/updater/IndexDataWriter.java | 19 ++---
13 files changed, 125 insertions(+), 155 deletions(-)
[maven-indexer] 01/02: [MINDEXER-117] ability to set index temp
directory for index update
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MINDEXER-117
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit 044e0d33ca42f53ec4236495b0099e393350bdba
Author: Przemyslaw Fusik <pr...@gmail.com>
AuthorDate: Thu Feb 1 22:46:55 2018 +0100
[MINDEXER-117] ability to set index temp directory for index update
Closes #26
---
.../apache/maven/index/updater/DefaultIndexUpdater.java | 6 +++++-
.../org/apache/maven/index/updater/IndexUpdateRequest.java | 14 +++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java b/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
index 38c8d0d..bcab914 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/updater/DefaultIndexUpdater.java
@@ -186,7 +186,11 @@ public class DefaultIndexUpdater
final boolean merge, final String remoteIndexFile )
throws IOException
{
- File indexDir = File.createTempFile( remoteIndexFile, ".dir" );
+ if ( updateRequest.getIndexTempDir() != null )
+ {
+ updateRequest.getIndexTempDir().mkdirs();
+ }
+ File indexDir = File.createTempFile( remoteIndexFile, ".dir" , updateRequest.getIndexTempDir() );
indexDir.delete();
indexDir.mkdirs();
diff --git a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexUpdateRequest.java b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexUpdateRequest.java
index 9b4e7e3..8dfbe9a 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/updater/IndexUpdateRequest.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/updater/IndexUpdateRequest.java
@@ -43,6 +43,8 @@ public class IndexUpdateRequest
private boolean incrementalOnly;
+ private File indexTempDir;
+
private File localIndexCacheDir;
private Locker locker;
@@ -153,4 +155,14 @@ public class IndexUpdateRequest
{
return directoryFactory != null ? directoryFactory : FSDirectoryFactory.DEFAULT;
}
-}
\ No newline at end of file
+
+ public void setIndexTempDir( File indexTempDir )
+ {
+ this.indexTempDir = indexTempDir;
+ }
+
+ public File getIndexTempDir()
+ {
+ return indexTempDir;
+ }
+}
[maven-indexer] 02/02: [MINDEXER-117] Integration test for index
temporary directory
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MINDEXER-117
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
commit 1b3d9ce615795d223e298f18153dbcccacbd6dd5
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat May 11 14:53:23 2019 +0200
[MINDEXER-117] Integration test for index temporary directory
---
.../updater/DefaultIndexUpdaterEmbeddingIT.java | 40 ++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java b/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
index 83f719d..b1161b4 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterEmbeddingIT.java
@@ -119,6 +119,46 @@ public class DefaultIndexUpdaterEmbeddingIT
}
}
+ public void testIndexTempDirB()
+ throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
+ {
+ File basedir = Files.createTempDirectory( "nexus-indexer." ).toFile();
+ basedir.delete();
+ basedir.mkdirs();
+
+ File indexTempDir = Files.createTempDirectory("index-temp" ).toFile();
+ indexTempDir.delete();
+ // temp dir should not exists
+ assertFalse( indexTempDir.exists());
+
+ try
+ {
+ IndexingContext ctx = newTestContext( basedir, baseUrl );
+
+ IndexUpdateRequest updateRequest =
+ new IndexUpdateRequest( ctx, wagonHelper.getWagonResourceFetcher( new TransferListenerFixture(), null,
+ null ) );
+ updateRequest.setIndexTempDir( indexTempDir );
+
+ updater.fetchAndUpdateIndex( updateRequest );
+
+ // dir should still exists after retrival
+ assertTrue( indexTempDir.exists() );
+ indexTempDir.delete();
+ ctx.close( false );
+ }
+ finally
+ {
+ try
+ {
+ FileUtils.forceDelete( basedir );
+ }
+ catch ( IOException e )
+ {
+ }
+ }
+ }
+
public void testBasicAuthenticatedIndexRetrieval()
throws IOException, UnsupportedExistingLuceneIndexException, ComponentLookupException
{