3:01 a.m.
Author: richard.opalka(a)jboss.com
Date: 2010-04-16 04:01:26 -0400 (Fri, 16 Apr 2010)
New Revision: 12008
Added:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.SOAPConnectionFactory
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-deploy.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/FactoryLoader.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPConnection.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPConnectionFactory.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPException.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/ws/addressing/AddressingBuilder.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml
Log:
[JBPAPP-4099] fixing JBossWS 1.2.1 to be executable on JDK6
Modified: legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-deploy.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-deploy.xml 2010-04-16
07:56:06 UTC (rev 12007)
+++ legacy/branches/jbossws-1.2.1.GA_CP/build/ant-import/build-deploy.xml 2010-04-16
08:01:26 UTC (rev 12008)
@@ -55,6 +55,15 @@
<include name="jbossws-wsconsume-impl.jar"/>
</fileset>
</copy>
+ <copy todir="${jboss42.home}/lib/endorsed"
overwrite="true">
+ <fileset dir="${core.output.lib.dir}">
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ </copy>
<copy todir="${jboss42.home}/server/${jboss.server.instance}/lib"
overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jbossws-integration.jar"/>
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/FactoryLoader.java
===================================================================
---
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/FactoryLoader.java 2010-04-16
07:56:06 UTC (rev 12007)
+++
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/FactoryLoader.java 2010-04-16
08:01:26 UTC (rev 12008)
@@ -31,8 +31,6 @@
import java.security.PrivilegedAction;
import java.util.Properties;
-import org.jboss.logging.Logger;
-
// $Id$
/**
@@ -43,9 +41,6 @@
*/
public class FactoryLoader
{
- // provide logging
- private static Logger log = Logger.getLogger(FactoryLoader.class);
-
private FactoryLoader()
{
}
@@ -72,7 +67,6 @@
{
try
{
- if(log.isDebugEnabled()) log.debug("Load from system property: " +
factoryName);
Class factoryClass = loader.loadClass(factoryName);
factory = factoryClass.newInstance();
}
@@ -98,7 +92,6 @@
factoryName = jaxmProperties.getProperty(propertyName);
if (factoryName != null)
{
- if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile +
": " + factoryName);
Class factoryClass = loader.loadClass(factoryName);
factory = factoryClass.newInstance();
}
@@ -124,7 +117,6 @@
br.close();
if (factoryName != null)
{
- if(log.isTraceEnabled()) log.trace("Load from Service API " +
filename + ": " + factoryName);
Class factoryClass = loader.loadClass(factoryName);
factory = factoryClass.newInstance();
}
@@ -142,7 +134,6 @@
try
{
factoryName = defaultFactory;
- if(log.isDebugEnabled()) log.debug("Load from default: " +
factoryName);
Class factoryClass = loader.loadClass(factoryName);
factory = factoryClass.newInstance();
}
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPConnection.java
===================================================================
---
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPConnection.java 2010-04-16
07:56:06 UTC (rev 12007)
+++
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPConnection.java 2010-04-16
08:01:26 UTC (rev 12008)
@@ -21,8 +21,6 @@
*/
package javax.xml.soap;
-import org.jboss.util.NotImplementedException;
-
/** A point-to-point connection that a client can use for sending messages directly to a
remote
* party (represented by a URL, for instance).
*
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPConnectionFactory.java
===================================================================
---
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPConnectionFactory.java 2010-04-16
07:56:06 UTC (rev 12007)
+++
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPConnectionFactory.java 2010-04-16
08:01:26 UTC (rev 12008)
@@ -24,8 +24,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import org.jboss.logging.Logger;
-
/** A factory for creating SOAPConnection objects. Implementation of this class
* is optional. If SOAPConnectionFactory.newInstance() throws an
* UnsupportedOperationException then the implementation does not support the
@@ -39,9 +37,6 @@
*/
public abstract class SOAPConnectionFactory
{
- // provide logging
- private static Logger log = Logger.getLogger(SOAPConnectionFactory.class);
-
private static final String DEFAULT_SOAP_CONNECTION_FACTORY =
"org.jboss.ws.core.soap.SOAPConnectionFactoryImpl";
private static final String[] alternativeFactories = new String[] {
"org.jboss.webservice.soap.SOAPConnectionFactoryImpl",
"org.jboss.axis.soap.SOAPConnectionFactoryImpl" };
@@ -81,7 +76,7 @@
}
catch (ClassNotFoundException e1)
{
- if(log.isDebugEnabled()) log.debug("Cannot load factory: " +
factoryName);
+ // ignore
}
}
}
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPException.java
===================================================================
---
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPException.java 2010-04-16
07:56:06 UTC (rev 12007)
+++
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/soap/SOAPException.java 2010-04-16
08:01:26 UTC (rev 12008)
@@ -21,22 +21,13 @@
*/
package javax.xml.soap;
-import org.jboss.util.id.SerialVersion;
-
/**
* @author Scott.Stark(a)jboss.org
* @version $Revision$
*/
public class SOAPException extends Exception
{
- /** @since 4.0.2 */
- static final long serialVersionUID;
- static
- {
- if (SerialVersion.version == SerialVersion.LEGACY)
- serialVersionUID = -4385552115225336830L;
- else serialVersionUID = 5083961510786058130L;
- }
+ private static final long serialVersionUID = 5083961510786058130L;
public SOAPException()
{
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/ws/addressing/AddressingBuilder.java
===================================================================
---
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/ws/addressing/AddressingBuilder.java 2010-04-16
07:56:06 UTC (rev 12007)
+++
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/javax/xml/ws/addressing/AddressingBuilder.java 2010-04-16
08:01:26 UTC (rev 12008)
@@ -31,13 +31,8 @@
import javax.xml.namespace.QName;
-import org.jboss.logging.Logger;
-
public abstract class AddressingBuilder implements AddressingType
{
- // provide logging
- private static Logger log = Logger.getLogger(AddressingBuilder.class);
-
protected AddressingBuilder()
{
}
@@ -67,7 +62,7 @@
}
catch (Exception e)
{
- log.warn("Could not create and instance of " + name + " trying
" + DEFAULT_ADDRESSING_BUILDER);
+ // ignore
}
// default builder
Added:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.SOAPConnectionFactory
===================================================================
---
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.SOAPConnectionFactory
(rev 0)
+++
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/resources/jboss-saaj.jar/META-INF/services/javax.xml.soap.SOAPConnectionFactory 2010-04-16
08:01:26 UTC (rev 12008)
@@ -0,0 +1 @@
+org.jboss.ws.core.soap.SOAPConnectionFactoryImpl
\ No newline at end of file
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml 2010-04-16 07:56:06 UTC
(rev 12007)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml 2010-04-16 08:01:26 UTC
(rev 12008)
@@ -64,7 +64,7 @@
<!-- Java Endorsed -->
<condition property="endorsed.dirs"
value="${jboss.home}/lib/endorsed">
- <isset property="jbossws.integration.target.jboss"/>
+ <isset property="jbossws.integration.target"/>
</condition>
<condition property="endorsed.dirs"
value="${tomcat.home}/common/endorsed">
<isset property="jbossws.integration.target.tomcat"/>