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 2014/04/24 03:54:16 UTC
[1/5] git commit: make no limit working back
Repository: archiva
Updated Branches:
refs/heads/master 588f40d0d -> 0c07ad8d5
make no limit working back
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/30d380e6
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/30d380e6
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/30d380e6
Branch: refs/heads/master
Commit: 30d380e6b03aa1016c4ec0ba2df79336cc5e7c81
Parents: 641e049
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 24 11:52:05 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 24 11:52:24 2014 +1000
----------------------------------------------------------------------
.../org/apache/archiva/indexer/search/MavenRepositorySearch.java | 3 ++-
.../apache/archiva/indexer/search/MavenRepositorySearchTest.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/30d380e6/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
index c126fd7..2a41526 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
@@ -274,7 +274,8 @@ public class MavenRepositorySearch
request.setContexts( getIndexingContexts( indexingContextIds ) );
if ( limits != null )
{
- if ( limits.getSelectedPage() < 1 )
+ // we apply limits only when first page asked
+ if ( limits.getSelectedPage() == 0 )
{
request.setCount( limits.getPageSize() * ( Math.max( 1, limits.getSelectedPage() ) ) );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/30d380e6/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 c3c8bfa..4b0d993 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
@@ -879,7 +879,7 @@ public class MavenRepositorySearchTest
repo.toURI().toURL().toExternalForm(),
indexDirectory.toURI().toURL().toString(), search.getAllIndexCreators() );
- SearchResultLimits limits = new SearchResultLimits( 0 );
+ SearchResultLimits limits = new SearchResultLimits( SearchResultLimits.ALL_PAGES );
limits.setPageSize( 300 );
EasyMock.expect( archivaConfig.getConfiguration() ).andReturn( config ).times( 1, 5 );
[5/5] git commit: complete .gitattributes file
Posted by ol...@apache.org.
complete .gitattributes file
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/0c07ad8d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/0c07ad8d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/0c07ad8d
Branch: refs/heads/master
Commit: 0c07ad8d5cf29f15bdb6778d6c3a257d0e88509d
Parents: 30d380e
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 24 11:54:01 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 24 11:54:01 2014 +1000
----------------------------------------------------------------------
.gitattributes | 12 +++++++++++-
.../get-present-timestamped-snapshot-1.0-SNAPSHOT.jar | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/0c07ad8d/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index 6b3097a..ed5a6a7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,11 @@
-*.jar binary
\ No newline at end of file
+*.jar binary
+
+# Auto detect text files and perform LF normalization
+* text=auto
+
+*.java text diff=java
+*.html text diff=html
+*.xml text diff=xml
+*.css text
+*.js text
+*.sql text
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/0c07ad8d/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar b/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
index 0bf1784..df51edd 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/repositories/proxied1/org/apache/maven/test/get-present-timestamped-snapshot/1.0-SNAPSHOT/get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
@@ -1,2 +1,2 @@
-get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
+get-present-timestamped-snapshot-1.0-SNAPSHOT.jar
(proxied 1)
\ No newline at end of file
[2/5] git commit: fix unit test for pagination
Posted by ol...@apache.org.
fix unit test for pagination
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/641e0490
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/641e0490
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/641e0490
Branch: refs/heads/master
Commit: 641e04909f6921be57c0650131f471a8b3e277d3
Parents: c52eb2c
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Apr 24 11:35:35 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 24 11:52:24 2014 +1000
----------------------------------------------------------------------
.../indexer/search/MavenRepositorySearch.java | 39 ++++++++++++++------
.../apache/archiva/indexer/util/SearchUtil.java | 8 ++--
.../search/MavenRepositorySearchTest.java | 22 ++++++-----
3 files changed, 44 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/641e0490/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
index 1968cef..c126fd7 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
@@ -160,8 +160,8 @@ public class MavenRepositorySearch
if ( StringUtils.isNotBlank( searchFields.getArtifactId() ) )
{
q.add( indexer.constructQuery( MAVEN.ARTIFACT_ID,
- new UserInputSearchExpression( searchFields.getArtifactId() ) ),
- Occur.MUST );
+ new UserInputSearchExpression( searchFields.getArtifactId() ) ), Occur.MUST
+ );
}
if ( StringUtils.isNotBlank( searchFields.getVersion() ) )
@@ -187,35 +187,40 @@ public class MavenRepositorySearch
{
q.add( indexer.constructQuery( OSGI.SYMBOLIC_NAME,
new UserInputSearchExpression( searchFields.getBundleSymbolicName() ) ),
- Occur.MUST );
+ Occur.MUST
+ );
}
if ( StringUtils.isNotBlank( searchFields.getBundleVersion() ) )
{
q.add( indexer.constructQuery( OSGI.VERSION,
new UserInputSearchExpression( searchFields.getBundleVersion() ) ),
- Occur.MUST );
+ Occur.MUST
+ );
}
if ( StringUtils.isNotBlank( searchFields.getBundleExportPackage() ) )
{
q.add( indexer.constructQuery( OSGI.EXPORT_PACKAGE,
new UserInputSearchExpression( searchFields.getBundleExportPackage() ) ),
- Occur.MUST );
+ Occur.MUST
+ );
}
if ( StringUtils.isNotBlank( searchFields.getBundleExportService() ) )
{
q.add( indexer.constructQuery( OSGI.EXPORT_SERVICE,
new UserInputSearchExpression( searchFields.getBundleExportService() ) ),
- Occur.MUST );
+ Occur.MUST
+ );
}
if ( StringUtils.isNotBlank( searchFields.getBundleImportPackage() ) )
{
q.add( indexer.constructQuery( OSGI.IMPORT_PACKAGE,
new UserInputSearchExpression( searchFields.getBundleImportPackage() ) ),
- Occur.MUST );
+ Occur.MUST
+ );
}
if ( StringUtils.isNotBlank( searchFields.getBundleName() ) )
@@ -228,21 +233,23 @@ public class MavenRepositorySearch
{
q.add( indexer.constructQuery( OSGI.IMPORT_PACKAGE,
new UserInputSearchExpression( searchFields.getBundleImportPackage() ) ),
- Occur.MUST );
+ Occur.MUST
+ );
}
if ( StringUtils.isNotBlank( searchFields.getBundleRequireBundle() ) )
{
q.add( indexer.constructQuery( OSGI.REQUIRE_BUNDLE,
new UserInputSearchExpression( searchFields.getBundleRequireBundle() ) ),
- Occur.MUST );
+ Occur.MUST
+ );
}
if ( StringUtils.isNotBlank( searchFields.getClassifier() ) )
{
q.add( indexer.constructQuery( MAVEN.CLASSIFIER,
- new UserInputSearchExpression( searchFields.getClassifier() ) ),
- Occur.MUST );
+ new UserInputSearchExpression( searchFields.getClassifier() ) ), Occur.MUST
+ );
}
if ( q.getClauses() == null || q.getClauses().length <= 0 )
@@ -265,7 +272,13 @@ public class MavenRepositorySearch
FlatSearchRequest request = new FlatSearchRequest( q );
request.setContexts( getIndexingContexts( indexingContextIds ) );
- request.setCount(limits.getPageSize()*(Math.max(1, limits.getSelectedPage())));
+ if ( limits != null )
+ {
+ if ( limits.getSelectedPage() < 1 )
+ {
+ request.setCount( limits.getPageSize() * ( Math.max( 1, limits.getSelectedPage() ) ) );
+ }
+ }
FlatSearchResponse response = indexer.searchFlat( request );
@@ -627,6 +640,8 @@ public class MavenRepositorySearch
SearchResultLimits limits = results.getLimits();
SearchResults paginated = new SearchResults();
+ // ( limits.getPageSize() * ( Math.max( 1, limits.getSelectedPage() ) ) );
+
int fetchCount = limits.getPageSize();
int offset = ( limits.getSelectedPage() * limits.getPageSize() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/641e0490/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java
index bdb4de4..0a0c922 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/util/SearchUtil.java
@@ -28,9 +28,9 @@ public class SearchUtil
{
public static String getHitId( String groupId, String artifactId, String classifier, String packaging )
{
- return ( StringUtils.isBlank( groupId ) ? "" : StringUtils.trim( groupId ) ) + ":"
- + ( StringUtils.isBlank( artifactId ) ? "" : StringUtils.trim( artifactId ) ) + ":"
- + ( StringUtils.isBlank( classifier ) ? "" : StringUtils.trim( classifier ) ) + ":" + ( StringUtils.isBlank(
- packaging ) ? "" : StringUtils.trim( packaging ) );
+ return ( StringUtils.isBlank( groupId ) ? "" : StringUtils.trim( groupId ) ) + ":" //
+ + ( StringUtils.isBlank( artifactId ) ? "" : StringUtils.trim( artifactId ) ) + ":" //
+ + ( StringUtils.isBlank( classifier ) ? "" : StringUtils.trim( classifier ) ) + ":" //
+ + ( StringUtils.isBlank( packaging ) ? "" : StringUtils.trim( packaging ) );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/641e0490/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 83d1938..c3c8bfa 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
@@ -29,6 +29,10 @@ 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;
@@ -36,8 +40,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
{
@@ -47,12 +51,12 @@ public class MavenRepositorySearchTest
throws Exception
{
List<File> files = new ArrayList<>();
- files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
- + "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar" ) );
- files.add( new File( FileUtil.getBasedir(), "src/test/" + TEST_REPO_1
- + "/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar" ) );
- files.add( new File( FileUtil.getBasedir(), "/src/test/" + TEST_REPO_1
- + "/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar" ) );
+ files.add( Paths.get( FileUtil.getBasedir(), "src/test", TEST_REPO_1,
+ "/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar" ).toFile() );
+ files.add( Paths.get( FileUtil.getBasedir(), "src/test", TEST_REPO_1,
+ "/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar" ).toFile() );
+ files.add( Paths.get( FileUtil.getBasedir(), "src/test", TEST_REPO_1,
+ "org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar" ).toFile() );
createIndex( TEST_REPO_1, files, scan );
}
@@ -286,7 +290,7 @@ public class MavenRepositorySearchTest
archivaConfigControl.replay();
- SearchResults results = search.search( "user", selectedRepos, "org", limits, new ArrayList<String>() );
+ SearchResults results = search.search( "user", selectedRepos, "org", limits, Collections.<String>emptyList() );
archivaConfigControl.verify();
[3/5] git commit: [MRM-1833] Nullpointer when browsing artifacts
which have dependencies with scope "import"
Posted by ol...@apache.org.
[MRM-1833] Nullpointer when browsing artifacts which have dependencies
with scope "import"
Use the full constructor to create the clone, as resolveModel expects
remoteRepositories to be not null
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/6790e2a8
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/6790e2a8
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/6790e2a8
Branch: refs/heads/master
Commit: 6790e2a82fbf43eb407acfb8430f323f6a004bcd
Parents: 588f40d
Author: Sascha Vogt <sa...@vogt-neuenbuerg.de>
Authored: Wed Apr 23 15:37:56 2014 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 24 11:52:24 2014 +1000
----------------------------------------------------------------------
.../repository/storage/maven2/RepositoryModelResolver.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/6790e2a8/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
index 0113513..0cb9264 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
@@ -212,7 +212,8 @@ public class RepositoryModelResolver
@Override
public ModelResolver newCopy()
{
- return new RepositoryModelResolver( basedir, pathTranslator );
+ return new RepositoryModelResolver( managedRepository, pathTranslator, wagonFactory, remoteRepositories,
+ networkProxyMap, targetRepository );
}
// FIXME: we need to do some refactoring, we cannot re-use the proxy components of archiva-proxy in maven2-repository
[4/5] git commit: [MRM-1834] Add limit to index search query to
prevent unnecessary calculations
Posted by ol...@apache.org.
[MRM-1834] Add limit to index search query to prevent unnecessary
calculations
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/c52eb2c0
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/c52eb2c0
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/c52eb2c0
Branch: refs/heads/master
Commit: c52eb2c0426bd64cfbff925ea9b4070f395f9aa4
Parents: 6790e2a
Author: Sascha Vogt <s....@seeburger.de>
Authored: Wed Apr 23 15:42:46 2014 +0200
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Apr 24 11:52:24 2014 +1000
----------------------------------------------------------------------
.../org/apache/archiva/indexer/search/MavenRepositorySearch.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/c52eb2c0/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
index 235c850..1968cef 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
+++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/MavenRepositorySearch.java
@@ -265,6 +265,7 @@ public class MavenRepositorySearch
FlatSearchRequest request = new FlatSearchRequest( q );
request.setContexts( getIndexingContexts( indexingContextIds ) );
+ request.setCount(limits.getPageSize()*(Math.max(1, limits.getSelectedPage())));
FlatSearchResponse response = indexer.searchFlat( request );