Ignore:
Timestamp:
May 25, 2010, 9:05:32 PM (12 years ago)
Author:
Matthäus Wander
Message:

Soap + WebService:

  • migrated to VS2010
  • replaced Control properties with regular Data properties
Location:
trunk/CrypPlugins/WebService
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/WebService/Resource1.Designer.cs

    r639 r1489  
    11//------------------------------------------------------------------------------
    22// <auto-generated>
    3 //     Dieser Code wurde von einem Tool generiert.
    4 //     Laufzeitversion:2.0.50727.3074
     3//     This code was generated by a tool.
     4//     Runtime Version:4.0.30319.1
    55//
    6 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
    7 //     der Code erneut generiert wird.
     6//     Changes to this file may cause incorrect behavior and will be lost if
     7//     the code is regenerated.
    88// </auto-generated>
    99//------------------------------------------------------------------------------
     
    1414   
    1515    /// <summary>
    16     ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     16    ///   A strongly-typed resource class, for looking up localized strings, etc.
    1717    /// </summary>
    18     // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
    19     // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
    20     // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
    21     // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
    22     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
     18    // This class was auto-generated by the StronglyTypedResourceBuilder
     19    // class via a tool like ResGen or Visual Studio.
     20    // To add or remove a member, edit your .ResX file then rerun ResGen
     21    // with the /str option, or rebuild your VS project.
     22    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    2323    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    2424    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     
    3434       
    3535        /// <summary>
    36         ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
     36        ///   Returns the cached ResourceManager instance used by this class.
    3737        /// </summary>
    3838        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
     
    4848       
    4949        /// <summary>
    50         ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
    51         ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
     50        ///   Overrides the current thread's CurrentUICulture property for all
     51        ///   resource lookups using this strongly typed resource class.
    5252        /// </summary>
    5353        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
     
    7676       
    7777        /// <summary>
    78         ///   Sucht eine lokalisierte Zeichenfolge, die &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
     78        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
    7979        ///&lt;!DOCTYPE schema PUBLIC &quot;-//W3C//DTD XMLSchema 200102//EN&quot; &quot;http://www.w3.org/2001/XMLSchema.dtd&quot; [
    8080        ///   &lt;!ATTLIST schema
     
    8888        ///    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
    8989        ///
    90         ///    Copyright 2001 The Internet Society an [Rest der Zeichenfolge wurde abgeschnitten]&quot;; ähnelt.
     90        ///    Copyright 2001 The Internet Society an [rest of string was truncated]&quot;;.
    9191        /// </summary>
    9292        public static string SignatureSchema {
     
    9797       
    9898        /// <summary>
    99         ///   Sucht eine lokalisierte Zeichenfolge, die &lt;!-- Schema defined in the SOAP Version 1.2 Part 1 specification
     99        ///   Looks up a localized string similar to &lt;!-- Schema defined in the SOAP Version 1.2 Part 1 specification
    100100        ///     Recommendation:
    101101        ///     http://www.w3.org/TR/2003/REC-soap12-part1-20030624/
     
    110110        ///     described in the FAQ [2].
    111111        ///
    112         ///     [Rest der Zeichenfolge wurde abgeschnitten]&quot;; ähnelt.
     112        ///     [rest of string was truncated]&quot;;.
    113113        /// </summary>
    114114        public static string SoapSchema {
     
    119119       
    120120        /// <summary>
    121         ///   Sucht eine lokalisierte Zeichenfolge, die &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
     121        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
    122122        ///&lt;!--
    123         ///OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS&apos;s procedures with respect to rights in OASIS specifications can be f [Rest der Zeichenfolge wurde abgeschnitten]&quot;; ähnelt.
     123        ///OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS&apos;s procedures with respect to rights in OASIS specifications can be f [rest of string was truncated]&quot;;.
    124124        /// </summary>
    125125        public static string WSSESchema {
  • trunk/CrypPlugins/WebService/WebService.cs

    r1218 r1489  
    6363        private SignatureValidator validator;
    6464        private XmlSchemaCollection collection;
    65         private string wsdl,publicRSAkey;
     65        private string wsdl,publickey;
    6666
    6767        public RSACryptoServiceProvider provider;
     
    207207            if (e.PropertyName.Equals("publishKey"))
    208208            {
    209                // this.publicKey = this.exportPublicKey();
    210                 if (PublicKeyControl != null)
    211                 {
    212                     PublicKeyControl.setPublicKey(this.exportPublicKey());
    213                 }
     209                PublicKey = exportPublicKey();
    214210            }
    215211            if (e.PropertyName.Equals("exportWSDL"))
    216             {   if(Control!=null)
    217                 Control.setWsdl(this.Wsdl);
     212            {
     213                Wsdl = this.wsdlDocument;
    218214            }
    219215            if (e.PropertyName.Equals("MethodenStub"))
     
    545541                                    }
    546542                                }
    547                                 else { EventsHelper.GuiLogMessage(OnGuiLogNotificationOccured, this, new GuiLogEventArgs("Es wurden nicht alle Parameter übergeben!", this, NotificationLevel.Error));
    548                                 goto Abbruch;
     543                                else {
     544                                    EventsHelper.GuiLogMessage(OnGuiLogNotificationOccured, this, new GuiLogEventArgs("Es wurden nicht alle Parameter übergeben!", this, NotificationLevel.Error));
     545                                    goto Abbruch;
    549546                               
    550547                                }
     
    668665
    669666        }
    670        
    671     //    [PropertyInfo(Direction.ControlMaster,"Public-Key output", "Encryption Key",null,DisplayLevel.Beginner)]
    672       public string publicKey
    673     {
    674         get
    675         {
    676 
    677             return this.publicRSAkey;
    678        
    679         }
    680         set
    681         { this.publicRSAkey = value;
    682         OnPropertyChanged("publicKey");
    683         }
    684            
    685     }
    686         private IControlPublicKey publicKeyControl;
    687         [PropertyInfo(Direction.ControlMaster, "Public-Key output", "Encryption Key", null, DisplayLevel.Beginner)]
    688         public IControlPublicKey PublicKeyControl
    689         {
    690             get { return publicKeyControl; }
    691             set
    692             {
    693                 publicKeyControl = value;
    694                 publicKeyControl.setPublicKey(this.publicKey);
    695             }
    696         }
    697         private IControlWsdl control;
    698         [PropertyInfo(Direction.ControlMaster, "WSDL output", "Web Service Description", null, DisplayLevel.Beginner)]
    699         public IControlWsdl Control
    700         {
    701             get { return control; }
    702             set
    703             {
    704                 /* Die Verbindung wurde hergestellt, Sie können ab jetzt Methoden aufrufen */
    705                 control = value;
    706                 control.setWsdl(this.wsdlDocument);
    707             }
    708         }
    709 
    710       //  [PropertyInfo(Direction.ControlMaster, "WSDL output", "Web Service Description", null, DisplayLevel.Beginner)]
     667
     668        [PropertyInfo(Direction.OutputData, "WSDL output", "Web Service Description", null, DisplayLevel.Beginner)]
    711669        public XmlDocument Wsdl
    712670        {
     
    715673            {
    716674                this.wsdlDocument = value;
    717                 control.setWsdl(this.wsdlDocument);
    718675                OnPropertyChanged("Wsdl");
    719676            }
    720677        }
     678
     679        [PropertyInfo(Direction.OutputData, "Public-Key output", "Encryption Key", null, DisplayLevel.Beginner)]
     680        public string PublicKey
     681        {
     682            get { return this.publickey; }
     683            set
     684            {
     685                this.publickey = value;
     686                OnPropertyChanged("PublicKey");
     687            }
     688        }
     689
    721690        [PropertyInfo(Direction.OutputData, "SOAP output", "Response from Web Service", "", false, false, DisplayLevel.Beginner, QuickWatchFormat.Text, "XmlOutputConverter")]
    722691        public XmlDocument OutputString
  • trunk/CrypPlugins/WebService/WebService.csproj

    r1487 r1489  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     
    1111    <RootNamespace>WebService</RootNamespace>
    1212    <AssemblyName>WebService</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    15     <SignAssembly>true</SignAssembly>
    16     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
     15    <SignAssembly>false</SignAssembly>
     16    <AssemblyOriginatorKeyFile>
     17    </AssemblyOriginatorKeyFile>
     18    <FileUpgradeFlags>
     19    </FileUpgradeFlags>
     20    <OldToolsVersion>3.5</OldToolsVersion>
     21    <UpgradeBackupLocation />
     22    <PublishUrl>publish\</PublishUrl>
     23    <Install>true</Install>
     24    <InstallFrom>Disk</InstallFrom>
     25    <UpdateEnabled>false</UpdateEnabled>
     26    <UpdateMode>Foreground</UpdateMode>
     27    <UpdateInterval>7</UpdateInterval>
     28    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     29    <UpdatePeriodically>false</UpdatePeriodically>
     30    <UpdateRequired>false</UpdateRequired>
     31    <MapFileExtensions>true</MapFileExtensions>
     32    <ApplicationRevision>0</ApplicationRevision>
     33    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     34    <IsWebBootstrapper>false</IsWebBootstrapper>
     35    <UseApplicationTrust>false</UseApplicationTrust>
     36    <BootstrapperEnabled>true</BootstrapperEnabled>
     37    <TargetFrameworkProfile />
    1738  </PropertyGroup>
    1839  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    2445    <Optimize>true</Optimize>
    2546    <DefineConstants>TRACE</DefineConstants>
     47    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2648  </PropertyGroup>
    2749  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    3355    <Optimize>true</Optimize>
    3456    <DefineConstants>TRACE</DefineConstants>
     57    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3558  </PropertyGroup>
    3659  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    4366    <Optimize>false</Optimize>
    4467    <DefineConstants>DEBUG;TRACE</DefineConstants>
     68    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4569  </PropertyGroup>
    4670  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    5377    <Optimize>false</Optimize>
    5478    <DefineConstants>DEBUG;TRACE</DefineConstants>
     79    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5580  </PropertyGroup>
    5681  <ItemGroup Condition=" '$(Platform)' == 'x86' " />
     
    7297    <Reference Include="System.Web.Services" />
    7398    <Reference Include="System.Windows.Forms" />
     99    <Reference Include="System.Xaml" />
    74100    <Reference Include="System.Xml.Linq">
    75101      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    112138      <SubType>Designer</SubType>
    113139      <Generator>MSBuild:Compile</Generator>
     140      <Generator>MSBuild:Compile</Generator>
     141      <SubType>Designer</SubType>
    114142    </Page>
    115143    <Page Include="WebServiceQuickWatchPresentation.xaml">
    116144      <SubType>Designer</SubType>
    117145      <Generator>MSBuild:Compile</Generator>
     146      <Generator>MSBuild:Compile</Generator>
     147      <SubType>Designer</SubType>
    118148    </Page>
    119149  </ItemGroup>
     
    144174  </ItemGroup>
    145175  <ItemGroup>
    146     <None Include="key.snk" />
    147176    <Resource Include="Ressources\ClosedLock.PNG" />
     177  </ItemGroup>
     178  <ItemGroup>
     179    <Folder Include="Controls\" />
     180    <Folder Include="WpfControls\" />
     181  </ItemGroup>
     182  <ItemGroup>
     183    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     184      <Visible>False</Visible>
     185      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     186      <Install>false</Install>
     187    </BootstrapperPackage>
     188    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     189      <Visible>False</Visible>
     190      <ProductName>.NET Framework 3.5 SP1</ProductName>
     191      <Install>true</Install>
     192    </BootstrapperPackage>
     193    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     194      <Visible>False</Visible>
     195      <ProductName>Windows Installer 3.1</ProductName>
     196      <Install>true</Install>
     197    </BootstrapperPackage>
    148198  </ItemGroup>
    149199  <ItemGroup>
     
    152202      <Name>CrypPluginBase</Name>
    153203    </ProjectReference>
    154   </ItemGroup>
    155   <ItemGroup>
    156     <Folder Include="Controls\" />
    157     <Folder Include="WpfControls\" />
    158204  </ItemGroup>
    159205  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • trunk/CrypPlugins/WebService/WebService.csproj.user

    r639 r1489  
    1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
     1<?xml version="1.0" encoding="utf-8"?>
     2<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     3  <PropertyGroup>
     4    <PublishUrlHistory />
     5    <InstallUrlHistory />
     6    <SupportUrlHistory />
     7    <UpdateUrlHistory />
     8    <BootstrapperUrlHistory />
     9    <ErrorReportUrlHistory />
     10    <FallbackCulture>en-US</FallbackCulture>
     11    <VerifyUploadedFiles>false</VerifyUploadedFiles>
     12  </PropertyGroup>
     13</Project>
  • trunk/CrypPlugins/WebService/WebServiceSettings.cs

    r812 r1489  
    3030       
    3131        private string methodName;
    32         [TaskPane("Methodenname", "Benennen Sie ihre Web Methode", "Konfigurieren", 1, false, DisplayLevel.Expert, ControlType.TextBox,"")]
     32        [TaskPane("Methodenname", "Benennen Sie ihre Web Methode", "Konfigurieren", 1, true, DisplayLevel.Expert, ControlType.TextBox, "")]
    3333        public string MethodName
    3434        {
     
    4545
    4646        private int paramString;
    47         [TaskPane("Eingabeparameter vom Typ string", "Anzahl der Parameter vom Typ string", "Konfigurieren", 3, false, DisplayLevel.Expert, ControlType.ComboBox, new string[] {"0","1", "2"})]
     47        [TaskPane("Eingabeparameter vom Typ string", "Anzahl der Parameter vom Typ string", "Konfigurieren", 3, true, DisplayLevel.Expert, ControlType.ComboBox, new string[] { "0", "1", "2" })]
    4848        public int String
    4949        {
     
    5555        }
    5656        private int paramDouble;
    57         [TaskPane("Eingabeparameter vom Typ double", "Anzahl der Parameter vom Typ double", "Konfigurieren", 4, false, DisplayLevel.Expert, ControlType.ComboBox, new string[] { "0", "1", "2" })]
     57        [TaskPane("Eingabeparameter vom Typ double", "Anzahl der Parameter vom Typ double", "Konfigurieren", 4, true, DisplayLevel.Expert, ControlType.ComboBox, new string[] { "0", "1", "2" })]
    5858        public int Double
    5959        {
     
    6767        private int integer;
    6868      //  [ContextMenu("Eingabeparameter", "Erwartete Eingabeparameter", 0, DisplayLevel.Beginner, ContextMenuControlType.ComboBox, null, "True", "False")]
    69        [TaskPane("Eingabeparameter vom Typ int", "Anzahl der Parameter vom Typ int","Konfigurieren", 2, false, DisplayLevel.Expert, ControlType.ComboBox, new string[] {"0","1","2"})]
     69       [TaskPane("Eingabeparameter vom Typ int", "Anzahl der Parameter vom Typ int", "Konfigurieren", 2, true, DisplayLevel.Expert, ControlType.ComboBox, new string[] { "0", "1", "2" })]
    7070        public int Integer
    7171        {
     
    8282
    8383       private int test;
    84        [TaskPane("Rückgabeparameter", "Wählen Sie den Typen des Rückgabeparameters", "Konfigurieren", 5, false, DisplayLevel.Expert, ControlType.ComboBox, new string[] { "void","int", "string", "float", "double"})]
     84       [TaskPane("Rückgabeparameter", "Wählen Sie den Typen des Rückgabeparameters", "Konfigurieren", 5, true, DisplayLevel.Expert, ControlType.ComboBox, new string[] { "void", "int", "string", "float", "double" })]
    8585       public int Test
    8686       {
     
    9595           }
    9696       }
    97        [TaskPane("WSDL veröffentlichen", "", "", 0, false, DisplayLevel.Beginner, ControlType.Button)]
     97       [TaskPane("WSDL veröffentlichen", "", "", 0, true, DisplayLevel.Beginner, ControlType.Button)]
    9898       public void exportWSDL()
    9999       {
     
    110110       //}
    111111
    112        [TaskPane("Öffentlichen Schlüssel bereitstellen", "Exportiert den öffentlichen Schlüssel", "Key Management", 1, false, DisplayLevel.Beginner, ControlType.Button)]
     112       [TaskPane("Öffentlichen Schlüssel bereitstellen", "Exportiert den öffentlichen Schlüssel", "Key Management", 1, true, DisplayLevel.Beginner, ControlType.Button)]
    113113       public void publishKey()
    114114       {
    115115           OnPropertyChanged("publishKey");
    116            {
    117 
    118            }
    119116       }
    120117
    121        [TaskPane("Vorgefertigte Methode", "Erstellt eine Testmethode, die zwei int Parameter entgegennimmt, diese addiert und das Ergebnis zurückgibt.","Konfigurieren", 0, false, DisplayLevel.Beginner, ControlType.Button)]
     118       [TaskPane("Vorgefertigte Methode", "Erstellt eine Testmethode, die zwei int Parameter entgegennimmt, diese addiert und das Ergebnis zurückgibt.", "Konfigurieren", 0, true, DisplayLevel.Beginner, ControlType.Button)]
    122119       public void MethodenStub()
    123120       {
     
    127124       
    128125       private string targetFileName;
    129       [TaskPane("Target File Name","Target to write WSDL",null,0,false,DisplayLevel.Beginner,ControlType.SaveFileDialog, FileExtension="Cryptool Alphabet (*.cta)|*.cta")]
     126      [TaskPane("Target File Name", "Target to write WSDL", null, 0, true, DisplayLevel.Beginner, ControlType.SaveFileDialog, FileExtension = "Cryptool Alphabet (*.cta)|*.cta")]
    130127       public string TargetFilename
    131128       {
Note: See TracChangeset for help on using the changeset viewer.