rpms/maven2/devel maven2-2.2.1-default-resolver-pool-size.patch, 1.1, 1.2 maven2.spec, 1.34, 1.35

[Stanislav Ochotnicky]

Author: sochotni

Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11734

Modified Files:
	maven2-2.2.1-default-resolver-pool-size.patch maven2.spec 
Log Message:
Updated previous patch to only modify behaviour in JPP mode



maven2-2.2.1-default-resolver-pool-size.patch:
 DefaultArtifactResolver.java |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Index: maven2-2.2.1-default-resolver-pool-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2-2.2.1-default-resolver-pool-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven2-2.2.1-default-resolver-pool-size.patch	28 Jun 2010 14:36:22 -0000	1.1
+++ maven2-2.2.1-default-resolver-pool-size.patch	29 Jun 2010 07:37:17 -0000	1.2
@@ -1,22 +1,29 @@
-From 1a41c366dca46911114605ad88b650d02ba232e6 Mon Sep 17 00:00:00 2001
+From 9c7b1812cbca35f8bd9997e6b5e3ce93f3191840 Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky at redhat.com>
 Date: Mon, 28 Jun 2010 15:39:30 +0200
-Subject: [PATCH] change default resolver pool size
+Subject: [PATCH] change default resolver pool size in jpp mode
 
 ---
- .../artifact/resolver/DefaultArtifactResolver.java |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ .../artifact/resolver/DefaultArtifactResolver.java |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
 
 diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
-index d8c3629..55185cf 100644
+index d8c3629..0c40881 100644
 --- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
 +++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
-@@ -61,7 +61,7 @@ public class DefaultArtifactResolver
+@@ -61,7 +61,14 @@ public class DefaultArtifactResolver
      // Components
      // ----------------------------------------------------------------------
  
 -    private static final int DEFAULT_POOL_SIZE = 5;
-+    private static final int DEFAULT_POOL_SIZE = 1;
++    private static final int DEFAULT_POOL_SIZE;
++    static {
++        if (System.getProperty("maven2.jpp.mode") == null) {
++            DEFAULT_POOL_SIZE = 5;
++        } else {
++            DEFAULT_POOL_SIZE = 1;
++        }
++    }
  
      private WagonManager wagonManager;
  


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- maven2.spec	28 Jun 2010 14:35:01 -0000	1.34
+++ maven2.spec	29 Jun 2010 07:37:17 -0000	1.35
@@ -4,7 +4,7 @@
 
 Name:	    maven2	
 Version:	2.2.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Java project management and project comprehension tool
 
 Group:		Development/Build Tools
@@ -508,6 +508,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc
 
 %changelog
+* Tue Jun 29 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-7
+- Updated previous patch to only modify behaviour in JPP mode
+
 * Mon Jun 28 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-6
 - Disable parallel artifact resolution