alte Webservice Referenz entfernt, Code für alle alten Meldeklassen +bernommen

ENI2/ENI2.csproj

@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>7.6.0.%2a</ApplicationVersion>
+    <ApplicationVersion>7.7.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

bsmd.LockingService/bsmd.LockingService.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

bsmd.database/Properties/AssemblyProductInfo.cs

@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.6.0")]
+[assembly: AssemblyInformationalVersion("7.7.0")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2022 schick Informatik")]
 [assembly: AssemblyTrademark("")]

bsmd.database/Properties/AssemblyProjectInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.6.0.*")]
+[assembly: AssemblyVersion("7.7.0.*")]
 

bsmd.dbh/Properties/Settings.Designer.cs

@@ -23,16 +23,6 @@ namespace bsmd.dbh.Properties {
             }
         }
         
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://edi-gate.dbh.de/test/bsmd-soap")]
-        public string bsmd_dbh_DBHWebReference_Dbh_Osis_Answ_Ws {
-            get {
-                return ((string)(this["bsmd_dbh_DBHWebReference_Dbh_Osis_Answ_Ws"]));
-            }
-        }
-        
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("00003050")]

bsmd.dbh/Properties/Settings.settings

@@ -2,9 +2,6 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="bsmd.dbh.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="bsmd_dbh_DBHWebReference_Dbh_Osis_Answ_Ws" Type="(Web Service URL)" Scope="Application">
-      <Value Profile="(Default)">https://edi-gate.dbh.de/test/bsmd-soap</Value>
-    </Setting>
     <Setting Name="Sender" Type="System.String" Scope="Application">
       <Value Profile="(Default)">00003050</Value>
     </Setting>

bsmd.dbh/Web References/DBHWebReference/Reference.map

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="file:///E:/svnlager/bsmd/nsw/dbh/answ-osis-extern.wsdl" filename="answ-osis-extern.wsdl" />
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.SchemaReference" url="file:///E:/svnlager/bsmd/nsw/dbh/NSWRequest.xsd" filename="NSWRequest.xsd" />
-  </Results>
-</DiscoveryClientResultsFile>

bsmd.dbh/Web References/DBHWebReference/answ-osis-extern.wsdl

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:cw="http://www.openuri.org/2002/04/wsdl/conversation/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:s0="http://www.openuri.org/" xmlns:jms="http://www.openuri.org/2002/04/wsdl/jms/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:conv="http://www.openuri.org/2002/04/soap/conversation/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" targetNamespace="http://www.openuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <s:schema xmlns:ope="http://www.openuri.org/" elementFormDefault="qualified" targetNamespace="http://www.openuri.org/">
-      <s:include schemaLocation="NSWRequest.xsd" />
-      <s:element name="submitResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" name="messageID" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-    </s:schema>
-  </wsdl:types>
-  <wsdl:message name="submitSoapIn">
-    <wsdl:part name="parameters" element="s0:Root" />
-  </wsdl:message>
-  <wsdl:message name="submitSoapOut">
-    <wsdl:part name="parameters" element="s0:submitResponse" />
-  </wsdl:message>
-  <wsdl:portType name="Dbh_Osis_Answ_Ws">
-    <wsdl:operation name="Root">
-      <wsdl:documentation>Submit a new NSW Request (only one NSWRequest per Submit!) to DBH ANSW OSIS, giving the senderID, messageID, messageType, the message. The method returns the OsisOrderNr (Unique message identifier generated by OSIS). </wsdl:documentation>
-      <wsdl:input message="s0:submitSoapIn" />
-      <wsdl:output message="s0:submitSoapOut" />
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="Dbh_Osis_Answ_Ws" type="s0:Dbh_Osis_Answ_Ws">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Root">
-      <soap:operation soapAction="http://www.openuri.org/submit" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="Dbh_Osis_Answ_Ws">
-    <wsdl:documentation>Dbh_Osis_Answ_Ws is used to send Message to the DBH ANSW OSIS Application. Message format is XML.</wsdl:documentation>
-    <wsdl:port name="Dbh_Osis_Answ_Ws" binding="s0:Dbh_Osis_Answ_Ws">
-      <soap:address location="https://edi-gate.dbh.de/test/bsmd-soap" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

