From fe20ca48433a97138e7eebe196fab4c4bb7ce7f9 Mon Sep 17 00:00:00 2001
From: Jens Buehring <jens.buehring@kapdion.com>
Date: Mon, 2 Sep 2019 09:46:17 +0200
Subject: [PATCH] =?UTF-8?q?Unterst=C3=BCtzung=20Base64=20aus=20Version=201?=
 =?UTF-8?q?.4=20entfernt,=20Services=20auf=20Broker-seite=20aus=20Version?=
 =?UTF-8?q?=201.4=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../def/r1_4_0/omds3ServiceTypes.xsd          |   2 +-
 .../def/r1_4_0/omds3ServicesBroker.wsdl       | 174 ------------------
 2 files changed, 1 insertion(+), 175 deletions(-)
 delete mode 100644 OMDSServiceDefinition/src/main/resources/def/r1_4_0/omds3ServicesBroker.wsdl

diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_4_0/omds3ServiceTypes.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_4_0/omds3ServiceTypes.xsd
index 0012ef7e..60d06ceb 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_4_0/omds3ServiceTypes.xsd
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_4_0/omds3ServiceTypes.xsd
@@ -422,7 +422,7 @@
 					<xsd:documentation>Meta-Informationen zum Dokument</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="arcImage" type="xsd:base64Binary" xmime:expectedContentTypes="application/octet-stream" xmlns:xmime="http://www.w3.org/2005/05/xmlmime">
+			<xsd:element name="arcImage" type="xsd:base64Binary">
 				<xsd:annotation>
 					<xsd:documentation>Das eigentliche Dokument als base64-Binary</xsd:documentation>
 				</xsd:annotation>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_4_0/omds3ServicesBroker.wsdl b/OMDSServiceDefinition/src/main/resources/def/r1_4_0/omds3ServicesBroker.wsdl
