You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2017/08/19 11:40:50 UTC
[10/31] archiva git commit: more progress on new maven indexer version
more progress on new maven indexer version
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/003d5794
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/003d5794
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/003d5794
Branch: refs/heads/master
Commit: 003d5794a823d57b58ec26663fe145f31649ce31
Parents: 7480b7f
Author: olivier lamy <ol...@apache.org>
Authored: Mon Jul 24 10:12:23 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Mon Jul 24 10:12:23 2017 +1000
----------------------------------------------------------------------
.../lucene/NexusIndexerConsumerTest.java | 14 +-
.../search/MavenRepositorySearchTest.java | 23 +-
.../src/test/repo-release/.index/_7.fdt | Bin 358889 -> 0 bytes
.../src/test/repo-release/.index/_7.fdx | Bin 3324 -> 0 bytes
.../src/test/repo-release/.index/_7.fnm | 5 -
.../src/test/repo-release/.index/_7.frq | 262 -------------------
.../src/test/repo-release/.index/_7.nrm | 1 -
.../src/test/repo-release/.index/_7.prx | Bin 48973 -> 0 bytes
.../src/test/repo-release/.index/_7.tii | Bin 852 -> 0 bytes
.../src/test/repo-release/.index/_7.tis | Bin 67003 -> 0 bytes
.../src/test/repo-release/.index/_8.fdt | Bin 0 -> 86211 bytes
.../src/test/repo-release/.index/_8.fdx | Bin 0 -> 114 bytes
.../src/test/repo-release/.index/_8.fnm | Bin 0 -> 2157 bytes
.../src/test/repo-release/.index/_8.nvd | Bin 0 -> 2330 bytes
.../src/test/repo-release/.index/_8.nvm | Bin 0 -> 261 bytes
.../src/test/repo-release/.index/_8.si | Bin 0 -> 371 bytes
.../test/repo-release/.index/_8_Lucene41_0.doc | Bin 0 -> 21619 bytes
.../test/repo-release/.index/_8_Lucene41_0.pos | Bin 0 -> 40037 bytes
.../test/repo-release/.index/_8_Lucene41_0.tim | Bin 0 -> 91607 bytes
.../test/repo-release/.index/_8_Lucene41_0.tip | Bin 0 -> 1250 bytes
.../src/test/repo-release/.index/segments.gen | Bin 20 -> 36 bytes
.../src/test/repo-release/.index/segments_8 | Bin 279 -> 0 bytes
.../src/test/repo-release/.index/segments_9 | Bin 0 -> 102 bytes
.../indexing/ArchivaIndexingTaskExecutor.java | 13 +-
.../indexing/ArtifactIndexingTask.java | 8 +-
.../DefaultDownloadRemoteIndexScheduler.java | 29 +-
.../indexing/DefaultIndexUpdateSideEffect.java | 47 ++++
.../indexing/DownloadRemoteIndexTask.java | 27 +-
.../ArchivaIndexingTaskExecutorTest.java | 91 +++----
.../indexing/DownloadRemoteIndexTaskTest.java | 7 +-
.../archiva/web/startup/ArchivaStartup.java | 12 +-
.../archiva-web/archiva-webdav/pom.xml | 4 +
.../plugins/maven2-repository/pom.xml | 2 +-
.../plugins/metadata-store-jcr/pom.xml | 7 +-
.../jcr/JcrRepositorySessionFactory.java | 8 +-
.../META-INF/spring-context.xml | 4 +-
pom.xml | 34 ++-
37 files changed, 180 insertions(+), 418 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
index 5ce2781..b5e688b 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
@@ -23,13 +23,14 @@ import junit.framework.TestCase;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.FileTypes;
+import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
+import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
-import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
+import org.apache.maven.index.NexusIndexer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +46,6 @@ import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
/**
* NexusIndexerConsumerTest
@@ -58,7 +58,7 @@ public class NexusIndexerConsumerTest
private final class ArchivaTaskSchedulerStub
implements ArchivaTaskScheduler<ArtifactIndexingTask>
{
- Set<File> indexed = new HashSet<File>();
+ Set<File> indexed = new HashSet<>();
@Override
public void queueTask( ArtifactIndexingTask task )
@@ -96,7 +96,7 @@ public class NexusIndexerConsumerTest
private ApplicationContext applicationContext;
@Inject
- private PlexusSisuBridge plexusSisuBridge;
+ private NexusIndexer nexusIndexer;
@Inject
private MavenIndexerUtils mavenIndexerUtils;
@@ -119,8 +119,8 @@ public class NexusIndexerConsumerTest
FileTypes filetypes = applicationContext.getBean( FileTypes.class );
nexusIndexerConsumer =
- new NexusIndexerConsumer( scheduler, configuration, filetypes, plexusSisuBridge, mavenIndexerUtils,
- managedRepositoryAdmin );
+ new NexusIndexerConsumer( scheduler, configuration, filetypes, mavenIndexerUtils,
+ managedRepositoryAdmin, nexusIndexer );
// initialize to set the file types to be processed
( (NexusIndexerConsumer) nexusIndexerConsumer ).initialize();
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
index 4b0d993..8fb3728 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/MavenRepositorySearchTest.java
@@ -22,6 +22,7 @@ package org.apache.archiva.indexer.search;
import org.apache.archiva.common.utils.FileUtil;
import org.apache.archiva.indexer.util.SearchUtil;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
+import org.apache.maven.index.shaded.lucene.index.IndexUpgrader;
import org.codehaus.plexus.util.FileUtils;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -29,10 +30,7 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -40,8 +38,8 @@ import java.util.Collections;
import java.util.List;
-@RunWith(ArchivaSpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" })
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class MavenRepositorySearchTest
extends AbstractMavenRepositorySearch
{
@@ -290,13 +288,13 @@ public class MavenRepositorySearchTest
archivaConfigControl.replay();
- SearchResults results = search.search( "user", selectedRepos, "org", limits, Collections.<String>emptyList() );
+ SearchResults results = search.search( "user", selectedRepos, "org", limits, Collections.emptyList() );
archivaConfigControl.verify();
assertNotNull( results );
assertEquals( 1, results.getHits().size() );
- assertEquals( "total hits not 8 for page1 " + results, 8, results.getTotalHits() );
+ assertEquals( "total hits not 9 for page1 " + results, 9, results.getTotalHits() );
assertEquals( "returned hits not 1 for page1 " + results, 1, results.getReturnedHitsCount() );
assertEquals( limits, results.getLimits() );
@@ -317,7 +315,7 @@ public class MavenRepositorySearchTest
assertNotNull( results );
assertEquals( "hits not 1", 1, results.getHits().size() );
- assertEquals( "total hits not 8 for page 2 " + results, 8, results.getTotalHits() );
+ assertEquals( "total hits not 9 for page 2 " + results, 9, results.getTotalHits() );
assertEquals( "returned hits not 1 for page2 " + results, 1, results.getReturnedHitsCount() );
assertEquals( limits, results.getLimits() );
}
@@ -873,7 +871,9 @@ public class MavenRepositorySearchTest
File indexDirectory = new File( repo, ".index" );
FileUtils.copyDirectoryStructure( new File( "src/test/repo-release" ), repo );
- createIndex( "repo-release", Collections.<File>emptyList(), false );
+ IndexUpgrader.main( new String[]{indexDirectory.getAbsolutePath()} );
+
+ createIndex( "repo-release", Collections.emptyList(), false );
nexusIndexer.addIndexingContext( REPO_RELEASE, REPO_RELEASE, repo, indexDirectory,
repo.toURI().toURL().toExternalForm(),
@@ -886,8 +886,9 @@ public class MavenRepositorySearchTest
archivaConfigControl.replay();
- SearchResults searchResults = search.search( null, Arrays.asList( REPO_RELEASE ), "org.example", limits,
- Collections.<String>emptyList() );
+ SearchResults searchResults = search.search( null, Arrays.asList( REPO_RELEASE ), //
+ "org.example", limits, //
+ Collections.emptyList() );
log.info( "results: {}", searchResults.getHits().size() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdt
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdt b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdt
deleted file mode 100644
index 9c708ca..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdx
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdx b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdx
deleted file mode 100644
index 9c6ebd9..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fdx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fnm
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fnm b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fnm
deleted file mode 100644
index b57e721..0000000
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.fnm
+++ /dev/null
@@ -1,5 +0,0 @@
-����
-DESCRIPTORIDXINFOumigavgroupId
-artifactIdversionp1c
-classnamesBundle-SymbolicNameBundle-VersionExport-PackageExport-Service Bundle-NameImport-PackageRequire-Bundle
-rootGroupsrootGroupsList allGroups
allGroupsList
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.frq
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.frq b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.frq
deleted file mode 100644
index d966170..0000000
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.frq
+++ /dev/null
@@ -1,262 +0,0 @@
-���Y�%��5��������yq����u�W�
������������������I�����������������_�����#��s���������������+�������������1?�������;w��������������������������i��g��K!�)������U�����������������A�3�������'�{���������������������9���������������m�������������������������=��Q��e���������������
���}�����������7 E������������������M�k�������������-�����������/������GO���]��c�����o��C������������ �[� ���� �S������������������ �� 1e �K^X�������� 1e �K^X�� ���������������������������������������������������������������������������������
���� ��� ����������{�����si_[W��OIC;3+# %
7/ 1
3
1u� %
7
J]9$/@�� �� 1e �K^X�������� 1e �K^X�� �����������������������������������1�W������������������������������������������������������� ���
����������{�����si_[�W# 5
'>"7,%%*(��OIC;3+#
-
A�
)
`L
/ +
)
1YO�
'G?+ (,<�
3 )(( ! !1
7A�
9
|� %
7/ 1
3
1u�
7
9MF$#5:!1
7A�
9
|� %
7/ 1
3
1u� %
7
J]9$/@�� 9 �`� t(6� I* P� E
=
9SV*64� u77�*�� u77�*�� t.6� K* P� H�������
���s�r���'%
_%
=
�eI�� �s���� u77�*������������a� u17�*�
-
<
9-S%V*6 4r��'1_% = �{I���������������� u77�*�����1�W�� '$
_%
=
; ( tl M* `i:� u77�*������������������������������������������������
=
9SV*64�r�����������������
��s'1_%
=
�{I�
=
�
#
1Bn��
=
9SV*64W'1_%
=
�{I�
!
3
.%(*$ "# ��OI;3#
=
9SV*64� u77�*�'$
_%
=
�dI�
-&0^$ < :!7!� \*~�� 9 �
3 )(( ! ���������� �������������
3� - -$(q 1���������������
3 )(( ! ��������
����� u75� X������������������������������������
3 )(( ! �������������������s
3 )(( !
3
)(( ! W
3 )(( ! ��OI;3# � ## ### t 6 4 � � �X � 1e 9(&4>h0 P L
-
- 1e
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9(
-
-
-
-
-
-&
-
-4
-
-
-
-
-
-
-
-
-
->!h0 � �P L � 1e 9(&4> h0 r �P dL r�� u75� X�
Y�t64� x �X ��
=
9SV * 64 � qW��V���
��W���� u77� * � �� '1_%
=
!!�N 'XV�Z8���
F
-
-
-
-
-
-
-
-
-
4
-
-
c
4
-
-
d �%m#� / � �! � �% �"�
3 )(( ! W��������0 > r� "> 1� 2����V������V��1 ?
s�!
u
� ! ?
s#!
!
z\ 6 Z "�W��� u15� X �W�[9���W���� u/5� X��1 ?
s�
!
#?
1��
- <
9 5S H � �' �1 J< yW�[?����V�q(W�� 1e �C ^XW�[?�V�Z01 ?
s�
!
"?
1� 1 ?
s�
!
""
0 � W�[?0 > r� "R � -�
> r 4 1 z c^$ P2F.�I� $ 9A
1)
� �!W�[?W�[?�V�Z>0 > r� 9< � <V��W��W�[?����V�Z8� 1e �K^X�W�Z?W���V �Z
-� � ! /!!, $r!4W���V�Z>PW�[?�
-
-
-
-
- ,(
-
- !
-
- !9!(,d 8$V 1"./9+:W�����y
7?1 ?
s�!
#S
1��W����W���� � �W��
=
9 S.V * 6!4$
- < 9 4S :V >* @6 84 =1 ?
s�!
[
� V
-�
-Z>
-�W�[?�W�[?�����W�[?0 " r� #+ � -�W��� 1e 6
Y=K^XV�Z9�W��Q�W�Z?���s�+W0 > r� t 0
� .1 ?
s�
!
#>
1��� ) !�� �� u /7� * � ��9����D� A)� %o W��V����������0W�Z?W���9W�Z9Q�0 > rG� "# 0� J0 > rF� a � <�W�[>Q���pD � 4A+ )� V"J7W�������1 ?
s�!
"S
0�W� k/W��
=
9 SV * 6 4&W����V����W���
-
- /
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-&
-
-
-
-
-
-J
- &
-
-
-
-
-
-
-
-
-
-# v� C � � .! j � � � t � q �1 ?
s�!
u
� ��r�t1 ?
s�!
u
� V��W��V��W�[?�W�Z?V
-�
-�
-W���� �W�[?V� dZ>W��W�� 1e �K^X��W��V���W �[�1 ?
s�!
#S
� W�Z8� '1_% = ; 0 �N B X ���1�W��W��s���9� u17� * �!W�[?W��������
! ?
s 4
!
1
z"^ P"H!W�[?�V�j.� u17� * �
-
-
-
-
-
-
-
-
-%+ $ $ %+# �1 ?
s�!
u
� W�[?���V��W�Z?�V���1 ?
s�
!
a
� ����
-���E� 5A1)� VJ�������V��� ����V��W�� )
=
5
?k, =CV�Z(Q1 ?
s�
!
" (
0���W�Z?�V��W�����W�[?�1
- 11�
- 111111111120 �111�%2�11[ �)!�( � �( c' �* � �!!�"!�!� � �
-
-
-
-
-
-
-
n
-
-�
- n
-
-- � �%�#� 6J � �! � �% �"�� 1e (
(=h/ * 0' (C+W�����W��W��W����
=
9SV*64��W����V��V������� t06� -* 1� 4W���W��W��W���r�t�V��������V�Z>Q�����W�[)�W��1
- 11�
- 111111111120 �111�%2�11[ �)!�( � �( c' �* � �!!�"!�!� ��V�[>���
3 )(( ! �r�ue�V�Z0QW�������
=
9SV * 64'�0 > r� "R 0� .�
! % @B/9#! $!5B..��V���V�[> 1e
9) '5>h0 P J$�
]0 > r� "8 0� !���� u 5� X �
-
- 2 $* &( & &( # 3 %% ! "��W�[?Q�
=
9SH '1 :%�V��V � Z>
=
9SV*641 ?
s�
!
#(
1����'1_%
=
�{I� )
I �
")
0j��
=
9 S$V * 6 45V�Z>V�Z8
3 )(( ! W�[9 1e
9) '7>h: * |W�Z9W�Z9�V����V���1 ?
s�
!
"8
�#��W�Z?Q
<
� " 0B n '� 0�1 ?
s�
!
")
� 1 ?
s�!
9=
� W��
=
9SV * 64 ���W�����W�[9Q�1 ?
s�
!
"(
0�)W�[?W�� 1e �C ^X���V����
-
- 1e
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9(
-
-
-
-
-
-&
-
-4
-
-
-
-
-
-
-
-
-
->!h0 � �P L �� u15� X
=
9SV * 64 ��W��W��W�������
- & '" ( + �0 > r� t 0
-� [� 1 ?
s�!
u
� �[?��V��1 ?
s�!
u
� , RM 0 T W ' I [ m U N � C hW�Z
-?��V���D� 4A)�!* �'W���V���t 1e �K^X
-
-
-
-
-
-
- 9
-
-
-
-% !!/ * + @ -!u 1e �K^X
� ' /($/�@ "
-
-
-
-2�
-
-6
-
-.D8 / � �t64� X u 1e �K^X 1e �K^X 1e
9)'5>h0 PL
� ' /($/�@ #
3� 7 /D8/�uu %
5�
7
/S1�Jutu 1e �K^X
-
-
-
-
-
-
-
- 8
-
-
-
-% .! :/ 3 . ; @ +-' 1e �K^Xuut
-0d �J^ X "
-
-
-
-2�
-
-6
-
-.D 8 / � u
-0d �J^ -X 0�������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
�������������{wsoica_][YWUOIC=;93-+)#
��� �� 1e �K^X��
������ 1e �K^X�� ��
! !
,%'+," ( (������������������������������������������������������������������������������
������������������w�����oca]YU��OI=9-)# ��������������������W��������������������������������SM7'!���������������������������������������uQK5% ���������������������� ������������������������������������������������������������������
������������������������������������������������������sOI;3#
3 )(( ! !1
7A�
9
|� %
7/ 1
3
1u�
7
9MF$ # 5:!1
7A�
9
|� %
7/ 1
3
1u� %
7
J]9 $ /@��8�����������
-��������������������������������0�W����������������������������������������������������������������~����r�� u77� XV
!
3 .%
(*$ "# ��NH:2" ���0���0
���0 a
! !
,%'+," ( (������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
�������������������������������������������������������������������������������������������������������������������}{ywqousmkigeca_][YUWSQOMKIGECA?=9;1/-753+)'%#!
;�% A80� ){%% 1;70tI�
*(/
' ���0
;�%
A80� ){%% 1;70tI
*(/ (
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.nrm
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.nrm b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.nrm
deleted file mode 100644
index 6579c29..0000000
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.nrm
+++ /dev/null
@@ -1 +0,0 @@
-NRM�|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy|||xx||||y|y|yyxx||||||yxyyy|||y|yyyxxx||||||y|yxyx|yyyxxxyy||yyxx||||||yxyyy|||y|yyy|||yyy|||yyyxxxyyy|||yyy|||y|y|||||||yyy|||yyy|||yyy|||yyy|||xxxxxxyyyxxxxxxxxxyyyxxxyyy|||yyy|||yyxxyy||y|y|y|y|y|y|y|y|y|yyy|||y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|xyxyxyy|yy||yy||yy||yy||y|y|y|y|y|yx||y|yyyxxx||||||yyy|||yyy|||y|y|y|y|y|y|yy||yyxxyy||y|||||yy||y|yy||yy||y|||||||yyy|||yyy|||xyxyxyxyxyxyxyxyxyy|xyy|||xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxyxyxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||y|y||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||y|y|y|y|y|y|y|y|y|||y|||y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|y|||||||||||||||||||||||||||||||||||||||||||||||||||||||||y|y|y|y|y|y||||||||||||||||||||||||||y||||||||||||||||||||||||||y|y|y|y|y|y|y|y|y|y|||||||uvvvv|u|u||||vvvvvv|||||vvv|v||||||vvvvvv|w|||||||||||||vv||||vvvvvv|||||vvv|v|||vvv|||vvv|||||||||vvv|||vvv|v|vvvvvvv|||vvv|||vvvuuuvvvuuuvvv||||||||||||||||||||||||uuuvvvuuuvvv||||||vv|t|t|t|t|u|u|u|u|u|||tvv|t|t|t|t|t|t|t|t|t|t|t|t|t|t|u|u|t|t|t|t|t|t|t|t|t|t|t|t|t||vv||vv||vv||vv|v|w|v|v|v||vv|v||||||vvvvvv|||vvv|||vvv|t|t|t|t|t|t||wv||||||vv|vvvvv||wv|v||uv||vv|vvvvvvv|||vvv|||vvv|t|t|t|t|t|t|t|t|t|t|uu||
||wxxxx|y|y||xxxx|xx||x|||xx||x|||xxxxx|xx||y|x|x||||xxx||xx||xxxx|xx||x|||xx||x|||xx||||xx||||xxx|||xx||||xx||x|xxx|xx||||xx||||xx|xxyxx|xxyxx||||xxx|||xxx|||xxx|||xxxxxyxx|xxyxx|||xx||xx|x|x|x|x|y|y|y|y|y|||xx||x|x|x|x|x|x|x|x|x|x|x|x|x|x|y|y|x|x|x|x|x|x|x|x|x|x|x|x|x||xx||xx||xx||xx|x|y|x|x|x|xxx|x|||xxxxx|xx||||xx||||xx||x|x|x|x|x|x||yx||xx||xx|xx|x|||y||x||yx||xx|xxx|xx||||xx||||xx||x|x|x|x|x|x|x|x|x|x|xx||||xxxxx|x|x||xxxyxxyx|x|||xxx|x|||xxxxyxxyx|x|x|x||||xxx||xx||xxxyxxyx|x|||xxx|x|||xxx|||xxx|||xxx|||xxx|||xxx|x|xxyxxyx|||xxx|||xxxyyxxyxyyxxyx|||xxx|||xxx|||xxx|||xxxyyxxyxyyxxyx||xx||xx|x|x|x|x|x|x|x|x|x|||xyx|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x|x||xx||xx||xx||xx|x|x|x|x|x|xxx|x|||xxxxyxxyx|||xxx|||xxx|x|x|x|x|x|x||xy||xx||xx|xyxyx||xx|x||xy||xx|xxyxxyx|||xxx|||xxx|x|x|x|x|x|x|x|x|x|x|xy||||trrrr|q|q||||rwwrww|||||tww|t||||||rwwrww|u|||||||||||||qw||||rwwrww|||||tww|t|||tww|||tww|||||||||tww|||tww|t|trwwrww|||tww|||twwvvvrwwvvvrww|||||||||||||||||||||||
|vvvrwwvvvrww||||||tw|q|q|q|q|x|x|x|x|x|||qww|q|q|q|q|q|q|q|q|w|w|w|w|w|q|q|q|q|q|q|q|q|q|q|q|q|q|q|q|q||tw||tw||tw||tw|t|u|t|t|t||rr|t||||||rwwrww|||tww|||tww|q|q|q|q|q|q||tt||||||tw|twwww||xw|q||qw||tw|trwwrww|||tww|||tww|q|q|q|q|q|q|q|q|q|q|rv||||uuuuu|u|u||||uuuuuu|||||uuu|u||||||uuuuuu|u|||||||||||||uu||||uuuuuu|||||uuu|u|||uuu|||uuu|||||||||uuu|||uuu|u|uuuuuuu|||uuu|||uuuuuuuuuuuuuuu||||||||||||||||||||||||uuuuuuuuuuuu||||||uu|u|u|u|u|u|u|u|u|u|||uuu|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u|u||uu||uu||uu||uu|u|u|u|u|u||uu|u||||||uuuuuu|||uuu|||uuu|u|u|u|u|u|u||uu||||||uu|uuuuu||uu|u||uu||uu|uuuuuuu|||uuu|||uuu|u|u|u|u|u|u|u|u|u|u|uu||||x||||||||||xx|||||||x|||||||||||xxx|||||||||x|x||||xxx||||||xx|||||||x|||||||||||||||||||||||xxx||||||||||||||||||||||||||||||||||yyy|||yyy||||||xxx|||xxx|||xxx|||xxxyyy|||yyy|||||xx|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||y|y|y|||||||||||||||||||||||||||||x|||||||xxx||||||||||||||||||||||||||
||||||||||xx|||||||||||||||||||||||||||||||||||||||||||||y|y|y|y|y|y|y|y|y|||yy||||knnnn|l|l||rrnrtnrt|r|||krt|k|||rrrnrtnrt|g|r|r||||rrr||mr||rrnrtnrt|r|||krt|k|||krt|||krt|||rrr|||krt|||krt|k|knrtnrt|||krt|||krtrrtnrtrrtnrt|||rrr|||rrr|||rrr|||rrrrrtnrtrrtnrt||rr||kr|l|l|l|l|m|m|m|m|m|||lmm|l|l|l|l|l|l|l|l|m|m|m|m|m|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l||mr||mr||mr||mr|m|m|n|n|g|rnn|k|||rrrnrtnrt|||krt|||krt|l|l|l|l|l|l||eo||rr||mr|lrtrt||tt|m||lm||kr|gnrtnrt|||krt|||krt|l|l|l|l|l|l|l|l|l|l|ir||||||||||w|w||ss|tt|tu|s||||tt|||||sss|tt|tu|||s|s||||sss|||p||ss|tt|tu|s||||tt||||||tt||||tt|||sss||||tt||||tt|||||tt|tu||||tt||||ttttt|ttttu|tu|||sss|||sss|||sss|||sssttt|ttttu|tu||ss|||t|w|w|w|w|w|w|w|w|w|||www|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|w|||||||||||||||||||||||||||s|||||||sss|tt|tu||||tt||||tt|w|w|w|w|w|w||||||ss||||||tttu||tt||||ww|||||||tt|tu||||tt||||tt|w|w|w|w|w|w|w|w|w|w||s||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.prx
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.prx b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.prx
deleted file mode 100644
index 601fb22..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.prx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tii
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tii b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tii
deleted file mode 100644
index 52941c7..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tii and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tis
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tis b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tis
deleted file mode 100644
index d018fa6..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_7.tis and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdt
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdt b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdt
new file mode 100644
index 0000000..9ab6d4d
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdt differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdx
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdx b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdx
new file mode 100644
index 0000000..a26fbfa
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fdx differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fnm
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fnm b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fnm
new file mode 100644
index 0000000..b9f9243
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.fnm differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvd
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvd b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvd
new file mode 100644
index 0000000..d832c2f
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvd differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvm
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvm b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvm
new file mode 100644
index 0000000..a27cff8
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.nvm differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.si
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.si b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.si
new file mode 100644
index 0000000..2539c76
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8.si differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc
new file mode 100644
index 0000000..0a2394b
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.doc differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos
new file mode 100644
index 0000000..4d9bbaa
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.pos differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim
new file mode 100644
index 0000000..ac84752
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tim differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip
new file mode 100644
index 0000000..d94d9c9
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/_8_Lucene41_0.tip differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments.gen
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments.gen b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments.gen
index e76c903..077a451 100644
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments.gen and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments.gen differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_8
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_8 b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_8
deleted file mode 100644
index 8d4ef95..0000000
Binary files a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_8 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_9
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_9 b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_9
new file mode 100644
index 0000000..a01b84f
Binary files /dev/null and b/archiva-modules/archiva-base/archiva-indexer/src/test/repo-release/.index/segments_9 differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
index 478473e..67d05d1 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
@@ -51,7 +51,7 @@ import java.io.IOException;
* all performed by this executor. Add and update artifact in index tasks are added in the indexing task queue by the
* NexusIndexerConsumer while remove artifact from index tasks are added by the LuceneCleanupRemoveIndexedConsumer.
*/
-@Service ( "taskExecutor#indexing" )
+@Service( "taskExecutor#indexing" )
public class ArchivaIndexingTaskExecutor
implements TaskExecutor
{
@@ -112,9 +112,10 @@ public class ArchivaIndexingTaskExecutor
{
try
{
- log.debug( "Creating indexing context on resource: {}", ( indexingTask.getResourceFile() == null
- ? "none"
- : indexingTask.getResourceFile().getPath() ) );
+ log.debug( "Creating indexing context on resource: {}", //
+ ( indexingTask.getResourceFile() == null
+ ? "none"
+ : indexingTask.getResourceFile().getPath() ) );
context = managedRepositoryAdmin.createIndexContext( repository );
}
catch ( RepositoryAdminException e )
@@ -233,8 +234,10 @@ public class ArchivaIndexingTaskExecutor
{
IndexPackingRequest request = new IndexPackingRequest( context, //
- context.acquireIndexSearcher().getIndexReader(), //
+ context.acquireIndexSearcher().getIndexReader(),
+ //
context.getIndexDirectoryFile() );
+
indexPacker.packIndex( request );
context.updateTimestamp( true );
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
index 0029bc0..2da5ab7 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
@@ -20,8 +20,8 @@ package org.apache.archiva.scheduler.indexing;
*/
import org.apache.archiva.admin.model.beans.ManagedRepository;
-import org.apache.maven.index.context.IndexingContext;
import org.apache.archiva.redback.components.taskqueue.Task;
+import org.apache.maven.index.context.IndexingContext;
import java.io.File;
@@ -80,7 +80,13 @@ public class ArtifactIndexingTask
public void setExecuteOnEntireRepo( boolean executeOnEntireRepo )
{
+ this.executeOnEntireRepo( executeOnEntireRepo );
+ }
+
+ public ArtifactIndexingTask executeOnEntireRepo( boolean executeOnEntireRepo )
+ {
this.executeOnEntireRepo = executeOnEntireRepo;
+ return this;
}
@Override
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
index 42a6b72..a3930c6 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
@@ -57,7 +57,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
* @author Olivier Lamy
* @since 1.4-M1
*/
-@Service ("downloadRemoteIndexScheduler#default")
+@Service( "downloadRemoteIndexScheduler#default" )
public class DefaultDownloadRemoteIndexScheduler
implements ConfigurationListener, DownloadRemoteIndexScheduler
{
@@ -65,7 +65,7 @@ public class DefaultDownloadRemoteIndexScheduler
private Logger log = LoggerFactory.getLogger( getClass() );
@Inject
- @Named (value = "taskScheduler#indexDownloadRemote")
+ @Named( value = "taskScheduler#indexDownloadRemote" )
private TaskScheduler taskScheduler;
@Inject
@@ -84,15 +84,15 @@ public class DefaultDownloadRemoteIndexScheduler
private NetworkProxyAdmin networkProxyAdmin;
@Inject
- private PlexusSisuBridge plexusSisuBridge;
-
- @Inject
private MavenIndexerUtils mavenIndexerUtils;
+ @Inject
private NexusIndexer nexusIndexer;
+ @Inject
private IndexUpdater indexUpdater;
+ @Inject
private IndexPacker indexPacker;
// store ids about currently running remote download : updated in DownloadRemoteIndexTask
@@ -106,12 +106,6 @@ public class DefaultDownloadRemoteIndexScheduler
archivaConfiguration.addListener( this );
// TODO add indexContexts even if null
- nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class );
-
- indexUpdater = plexusSisuBridge.lookup( IndexUpdater.class );
-
- this.indexPacker = plexusSisuBridge.lookup( IndexPacker.class );
-
for ( RemoteRepository remoteRepository : remoteRepositoryAdmin.getRemoteRepositories() )
{
String contextKey = "remote-" + remoteRepository.getId();
@@ -180,11 +174,14 @@ public class DefaultDownloadRemoteIndexScheduler
}
}
- DownloadRemoteIndexTaskRequest downloadRemoteIndexTaskRequest =
- new DownloadRemoteIndexTaskRequest().setRemoteRepository( remoteRepository ).setNetworkProxy(
- networkProxy ).setFullDownload( fullDownload ).setWagonFactory(
- wagonFactory ).setRemoteRepositoryAdmin( remoteRepositoryAdmin ).setIndexUpdater(
- indexUpdater ).setIndexPacker( this.indexPacker );
+ DownloadRemoteIndexTaskRequest downloadRemoteIndexTaskRequest = new DownloadRemoteIndexTaskRequest() //
+ .setRemoteRepository( remoteRepository ) //
+ .setNetworkProxy( networkProxy ) //
+ .setFullDownload( fullDownload ) //
+ .setWagonFactory( wagonFactory ) //
+ .setRemoteRepositoryAdmin( remoteRepositoryAdmin ) //
+ .setIndexUpdater( indexUpdater ) //
+ .setIndexPacker( this.indexPacker );
if ( now )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java
new file mode 100644
index 0000000..d6a29c9
--- /dev/null
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultIndexUpdateSideEffect.java
@@ -0,0 +1,47 @@
+package org.apache.archiva.scheduler.indexing;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.maven.index.context.IndexingContext;
+import org.apache.maven.index.shaded.lucene.store.Directory;
+import org.apache.maven.index.updater.IndexUpdateSideEffect;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+/**
+ * Not doing much but required at least one implementation
+ *
+ * @since 3.0.0
+ */
+@Service
+public class DefaultIndexUpdateSideEffect
+ implements IndexUpdateSideEffect
+{
+ private static final Logger LOGGER = LoggerFactory.getLogger( DefaultIndexUpdateSideEffect.class );
+
+ @Override
+ public void updateIndex( Directory directory, IndexingContext indexingContext, boolean b )
+ {
+ LOGGER.info( "updating index: {} with directory: {}", //
+ indexingContext.getId(), //
+ directory.toString() );
+ }
+}
http://git-wip-us.apache.org/repos/asf/archiva/blob/003d5794/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
index f8fd42a..436e7bb 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
@@ -196,32 +196,7 @@ public class DownloadRemoteIndexTask
indexingContext.updateTimestamp( true );
}
- catch ( MalformedURLException e )
- {
- log.error( e.getMessage(), e );
- throw new RuntimeException( e.getMessage(), e );
- }
- catch ( WagonFactoryException e )
- {
- log.error( e.getMessage(), e );
- throw new RuntimeException( e.getMessage(), e );
- }
- catch ( ConnectionException e )
- {
- log.error( e.getMessage(), e );
- throw new RuntimeException( e.getMessage(), e );
- }
- catch ( AuthenticationException e )
- {
- log.error( e.getMessage(), e );
- throw new RuntimeException( e.getMessage(), e );
- }
- catch ( IOException e )
- {
- log.error( e.getMessage(), e );
- throw new RuntimeException( e.getMessage(), e );
- }
- catch ( RepositoryAdminException e )
+ catch ( Exception e )
{
log.error( e.getMessage(), e );
throw new RuntimeException( e.getMessage(), e );