Removed dependency to msv/xsdlib. (#52)

Signed-off-by: Roman Grigoriadi <roman.grigoriadi@oracle.com>
javaee · Apr 26, 2018 · 5968fce · 5968fce
1 parent 11bda07
commit 5968fce
Show file tree

Hide file tree

Showing 44 changed files with 797 additions and 115 deletions.
diff --git a/jaxrpc-ri/build.xml b/jaxrpc-ri/build.xml
@@ -3,7 +3,7 @@
 <!--
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  
- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ Copyright 1997-2018 Sun Microsystems, Inc. All rights reserved.
  
  The contents of this file are subject to the terms of either the GNU
  General Public License Version 2 only ("GPL") or the Common Development
@@ -145,7 +145,6 @@
   <property name="saaj-api.jar" value="${lib.home}/saaj-api.jar"/>
   <property name="saaj-impl.jar" value="${lib.home}/saaj-impl.jar"/>
   <property name="relaxngDatatype.jar" value="${lib.home}/relaxngDatatype.jar"/>
-  <property name="xsdlib.jar" value="${lib.home}/xsdlib.jar"/>
   <property name="jax-qname.jar" value="${lib.home}/jax-qname.jar"/>
   <property name="ant.jar" value="${lib.home}/ant.jar"/>
   <property name="jcert.jar" value="${lib.home}/jcert.jar"/>
@@ -187,7 +186,6 @@
     <pathelement location="${saaj-impl.jar}"/>
     <pathelement location="${jaxrpc-api.jar}"/>
     <pathelement location="${relaxngDatatype.jar}"/>
-    <pathelement location="${xsdlib.jar}"/>
     <pathelement location="${jax-qname.jar}"/>
     <pathelement location="${ant.jar}"/>
     <pathelement location="${jcert.jar}"/>

diff --git a/jaxrpc-ri/etc/bin/wscompile.bat b/jaxrpc-ri/etc/bin/wscompile.bat
@@ -58,7 +58,7 @@ goto setArgs
 
 setlocal
 
-set CLASSPATH=.;%JAXRPC_HOME%\lib\jaxrpc-impl.jar;%JAXRPC_HOME%\lib\jaxrpc-api.jar;%JAXRPC_HOME%\lib\jaxrpc-spi.jar;%JAXRPC_HOME%\lib\activation.jar;%JAXRPC_HOME%\lib\saaj-api.jar;%JAXRPC_HOME%\lib\saaj-impl.jar;%JAXRPC_HOME%\lib\mail.jar;%JAXRPC_HOME%\lib\jaxp-api.jar;%JAXRPC_HOME%\lib\dom.jar;%JAXRPC_HOME%\lib\sax.jar;%JAXRPC_HOME%\lib\xalan.jar;%JAXRPC_HOME%\lib\xercesImpl.jar;%JAXRPC_HOME%\lib\jax-qname.jar;%JAXRPC_HOME%\lib\relaxngDatatype.jar;%JAXRPC_HOME%\lib\xsdlib.jar;%JAXRPC_HOME%\lib\jcert.jar;%JAXRPC_HOME%\lib\jnet.jar;%JAXRPC_HOME%\lib\jsse.jar;%JAVA_HOME%\lib\tools.jar
+set CLASSPATH=.;%JAXRPC_HOME%\lib\jaxrpc-impl.jar;%JAXRPC_HOME%\lib\jaxrpc-api.jar;%JAXRPC_HOME%\lib\jaxrpc-spi.jar;%JAXRPC_HOME%\lib\activation.jar;%JAXRPC_HOME%\lib\saaj-api.jar;%JAXRPC_HOME%\lib\saaj-impl.jar;%JAXRPC_HOME%\lib\mail.jar;%JAXRPC_HOME%\lib\jaxp-api.jar;%JAXRPC_HOME%\lib\dom.jar;%JAXRPC_HOME%\lib\sax.jar;%JAXRPC_HOME%\lib\xalan.jar;%JAXRPC_HOME%\lib\xercesImpl.jar;%JAXRPC_HOME%\lib\jax-qname.jar;%JAXRPC_HOME%\lib\relaxngDatatype.jar;%JAXRPC_HOME%\lib\jcert.jar;%JAXRPC_HOME%\lib\jnet.jar;%JAXRPC_HOME%\lib\jsse.jar;%JAVA_HOME%\lib\tools.jar
 
 %JAVA_HOME%\bin\java -cp "%CLASSPATH%" com.sun.xml.rpc.tools.wscompile.Main %CMD_LINE_ARGS%
 

diff --git a/jaxrpc-ri/etc/bin/wscompile.sh b/jaxrpc-ri/etc/bin/wscompile.sh
@@ -3,7 +3,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 # 
-# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 1997-2018 Sun Microsystems, Inc. All rights reserved.
 # 
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -47,7 +47,7 @@ if [ -z "$JAXRPC_HOME" ]; then
 fi
 
 
-CLASSPATH=.:$JAXRPC_HOME/lib/jaxrpc-impl.jar:$JAXRPC_HOME/lib/jaxrpc-api.jar:$JAXRPC_HOME/lib/jaxrpc-spi.jar:$JAXRPC_HOME/lib/activation.jar:$JAXRPC_HOME/lib/saaj-api.jar:$JAXRPC_HOME/lib/saaj-impl.jar:$JAXRPC_HOME/lib/mail.jar:$JAXRPC_HOME/lib/jaxp-api.jar:$JAXRPC_HOME/lib/dom.jar:$JAXRPC_HOME/lib/sax.jar:$JAXRPC_HOME/lib/xalan.jar:$JAXRPC_HOME/lib/xercesImpl.jar:$JAXRPC_HOME/lib/jcert.jar:$JAXRPC_HOME/lib/jnet.jar:$JAXRPC_HOME/lib/jsse.jar:$JAVA_HOME/lib/tools.jar:$JAXRPC_HOME/lib/jax-qname.jar:$JAXRPC_HOME/lib/relaxngDatatype.jar:$JAXRPC_HOME/lib/xsdlib.jar
+CLASSPATH=.:$JAXRPC_HOME/lib/jaxrpc-impl.jar:$JAXRPC_HOME/lib/jaxrpc-api.jar:$JAXRPC_HOME/lib/jaxrpc-spi.jar:$JAXRPC_HOME/lib/activation.jar:$JAXRPC_HOME/lib/saaj-api.jar:$JAXRPC_HOME/lib/saaj-impl.jar:$JAXRPC_HOME/lib/mail.jar:$JAXRPC_HOME/lib/jaxp-api.jar:$JAXRPC_HOME/lib/dom.jar:$JAXRPC_HOME/lib/sax.jar:$JAXRPC_HOME/lib/xalan.jar:$JAXRPC_HOME/lib/xercesImpl.jar:$JAXRPC_HOME/lib/jcert.jar:$JAXRPC_HOME/lib/jnet.jar:$JAXRPC_HOME/lib/jsse.jar:$JAVA_HOME/lib/tools.jar:$JAXRPC_HOME/lib/jax-qname.jar:$JAXRPC_HOME/lib/relaxngDatatype.jar
 
 $JAVA_HOME/bin/java -cp "$CLASSPATH" com.sun.xml.rpc.tools.wscompile.Main "$@"
 

diff --git a/jaxrpc-ri/etc/bin/wsdeploy.bat b/jaxrpc-ri/etc/bin/wsdeploy.bat
@@ -58,7 +58,7 @@ goto setArgs
 
 setlocal
 
-set CLASSPATH=.;%JAXRPC_HOME%\lib\jaxrpc-impl.jar;%JAXRPC_HOME%\lib\jaxrpc-api.jar;%JAXRPC_HOME%\lib\jaxrpc-spi.jar;%JAXRPC_HOME%\lib\activation.jar;%JAXRPC_HOME%\lib\saaj-api.jar;%JAXRPC_HOME%\lib\saaj-impl.jar;%JAXRPC_HOME%\lib\mail.jar;%JAXRPC_HOME%\lib\jaxp-api.jar;%JAXRPC_HOME%\lib\dom.jar;%JAXRPC_HOME%\lib\sax.jar;%JAXRPC_HOME%\lib\xalan.jar;%JAXRPC_HOME%\lib\xercesImpl.jar;%JAXRPC_HOME%\lib\jcert.jar;%JAXRPC_HOME%\lib\jnet.jar;%JAXRPC_HOME%\lib\jsse.jar;%JAXRPC_HOME%\lib\jax-qname.jar;%JAXRPC_HOME%\lib\relaxngDatatype.jar;%JAXRPC_HOME%\lib\xsdlib.jar;%JAVA_HOME%\lib\tools.jar
+set CLASSPATH=.;%JAXRPC_HOME%\lib\jaxrpc-impl.jar;%JAXRPC_HOME%\lib\jaxrpc-api.jar;%JAXRPC_HOME%\lib\jaxrpc-spi.jar;%JAXRPC_HOME%\lib\activation.jar;%JAXRPC_HOME%\lib\saaj-api.jar;%JAXRPC_HOME%\lib\saaj-impl.jar;%JAXRPC_HOME%\lib\mail.jar;%JAXRPC_HOME%\lib\jaxp-api.jar;%JAXRPC_HOME%\lib\dom.jar;%JAXRPC_HOME%\lib\sax.jar;%JAXRPC_HOME%\lib\xalan.jar;%JAXRPC_HOME%\lib\xercesImpl.jar;%JAXRPC_HOME%\lib\jcert.jar;%JAXRPC_HOME%\lib\jnet.jar;%JAXRPC_HOME%\lib\jsse.jar;%JAXRPC_HOME%\lib\jax-qname.jar;%JAXRPC_HOME%\lib\relaxngDatatype.jar;%JAVA_HOME%\lib\tools.jar
 
 %JAVA_HOME%\bin\java -cp "%CLASSPATH%" com.sun.xml.rpc.tools.wsdeploy.Main %CMD_LINE_ARGS% 
 

diff --git a/jaxrpc-ri/etc/bin/wsdeploy.sh b/jaxrpc-ri/etc/bin/wsdeploy.sh
@@ -3,7 +3,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 # 
-# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 1997-2018 Sun Microsystems, Inc. All rights reserved.
 # 
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -47,7 +47,7 @@ if [ -z "$JAXRPC_HOME" ]; then
 fi
 
 
-CLASSPATH=.:$JAXRPC_HOME/lib/jaxrpc-impl.jar:$JAXRPC_HOME/lib/jaxrpc-api.jar:$JAXRPC_HOME/lib/jaxrpc-spi.jar:$JAXRPC_HOME/lib/activation.jar:$JAXRPC_HOME/lib/saaj-api.jar:$JAXRPC_HOME/lib/saaj-impl.jar:$JAXRPC_HOME/lib/mail.jar:$JAXRPC_HOME/lib/jaxp-api.jar:$JAXRPC_HOME/lib/dom.jar:$JAXRPC_HOME/lib/sax.jar:$JAXRPC_HOME/lib/xalan.jar:$JAXRPC_HOME/lib/xercesImpl.jar:$JAXRPC_HOME/lib/jcert.jar:$JAXRPC_HOME/lib/jnet.jar:$JAXRPC_HOME/lib/jsse.jar:$JAXRPC_HOME/lib/jax-qname.jar:$JAXRPC_HOME/lib/relaxngDatatype.jar:$JAXRPC_HOME/lib/xsdlib.jar:$JAVA_HOME/lib/tools.jar
+CLASSPATH=.:$JAXRPC_HOME/lib/jaxrpc-impl.jar:$JAXRPC_HOME/lib/jaxrpc-api.jar:$JAXRPC_HOME/lib/jaxrpc-spi.jar:$JAXRPC_HOME/lib/activation.jar:$JAXRPC_HOME/lib/saaj-api.jar:$JAXRPC_HOME/lib/saaj-impl.jar:$JAXRPC_HOME/lib/mail.jar:$JAXRPC_HOME/lib/jaxp-api.jar:$JAXRPC_HOME/lib/dom.jar:$JAXRPC_HOME/lib/sax.jar:$JAXRPC_HOME/lib/xalan.jar:$JAXRPC_HOME/lib/xercesImpl.jar:$JAXRPC_HOME/lib/jcert.jar:$JAXRPC_HOME/lib/jnet.jar:$JAXRPC_HOME/lib/jsse.jar:$JAXRPC_HOME/lib/jax-qname.jar:$JAXRPC_HOME/lib/relaxngDatatype.jar:$JAVA_HOME/lib/tools.jar
 
 $JAVA_HOME/bin/java -cp "$CLASSPATH" com.sun.xml.rpc.tools.wsdeploy.Main "$@"
 

diff --git a/jaxrpc-ri/etc/impl-manifest b/jaxrpc-ri/etc/impl-manifest
@@ -6,5 +6,5 @@ Implementation-Version: 1.1.3_01
 Implementation-Vendor: Sun Microsystems Inc
 Implementation-Vendor-Id: com.sun
 Extension-Name: com.sun.xml.rpc
-Class-Path: jaxrpc-spi.jar ../../private/share/lib/jaxrpc-spi.jar saaj-api.jar saaj-impl.jar jax-qname.jar namespace.jar relaxngDatatype.jar ../../private/share/lib/relaxngDatatype.jar xsdlib.jar ../../private/share/lib/xsdlib.jar FastInfoset.jar ../../../opt/SUNWjax/share/lib/FastInfoset.jar jsr173_api.jar
+Class-Path: jaxrpc-spi.jar ../../private/share/lib/jaxrpc-spi.jar saaj-api.jar saaj-impl.jar jax-qname.jar namespace.jar relaxngDatatype.jar ../../private/share/lib/relaxngDatatype.jar FastInfoset.jar ../../../opt/SUNWjax/share/lib/FastInfoset.jar jsr173_api.jar
 
diff --git a/jaxrpc-ri/hpux/wscompile.sh b/jaxrpc-ri/hpux/wscompile.sh
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 # 
-# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 1997-2018 Sun Microsystems, Inc. All rights reserved.
 # 
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -48,6 +48,6 @@ WEBSERVICES_LIB=`cd $bin_dir/../share/lib; pwd`
 WEBSERVICES_PRIVATE_LIB=`cd $bin_dir/../private/share/lib; pwd`
 
 # Set CLASSPATH
-CLASSPATH=$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_PRIVATE_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/lib/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$JAVA_HOME/lib/tools.jar:$WEBSERVICES_PRIVATE_LIB/relaxngDatatype.jar:$WEBSERVICES_PRIVATE_LIB/xsdlib.jar
+CLASSPATH=$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_PRIVATE_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/lib/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$JAVA_HOME/lib/tools.jar:$WEBSERVICES_PRIVATE_LIB/relaxngDatatype.jar
 
 $JAVA_HOME/bin/java $WSCOMPILE_OPTS -classpath "$CLASSPATH" com.sun.xml.rpc.tools.wscompile.Main "$@"
diff --git a/jaxrpc-ri/hpux/wsdeploy.sh b/jaxrpc-ri/hpux/wsdeploy.sh
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 # 
-# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 1997-2018 Sun Microsystems, Inc. All rights reserved.
 # 
 # The contents of this file are subject to the terms of either the GNU
 # General Public License Version 2 only ("GPL") or the Common Development
@@ -48,6 +48,6 @@ WEBSERVICES_LIB=`cd $bin_dir/../share/lib; pwd`
 WEBSERVICES_PRIVATE_LIB=`cd $bin_dir/../private/share/lib; pwd`
 
 # Set CLASSPATH
-CLASSPATH=.:$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_PRIVATE_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/lib/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$WEBSERVICES_PRIVATE_LIB/relaxngDatatype.jar:$WEBSERVICES_PRIVATE_LIB/xsdlib.jar:$JAVA_HOME/lib/tools.jar
+CLASSPATH=.:$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_PRIVATE_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/lib/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$WEBSERVICES_PRIVATE_LIB/relaxngDatatype.jar:$JAVA_HOME/lib/tools.jar
 
 $JAVA_HOME/bin/java $WSDEPLOY_OPTS -classpath "$CLASSPATH" com.sun.xml.rpc.tools.wsdeploy.Main "$@"
diff --git a/jaxrpc-ri/lib/xsdlib.jar b/jaxrpc-ri/lib/xsdlib.jar
diff --git a/jaxrpc-ri/maven/jaxrpc-impl.pom b/jaxrpc-ri/maven/jaxrpc-impl.pom
@@ -2,7 +2,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.sun.xml.rpc</groupId>
  <artifactId>jaxrpc-impl</artifactId>
- <version>1.1.3_01</version>
+ <version>1.1.4_01</version>
  <dependencies>
 
    <dependency>
@@ -24,9 +24,9 @@
    </dependency>
 
    <dependency>
-     <groupId>org.jvnet.fastinfoset</groupId>
+     <groupId>com.sun.xml.fastinfoset</groupId>
      <artifactId>FastInfoset</artifactId>
-     <version>1.0.2</version>
+     <version>1.2.13</version>
    </dependency>
 
  </dependencies>

diff --git a/jaxrpc-ri/maven/jaxrpc-spi.pom b/jaxrpc-ri/maven/jaxrpc-spi.pom
@@ -2,7 +2,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.sun.xml.rpc</groupId>
  <artifactId>jaxrpc-spi</artifactId>
- <version>1.1.3_01</version>
+ <version>1.1.4_01</version>
  <dependencies>
    <dependency>
      <groupId>javax.xml</groupId>

diff --git a/jaxrpc-ri/nbproject/project.xml b/jaxrpc-ri/nbproject/project.xml
@@ -3,7 +3,7 @@
 <!--
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  
- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ Copyright 1997-2018 Sun Microsystems, Inc. All rights reserved.
  
  The contents of this file are subject to the terms of either the GNU
  General Public License Version 2 only ("GPL") or the Common Development
@@ -109,7 +109,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">lib/activation.jar;lib/ant.jar;lib/dom.jar;lib/FastInfoset.jar;lib/jax-qname.jar;lib/jaxp-api.jar;lib/jaxrpc-api.jar;lib/jsr173_api.jar;lib/junit.jar;lib/mail.jar;lib/optional.jar;lib/relaxngDatatype.jar;lib/saaj-api.jar;lib/saaj-impl.jar;lib/sax.jar;lib/servlet.jar;lib/stax-utils.jar;lib/xalan.jar;lib/xercesImpl.jar;lib/xsdlib.jar</classpath>
+                <classpath mode="compile">lib/activation.jar;lib/ant.jar;lib/dom.jar;lib/FastInfoset.jar;lib/jax-qname.jar;lib/jaxp-api.jar;lib/jaxrpc-api.jar;lib/jsr173_api.jar;lib/junit.jar;lib/mail.jar;lib/optional.jar;lib/relaxngDatatype.jar;lib/saaj-api.jar;lib/saaj-impl.jar;lib/sax.jar;lib/servlet.jar;lib/stax-utils.jar;lib/xalan.jar;lib/xercesImpl.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>

diff --git a/jaxrpc-ri/pkg/SUNWxrpcrt/wscompile.template b/jaxrpc-ri/pkg/SUNWxrpcrt/wscompile.template
@@ -16,6 +16,6 @@ bin_dir=`dirname $0`
 WEBSERVICES_LIB=`cd $bin_dir/../share/lib; pwd`
 
 # Set CLASSPATH
-CLASSPATH=$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$JAVA_HOME/lib/tools.jar:$WEBSERVICES_LIB/relaxngDatatype.jar:$WEBSERVICES_LIB/xsdlib.jar
+CLASSPATH=$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$JAVA_HOME/lib/tools.jar:$WEBSERVICES_LIB/relaxngDatatype.jar
 
 $JAVA_HOME/bin/java $WSCOMPILE_OPTS -classpath "$CLASSPATH" com.sun.xml.rpc.tools.wscompile.Main "$@"
diff --git a/jaxrpc-ri/pkg/SUNWxrpcrt/wsdeploy.template b/jaxrpc-ri/pkg/SUNWxrpcrt/wsdeploy.template
@@ -16,6 +16,6 @@ bin_dir=`dirname $0`
 WEBSERVICES_LIB=`cd $bin_dir/../share/lib; pwd`
 
 # Set CLASSPATH
-CLASSPATH=.:$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/lib/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$WEBSERVICES_LIB/relaxngDatatype.jar:$WEBSERVICES_LIB/xsdlib.jar:$JAVA_HOME/lib/tools.jar
+CLASSPATH=.:$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/lib/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$WEBSERVICES_LIB/relaxngDatatype.jar:$JAVA_HOME/lib/tools.jar
 
 $JAVA_HOME/bin/java $WSDEPLOY_OPTS -classpath "$CLASSPATH" com.sun.xml.rpc.tools.wsdeploy.Main "$@"
diff --git a/jaxrpc-ri/rpm/wscompile.template b/jaxrpc-ri/rpm/wscompile.template
@@ -34,6 +34,6 @@ WEBSERVICES_LIB=%WEBSERVICES_LIB%
 WEBSERVICES_PRIVATE_LIB=%WEBSERVICES_PRIVATE_LIB%
 
 # Set CLASSPATH
-CLASSPATH=$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_PRIVATE_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/lib/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$JAVA_HOME/lib/tools.jar:$WEBSERVICES_PRIVATE_LIB/relaxngDatatype.jar:$WEBSERVICES_PRIVATE_LIB/xsdlib.jar
+CLASSPATH=$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_PRIVATE_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/lib/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$JAVA_HOME/lib/tools.jar:$WEBSERVICES_PRIVATE_LIB/relaxngDatatype.jar
 
 $JAVA_HOME/bin/java $WSCOMPILE_OPTS -classpath "$CLASSPATH" com.sun.xml.rpc.tools.wscompile.Main "$@"
diff --git a/jaxrpc-ri/rpm/wsdeploy.template b/jaxrpc-ri/rpm/wsdeploy.template
@@ -34,6 +34,6 @@ WEBSERVICES_LIB=%WEBSERVICES_LIB%
 WEBSERVICES_PRIVATE_LIB=%WEBSERVICES_PRIVATE_LIB%
 
 # Set CLASSPATH
-CLASSPATH=.:$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_PRIVATE_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/lib/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$WEBSERVICES_PRIVATE_LIB/relaxngDatatype.jar:$WEBSERVICES_PRIVATE_LIB/xsdlib.jar:$JAVA_HOME/lib/tools.jar
+CLASSPATH=.:$WEBSERVICES_LIB/jaxrpc-impl.jar:$WEBSERVICES_LIB/jaxrpc-api.jar:$WEBSERVICES_PRIVATE_LIB/jaxrpc-spi.jar:$WEBSERVICES_LIB/activation.jar:$WEBSERVICES_LIB/saaj-api.jar:$WEBSERVICES_LIB/saaj-impl.jar:$WEBSERVICES_LIB/mail.jar:$WEBSERVICES_LIB/endorsed/dom.jar:$WEBSERVICES_LIB/endorsed/xalan.jar:$WEBSERVICES_LIB/endorsed/xercesImpl.jar:$WEBSERVICES_LIB/endorsed/lib/jaxp-api.jar:$WEBSERVICES_LIB/endorsed/sax.jar:$WEBSERVICES_PRIVATE_LIB/relaxngDatatype.jar:$JAVA_HOME/lib/tools.jar
 
 $JAVA_HOME/bin/java $WSDEPLOY_OPTS -classpath "$CLASSPATH" com.sun.xml.rpc.tools.wsdeploy.Main "$@"
diff --git a/jaxrpc-ri/samples/AttachmentsSample/build.properties b/jaxrpc-ri/samples/AttachmentsSample/build.properties
@@ -36,7 +36,6 @@ change only the container property and it's root
 <property name="saaj-api.jar" value="${saajhome}/lib/saaj-api.jar"/>
 <property name="saaj-impl.jar" value="${saajhome}/lib/saaj-impl.jar"/>
 <property name="relaxngDatatype.jar" value="${jwsdpshared}/lib/relaxngDatatype.jar"/>
-<property name="xsdlib.jar" value="${jwsdpshared}/lib/xsdlib.jar"/>
 <property name="jax-qname.jar" value="${jaxrpchome}/lib/jax-qname.jar"/>
 <property name="ant.jar" value="${jwsdphome}/apache-ant/lib/ant.jar"/>
 <property name="sjsws.instance" value="localhost"/>

diff --git a/jaxrpc-ri/samples/AttachmentsSample/build.properties.jwsdp b/jaxrpc-ri/samples/AttachmentsSample/build.properties.jwsdp
@@ -36,7 +36,6 @@ change only the container property and it's root
 <property name="saaj-api.jar" value="${saajhome}/lib/saaj-api.jar"/>
 <property name="saaj-impl.jar" value="${saajhome}/lib/saaj-impl.jar"/>
 <property name="relaxngDatatype.jar" value="${jwsdpshared}/lib/relaxngDatatype.jar"/>
-<property name="xsdlib.jar" value="${jwsdpshared}/lib/xsdlib.jar"/>
 <property name="jax-qname.jar" value="${jaxrpchome}/lib/jax-qname.jar"/>
 <property name="ant.jar" value="${jwsdphome}/apache-ant/lib/ant.jar"/>
 <property name="sjsas.servlet.jar" value="${sjsas.root}/lib/j2ee.jar"/>

diff --git a/jaxrpc-ri/samples/AttachmentsSample/build.xml b/jaxrpc-ri/samples/AttachmentsSample/build.xml
@@ -6,7 +6,7 @@
 <!--
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  
- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ Copyright 1997-2018 Sun Microsystems, Inc. All rights reserved.
  
  The contents of this file are subject to the terms of either the GNU
  General Public License Version 2 only ("GPL") or the Common Development
@@ -72,7 +72,6 @@
     <pathelement location="${saaj-api.jar}"/>
     <pathelement location="${saaj-impl.jar}"/>
     <pathelement location="${relaxngDatatype.jar}"/>
-    <pathelement location="${xsdlib.jar}"/>
     <pathelement location="${jax-qname.jar}"/>
     <pathelement location="${ant.jar}"/>
     <pathelement location="${samplesbuild}/${appname}/classes/util"/>

diff --git a/jaxrpc-ri/samples/HelloWorld/build.properties b/jaxrpc-ri/samples/HelloWorld/build.properties
@@ -25,7 +25,6 @@ jaxrpc-spi.jar=${jaxrpchome}/lib/jaxrpc-spi.jar
 saaj-api.jar=${saajhome}/lib/saaj-api.jar
 saaj-impl.jar=${saajhome}/lib/saaj-impl.jar
 relaxngDatatype.jar=${jwsdpshared}/lib/relaxngDatatype.jar
-xsdlib.jar=${jwsdpshared}/lib/xsdlib.jar
 jax-qname.jar=${jwsdpshared}/lib/jax-qname.jar
 junit.jar=${jwsdpshared}/lib/junit.jar
 ant.jar=${jwsdphome}/apache-ant/lib/ant.jar