bsmd.dbh/app.config

@@ -7,9 +7,6 @@
     </configSections>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup><applicationSettings>
         <bsmd.dbh.Properties.Settings>
-            <setting name="bsmd_dbh_DBHWebReference_Dbh_Osis_Answ_Ws" serializeAs="String">
-                <value>https://edi-gate.dbh.de/test/bsmd-soap</value>
-            </setting>
             <setting name="Sender" serializeAs="String">
                 <value>00003050</value>
             </setting>

bsmd.dbh/bsmd.dbh.csproj

@@ -77,11 +77,6 @@
     <Compile Include="Request\NSWRequest.cs" />
     <Compile Include="ResponseUtil.cs" />
     <Compile Include="Response\NSWResponse.cs" />
-    <Compile Include="Web References\DBHWebReference\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.map</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\bsmd.dakosy\bsmd.dakosy.csproj">
@@ -104,34 +99,10 @@
       <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Web References\DBHWebReference\answ-osis-extern.wsdl" />
-    <None Include="Web References\DBHWebReference\NSWRequest.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Web References\DBHWebReference\Reference.map">
-      <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <ItemGroup>
-    <WebReferences Include="Web References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WebReferenceUrl Include="E:\svnlager\bsmd\nsw\dbh\answ-osis-extern.wsdl">
-      <UrlBehavior>Dynamic</UrlBehavior>
-      <RelPath>Web References\DBHWebReference\</RelPath>
-      <UpdateFromURL>E:\svnlager\bsmd\nsw\dbh\answ-osis-extern.wsdl</UpdateFromURL>
-      <ServiceLocationURL>
-      </ServiceLocationURL>
-      <CachedDynamicPropName>
-      </CachedDynamicPropName>
-      <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
-      <CachedSettingsPropName>bsmd_dbh_DBHWebReference_Dbh_Osis_Answ_Ws</CachedSettingsPropName>
-    </WebReferenceUrl>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="readme.txt" />
   </ItemGroup>

bsmd.status/Status.cs

@@ -15,8 +15,8 @@ namespace bsmd.status
     public class Status
     {
 
-        private static ILog _log = LogManager.GetLogger(typeof(bsmd.status.Status));
+        private static readonly ILog _log = LogManager.GetLogger(typeof(bsmd.status.Status));
-        private MessageCore _queryCore;
+        private readonly MessageCore _queryCore;
 
         public Status(MessageCore core2Query) { _queryCore = core2Query; }
 
@@ -73,12 +73,12 @@ namespace bsmd.status
                         {
                             // three-way bool!
                             if (result.NswResponse.Cancelled != null)
-                                _queryCore.Cancelled = result.NswResponse.Equals("Y") ? true : false;
+                                _queryCore.Cancelled = result.NswResponse.Equals("Y");
                             else
                                 _queryCore.Cancelled = null;
 
                             if (result.NswResponse.VisitIdOrTransitIdCancellable != null)
-                                _queryCore.VisitIdOrTransitIdCancellable = result.NswResponse.VisitIdOrTransitIdCancellable.Equals("Y") ? true : false;
+                                _queryCore.VisitIdOrTransitIdCancellable = result.NswResponse.VisitIdOrTransitIdCancellable.Equals("Y");
                             else
                                 _queryCore.VisitIdOrTransitIdCancellable = null;
 

bsmd.status/dataset.cs

@@ -12,7 +12,7 @@ namespace bsmd.status
     [Serializable]
     public class dataset
     {
-        private static ILog _log = LogManager.GetLogger(typeof(bsmd.status.dataset));
+        private static readonly ILog _log = LogManager.GetLogger(typeof(bsmd.status.dataset));
 
         /// <summary>
         /// this class needs a public empty constructor for deserialization