[jglobus/el5] 2.0.6 final release
Mattias Ellert
ellert at fedoraproject.org
Wed Aug 14 12:49:34 UTC 2013
commit 9d81eb6579d203c0362342682ed4ca3cddd44c6f
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Wed Aug 14 14:43:54 2013 +0200
2.0.6 final release
jglobus-doc.patch | 72 +++++++++++++++++++++++++++++++---------------------
jglobus.spec | 55 ++++++++++++++++++++++++++++++++++++---
sources | 4 +-
3 files changed, 95 insertions(+), 36 deletions(-)
---
diff --git a/jglobus-doc.patch b/jglobus-doc.patch
index de7f4d2..51ddfe9 100644
--- a/jglobus-doc.patch
+++ b/jglobus-doc.patch
@@ -1,6 +1,6 @@
-diff -ur JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/ChecksumOptions.java JGlobus-jglobus-all-2.0.5/gridftp/src/main/java/org/globus/ftp/ChecksumOptions.java
---- JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/ChecksumOptions.java 2013-03-25 15:17:47.000000000 +0100
-+++ JGlobus-jglobus-all-2.0.5/gridftp/src/main/java/org/globus/ftp/ChecksumOptions.java 2013-03-26 13:47:01.360820842 +0100
+diff -ur JGlobus-jglobus-2.0.6.orig/gridftp/src/main/java/org/globus/ftp/ChecksumOptions.java JGlobus-jglobus-2.0.6/gridftp/src/main/java/org/globus/ftp/ChecksumOptions.java
+--- JGlobus-jglobus-2.0.6.orig/gridftp/src/main/java/org/globus/ftp/ChecksumOptions.java 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/gridftp/src/main/java/org/globus/ftp/ChecksumOptions.java 2013-08-14 07:18:14.171269946 +0200
@@ -23,7 +23,7 @@
protected ChecksumAlgorithm algo;
@@ -10,9 +10,9 @@ diff -ur JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/Che
*/
public ChecksumOptions(ChecksumAlgorithm algo) {
super("CKSM");
-diff -ur JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/FTPClient.java JGlobus-jglobus-all-2.0.5/gridftp/src/main/java/org/globus/ftp/FTPClient.java
---- JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/FTPClient.java 2013-03-25 15:17:47.000000000 +0100
-+++ JGlobus-jglobus-all-2.0.5/gridftp/src/main/java/org/globus/ftp/FTPClient.java 2013-03-26 13:48:09.921970962 +0100
+diff -ur JGlobus-jglobus-2.0.6.orig/gridftp/src/main/java/org/globus/ftp/FTPClient.java JGlobus-jglobus-2.0.6/gridftp/src/main/java/org/globus/ftp/FTPClient.java
+--- JGlobus-jglobus-2.0.6.orig/gridftp/src/main/java/org/globus/ftp/FTPClient.java 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/gridftp/src/main/java/org/globus/ftp/FTPClient.java 2013-08-14 07:18:14.171269946 +0200
@@ -83,7 +83,7 @@
/**
@@ -58,9 +58,9 @@ diff -ur JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/FTP
* <pre>
* 5.2 SCKS
* This command is sent prior to upload command such as STOR, ESTO, PUT. It is used
-diff -ur JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/GridFTPClient.java JGlobus-jglobus-all-2.0.5/gridftp/src/main/java/org/globus/ftp/GridFTPClient.java
---- JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/GridFTPClient.java 2013-03-25 15:17:47.000000000 +0100
-+++ JGlobus-jglobus-all-2.0.5/gridftp/src/main/java/org/globus/ftp/GridFTPClient.java 2013-03-26 13:48:45.855527114 +0100
+diff -ur JGlobus-jglobus-2.0.6.orig/gridftp/src/main/java/org/globus/ftp/GridFTPClient.java JGlobus-jglobus-2.0.6/gridftp/src/main/java/org/globus/ftp/GridFTPClient.java
+--- JGlobus-jglobus-2.0.6.orig/gridftp/src/main/java/org/globus/ftp/GridFTPClient.java 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/gridftp/src/main/java/org/globus/ftp/GridFTPClient.java 2013-08-14 07:18:14.172269955 +0200
@@ -963,7 +963,6 @@
* Sets the checksum values ahead of the transfer
* @param algorithm the checksume algorithm
@@ -69,9 +69,9 @@ diff -ur JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/Gri
* @exception ServerException if an error occured.
*/
public void setChecksum(ChecksumAlgorithm algorithm,
-diff -ur JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/MlsxEntryWriter.java JGlobus-jglobus-all-2.0.5/gridftp/src/main/java/org/globus/ftp/MlsxEntryWriter.java
---- JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/MlsxEntryWriter.java 2013-03-25 15:17:47.000000000 +0100
-+++ JGlobus-jglobus-all-2.0.5/gridftp/src/main/java/org/globus/ftp/MlsxEntryWriter.java 2013-03-26 13:49:18.367124890 +0100
+diff -ur JGlobus-jglobus-2.0.6.orig/gridftp/src/main/java/org/globus/ftp/MlsxEntryWriter.java JGlobus-jglobus-2.0.6/gridftp/src/main/java/org/globus/ftp/MlsxEntryWriter.java
+--- JGlobus-jglobus-2.0.6.orig/gridftp/src/main/java/org/globus/ftp/MlsxEntryWriter.java 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/gridftp/src/main/java/org/globus/ftp/MlsxEntryWriter.java 2013-08-14 07:18:14.172269955 +0200
@@ -12,7 +12,6 @@
/**
* Writes a single entry from the stream.
@@ -80,9 +80,9 @@ diff -ur JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/Mls
* @param entry the file/directory entry
*/
public void write(MlsxEntry entry) throws IOException;
-diff -ur JGlobus-jglobus-all-2.0.5.orig/io/src/main/java/org/globus/io/urlcopy/UrlCopy.java JGlobus-jglobus-all-2.0.5/io/src/main/java/org/globus/io/urlcopy/UrlCopy.java
---- JGlobus-jglobus-all-2.0.5.orig/io/src/main/java/org/globus/io/urlcopy/UrlCopy.java 2013-03-25 15:17:47.000000000 +0100
-+++ JGlobus-jglobus-all-2.0.5/io/src/main/java/org/globus/io/urlcopy/UrlCopy.java 2013-03-26 13:57:14.841236768 +0100
+diff -ur JGlobus-jglobus-2.0.6.orig/io/src/main/java/org/globus/io/urlcopy/UrlCopy.java JGlobus-jglobus-2.0.6/io/src/main/java/org/globus/io/urlcopy/UrlCopy.java
+--- JGlobus-jglobus-2.0.6.orig/io/src/main/java/org/globus/io/urlcopy/UrlCopy.java 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/io/src/main/java/org/globus/io/urlcopy/UrlCopy.java 2013-08-14 07:18:14.172269955 +0200
@@ -437,7 +437,7 @@
* This method will perform the transfer and signal completion and
* errors through the {@link UrlCopyListener#transferCompleted()} and
@@ -92,9 +92,9 @@ diff -ur JGlobus-jglobus-all-2.0.5.orig/io/src/main/java/org/globus/io/urlcopy/U
*
*/
public void run() {
-diff -ur JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/common/CoGProperties.java JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/common/CoGProperties.java
---- JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/common/CoGProperties.java 2013-03-25 15:17:47.000000000 +0100
-+++ JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/common/CoGProperties.java 2013-03-26 12:59:30.294282873 +0100
+diff -ur JGlobus-jglobus-2.0.6.orig/ssl-proxies/src/main/java/org/globus/common/CoGProperties.java JGlobus-jglobus-2.0.6/ssl-proxies/src/main/java/org/globus/common/CoGProperties.java
+--- JGlobus-jglobus-2.0.6.orig/ssl-proxies/src/main/java/org/globus/common/CoGProperties.java 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/ssl-proxies/src/main/java/org/globus/common/CoGProperties.java 2013-08-14 07:18:14.173269965 +0200
@@ -492,9 +492,10 @@
/**
@@ -109,9 +109,9 @@ diff -ur JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/com
*/
public int getDelegationKeyCacheLifetime() {
-diff -ur JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi/bc/BouncyCastleCertProcessingFactory.java JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/gsi/bc/BouncyCastleCertProcessingFactory.java
---- JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi/bc/BouncyCastleCertProcessingFactory.java 2013-03-25 15:17:47.000000000 +0100
-+++ JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/gsi/bc/BouncyCastleCertProcessingFactory.java 2013-03-26 13:45:29.464963635 +0100
+diff -ur JGlobus-jglobus-2.0.6.orig/ssl-proxies/src/main/java/org/globus/gsi/bc/BouncyCastleCertProcessingFactory.java JGlobus-jglobus-2.0.6/ssl-proxies/src/main/java/org/globus/gsi/bc/BouncyCastleCertProcessingFactory.java
+--- JGlobus-jglobus-2.0.6.orig/ssl-proxies/src/main/java/org/globus/gsi/bc/BouncyCastleCertProcessingFactory.java 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/ssl-proxies/src/main/java/org/globus/gsi/bc/BouncyCastleCertProcessingFactory.java 2013-08-14 07:18:14.173269965 +0200
@@ -255,7 +255,7 @@
*
* The methods defaults to creating GSI 4 proxy
@@ -204,10 +204,24 @@ diff -ur JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi
* GSIConstants.GSI_4_RESTRICTED_PROXY} then
* {@link org.globus.gsi.proxy.ext.ProxyCertInfoExtension ProxyCertInfoExtension} must be
* present in the extension set.
-diff -ur JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi/util/CertificateUtil.java JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/gsi/util/CertificateUtil.java
---- JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi/util/CertificateUtil.java 2013-03-25 15:17:47.000000000 +0100
-+++ JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/gsi/util/CertificateUtil.java 2013-03-26 13:27:18.872527577 +0100
-@@ -140,7 +140,7 @@
+diff -ur JGlobus-jglobus-2.0.6.orig/ssl-proxies/src/main/java/org/globus/gsi/stores/ResourceSigningPolicyStore.java JGlobus-jglobus-2.0.6/ssl-proxies/src/main/java/org/globus/gsi/stores/ResourceSigningPolicyStore.java
+--- JGlobus-jglobus-2.0.6.orig/ssl-proxies/src/main/java/org/globus/gsi/stores/ResourceSigningPolicyStore.java 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/ssl-proxies/src/main/java/org/globus/gsi/stores/ResourceSigningPolicyStore.java 2013-08-14 07:19:54.888206561 +0200
+@@ -54,10 +54,6 @@
+ private final Map<String, Long> validPoliciesCache = new HashMap<String, Long>();
+ private final static long CACHE_TIME_MILLIS = 3600*1000;
+
+-
+- /**
+- * Please use the {@link Stores} class to generate Key/Cert stores
+- */
+ public ResourceSigningPolicyStore(SigningPolicyStoreParameters param) throws InvalidAlgorithmParameterException {
+ if (param == null) {
+ throw new IllegalArgumentException();
+diff -ur JGlobus-jglobus-2.0.6.orig/ssl-proxies/src/main/java/org/globus/gsi/util/CertificateUtil.java JGlobus-jglobus-2.0.6/ssl-proxies/src/main/java/org/globus/gsi/util/CertificateUtil.java
+--- JGlobus-jglobus-2.0.6.orig/ssl-proxies/src/main/java/org/globus/gsi/util/CertificateUtil.java 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/ssl-proxies/src/main/java/org/globus/gsi/util/CertificateUtil.java 2013-08-14 07:18:14.174269974 +0200
+@@ -205,7 +205,7 @@
* Return CA Path constraint
*
* @param crt
@@ -216,7 +230,7 @@ diff -ur JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi
* @throws IOException
*/
public static int getCAPathConstraint(TBSCertificateStructure crt)
-@@ -188,40 +188,40 @@
+@@ -253,40 +253,40 @@
/**
* Returns certificate type of the given TBS certificate. <BR> The
@@ -273,9 +287,9 @@ diff -ur JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi
* CertificateType.EEC} if the certificate is not a CA certificate or a
* GSI-2 or GSI-3 proxy.
*
-diff -ur JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi/util/KeyStoreUtil.java JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/gsi/util/KeyStoreUtil.java
---- JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi/util/KeyStoreUtil.java 2013-03-25 15:17:47.000000000 +0100
-+++ JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/gsi/util/KeyStoreUtil.java 2013-03-26 13:30:06.135447777 +0100
+diff -ur JGlobus-jglobus-2.0.6.orig/ssl-proxies/src/main/java/org/globus/gsi/util/KeyStoreUtil.java JGlobus-jglobus-2.0.6/ssl-proxies/src/main/java/org/globus/gsi/util/KeyStoreUtil.java
+--- JGlobus-jglobus-2.0.6.orig/ssl-proxies/src/main/java/org/globus/gsi/util/KeyStoreUtil.java 2013-08-13 05:53:37.000000000 +0200
++++ JGlobus-jglobus-2.0.6/ssl-proxies/src/main/java/org/globus/gsi/util/KeyStoreUtil.java 2013-08-14 07:18:14.174269974 +0200
@@ -40,7 +40,7 @@
*
* @param keyStore
diff --git a/jglobus.spec b/jglobus.spec
index 9887595..349e462 100644
--- a/jglobus.spec
+++ b/jglobus.spec
@@ -13,7 +13,7 @@
%endif
Name: jglobus
-Version: 2.0.5
+Version: 2.0.6
Release: 1%{?dist}
Summary: Globus Java client libraries
@@ -22,7 +22,7 @@ Summary: Globus Java client libraries
License: ASL 2.0 and MIT
Group: Development/Libraries
URL: http://github.com/%{name}/
-Source0: http://github.com/%{name}/JGlobus/archive/%{name}-all-%{version}.tar.gz
+Source0: http://github.com/%{name}/JGlobus/archive/%{name}-%{version}.tar.gz
# Build with ant on old distributions
Source1: %{name}-ant-%{version}.tar.gz
# Fixes from Bartek Palak (see pull request in github)
@@ -175,7 +175,7 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -a 1 -n JGlobus-%{name}-all-%{version}
+%setup -q -a 1 -n JGlobus-%{name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -191,9 +191,51 @@ patch -p1 < ssl-proxies-tomcat/src/main/patches/jglobus-tomcat5.patch
dos2unix axis/src/main/java/org/globus/axis/example/README.txt
chmod 644 axis/src/main/java/org/globus/axis/example/README.txt
+# Move test clsses to test directory
+mkdir -p gram/src/test/java/org/globus/gram/util
+mv gram/src/main/java/org/globus/gram/Gram15Test.java \
+ gram/src/test/java/org/globus/gram/Gram15Test.java
+mv gram/src/main/java/org/globus/gram/GramTest.java \
+ gram/src/test/java/org/globus/gram/GramTest.java
+mv gram/src/main/java/org/globus/gram/MultiUserGramTest.java \
+ gram/src/test/java/org/globus/gram/MultiUserGramTest.java
+mv gram/src/main/java/org/globus/gram/util/TestUtil.java \
+ gram/src/test/java/org/globus/gram/util/TestUtil.java
+
+# Move gram tests using io classes to io directory
+mkdir -p io/src/test/java/org/globus/gram/tests
+mkdir -p io/src/test/java/org/globus/gram/util
+mkdir -p io/src/test/resources
+mv gram/src/test/java/org/globus/gram/Gram15Test.java \
+ io/src/test/java/org/globus/gram/Gram15Test.java
+mv gram/src/test/java/org/globus/gram/tests/GramTest.java \
+ io/src/test/java/org/globus/gram/tests/GramTest.java
+mv gram/src/test/java/org/globus/gram/tests/test.sh \
+ io/src/test/java/org/globus/gram/tests/test.sh
+mv gram/src/test/java/org/globus/gram/util/TestUtil.java \
+ io/src/test/java/org/globus/gram/util/TestUtil.java
+mv gram/src/test/resources/test.properties \
+ io/src/test/resources/test.properties
+
# Remove code duplication
-rm -rf gram/src/main/java/org/globus/net # also in gss
-rm -rf io/src/main/java/org/globus/io/gass # also in gram
+mkdir -p gss/src/test/java/org/globus/net/test
+mv gram/src/test/java/org/globus/net/test/GSIHttpURLConnectionTest.java \
+ gss/src/test/java/org/globus/net/test/GSIHttpURLConnectionTest.java
+rm gss/src/test/java/org/globus/net/GSIHttpURLConnectionTest.java
+rm -rf gram/src/main/java/org/globus/net # also in gss
+rm -rf gram/src/main/java/org/globus/io/gass # also in io
+
+# Move test.properties files to resources directories
+mkdir -p gridftp/src/test/resources/org/globus/ftp/test
+mkdir -p myproxy/src/test/resources/org/globus/myproxy/test
+rm gridftp/src/test/java/org/globus/ftp/test/test1.properties
+rm gridftp/src/test/java/test.properties
+mv gridftp/src/test/java/org/globus/ftp/test/test.properties \
+ gridftp/src/test/resources/org/globus/ftp/test/test.properties
+mv gridftp/src/test/java/org/globus/ftp/test/test.properties.in \
+ gridftp/src/test/resources/org/globus/ftp/test/test.properties.in
+mv myproxy/src/test/java/org/globus/myproxy/test/test.properties \
+ myproxy/src/test/resources/org/globus/myproxy/test/test.properties
%build
# Many tests requires network connections and a valid proxy certificate
@@ -270,6 +312,9 @@ rm -rf %{buildroot}
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Aug 14 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.6-1
+- 2.0.6 final release
+
* Tue Mar 26 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.5-1
- 2.0.5 final release
diff --git a/sources b/sources
index de8c321..20259ff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9d2b5598a540d6b8547a92fbe3d6ac8b jglobus-all-2.0.5.tar.gz
-2ae4560f2e376e4ba9ad556ceb249d51 jglobus-ant-2.0.5.tar.gz
+2f31961ba27c978302c544e11588e7c4 jglobus-2.0.6.tar.gz
+0401e38f26d76da94f09e8574437f421 jglobus-ant-2.0.6.tar.gz
More information about the scm-commits
mailing list