rpms/xmlrpc/devel xmlrpc-2.0.1-jessie.patch, NONE, 1.1 xmlrpc.spec, 1.17, 1.18
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Mar 8 23:16:19 UTC 2007
Author: dbhole
Update of /cvs/dist/rpms/xmlrpc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31698
Modified Files:
xmlrpc.spec
Added Files:
xmlrpc-2.0.1-jessie.patch
Log Message:
Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
xmlrpc-2.0.1-jessie.patch:
build.xml | 2
src/java/org/apache/xmlrpc/secure/SecureWebServer.java | 4 -
src/java/org/apache/xmlrpc/secure/SecurityConstants.java | 6 +-
src/java/org/apache/xmlrpc/secure/sunssl/SunSSLTransportFactory.java | 25 +++++-----
4 files changed, 19 insertions(+), 18 deletions(-)
--- NEW FILE xmlrpc-2.0.1-jessie.patch ---
--- ./src/java/org/apache/xmlrpc/secure/SecurityConstants.java.sav 2005-08-24 15:49:40.000000000 -0400
+++ ./src/java/org/apache/xmlrpc/secure/SecurityConstants.java 2007-03-08 17:43:27.000000000 -0500
@@ -26,7 +26,7 @@
* default with setSecurityProviderClass().
*/
public final static String DEFAULT_SECURITY_PROVIDER_CLASS =
- "com.sun.net.ssl.internal.ssl.Provider";
+ "gnu.javax.net.ssl.provider.Jessie";
public final static String SECURITY_PROVIDER_CLASS =
"security.provider";
@@ -97,7 +97,7 @@
* Default key manager type. You probably don't need to
* override this default.
*/
- public final static String DEFAULT_KEY_MANAGER_TYPE = "SunX509";
+ public final static String DEFAULT_KEY_MANAGER_TYPE = "JessieX509";
public final static String KEY_MANAGER_TYPE =
"sun.ssl.keymanager.type";
@@ -110,7 +110,7 @@
* are using something other than the Sun JSSE.
*/
public final static String DEFAULT_PROTOCOL_HANDLER_PACKAGES =
- "com.sun.net.ssl.internal.www.protocol";
+ "gnu.java.net.protocol";
public final static String PROTOCOL_HANDLER_PACKAGES =
"java.protocol.handler.pkgs";
--- ./src/java/org/apache/xmlrpc/secure/SecureWebServer.java.sav 2005-08-24 15:49:40.000000000 -0400
+++ ./src/java/org/apache/xmlrpc/secure/SecureWebServer.java 2007-03-08 17:23:25.000000000 -0500
@@ -30,8 +30,8 @@
import org.apache.xmlrpc.XmlRpc;
import org.apache.xmlrpc.XmlRpcServer;
-import com.sun.net.ssl.KeyManagerFactory;
-import com.sun.net.ssl.SSLContext;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
/**
* A minimal web server that exclusively handles XML-RPC requests
--- ./src/java/org/apache/xmlrpc/secure/sunssl/SunSSLTransportFactory.java.sav 2005-08-24 15:49:40.000000000 -0400
+++ ./src/java/org/apache/xmlrpc/secure/sunssl/SunSSLTransportFactory.java 2007-03-08 17:35:54.000000000 -0500
@@ -29,10 +29,11 @@
import org.apache.xmlrpc.XmlRpcTransportFactory;
import org.apache.xmlrpc.secure.SecurityTool;
-import com.sun.net.ssl.HostnameVerifier;
-import com.sun.net.ssl.HttpsURLConnection;
-import com.sun.net.ssl.SSLContext;
-import com.sun.net.ssl.X509TrustManager;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.X509TrustManager;
/**
* Interface from XML-RPC to the HTTPS transport based on the
@@ -55,14 +56,14 @@
// The openTrustManager trusts all certificates
private static X509TrustManager openTrustManager = new X509TrustManager()
{
- public boolean isClientTrusted(X509Certificate[] chain)
+ public void checkClientTrusted(X509Certificate[] chain, String authType)
{
- return true;
+ //return true;
}
- public boolean isServerTrusted(X509Certificate[] chain)
+ public void checkServerTrusted(X509Certificate[] chain, String authType)
{
- return true;
+ //return true;
}
public X509Certificate[] getAcceptedIssuers()
@@ -74,7 +75,7 @@
// The openHostnameVerifier trusts all hostnames
private static HostnameVerifier openHostnameVerifier = new HostnameVerifier()
{
- public boolean verify(String hostname, String session)
+ public boolean verify(String hostname, SSLSession session)
{
return true;
}
@@ -86,8 +87,8 @@
properties.setProperty(XmlRpcTransportFactory.TRANSPORT_URL, "(java.net.URL) - URL to connect to");
properties.setProperty(XmlRpcTransportFactory.TRANSPORT_AUTH, "(java.lang.String) - HTTP Basic Authentication string (encoded).");
- properties.setProperty(TRANSPORT_TRUSTMANAGER, "(com.sun.net.ssl.X509TrustManager) - X.509 Trust Manager to use");
- properties.setProperty(TRANSPORT_HOSTNAMEVERIFIER, "(com.sun.net.ssl.HostnameVerifier) - Hostname verifier to use");
+ properties.setProperty(TRANSPORT_TRUSTMANAGER, "(javax.net.ssl.X509TrustManager) - X.509 Trust Manager to use");
+ properties.setProperty(TRANSPORT_HOSTNAMEVERIFIER, "(javax.net.ssl.HostnameVerifier) - Hostname verifier to use");
return properties;
}
@@ -99,7 +100,7 @@
HostnameVerifier hostnameVerifier;
SSLContext sslContext;
- Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+ Security.addProvider(new gnu.javax.net.ssl.provider.Jessie());
url = (URL) properties.get(XmlRpcTransportFactory.TRANSPORT_URL);
auth = properties.getProperty(XmlRpcTransportFactory.TRANSPORT_AUTH);
--- ./build.xml.sav 2005-12-21 04:09:45.000000000 -0500
+++ ./build.xml 2007-03-08 17:23:25.000000000 -0500
@@ -94,7 +94,7 @@
<target name="init" depends="env,copy-deps">
<available
- classname="com.sun.net.ssl.SSLContext"
+ classname="javax.net.ssl.SSLContext"
property="jsse.present"
classpathref="classpath"
/>
Index: xmlrpc.spec
===================================================================
RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xmlrpc.spec 5 Aug 2006 00:18:54 -0000 1.17
+++ xmlrpc.spec 8 Mar 2007 23:16:17 -0000 1.18
@@ -36,13 +36,14 @@
Name: xmlrpc
Version: 2.0.1
-Release: 3jpp.1
+Release: 3jpp.2
Epoch: 0
Summary: Java XML-RPC implementation
License: Apache Software License
Group: Development/Java
Url: http://xml.apache.org/%{name}/
Source0: http://www.apache.org/dist/ws/xmlrpc/source/xmlrpc-%{version}-src.tar.gz
+Patch0: %{name}-%{version}-jessie.patch
Requires: servletapi5
Requires: jakarta-commons-httpclient
Requires: jakarta-commons-codec >= 1.3
@@ -53,6 +54,7 @@
BuildRequires: junit
BuildRequires: jakarta-commons-httpclient
BuildRequires: jakarta-commons-codec >= 1.3
+BuildRequires: jsse
%if ! %{gcj_support}
Buildarch: noarch
%endif
@@ -86,6 +88,8 @@
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
+%patch0 -b .sav
+
%build
export CLASSPATH=%(build-classpath jsse commons-httpclient commons-codec servletapi5 junit 2>/dev/null)
ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version} -Djavadoc.destdir=./docs/apidocs -Dhave.deps=true jar
@@ -152,6 +156,9 @@
%{_javadocdir}/%{name}-%{version}
%changelog
+* Thu Mar 08 2007 Deepak Bhole <dbhole at redhat.com> 2.0.1-3jpp.2
+- Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
+
* Fri Aug 04 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:2.0.1-3jpp.1
- Merge with latest from JPP.
More information about the fedora-cvs-commits
mailing list