[jglobus/f17: 2/2] 2.0.5 final release
Mattias Ellert
ellert at fedoraproject.org
Tue Mar 26 17:38:44 UTC 2013
commit 9f37fc3eedf4839aec863a755f65a102aff46d87
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Tue Mar 26 18:31:18 2013 +0100
2.0.5 final release
jglobus-doc.patch | 287 ++++++++++++++++++++++++++++++++++++++++
jglobus-dont-hide-super.patch | 55 ++++++++
jglobus-errors.patch | 16 +++
jglobus-final-static.patch | 38 ++++++
jglobus-impl-clonable.patch | 13 ++
jglobus-semi.patch | 13 ++
jglobus-synch-disconnect.patch | 32 +++++
jglobus.spec | 51 ++++++--
sources | 2 +-
9 files changed, 494 insertions(+), 13 deletions(-)
---
diff --git a/jglobus-doc.patch b/jglobus-doc.patch
new file mode 100644
index 0000000..de7f4d2
--- /dev/null
+++ b/jglobus-doc.patch
@@ -0,0 +1,287 @@
+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
+@@ -23,7 +23,7 @@
+ protected ChecksumAlgorithm algo;
+
+ /**
+- @param cmd command whose options are represent by this object
++ @param algo algorithm whose options are represent by this object
+ */
+ 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
+@@ -83,7 +83,7 @@
+
+ /**
+ * List of the checksum algorithms supported by the server as described in
+- * {@link http://www.ogf.org/documents/GFD.47.pdf [GridFTP v2 Protocol Description]}
++ * <a href="http://www.ogf.org/documents/GFD.47.pdf">GridFTP v2 Protocol Description</a>
+ */
+ protected List<String> algorithms;
+
+@@ -1979,7 +1979,7 @@
+ * Performs third-party transfer between two servers. If possibly,
+ * GFD.47 (a.k.a GridFTP2) GET and PUT commands are used.
+ *
+- * @param destination client connected to source server
++ * @param source client connected to source server
+ * @param remoteSrcFile source filename
+ * @param destination client connected to destination server
+ * @param remoteDstFile destination filename
+@@ -2060,7 +2060,7 @@
+
+ /**
+ * According to
+- * {@link http://www.ogf.org/documents/GFD.47.pdf [GridFTP v2 Protocol Description]}
++ * <a href="http://www.ogf.org/documents/GFD.47.pdf">GridFTP v2 Protocol Description</a>
+ * checksum feature has the following syntax:
+ * <pre>
+ * CKSUM <algorithm>[, …]
+@@ -2125,7 +2125,7 @@
+
+ /**
+ * implement GridFTP v2 CKSM command from
+- * {@link http://www.ogf.org/documents/GFD.47.pdf [GridFTP v2 Protocol Description]}
++ * <a href="http://www.ogf.org/documents/GFD.47.pdf">GridFTP v2 Protocol Description</a>
+ * <pre>
+ * 5.1 CKSM
+ * This command is used by the client to request checksum calculation over a portion or
+@@ -2191,7 +2191,7 @@
+
+ /**
+ * implement GridFTP v2 SCKS command as described in
+- * {@link http://www.ogf.org/documents/GFD.47.pdf [GridFTP v2 Protocol Description]}
++ * <a href="http://www.ogf.org/documents/GFD.47.pdf">GridFTP v2 Protocol Description</a>
+ * <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
+@@ -963,7 +963,6 @@
+ * Sets the checksum values ahead of the transfer
+ * @param algorithm the checksume algorithm
+ * @param value the checksum value as hexadecimal number
+- * @return nothing
+ * @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
+@@ -12,7 +12,6 @@
+ /**
+ * Writes a single entry from the stream.
+ *
+- * @return true to continue, false to stop writer
+ * @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
+@@ -437,7 +437,7 @@
+ * This method will perform the transfer and signal completion and
+ * errors through the {@link UrlCopyListener#transferCompleted()} and
+ * {@link UrlCopyListener#transferError(Exception)} of any registered listeners
+- * (see {@link addUrlCopyListener}).
++ * (see {@link #addUrlCopyListener(UrlCopyListener)}).
+ *
+ */
+ 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
+@@ -492,9 +492,10 @@
+
+ /**
+ * Returns the delegation key cache lifetime for all delegations from this
+- * JVM. If this property is not set or set to zero or less, no caching is done. The
+- * value is the number of milliseconds the key/pair is cached.
+- * @return
++ * JVM. If this property is not set or set to zero or less, no caching is
++ * done.
++ *
++ * @return the number of milliseconds the key/pair is cached.
+ */
+ 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
+@@ -255,7 +255,7 @@
+ *
+ * The methods defaults to creating GSI 4 proxy
+ *
+- * @param issuerCert
++ * @param issuerCert_
+ * the issuing certificate
+ * @param issuerKey
+ * private key matching the public key of issuer certificate. The new proxy certificate will be
+@@ -553,8 +553,8 @@
+ * the type of proxy credential to create
+ * @param extSet
+ * a set of X.509 extensions to be included in the new proxy certificate. Can be null. If
+- * delegation mode is {@link GSIConstants#CertificateType#GSI_3_RESTRICTED_PROXY
+- * GSIConstants.CertificateType.GSI_3_RESTRICTED_PROXY} or {@link GSIConstants#CertificateType#GSI_4_RESTRICTED_PROXY
++ * delegation mode is {@link GSIConstants#GSI_3_RESTRICTED_PROXY
++ * GSIConstants.CertificateType.GSI_3_RESTRICTED_PROXY} or {@link GSIConstants#GSI_4_RESTRICTED_PROXY
+ * GSIConstants.CertificateType.GSI_4_RESTRICTED_PROXY} then
+ * {@link org.globus.gsi.proxy.ext.ProxyCertInfoExtension ProxyCertInfoExtension} must be
+ * present in the extension set.
+@@ -629,8 +629,8 @@
+ * the type of proxy credential to create
+ * @param extSet
+ * a set of X.509 extensions to be included in the new proxy certificate. Can be null. If
+- * delegation mode is {@link GSIConstants#CertificateType#GSI_3_RESTRICTED_PROXY
+- * GSIConstants.CertificateType.GSI_3_RESTRICTED_PROXY} or {@link GSIConstants#CertificateType#GSI_4_RESTRICTED_PROXY
++ * delegation mode is {@link GSIConstants#GSI_3_RESTRICTED_PROXY
++ * GSIConstants.CertificateType.GSI_3_RESTRICTED_PROXY} or {@link GSIConstants#GSI_4_RESTRICTED_PROXY
+ * GSIConstants.CertificateType.GSI_4_RESTRICTED_PROXY} then
+ * {@link org.globus.gsi.proxy.ext.ProxyCertInfoExtension ProxyCertInfoExtension} must be
+ * present in the extension set.
+@@ -711,7 +711,7 @@
+ *
+ * The methods defaults to creating GSI 4 proxy
+ *
+- * @param issuerCert
++ * @param issuerCert_
+ * the issuing certificate
+ * @param issuerKey
+ * private key matching the public key of issuer certificate. The new proxy certificate will be
+@@ -722,35 +722,35 @@
+ * lifetime of the new certificate in seconds. If 0 (or less then) the new certificate will
+ * have the same lifetime as the issuing certificate.
+ * @param certType
+- * can be one of {@link GSIConstants#CertificateType#DELEGATION_LIMITED GSIConstants.CertificateTypeDELEGATION_LIMITED},
+- * {@link GSIConstants#CertificateType#DELEGATION_FULL GSIConstants.CertificateTypeDELEGATION_FULL},
++ * can be one of {@link GSIConstants#DELEGATION_LIMITED GSIConstants.CertificateTypeDELEGATION_LIMITED},
++ * {@link GSIConstants#DELEGATION_FULL GSIConstants.CertificateTypeDELEGATION_FULL},
+ *
+- * {@link GSIConstants#CertificateType#GSI_2_LIMITED_PROXY GSIConstants.CertificateType.GSI_2_LIMITED_PROXY},
+- * {@link GSIConstants#CertificateType#GSI_2_PROXY GSIConstants.CertificateType.GSI_2_PROXY},
+- * {@link GSIConstants#CertificateType#GSI_3_IMPERSONATION_PROXY GSIConstants.CertificateType.GSI_3_IMPERSONATION_PROXY},
+- * {@link GSIConstants#CertificateType#GSI_3_LIMITED_PROXY GSIConstants.CertificateType.GSI_3_LIMITED_PROXY},
+- * {@link GSIConstants#CertificateType#GSI_3_INDEPENDENT_PROXY GSIConstants.CertificateType.GSI_3_INDEPENDENT_PROXY},
+- * {@link GSIConstants#CertificateType#GSI_3_RESTRICTED_PROXY GSIConstants.CertificateType.GSI_3_RESTRICTED_PROXY}.
+- * {@link GSIConstants#CertificateType#GSI_4_IMPERSONATION_PROXY GSIConstants.CertificateType.GSI_4_IMPERSONATION_PROXY},
+- * {@link GSIConstants#CertificateType#GSI_4_LIMITED_PROXY GSIConstants.CertificateType.GSI_3_LIMITED_PROXY},
+- * {@link GSIConstants#CertificateType#GSI_4_INDEPENDENT_PROXY GSIConstants.CertificateType.GSI_4_INDEPENDENT_PROXY},
+- * {@link GSIConstants#CertificateType#GSI_4_RESTRICTED_PROXY GSIConstants.CertificateType.GSI_4_RESTRICTED_PROXY}.
++ * {@link GSIConstants#GSI_2_LIMITED_PROXY GSIConstants.CertificateType.GSI_2_LIMITED_PROXY},
++ * {@link GSIConstants#GSI_2_PROXY GSIConstants.CertificateType.GSI_2_PROXY},
++ * {@link GSIConstants#GSI_3_IMPERSONATION_PROXY GSIConstants.CertificateType.GSI_3_IMPERSONATION_PROXY},
++ * {@link GSIConstants#GSI_3_LIMITED_PROXY GSIConstants.CertificateType.GSI_3_LIMITED_PROXY},
++ * {@link GSIConstants#GSI_3_INDEPENDENT_PROXY GSIConstants.CertificateType.GSI_3_INDEPENDENT_PROXY},
++ * {@link GSIConstants#GSI_3_RESTRICTED_PROXY GSIConstants.CertificateType.GSI_3_RESTRICTED_PROXY}.
++ * {@link GSIConstants#GSI_4_IMPERSONATION_PROXY GSIConstants.CertificateType.GSI_4_IMPERSONATION_PROXY},
++ * {@link GSIConstants#GSI_4_LIMITED_PROXY GSIConstants.CertificateType.GSI_3_LIMITED_PROXY},
++ * {@link GSIConstants#GSI_4_INDEPENDENT_PROXY GSIConstants.CertificateType.GSI_4_INDEPENDENT_PROXY},
++ * {@link GSIConstants#GSI_4_RESTRICTED_PROXY GSIConstants.CertificateType.GSI_4_RESTRICTED_PROXY}.
+ *
+- * If {@link GSIConstants#CertificateType#DELEGATION_LIMITED GSIConstants.CertificateTypeDELEGATION_LIMITED} and if
++ * If {@link GSIConstants#DELEGATION_LIMITED GSIConstants.CertificateType.DELEGATION_LIMITED} and if
+ * {@link VersionUtil#isGsi2Enabled() CertUtil.isGsi2Enabled} returns true then a GSI-2 limited
+ * proxy will be created. Else if {@link VersionUtil#isGsi3Enabled() CertUtil.isGsi3Enabled}
+ * returns true then a GSI-3 limited proxy will be created. If not, a GSI-4 limited proxy will
+ * be created.
+ *
+- * If {@link GSIConstants#CertificateType#DELEGATION_FULL GSIConstants.CertificateTypeDELEGATION_FULL} and if
++ * If {@link GSIConstants#DELEGATION_FULL GSIConstants.CertificateTypeDELEGATION_FULL} and if
+ * {@link VersionUtil#isGsi2Enabled() CertUtil.isGsi2Enabled} returns true then a GSI-2 full proxy
+ * will be created. Else if {@link VersionUtil#isGsi3Enabled() CertUtil.isGsi3Enabled} returns
+ * true then a GSI-3 full proxy will be created. If not, a GSI-4 full proxy will be created.
+ *
+ * @param extSet
+ * a set of X.509 extensions to be included in the new proxy certificate. Can be null. If
+- * delegation mode is {@link GSIConstants#CertificateType#GSI_3_RESTRICTED_PROXY
+- * GSIConstants.CertificateType.GSI_3_RESTRICTED_PROXY} or {@link GSIConstants#CertificateType#GSI_4_RESTRICTED_PROXY
++ * delegation mode is {@link GSIConstants#GSI_3_RESTRICTED_PROXY
++ * GSIConstants.CertificateType.GSI_3_RESTRICTED_PROXY} or {@link GSIConstants#GSI_4_RESTRICTED_PROXY
+ * 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 @@
+ * Return CA Path constraint
+ *
+ * @param crt
+- * @return
++ * @return the CA path constraint
+ * @throws IOException
+ */
+ public static int getCAPathConstraint(TBSCertificateStructure crt)
+@@ -188,40 +188,40 @@
+
+ /**
+ * Returns certificate type of the given TBS certificate. <BR> The
+- * certificate type is {@link org.globus.gsi.GSIGSIConstants.CertificateType#CA
++ * certificate type is {@link org.globus.gsi.GSIConstants.CertificateType#CA
+ * CertificateType.CA} <B>only</B> if the certificate contains a
+ * BasicConstraints extension and it is marked as CA.<BR> A certificate is a
+ * GSI-2 proxy when the subject DN of the certificate ends with
+- * <I>"CN=proxy"</I> (certificate type {@link org.globus.gsi.GSIGSIConstants.CertificateType#GSI_2_PROXY
++ * <I>"CN=proxy"</I> (certificate type {@link org.globus.gsi.GSIConstants.CertificateType#GSI_2_PROXY
+ * CertificateType.GSI_2_PROXY}) or <I>"CN=limited proxy"</I> (certificate
+- * type {@link org.globus.gsi.GSIGSIConstants.CertificateType#GSI_2_LIMITED_PROXY
++ * type {@link org.globus.gsi.GSIConstants.CertificateType#GSI_2_LIMITED_PROXY
+ * CertificateType.LIMITED_PROXY}) component and the issuer DN of the
+ * certificate matches the subject DN without the last proxy <I>CN</I>
+ * component.<BR> A certificate is a GSI-3 proxy when the subject DN of the
+ * certificate ends with a <I>CN</I> component, the issuer DN of the
+ * certificate matches the subject DN without the last <I>CN</I> component
+- * and the certificate contains {@link org.globus.security.proxyExtension.ProxyCertInfo
++ * and the certificate contains {@link org.globus.gsi.proxy.ext.ProxyCertInfo
+ * ProxyCertInfo} critical extension. The certificate type is {@link
+- * org.globus.gsi.GSIGSIConstants.CertificateType#GSI_3_IMPERSONATION_PROXY
++ * org.globus.gsi.GSIConstants.CertificateType#GSI_3_IMPERSONATION_PROXY
+ * CertificateType.GSI_3_IMPERSONATION_PROXY} if the policy language of the
+- * {@link org.globus.security.proxyExtension.ProxyCertInfo ProxyCertInfo}
+- * extension is set to {@link org.globus.security.proxyExtension.ProxyPolicy#IMPERSONATION
++ * {@link org.globus.gsi.proxy.ext.ProxyCertInfo ProxyCertInfo}
++ * extension is set to {@link org.globus.gsi.proxy.ext.ProxyPolicy#IMPERSONATION
+ * ProxyPolicy.IMPERSONATION} OID. The certificate type is {@link
+- * org.globus.gsi.GSIGSIConstants.CertificateType#GSI_3_LIMITED_PROXY
++ * org.globus.gsi.GSIConstants.CertificateType#GSI_3_LIMITED_PROXY
+ * CertificateType.GSI_3_LIMITED_PROXY} if the policy language of the {@link
+- * org.globus.security.proxyExtension.ProxyCertInfo ProxyCertInfo} extension
+- * is set to {@link org.globus.security.proxyExtension.ProxyPolicy#LIMITED
++ * org.globus.gsi.proxy.ext.ProxyCertInfo ProxyCertInfo} extension
++ * is set to {@link org.globus.gsi.proxy.ext.ProxyPolicy#LIMITED
+ * ProxyPolicy.LIMITED} OID. The certificate type is {@link
+- * org.globus.gsi.GSIGSIConstants.CertificateType#GSI_3_INDEPENDENT_PROXY
++ * org.globus.gsi.GSIConstants.CertificateType#GSI_3_INDEPENDENT_PROXY
+ * CertificateType.GSI_3_INDEPENDENT_PROXY} if the policy language of the
+- * {@link org.globus.security.proxyExtension.ProxyCertInfo ProxyCertInfo}
+- * extension is set to {@link org.globus.security.proxyExtension.ProxyPolicy#INDEPENDENT
++ * {@link org.globus.gsi.proxy.ext.ProxyCertInfo ProxyCertInfo}
++ * extension is set to {@link org.globus.gsi.proxy.ext.ProxyPolicy#INDEPENDENT
+ * ProxyPolicy.INDEPENDENT} OID. The certificate type is {@link
+- * org.globus.gsi.GSIGSIConstants.CertificateType#GSI_3_RESTRICTED_PROXY
++ * org.globus.gsi.GSIConstants.CertificateType#GSI_3_RESTRICTED_PROXY
+ * CertificateType.GSI_3_RESTRICTED_PROXY} if the policy language of the
+- * {@link org.globus.security.proxyExtension.ProxyCertInfo ProxyCertInfo}
++ * {@link org.globus.gsi.proxy.ext.ProxyCertInfo ProxyCertInfo}
+ * extension is set to any other OID then the above.<BR> The certificate
+- * type is {@link org.globus.gsi.GSIGSIConstants.CertificateType#EEC
++ * type is {@link org.globus.gsi.GSIConstants.CertificateType#EEC
+ * 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
+@@ -40,7 +40,7 @@
+ *
+ * @param keyStore
+ * @param selector
+- * @return
++ * @return the list of certificates in the KeyStore
+ * @throws KeyStoreException
+ */
+ public static Collection<? extends Certificate> getTrustedCertificates(KeyStore keyStore, X509CertSelector selector)
diff --git a/jglobus-dont-hide-super.patch b/jglobus-dont-hide-super.patch
new file mode 100644
index 0000000..8bd4c05
--- /dev/null
+++ b/jglobus-dont-hide-super.patch
@@ -0,0 +1,55 @@
+diff --git a/gridftp/src/main/java/org/globus/ftp/exception/ClientException.java b/gridftp/src/main/java/org/globus/ftp/exception/ClientException.java
+index 2183601..c31d396 100755
+--- a/gridftp/src/main/java/org/globus/ftp/exception/ClientException.java
++++ b/gridftp/src/main/java/org/globus/ftp/exception/ClientException.java
+@@ -67,9 +67,6 @@ public class ClientException extends FTPException {
+ else return "";
+ }
+
+-
+- protected int code = UNSPECIFIED;
+-
+ public ClientException(int code, String message) {
+ super(code, message);
+ }
+diff --git a/gridftp/src/main/java/org/globus/ftp/exception/DataChannelException.java b/gridftp/src/main/java/org/globus/ftp/exception/DataChannelException.java
+index b930ff8..01e9d8f 100755
+--- a/gridftp/src/main/java/org/globus/ftp/exception/DataChannelException.java
++++ b/gridftp/src/main/java/org/globus/ftp/exception/DataChannelException.java
+@@ -39,8 +39,6 @@ public class DataChannelException extends FTPException {
+ }
+
+
+- protected int code = UNSPECIFIED;
+-
+ //this message is not just explanation of the code.
+ //it is a custom message informing of particular
+ //conditions of the error.
+diff --git a/gridftp/src/main/java/org/globus/ftp/exception/PerfMarkerException.java b/gridftp/src/main/java/org/globus/ftp/exception/PerfMarkerException.java
+index 43c64d0..4cfb430 100755
+--- a/gridftp/src/main/java/org/globus/ftp/exception/PerfMarkerException.java
++++ b/gridftp/src/main/java/org/globus/ftp/exception/PerfMarkerException.java
+@@ -39,9 +39,6 @@ public class PerfMarkerException extends FTPException {
+ else return "";
+ }
+
+-
+- protected int code = UNSPECIFIED;
+-
+ //this message is not just explanation of the code.
+ //it is a custom message informing of particular
+ //conditions of the error.
+diff --git a/gridftp/src/main/java/org/globus/ftp/exception/ServerException.java b/gridftp/src/main/java/org/globus/ftp/exception/ServerException.java
+index 1c6c2e2..b01f19e 100755
+--- a/gridftp/src/main/java/org/globus/ftp/exception/ServerException.java
++++ b/gridftp/src/main/java/org/globus/ftp/exception/ServerException.java
+@@ -54,9 +54,6 @@ public class ServerException extends FTPException {
+ else return "";
+ }
+
+-
+- protected int code = UNSPECIFIED;
+-
+ //this message is not just explanation of the code.
+ //it is a custom message informing of particular
+ //conditions of the error.
diff --git a/jglobus-errors.patch b/jglobus-errors.patch
new file mode 100644
index 0000000..483e5e7
--- /dev/null
+++ b/jglobus-errors.patch
@@ -0,0 +1,16 @@
+diff --git a/ssl-proxies/src/main/java/org/globus/tools/ProxyInit.java b/ssl-proxies/src/main/java/org/globus/tools/ProxyInit.java
+index 3a13125..dc5753c 100644
+--- a/ssl-proxies/src/main/java/org/globus/tools/ProxyInit.java
++++ b/ssl-proxies/src/main/java/org/globus/tools/ProxyInit.java
+@@ -666,9 +666,11 @@ class DefaultProxyInit extends ProxyInit {
+
+ } catch(IOException e) {
+ System.err.println("Error: Failed to load key: " + arg);
++ System.err.println("Error: " + e.getMessage());
+ System.exit(-1);
+ } catch(GeneralSecurityException e) {
+ System.err.println("Error: Wrong pass phrase");
++ System.err.println("Error: " + e.getMessage());
+ if (debug) {
+ e.printStackTrace();
+ }
diff --git a/jglobus-final-static.patch b/jglobus-final-static.patch
new file mode 100644
index 0000000..94d2dd4
--- /dev/null
+++ b/jglobus-final-static.patch
@@ -0,0 +1,38 @@
+diff -ur JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/dc/AsciiTranslator.java JGlobus-jglobus-all-2.0.5/gridftp/src/main/java/org/globus/ftp/dc/AsciiTranslator.java
+--- JGlobus-jglobus-all-2.0.5.orig/gridftp/src/main/java/org/globus/ftp/dc/AsciiTranslator.java 2013-03-25 15:17:47.000000000 +0100
++++ JGlobus-jglobus-all-2.0.5/gridftp/src/main/java/org/globus/ftp/dc/AsciiTranslator.java 2013-03-26 09:32:58.496812342 +0100
+@@ -32,7 +32,7 @@
+
+ protected byte[] lineSep;
+
+- protected static byte[] systemLineSep;
++ protected final static byte[] systemLineSep;
+
+ static {
+ systemLineSep = System.getProperty("line.separator").getBytes();
+diff -ur JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi/TrustedCertificates.java JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/gsi/TrustedCertificates.java
+--- JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/gsi/TrustedCertificates.java 2013-03-25 15:17:47.000000000 +0100
++++ JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/gsi/TrustedCertificates.java 2013-03-26 09:34:13.072916425 +0100
+@@ -82,7 +82,7 @@
+ * <caHash>.signing_policy in the same directory as the trusted
+ * certificates.
+ */
+- public static String SIGNING_POLICY_FILE_SUFFIX = ".signing_policy";
++ public final static String SIGNING_POLICY_FILE_SUFFIX = ".signing_policy";
+ private static KeyStore ms_trustStore = null;
+ // private static CertStore ms_crlStore = null;
+ private static ResourceSigningPolicyStore ms_sigPolStore = null;
+diff -ur JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/util/PEMUtils.java JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/util/PEMUtils.java
+--- JGlobus-jglobus-all-2.0.5.orig/ssl-proxies/src/main/java/org/globus/util/PEMUtils.java 2013-03-25 15:17:47.000000000 +0100
++++ JGlobus-jglobus-all-2.0.5/ssl-proxies/src/main/java/org/globus/util/PEMUtils.java 2013-03-26 09:32:58.497812329 +0100
+@@ -21,8 +21,8 @@
+
+ static final int LINE_LENGTH = 64;
+
+- public static String lineSep;
+- public static byte[] lineSepBytes;
++ public final static String lineSep;
++ public final static byte[] lineSepBytes;
+
+ static {
+ lineSep = System.getProperty("line.separator");
diff --git a/jglobus-impl-clonable.patch b/jglobus-impl-clonable.patch
new file mode 100644
index 0000000..cf462bb
--- /dev/null
+++ b/jglobus-impl-clonable.patch
@@ -0,0 +1,13 @@
+diff --git a/axis/src/main/java/org/globus/axis/transport/commons/ExtendedHostConfiguration.java b/axis/src/main/java/org/globus/axis/transport/commons/ExtendedHostConfiguration.java
+index e215c19..ae4ad88 100644
+--- a/axis/src/main/java/org/globus/axis/transport/commons/ExtendedHostConfiguration.java
++++ b/axis/src/main/java/org/globus/axis/transport/commons/ExtendedHostConfiguration.java
+@@ -17,7 +17,7 @@ package org.globus.axis.transport.commons;
+
+ import org.apache.commons.httpclient.HostConfiguration;
+
+-public class ExtendedHostConfiguration extends HostConfiguration {
++public class ExtendedHostConfiguration extends HostConfiguration implements Cloneable{
+
+ private String [] paramList;
+
diff --git a/jglobus-semi.patch b/jglobus-semi.patch
new file mode 100644
index 0000000..c8dd4e4
--- /dev/null
+++ b/jglobus-semi.patch
@@ -0,0 +1,13 @@
+diff --git a/ssl-proxies/src/main/java/org/globus/gsi/TrustedCertificates.java b/ssl-proxies/src/main/java/org/globus/gsi/TrustedCertificates.java
+index c999414..3413e84 100644
+--- a/ssl-proxies/src/main/java/org/globus/gsi/TrustedCertificates.java
++++ b/ssl-proxies/src/main/java/org/globus/gsi/TrustedCertificates.java
+@@ -251,7 +251,7 @@ public class TrustedCertificates implements Serializable {
+ Iterator iter = caCerts.iterator();
+ while (iter.hasNext()) {
+ X509Certificate cert = (X509Certificate) iter.next();
+- if (!newCertSubjectDNMap.containsKey(cert.getSubjectDN().toString()));
++ if (!newCertSubjectDNMap.containsKey(cert.getSubjectDN().toString()))
+ newCertSubjectDNMap.put(cert.getSubjectDN().toString(), cert);
+ }
+ } catch (Exception e) {
diff --git a/jglobus-synch-disconnect.patch b/jglobus-synch-disconnect.patch
new file mode 100644
index 0000000..b33ba7c
--- /dev/null
+++ b/jglobus-synch-disconnect.patch
@@ -0,0 +1,32 @@
+diff --git a/gram/src/main/java/org/globus/net/GSIHttpURLConnection.java b/gram/src/main/java/org/globus/net/GSIHttpURLConnection.java
+index d9e9d58..520393e 100755
+--- a/gram/src/main/java/org/globus/net/GSIHttpURLConnection.java
++++ b/gram/src/main/java/org/globus/net/GSIHttpURLConnection.java
+@@ -119,9 +119,10 @@ public class GSIHttpURLConnection extends GSIURLConnection {
+ ((GssSocket)socket).setAuthorization(authorization);
+ }
+
+- public void disconnect() {
++ public synchronized void disconnect() {
+ if (socket != null) {
+ try { socket.close(); } catch (Exception e) {}
++ socket = null;
+ }
+ }
+
+diff --git a/gss/src/main/java/org/globus/net/GSIHttpURLConnection.java b/gss/src/main/java/org/globus/net/GSIHttpURLConnection.java
+index 0ef1a65..05fcd0d 100644
+--- a/gss/src/main/java/org/globus/net/GSIHttpURLConnection.java
++++ b/gss/src/main/java/org/globus/net/GSIHttpURLConnection.java
+@@ -118,9 +118,10 @@ public class GSIHttpURLConnection extends GSIURLConnection {
+ ((GssSocket)socket).setAuthorization(authorization);
+ }
+
+- public void disconnect() {
++ public synchronized void disconnect() {
+ if (socket != null) {
+ try { socket.close(); } catch (Exception e) {}
++ socket = null;
+ }
+ }
+
diff --git a/jglobus.spec b/jglobus.spec
index 9388523..3327f41 100644
--- a/jglobus.spec
+++ b/jglobus.spec
@@ -1,13 +1,22 @@
Name: jglobus
Version: 2.0.5
-Release: 0.2.rc2%{?dist}
+Release: 1%{?dist}
Summary: Globus Java client libraries
# Everything is Apache 2.0 except for one file that is MIT:
# ssl-proxies/src/main/java/org/globus/tools/GridCertRequest.java
License: ASL 2.0 and MIT
URL: http://github.com/%{name}/
-Source0: http://github.com/%{name}/JGlobus/archive/%{name}-all-%{version}-rc2.tar.gz
+Source0: http://github.com/%{name}/JGlobus/archive/%{name}-all-%{version}.tar.gz
+# Fixes from Bartek Palak (see pull request in github)
+Patch0: jglobus-final-static.patch
+Patch1: jglobus-semi.patch
+Patch2: jglobus-synch-disconnect.patch
+Patch3: jglobus-errors.patch
+Patch4: jglobus-impl-clonable.patch
+Patch5: jglobus-dont-hide-super.patch
+# Fix javadoc warnings
+Patch6: jglobus-doc.patch
BuildArch: noarch
@@ -15,7 +24,9 @@ BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: dos2unix
BuildRequires: maven-local
+BuildRequires: maven-clean-plugin
BuildRequires: maven-compiler-plugin
+BuildRequires: maven-dependency-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -153,10 +164,22 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -n JGlobus-%{name}-all-%{version}-rc2
+%setup -q -n JGlobus-%{name}-all-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
dos2unix axis/src/main/java/org/globus/axis/example/README.txt
chmod 644 axis/src/main/java/org/globus/axis/example/README.txt
+# 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
+
%build
# Many tests requires network connections and a valid proxy certificate
mvn-rpmbuild -Ptomcat7 -Dproject.build.sourceEncoding=UTF-8 \
@@ -164,23 +187,23 @@ mvn-rpmbuild -Ptomcat7 -Dproject.build.sourceEncoding=UTF-8 \
%install
mkdir -p %{buildroot}%{_javadir}/%{name}
-install -p -m 644 ssl-proxies/target/ssl-proxies-%{version}-rc2.jar \
+install -p -m 644 ssl-proxies/target/ssl-proxies-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/ssl-proxies.jar
-install -p -m 644 jsse/target/jsse-%{version}-rc2.jar \
+install -p -m 644 jsse/target/jsse-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/jsse.jar
-install -p -m 644 gss/target/gss-%{version}-rc2.jar \
+install -p -m 644 gss/target/gss-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/gss.jar
-install -p -m 644 gram/target/gram-%{version}-rc2.jar \
+install -p -m 644 gram/target/gram-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/gram.jar
-install -p -m 644 gridftp/target/gridftp-%{version}-rc2.jar \
+install -p -m 644 gridftp/target/gridftp-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/gridftp.jar
-install -p -m 644 ssl-proxies-tomcat/target/ssl-proxies-tomcat-%{version}-rc2.jar \
+install -p -m 644 ssl-proxies-tomcat/target/ssl-proxies-tomcat-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/ssl-proxies-tomcat.jar
-install -p -m 644 io/target/io-%{version}-rc2.jar \
+install -p -m 644 io/target/io-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/io.jar
-install -p -m 644 myproxy/target/myproxy-%{version}-rc2.jar \
+install -p -m 644 myproxy/target/myproxy-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/myproxy.jar
-install -p -m 644 axis/target/axisg-%{version}-rc2.jar \
+install -p -m 644 axis/target/axisg-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/axisg.jar
mkdir -p %{buildroot}%{_javadocdir}
@@ -222,6 +245,7 @@ install -p -m 644 axis/pom.xml \
%files parent
%{_mavenpomdir}/JPP.%{name}-parent.pom
%{_mavendepmapfragdir}/%{name}-parent
+%doc LICENSE README.textile
%files ssl-proxies
%dir %{_javadir}/%{name}
@@ -274,6 +298,9 @@ install -p -m 644 axis/pom.xml \
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Mar 26 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.5-1
+- 2.0.5 final release
+
* Wed Feb 06 2013 Java SIG <java-devel at lists.fedoraproject.org> - 2.0.5-0.2.rc2
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
diff --git a/sources b/sources
index 733d9b2..b3b633c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a47c80956c4196cc28fcd00c80e95ef8 jglobus-all-2.0.5-rc2.tar.gz
+9d2b5598a540d6b8547a92fbe3d6ac8b jglobus-all-2.0.5.tar.gz
More information about the scm-commits
mailing list