From 8c802da016f8e9422ff0b898497d73769cb4713e Mon Sep 17 00:00:00 2001 From: richard-austin Date: Mon, 2 Dec 2024 14:54:52 +0000 Subject: [PATCH] * Tidy up dependencies. * Set at cxf 4.0.1 so that WsnNotificationTest is working --- onvif-java/pom.xml | 39 +------------------ onvif-ws-client/pom.xml | 8 +++- .../docs/wsn/bw_2/InvalidFilterFault.java | 4 +- .../InvalidMessageContentExpressionFault.java | 4 +- ...alidProducerPropertiesExpressionFault.java | 4 +- .../wsn/bw_2/InvalidTopicExpressionFault.java | 4 +- .../bw_2/NotifyMessageNotSupportedFault.java | 4 +- .../bw_2/SubscribeCreationFailedFault.java | 4 +- .../TopicExpressionDialectUnknownFault.java | 4 +- .../docs/wsn/bw_2/TopicNotSupportedFault.java | 4 +- ...acceptableInitialTerminationTimeFault.java | 4 +- .../bw_2/UnrecognizedPolicyRequestFault.java | 4 +- .../bw_2/UnsupportedPolicyRequestFault.java | 4 +- .../docs/wsrf/rw_2/ResourceUnknownFault.java | 4 +- .../ver10/accesscontrol/wsdl/PACSPort.java | 4 +- .../ver10/accesscontrol/wsdl/PACSService.java | 11 +++--- .../accessrules/wsdl/AccessRulesPort.java | 4 +- .../accessrules/wsdl/AccessRulesService.java | 11 +++--- .../wsdl/AdvancedSecurityService.java | 4 +- .../wsdl/AdvancedSecurityService_Service.java | 15 ++++--- .../ver10/advancedsecurity/wsdl/Keystore.java | 4 +- .../advancedsecurity/wsdl/TLSServer.java | 4 +- .../org/onvif/ver10/device/wsdl/Device.java | 4 +- .../ver10/device/wsdl/DeviceService.java | 11 +++--- .../ver10/deviceio/wsdl/DeviceIOPService.java | 11 +++--- .../ver10/deviceio/wsdl/DeviceIOPort.java | 4 +- .../onvif/ver10/display/wsdl/DisplayPort.java | 4 +- .../ver10/display/wsdl/DisplayService.java | 11 +++--- .../doorcontrol/wsdl/DoorControlPort.java | 4 +- .../doorcontrol/wsdl/DoorControlService.java | 11 +++--- .../ver10/events/wsdl/EventPortType.java | 4 +- .../onvif/ver10/events/wsdl/EventService.java | 11 +++--- .../org/onvif/ver10/media/wsdl/Media.java | 4 +- .../onvif/ver10/media/wsdl/MediaService.java | 11 +++--- .../network/wsdl/DiscoveryLookupPort.java | 4 +- .../ver10/network/wsdl/DiscoveryService.java | 13 +++---- .../network/wsdl/RemoteDiscoveryPort.java | 4 +- .../ver10/receiver/wsdl/ReceiverPort.java | 4 +- .../ver10/receiver/wsdl/ReceiverService.java | 11 +++--- .../ver10/recording/wsdl/RecordingPort.java | 4 +- .../recording/wsdl/RecordingService.java | 11 +++--- .../onvif/ver10/replay/wsdl/ReplayPort.java | 4 +- .../ver10/replay/wsdl/ReplayService.java | 11 +++--- .../onvif/ver10/search/wsdl/SearchPort.java | 4 +- .../ver10/search/wsdl/SearchService.java | 11 +++--- .../onvif/ver20/imaging/wsdl/ImagingPort.java | 4 +- .../ver20/imaging/wsdl/ImagingService.java | 11 +++--- .../java/org/onvif/ver20/ptz/wsdl/PTZ.java | 4 +- .../org/onvif/ver20/ptz/wsdl/PtzService.java | 11 +++--- pom.xml | 2 +- 50 files changed, 155 insertions(+), 200 deletions(-) diff --git a/onvif-java/pom.xml b/onvif-java/pom.xml index 93f7886..85c76c0 100644 --- a/onvif-java/pom.xml +++ b/onvif-java/pom.xml @@ -11,15 +11,9 @@ - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - - - org.apache.cxf - cxf-rt-ws-security + org.apache.cxf.services.wsn + cxf-services-wsn-core ${cxf.version} @@ -34,28 +28,6 @@ onvif-ws-client ${project.version} - - commons-io - commons-io - 2.18.0 - - - commons-codec - commons-codec - 1.17.1 - - - org.apache.commons - commons-lang3 - 3.17.0 - - - - - jakarta.annotation - jakarta.annotation-api - 3.0.0 - @@ -66,13 +38,6 @@ 1.7.26 test - - - jakarta.xml.soap - jakarta.xml.soap-api - 3.0.2 - - diff --git a/onvif-ws-client/pom.xml b/onvif-ws-client/pom.xml index 5ff1617..8154053 100644 --- a/onvif-ws-client/pom.xml +++ b/onvif-ws-client/pom.xml @@ -55,6 +55,12 @@ compile + + commons-io + commons-io + 2.18.0 + + org.apache.cxf.xjc-utils cxf-xjc-runtime @@ -74,7 +80,7 @@ org.apache.cxf cxf-codegen-plugin - 4.0.5 + 4.0.1 generate-ws-stubs diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidFilterFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidFilterFault.java index d9476e5..704177b 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidFilterFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidFilterFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "InvalidFilterFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidMessageContentExpressionFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidMessageContentExpressionFault.java index 0124a1e..f272254 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidMessageContentExpressionFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidMessageContentExpressionFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "InvalidMessageContentExpressionFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidProducerPropertiesExpressionFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidProducerPropertiesExpressionFault.java index fa0a5e1..34827cf 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidProducerPropertiesExpressionFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidProducerPropertiesExpressionFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "InvalidProducerPropertiesExpressionFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidTopicExpressionFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidTopicExpressionFault.java index f2d8f40..df7a014 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidTopicExpressionFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/InvalidTopicExpressionFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "InvalidTopicExpressionFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/NotifyMessageNotSupportedFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/NotifyMessageNotSupportedFault.java index 18f75ac..247e3bf 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/NotifyMessageNotSupportedFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/NotifyMessageNotSupportedFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "NotifyMessageNotSupportedFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/SubscribeCreationFailedFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/SubscribeCreationFailedFault.java index fc1a6e9..4e16e7a 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/SubscribeCreationFailedFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/SubscribeCreationFailedFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "SubscribeCreationFailedFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicExpressionDialectUnknownFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicExpressionDialectUnknownFault.java index 71a88c7..d5626bc 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicExpressionDialectUnknownFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicExpressionDialectUnknownFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "TopicExpressionDialectUnknownFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicNotSupportedFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicNotSupportedFault.java index b0a0571..38b5a15 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicNotSupportedFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/TopicNotSupportedFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "TopicNotSupportedFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnacceptableInitialTerminationTimeFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnacceptableInitialTerminationTimeFault.java index 34ea7a3..7148790 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnacceptableInitialTerminationTimeFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnacceptableInitialTerminationTimeFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "UnacceptableInitialTerminationTimeFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnrecognizedPolicyRequestFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnrecognizedPolicyRequestFault.java index 4a8f81e..926cfc9 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnrecognizedPolicyRequestFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnrecognizedPolicyRequestFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "UnrecognizedPolicyRequestFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnsupportedPolicyRequestFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnsupportedPolicyRequestFault.java index 747fd0f..a94e92f 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnsupportedPolicyRequestFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsn/bw_2/UnsupportedPolicyRequestFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ @WebFault(name = "UnsupportedPolicyRequestFault", targetNamespace = "http://docs.oasis-open.org/wsn/b-2") diff --git a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsrf/rw_2/ResourceUnknownFault.java b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsrf/rw_2/ResourceUnknownFault.java index 5ce8181..e29be4a 100644 --- a/onvif-ws-client/src/main/java/org/oasis_open/docs/wsrf/rw_2/ResourceUnknownFault.java +++ b/onvif-ws-client/src/main/java/org/oasis_open/docs/wsrf/rw_2/ResourceUnknownFault.java @@ -5,8 +5,8 @@ import jakarta.xml.ws.WebFault; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 */ public class ResourceUnknownFault extends Exception { diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSPort.java index cdbea88..d97b8b6 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSPort.java @@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/accesscontrol/wsdl", name = "PACSPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSService.java index f22ca86..efb3fc6 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/accesscontrol/wsdl/PACSService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.accesscontrol.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "PACSService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/accesscontrol/wsdl") public class PACSService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/accesscontrol/wsdl", "PACSService"); - public static final QName PACSPort = new QName("http://www.onvif.org/ver10/accesscontrol/wsdl", "PACSPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/accesscontrol/wsdl", "PACSService"); + public final static QName PACSPort = new QName("http://www.onvif.org/ver10/accesscontrol/wsdl", "PACSPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesPort.java index d95fc1c..a1a0182 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesPort.java @@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/accessrules/wsdl", name = "AccessRulesPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesService.java index db1719d..2ad0362 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/accessrules/wsdl/AccessRulesService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.accessrules.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "AccessRulesService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/accessrules/wsdl") public class AccessRulesService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/accessrules/wsdl", "AccessRulesService"); - public static final QName AccessRulesPort = new QName("http://www.onvif.org/ver10/accessrules/wsdl", "AccessRulesPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/accessrules/wsdl", "AccessRulesService"); + public final static QName AccessRulesPort = new QName("http://www.onvif.org/ver10/accessrules/wsdl", "AccessRulesPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService.java index 417ce1b..b5e6fc5 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService.java @@ -11,8 +11,8 @@ import jakarta.xml.ws.ResponseWrapper; * Common functionality for all advanced security service parts. * * - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/advancedsecurity/wsdl", name = "AdvancedSecurityService") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService_Service.java b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService_Service.java index aa1ef17..f94a756 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService_Service.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/AdvancedSecurityService_Service.java @@ -1,6 +1,5 @@ package org.onvif.ver10.advancedsecurity.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "AdvancedSecurityService", @@ -18,12 +17,12 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/advancedsecurity/wsdl") public class AdvancedSecurityService_Service extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "AdvancedSecurityService"); - public static final QName TLSServerPort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "TLSServerPort"); - public static final QName KeystorePort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "KeystorePort"); - public static final QName AdvancedSecurityServicePort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "AdvancedSecurityServicePort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "AdvancedSecurityService"); + public final static QName TLSServerPort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "TLSServerPort"); + public final static QName KeystorePort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "KeystorePort"); + public final static QName AdvancedSecurityServicePort = new QName("http://www.onvif.org/ver10/advancedsecurity/wsdl", "AdvancedSecurityServicePort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/Keystore.java b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/Keystore.java index 3602e93..24a8820 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/Keystore.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/Keystore.java @@ -11,8 +11,8 @@ import jakarta.xml.ws.ResponseWrapper; /** * Basic keystore functionality. * - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/advancedsecurity/wsdl", name = "Keystore") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/TLSServer.java b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/TLSServer.java index e33f900..cf39750 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/TLSServer.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/advancedsecurity/wsdl/TLSServer.java @@ -11,8 +11,8 @@ import jakarta.xml.ws.ResponseWrapper; /** * TLS server functionality. * - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/advancedsecurity/wsdl", name = "TLSServer") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/Device.java b/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/Device.java index ddc5585..cc22d64 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/Device.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/Device.java @@ -10,8 +10,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/device/wsdl", name = "Device") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/DeviceService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/DeviceService.java index f22ce3e..6af4aaf 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/DeviceService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/device/wsdl/DeviceService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.device.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -8,8 +7,8 @@ import jakarta.xml.ws.WebServiceClient; import jakarta.xml.ws.WebServiceFeature; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "DeviceService", @@ -17,10 +16,10 @@ import jakarta.xml.ws.WebServiceFeature; targetNamespace = "http://www.onvif.org/ver10/device/wsdl") public class DeviceService extends jakarta.xml.ws.Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/device/wsdl", "DeviceService"); - public static final QName DevicePort = new QName("http://www.onvif.org/ver10/device/wsdl", "DevicePort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/device/wsdl", "DeviceService"); + public final static QName DevicePort = new QName("http://www.onvif.org/ver10/device/wsdl", "DevicePort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPService.java index 9e79f4b..28cc5f5 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.deviceio.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "DeviceIOPService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/deviceIO/wsdl") public class DeviceIOPService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/deviceIO/wsdl", "DeviceIOPService"); - public static final QName DeviceIOPort = new QName("http://www.onvif.org/ver10/deviceIO/wsdl", "DeviceIOPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/deviceIO/wsdl", "DeviceIOPService"); + public final static QName DeviceIOPort = new QName("http://www.onvif.org/ver10/deviceIO/wsdl", "DeviceIOPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPort.java index a8bef8a..0ee5838 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/deviceio/wsdl/DeviceIOPort.java @@ -10,8 +10,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/deviceIO/wsdl", name = "DeviceIOPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayPort.java index 1bcbfa8..ac8622f 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayPort.java @@ -10,8 +10,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/display/wsdl", name = "DisplayPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayService.java index 59e8b00..0fec40c 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/display/wsdl/DisplayService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.display.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "DisplayService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/display/wsdl") public class DisplayService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/display/wsdl", "DisplayService"); - public static final QName DisplayPort = new QName("http://www.onvif.org/ver10/display/wsdl", "DisplayPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/display/wsdl", "DisplayService"); + public final static QName DisplayPort = new QName("http://www.onvif.org/ver10/display/wsdl", "DisplayPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlPort.java index 61edb9c..04ffd1e 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlPort.java @@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/doorcontrol/wsdl", name = "DoorControlPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlService.java index e981d8b..ed9a92f 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/doorcontrol/wsdl/DoorControlService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.doorcontrol.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "DoorControlService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/doorcontrol/wsdl") public class DoorControlService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/doorcontrol/wsdl", "DoorControlService"); - public static final QName DoorControlPort = new QName("http://www.onvif.org/ver10/doorcontrol/wsdl", "DoorControlPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/doorcontrol/wsdl", "DoorControlService"); + public final static QName DoorControlPort = new QName("http://www.onvif.org/ver10/doorcontrol/wsdl", "DoorControlPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventPortType.java b/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventPortType.java index 230ba2c..55c6642 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventPortType.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventPortType.java @@ -11,8 +11,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/events/wsdl", name = "EventPortType") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventService.java index ad75c06..012b740 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/events/wsdl/EventService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.events.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "EventService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/events/wsdl") public class EventService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/events/wsdl", "EventService"); - public static final QName EventPort = new QName("http://www.onvif.org/ver10/events/wsdl", "EventPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/events/wsdl", "EventService"); + public final static QName EventPort = new QName("http://www.onvif.org/ver10/events/wsdl", "EventPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/Media.java b/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/Media.java index 5200ff3..f43ca5a 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/Media.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/Media.java @@ -10,8 +10,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/media/wsdl", name = "Media") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/MediaService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/MediaService.java index 755dc99..a2c2ccf 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/MediaService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/media/wsdl/MediaService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.media.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "MediaService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/media/wsdl") public class MediaService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/media/wsdl", "MediaService"); - public static final QName MediaPort = new QName("http://www.onvif.org/ver10/media/wsdl", "MediaPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/media/wsdl", "MediaService"); + public final static QName MediaPort = new QName("http://www.onvif.org/ver10/media/wsdl", "MediaPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryLookupPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryLookupPort.java index a9df5b0..192d48f 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryLookupPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryLookupPort.java @@ -8,8 +8,8 @@ import jakarta.jws.soap.SOAPBinding; import jakarta.xml.bind.annotation.XmlSeeAlso; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/network/wsdl", name = "DiscoveryLookupPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryService.java index b007e92..4a639c7 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/DiscoveryService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.network.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "DiscoveryService", @@ -18,11 +17,11 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/network/wsdl") public class DiscoveryService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/network/wsdl", "DiscoveryService"); - public static final QName RemoteDiscoveryPort = new QName("http://www.onvif.org/ver10/network/wsdl", "RemoteDiscoveryPort"); - public static final QName DiscoveryLookupPort = new QName("http://www.onvif.org/ver10/network/wsdl", "DiscoveryLookupPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/network/wsdl", "DiscoveryService"); + public final static QName RemoteDiscoveryPort = new QName("http://www.onvif.org/ver10/network/wsdl", "RemoteDiscoveryPort"); + public final static QName DiscoveryLookupPort = new QName("http://www.onvif.org/ver10/network/wsdl", "DiscoveryLookupPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/RemoteDiscoveryPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/RemoteDiscoveryPort.java index 5424a72..4bf3a25 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/RemoteDiscoveryPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/network/wsdl/RemoteDiscoveryPort.java @@ -8,8 +8,8 @@ import jakarta.jws.soap.SOAPBinding; import jakarta.xml.bind.annotation.XmlSeeAlso; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/network/wsdl", name = "RemoteDiscoveryPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverPort.java index fc08cb7..66b23f8 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverPort.java @@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/receiver/wsdl", name = "ReceiverPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverService.java index 5c1a043..2087aa4 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/receiver/wsdl/ReceiverService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.receiver.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "ReceiverService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/receiver/wsdl") public class ReceiverService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/receiver/wsdl", "ReceiverService"); - public static final QName ReceiverPort = new QName("http://www.onvif.org/ver10/receiver/wsdl", "ReceiverPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/receiver/wsdl", "ReceiverService"); + public final static QName ReceiverPort = new QName("http://www.onvif.org/ver10/receiver/wsdl", "ReceiverPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingPort.java index 9c66f20..4fa4928 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingPort.java @@ -10,8 +10,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/recording/wsdl", name = "RecordingPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingService.java index bc575ec..bab7284 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/recording/wsdl/RecordingService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.recording.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "RecordingService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/recording/wsdl") public class RecordingService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/recording/wsdl", "RecordingService"); - public static final QName RecordingPort = new QName("http://www.onvif.org/ver10/recording/wsdl", "RecordingPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/recording/wsdl", "RecordingService"); + public final static QName RecordingPort = new QName("http://www.onvif.org/ver10/recording/wsdl", "RecordingPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayPort.java index 55c17e7..d72cb34 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayPort.java @@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/replay/wsdl", name = "ReplayPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayService.java index 3491e54..13e7dab 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/replay/wsdl/ReplayService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.replay.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "ReplayService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/replay/wsdl") public class ReplayService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/replay/wsdl", "ReplayService"); - public static final QName ReplayPort = new QName("http://www.onvif.org/ver10/replay/wsdl", "ReplayPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/replay/wsdl", "ReplayService"); + public final static QName ReplayPort = new QName("http://www.onvif.org/ver10/replay/wsdl", "ReplayPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchPort.java b/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchPort.java index 931d76b..e31491a 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchPort.java @@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver10/search/wsdl", name = "SearchPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchService.java b/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchService.java index 32df9fd..8c910e2 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver10/search/wsdl/SearchService.java @@ -1,6 +1,5 @@ package org.onvif.ver10.search.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "SearchService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver10/search/wsdl") public class SearchService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver10/search/wsdl", "SearchService"); - public static final QName SearchPort = new QName("http://www.onvif.org/ver10/search/wsdl", "SearchPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver10/search/wsdl", "SearchService"); + public final static QName SearchPort = new QName("http://www.onvif.org/ver10/search/wsdl", "SearchPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingPort.java b/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingPort.java index 1eaa8bc..4422a30 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingPort.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingPort.java @@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver20/imaging/wsdl", name = "ImagingPort") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingService.java b/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingService.java index dd0492c..94b6dc4 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver20/imaging/wsdl/ImagingService.java @@ -1,6 +1,5 @@ package org.onvif.ver20.imaging.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "ImagingService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver20/imaging/wsdl") public class ImagingService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver20/imaging/wsdl", "ImagingService"); - public static final QName ImagingPort = new QName("http://www.onvif.org/ver20/imaging/wsdl", "ImagingPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver20/imaging/wsdl", "ImagingService"); + public final static QName ImagingPort = new QName("http://www.onvif.org/ver20/imaging/wsdl", "ImagingPort"); static { WSDL_LOCATION = null; } diff --git a/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PTZ.java b/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PTZ.java index f1e6a23..75fd799 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PTZ.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PTZ.java @@ -9,8 +9,8 @@ import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebService(targetNamespace = "http://www.onvif.org/ver20/ptz/wsdl", name = "PTZ") diff --git a/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PtzService.java b/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PtzService.java index 3283f4c..442bd60 100644 --- a/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PtzService.java +++ b/onvif-ws-client/src/main/java/org/onvif/ver20/ptz/wsdl/PtzService.java @@ -1,6 +1,5 @@ package org.onvif.ver20.ptz.wsdl; -import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.WebEndpoint; @@ -9,8 +8,8 @@ import jakarta.xml.ws.WebServiceFeature; import jakarta.xml.ws.Service; /** - * This class was generated by Apache CXF 4.0.5 - * Generated source version: 4.0.5 + * This class was generated by Apache CXF 4.0.1 + * Generated source version: 4.0.1 * */ @WebServiceClient(name = "PtzService", @@ -18,10 +17,10 @@ import jakarta.xml.ws.Service; targetNamespace = "http://www.onvif.org/ver20/ptz/wsdl") public class PtzService extends Service { - public static final URL WSDL_LOCATION; + public final static URL WSDL_LOCATION; - public static final QName SERVICE = new QName("http://www.onvif.org/ver20/ptz/wsdl", "PtzService"); - public static final QName PtzPort = new QName("http://www.onvif.org/ver20/ptz/wsdl", "PtzPort"); + public final static QName SERVICE = new QName("http://www.onvif.org/ver20/ptz/wsdl", "PtzService"); + public final static QName PtzPort = new QName("http://www.onvif.org/ver20/ptz/wsdl", "PtzPort"); static { WSDL_LOCATION = null; } diff --git a/pom.xml b/pom.xml index fe35e7a..f50bbb2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 21 - 4.0.5 + 4.0.1 3.0.0 1.2.0 2.3.1