Integrate JAXB 2.3.4, Metro 2.4.5

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Apr 15, 2021 · 173eb26 · 173eb26
1 parent 472f40c
commit 173eb26
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 25 deletions.
diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -80,10 +80,10 @@
         <javaee.version>${javaee.major_version}.${minor_version}${javaee.version_qualifier}</javaee.version>
 
         <jsftemplating.version>2.1.4</jsftemplating.version>
-        <webservices.version>2.4.4</webservices.version>
-        <woodstox.version>5.1.0</woodstox.version>
-        <jaxb.version>2.3.3</jaxb.version>
-        <stax2-api.version>4.1</stax2-api.version>
+        <webservices.version>2.4.5</webservices.version>
+        <woodstox.version>6.2.4</woodstox.version>
+        <jaxb.version>2.3.4</jaxb.version>
+        <stax2-api.version>4.2.1</stax2-api.version>
         <jakarta.xml.registry-api.version>1.0.9</jakarta.xml.registry-api.version>
         <eclipselink.version>2.7.4</eclipselink.version>
         <jakarta-persistence-api.version>2.2.2</jakarta-persistence-api.version>

diff --git a/...ces.security/src/main/java/com/sun/enterprise/security/webservices/ClientPipeCreator.java b/...ces.security/src/main/java/com/sun/enterprise/security/webservices/ClientPipeCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -19,7 +19,7 @@
 import java.util.HashMap;
 
 import com.sun.xml.ws.api.pipe.Pipe;
-import com.sun.xml.ws.assembler.ClientPipelineHook;
+import com.sun.xml.ws.assembler.metro.dev.ClientPipelineHook;
 //import com.sun.xml.ws.assembler.ClientTubelineAssemblyContext;
 import com.sun.xml.ws.api.pipe.ClientPipeAssemblerContext;
 import com.sun.xml.ws.policy.PolicyMap;

diff --git a/...s.security/src/main/java/com/sun/enterprise/security/webservices/SecurityServiceImpl.java b/...s.security/src/main/java/com/sun/enterprise/security/webservices/SecurityServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,7 +24,7 @@
 import com.sun.web.security.RealmAdapter;
 import com.sun.xml.rpc.spi.runtime.SOAPMessageContext;
 import com.sun.xml.rpc.spi.runtime.SystemHandlerDelegate;
-import com.sun.xml.ws.assembler.ClientPipelineHook;
+import com.sun.xml.ws.assembler.metro.dev.ClientPipelineHook;
 import java.security.cert.X509Certificate;
 import java.util.logging.Level;
 import java.util.logging.Logger;

diff --git a/...erver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/MonitoringPipe.java b/...erver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/MonitoringPipe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,20 +18,16 @@
 
 import org.glassfish.webservices.monitoring.*;
 
-import javax.xml.namespace.QName;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.http.HTTPBinding;
 
 import com.sun.xml.ws.api.pipe.Pipe;
-import com.sun.xml.ws.api.message.Message;
 import com.sun.xml.ws.api.pipe.PipeCloner;
 import com.sun.xml.ws.api.message.Packet;
 import com.sun.xml.ws.api.model.SEIModel;
-import com.sun.xml.ws.api.model.JavaMethod;
 import com.sun.xml.ws.api.model.wsdl.WSDLPort;
 import com.sun.xml.ws.api.server.WSEndpoint;
-import com.sun.xml.ws.api.pipe.ServerPipeAssemblerContext;
+import com.sun.xml.ws.api.pipe.ServerTubeAssemblerContext;
 
 import com.sun.enterprise.deployment.WebServiceEndpoint;
 
@@ -48,7 +44,7 @@ public class MonitoringPipe extends AbstractFilterPipeImpl {
     private final WebServiceEndpoint endpoint;
     private final WebServiceEngineImpl wsEngine;
 
-    public MonitoringPipe(ServerPipeAssemblerContext ctxt, Pipe tail,
+    public MonitoringPipe(ServerTubeAssemblerContext ctxt, Pipe tail,
                           WebServiceEndpoint ep) {
         super(tail);
         this.endpoint = ep;

diff --git a/...rver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SecurityService.java b/...rver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SecurityService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,7 +24,7 @@
 import javax.servlet.http.HttpServletRequest;
 import com.sun.xml.rpc.spi.runtime.SOAPMessageContext;
 import com.sun.xml.rpc.spi.runtime.StreamingHandler;
-import com.sun.xml.ws.assembler.ClientPipelineHook;
+import com.sun.xml.ws.assembler.metro.dev.ClientPipelineHook;
 import java.security.Principal;
 import javax.xml.namespace.QName;
 import javax.xml.rpc.handler.HandlerInfo;

diff --git a/...er/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/ServerPipeCreator.java b/...er/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/ServerPipeCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,8 +20,8 @@
 import javax.xml.ws.http.HTTPBinding;
 
 import com.sun.xml.ws.api.pipe.Pipe;
-import com.sun.xml.ws.assembler.ServerPipelineHook;
-import com.sun.xml.ws.api.pipe.ServerPipeAssemblerContext;
+import com.sun.xml.ws.assembler.metro.ServerPipelineHook;
+import com.sun.xml.ws.api.pipe.ServerTubeAssemblerContext;
 
 import com.sun.enterprise.deployment.WebServiceEndpoint;
 import com.sun.xml.ws.api.model.SEIModel;
@@ -32,7 +32,7 @@
 
 /**
  * This is used by JAXWSContainer to return proper 196 security and
- *  app server monitoing pipes to the StandAlonePipeAssembler and 
+ *  app server monitoring pipes to the StandAlonePipeAssembler and 
  *  TangoPipeAssembler
  */
 @Contract
@@ -51,7 +51,7 @@ public void init(WebServiceEndpoint ep){
 	      (endpoint.getProtocolBinding())) ? true : false); 
     }
 
-    public Pipe createMonitoringPipe(ServerPipeAssemblerContext ctxt, Pipe tail) {
+    public Pipe createMonitoringPipe(ServerTubeAssemblerContext ctxt, Pipe tail) {
         return new MonitoringPipe(ctxt, tail, endpoint);
     }    
 

diff --git a/...er/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSClientContainer.java b/...er/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WSClientContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -34,10 +34,10 @@ public WSClientContainer(ServiceReferenceDescriptor ref) {
         }
     }
 
+    @Override
     public <T> T getSPI(Class<T> spiType) {
 
-        if((spiType == com.sun.xml.ws.assembler.ClientPipelineHook.class) ||
-           (spiType == com.sun.xml.ws.assembler.dev.ClientPipelineHook.class)){
+        if (spiType == com.sun.xml.ws.assembler.metro.dev.ClientPipelineHook.class) {
             if (secServ != null) {
                 return((T)(secServ.getClientPipelineHook(svcRef)));
             }