deleted file mode 100644
index 070450fd..00000000
--- a/OMDSServiceDefinition/src/main/resources/def/r1_4_0/omds3ServicesBroker.wsdl
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<definitions 
-	name="omds3ServicesBroker_v1_4_0" 
-	targetNamespace="http://omds.vvo.at/brokerservice/v1_4_0"
-	xmlns:os="http://omds.vvo.at/brokerservice/v1_4_0" 
-	xmlns:ost="urn:omds3ServiceTypes-1-1-0"
-	xmlns:cst="urn:omds3CommonServiceTypes-1-1-0"
-	xmlns:sch="urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden"
-	xmlns="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" 
-	xmlns:ns="http://www.w3.org/2001/XMLSchema"
-	xmlns:ns1="http://schemas.xmlsoap.org/soap/encoding/" 
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-	
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	
-	<!-- 
-	hier wird exampleVuServiceTypes.xsd referenziert, welches stellvertretend fuer eine individuelle
-	Erweiterung der omdsServiceTypes.xsd einer VU steht. So besteht die Möglichkeit die Requests und 
-	Responses um weitere Attribute zu erweitern 
-	-->
-	
-	<types>
-		<schema xmlns="http://www.w3.org/2001/XMLSchema">
-			<import namespace="urn:omds3ServiceTypes-1-1-0" schemaLocation="omds3ServiceTypes.xsd" />
-			<import namespace="urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden" schemaLocation="omds3_ON7_Schaden.xsd"/>
-		</schema>
-	</types>
-	
-	<!-- Schaden -->
-
-	
-	<message name="DeclareNewClaimStatusRequestMsg">
-		<part name="parameters" element="sch:DeclareNewClaimStatusRequest"/>
-	</message>
-	<message name="DeclareNewClaimStatusResponseMsg">
-		<part name="parameters" element="sch:DeclareNewClaimStatusResponse"/>
-	</message>
-
-	<message name="LossEventRegisteredRequestMsg">
-		<part name="parameters" element="sch:LossEventRegisteredRequest"/>
-	</message>
-	<message name="LossEventRegisteredResponseMsg">
-		<part name="parameters" element="sch:LossEventRegisteredResponse"/>
-	</message>
-
-	<!-- Vergabe eines Security Context Token 
-	<message name="SecurityContextTokenRequestMsg">
-		<part name="parameters" element="ost:SecurityContextTokenRequest"/>
-	</message>
-	<message name="SecurityContextTokenResponseMsg">
-		<part name="parameters" element="ost:SecurityContextTokenResponse" />
-	</message>		
-	-->
-
-	
-	<!-- Fehler Message -->	
-	<message name="ServiceFaultMsg">
-		<part name="parameters" element="cst:serviceFault" />
-	</message>
-	
-	
-	<portType name="omdsServicePortType">
-	
-		<!-- Schaden -->
-		<operation name="declareNewClaimStatus">
-			<input name="DeclareNewClaimStatusRequestPort" message="os:DeclareNewClaimStatusRequestMsg" />
-			<output name="DeclareNewClaimStatusResponsePort" message="os:DeclareNewClaimStatusResponseMsg" />
-            <fault name="DeclareNewClaimStatusFaultPort" message="os:ServiceFaultMsg" />
-        </operation>
-
-		<operation name="lossEventRegistered">
-			<input name="LossEventRegisteredRequestPort" message="os:LossEventRegisteredRequestMsg" />
-			<output name="LossEventRegisteredResponsePort" message="os:LossEventRegisteredResponseMsg" />
-            <fault name="LossEventRegisteredFaultPort" message="os:ServiceFaultMsg" />
-        </operation>
-        
-<!--	Vergabe eines Security Context Token 
-		<operation name="getSecurityContextToken">
-			<input name="SecurityContextTokenRequestPort" message="os:SecurityContextTokenRequestMsg" />
-			<output name="SecurityContextTokenResponsePort" message="os:SecurityContextTokenResponseMsg" />
-			<fault name="SecurityContextTokenFaultPort" message="os:ServiceFaultMsg" />
-		</operation>
--->
-	</portType>
-
-	<binding name="omdsServicePortBinding" type="os:omdsServicePortType">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-
-		<!-- Referenz auf jeweilige Security Policy für alle Methoden, in diesem Fall eine UsernameToken-Policy -->
- 		<wsp:PolicyReference URI="#OMDSUsernameTokenPolicy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"/>
-
-		<!-- Schaden -->
-		<operation name="declareNewClaimStatus">
-			<soap:operation soapAction="urn:declareNewClaimStatus" style="document" />
-			<input name="DeclareNewClaimStatusRequestPort">
-				<soap:body use="literal" />
-			</input>
-			<output name="DeclareNewClaimStatusResponsePort">
-				<soap:body use="literal" />
-			</output>
-			<fault name="DeclareNewClaimStatusFaultPort">
-				<soap:fault name="DeclareNewClaimStatusFault" use="literal"/>
-			</fault>
-		</operation>
-
-		<operation name="lossEventRegistered">
-			<soap:operation soapAction="urn:lossEventRegistered" style="document" />
-			<input name="LossEventRegisteredRequestPort">
-				<soap:body use="literal" />
-			</input>
-			<output name="LossEventRegisteredResponsePort">
-				<soap:body use="literal" />
-			</output>
-			<fault name="LossEventRegisteredFaultPort">
-				<soap:fault name="LossEventRegisteredFault" use="literal"/>
-			</fault>
-		</operation>
-				
-		<!-- Vergabe eines Security Context Token 
-		<operation name="getSecurityContextToken">
-			<soap:operation soapAction="urn:getSecurityContextToken" style="document" />
-			<input name="SecurityContextTokenRequestPort">
-				<soap:body use="literal" />
-			</input>
-			<output name="SecurityContextTokenResponsePort">
-				<soap:body use="literal" />
-			</output>
-			<fault name="SecurityContextTokenFaultPort">
-				<soap:fault name="SecurityContextTokenFault" use="literal"/>
-			</fault>
-		</operation>	
-		-->	
-	</binding>
-	
-	<service name="omdsService">
-		<port name="omdsServicePort" binding="os:omdsServicePortBinding">
-			<soap:address location="http://localhost:80/omdsServicePort" />
-		</port>
-	</service>
-		
-	<wsp:Policy wsu:Id="'OMDSUsernameTokenPolicy" xmlns:wsp="http://www.w3.org/ns/ws-policy" 
-	  xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-	  xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-	  <wsp:ExactlyOne>
-		  <wsp:All>
-			<!-- Def HTTPS -->
-			<sp:TransportBinding>
-				<wsp:Policy>
-					<sp:TransportToken>
-						<wsp:Policy>
-							<sp:HttpsToken RequireClientCertificate="false"/>
-						</wsp:Policy>
-					</sp:TransportToken>
-				</wsp:Policy>
-			</sp:TransportBinding>
-			<!-- schreibe Username-Token mit Passwort-Digest (Hash) vor -->
-			<sp:SupportingTokens>
-			  <wsp:Policy>
-				<sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-				  <wsp:Policy>
-					<sp:HashPassword/>
-				  </wsp:Policy>
-				</sp:UsernameToken>
-			  </wsp:Policy>
-			</sp:SupportingTokens>
-
-		  </wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-  
-</definitions>