Changeset 1489


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

Soap + WebService:

  • migrated to VS2010
  • replaced Control properties with regular Data properties
Location:
trunk
Files:
1 added
2 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPluginBase/CrypPluginBase.csproj

    r1487 r1489  
    110110    <Compile Include="Control\IControlCost.cs" />
    111111    <Compile Include="Control\IControlEncryption.cs" />
    112     <Compile Include="Control\IControlPublicKey.cs" />
    113     <Compile Include="Control\IControlWsdl.cs" />
    114112    <Compile Include="IO\CStream.cs" />
    115113    <Compile Include="IO\CStreamReader.cs" />
  • trunk/CrypPlugins/Soap/Resource1.Designer.cs

    r641 r1489  
    11//------------------------------------------------------------------------------
    22// <auto-generated>
    3 //     Dieser Code wurde von einem Tool generiert.
    4 //     Laufzeitversion:2.0.50727.3082
     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)]
  • trunk/CrypPlugins/Soap/Soap.cs

    r1219 r1489  
    122122
    123123
    124      //   [PropertyInfo(Direction.ControlSlave, "WSDL Input", "WSDL to create the soap message",null, DisplayLevel.Beginner)]
    125         //public XmlDocument wsdl
    126         //{
    127         //    set
    128         //    {
    129         //         presentation.Dispatcher.Invoke(DispatcherPriority.Normal, (SendOrPostCallback)delegate
    130         //            {
    131         //        string s = xmlToString(value);
    132         //        loadWSDL(s);
    133         //        wsdlLoaded = true;
    134                        
    135         //          OnPropertyChanged("wsdl");
    136         //          createInfoMessage("Received WSDL File");
    137         //          createInfoMessage("Created SOAP Message");
    138         //            }, null);
    139         //    }
    140         //    get
    141         //    {
    142         //        return null;
    143         //    }
    144         //}
    145         private ControlProxy control;
    146 [PropertyInfo(Direction.ControlSlave, "WSDL Input", "WSDL to create the soap message",null, DisplayLevel.Beginner)]
    147         public IControlWsdl Control
    148 {
    149  get
    150  {
    151  if (control == null)
    152     control = new ControlProxy (this);
    153   return control;
    154  }
    155 }
    156 
    157 private ControlPublicKeyProxy controlPublicKeyProxy;
    158         [PropertyInfo(Direction.ControlSlave, "Public-Key input", "Encryption Key",null, DisplayLevel.Beginner)]
    159         public IControlPublicKey publicKey
    160         {
     124        [PropertyInfo(Direction.InputData, "WSDL Input", "WSDL to create the soap message", null, DisplayLevel.Beginner)]
     125        public XmlDocument Wsdl
     126        {
     127            set
     128            {
     129                presentation.Dispatcher.Invoke(DispatcherPriority.Normal, (SendOrPostCallback)delegate
     130                   {
     131                       string s = xmlToString(value);
     132                       loadWSDL(s);
     133                       wsdlLoaded = true;
     134
     135                       OnPropertyChanged("wsdl");
     136                       createInfoMessage("Received WSDL File");
     137                       createInfoMessage("Created SOAP Message");
     138                   }, null);
     139            }
    161140            get
    162141            {
    163                 {
    164                     if (controlPublicKeyProxy == null)
    165                         controlPublicKeyProxy = new ControlPublicKeyProxy(this);
    166                     return controlPublicKeyProxy;
    167                 }
    168             }
    169         }
    170         private XmlDocument outputString;
     142                return null;
     143            }
     144        }
     145
     146        [PropertyInfo(Direction.InputData, "Public-Key input", "Encryption Key",null, DisplayLevel.Beginner)]
     147        public string PublicKey
     148        {
     149            get
     150            {
     151                return this.wsPublicKey;
     152            }
     153            set
     154            {
     155                Presentation.Dispatcher.Invoke(DispatcherPriority.Normal, (SendOrPostCallback)delegate
     156                {
     157                    {
     158                        WsPublicKey = value;
     159
     160                        WsRSACryptoProv.FromXmlString(wsPublicKey);
     161                        gotKey = true;
     162                        mySettings.gotkey = true;
     163                        mySettings.wsRSAcryptoProv = WsRSACryptoProv.ToXmlString(false);
     164                        OnPropertyChanged("publicKey");
     165                        createInfoMessage("Public Key Received");
     166                    }
     167                }, null);
     168            }
     169        }
     170
    171171       [PropertyInfo(Direction.OutputData, "SOAP output", "Send a SOAP Message", "",true, true, DisplayLevel.Beginner, QuickWatchFormat.Text, "XmlConverter")]
    172172        public XmlDocument OutputString                                                                                                 
     
    781781                case "wsdlloaded":
    782782                    this.wsdlLoaded = s.wsdlloaded ;
     783                    break;
     784                case "sendSoap":
     785                    if (!send)
     786                    {
     787                        OnPropertyChanged("OutputString");
     788                        send = true;
     789                    }
    783790                    break;
    784791                case "resetSoap":
     
    15501557        public void Execute()
    15511558        {
    1552             if (!send)
    1553             {
    1554                 OnPropertyChanged("OutputString");
    1555                 send = true;
    1556             }
    15571559        }
    15581560
     
    16161618        #endregion
    16171619    }
    1618     public class ControlProxy : IControlWsdl
    1619     {
    1620         private Soap plugin;
    1621 
    1622         // Konstruktor
    1623         public ControlProxy(Soap plugin)
    1624         {
    1625             this.plugin = plugin;
    1626         }
    1627         #region IControlWsdl Member
    1628 
    1629         public XmlDocument Wsdl
    1630         {
    1631             get
    1632             {
    1633                 return null;
    1634             }
    1635             set
    1636             {
    1637 
    1638             }
    1639         }
    1640 
    1641         public void setWsdl(XmlDocument wsdlDocument)
    1642         {
    1643            plugin.Presentation.Dispatcher.Invoke(DispatcherPriority.Normal, (SendOrPostCallback)delegate
    1644             {
    1645                 string s = plugin.xmlToString(wsdlDocument);
    1646                 plugin.loadWSDL(s);
    1647                 plugin.wsdlLoaded = true;
    1648 
    1649                 plugin.OnPropertyChanged("wsdl");
    1650                plugin.createInfoMessage("Received WSDL File");
    1651                 plugin.createInfoMessage("Created SOAP Message");
    1652             }, null);
    1653         }
    1654 
    1655         #endregion
    1656 
    1657         #region IControl Member
    1658 
    1659         public event IControlStatusChangedEventHandler OnStatusChanged;
    1660 
    1661         #endregion
    1662     }
    1663     public class ControlPublicKeyProxy : IControlPublicKey
    1664     {
    1665         private Soap plugin;
    1666         public ControlPublicKeyProxy(Soap plugin)
    1667         {
    1668             this.plugin = plugin;
    1669         }
    1670 
    1671         #region IControlPublicKey Member
    1672      
    1673         public string publicKey
    1674         {
    1675             get
    1676             {
    1677                 return null;
    1678             }
    1679             set
    1680             {
    1681          
    1682             }
    1683         }
    1684 
    1685         public void setPublicKey(string publicKey)
    1686         {
    1687             try
    1688             {
    1689                 if (publicKey == null)
    1690                     return;
    1691                 plugin.Presentation.Dispatcher.Invoke(DispatcherPriority.Normal, (SendOrPostCallback)delegate
    1692                 {
    1693 
    1694 
    1695                     {
    1696                         plugin.WsPublicKey = publicKey;
    1697 
    1698                         plugin.WsRSACryptoProv.FromXmlString(plugin.WsPublicKey);
    1699                         plugin.gotKey = true;
    1700                         plugin.mySettings.gotkey = true;
    1701                         plugin.mySettings.wsRSAcryptoProv = plugin.WsRSACryptoProv.ToXmlString(false);
    1702                         plugin.OnPropertyChanged("publicKey");
    1703                         plugin.createInfoMessage("Public Key Received");
    1704                     }
    1705                 }, null);
    1706             }
    1707             catch (Exception exc)
    1708             {
    1709             }
    1710         }
    1711 
    1712 
    1713         #endregion
    1714 
    1715         #region IControl Member
    1716 
    1717         public event IControlStatusChangedEventHandler OnStatusChanged;
    1718 
    1719         #endregion
    1720     }
    17211620
    17221621}
  • trunk/CrypPlugins/Soap/Soap.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>Soap</RootNamespace>
    1212    <AssemblyName>Soap</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' " />
     
    7196    <Reference Include="System.Security" />
    7297    <Reference Include="System.Web.Services" />
     98    <Reference Include="System.Xaml" />
    7399    <Reference Include="System.Xml.Linq">
    74100      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    105131      <SubType>Designer</SubType>
    106132      <Generator>MSBuild:Compile</Generator>
     133      <Generator>MSBuild:Compile</Generator>
     134      <SubType>Designer</SubType>
    107135    </Page>
    108136  </ItemGroup>
     
    121149  <ItemGroup>
    122150    <Content Include="Key.bmp" />
    123     <None Include="key.snk" />
    124151    <None Include="Resources\EditIcon.PNG" />
    125152    <Resource Include="SOAPImage.PNG" />
     
    129156    <None Include="Resources\OpenLock.PNG" />
    130157    <None Include="Resources\webservice.png" />
     158  </ItemGroup>
     159  <ItemGroup>
     160    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     161      <Visible>False</Visible>
     162      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     163      <Install>false</Install>
     164    </BootstrapperPackage>
     165    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     166      <Visible>False</Visible>
     167      <ProductName>.NET Framework 3.5 SP1</ProductName>
     168      <Install>true</Install>
     169    </BootstrapperPackage>
     170    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     171      <Visible>False</Visible>
     172      <ProductName>Windows Installer 3.1</ProductName>
     173      <Install>true</Install>
     174    </BootstrapperPackage>
    131175  </ItemGroup>
    132176  <ItemGroup>
  • trunk/CrypPlugins/Soap/SoapSettings.cs

    r641 r1489  
    3232        }
    3333
    34         [TaskPane("Reset Soap", "Resets the Soap Message", null, 1, false, DisplayLevel.Beginner, ControlType.Button)]
     34        [TaskPane("Send Soap", "Sends the Soap Message", null, 1, true, DisplayLevel.Beginner, ControlType.Button)]
     35        public void sendSoap()
     36        {
     37            OnPropertyChanged("sendSoap");
     38        }
     39
     40        [TaskPane("Reset Soap", "Resets the Soap Message", null, 1, true, DisplayLevel.Beginner, ControlType.Button)]
    3541        public void resetSoap()
    3642        {
    3743            OnPropertyChanged("resetSoap");
    38             {
    39             }
    4044        }
    4145
    4246        private string signatureAlg = "1";
    43         [TaskPane("Signature Algorithm","Select the Signature Algorithm","Signature",3,false,DisplayLevel.Expert,ControlType.ComboBox,new string[] {"DSA-SHA1","RSA-SHA1"})]
     47        [TaskPane("Signature Algorithm", "Select the Signature Algorithm", "Signature", 3, true, DisplayLevel.Expert, ControlType.ComboBox, new string[] { "DSA-SHA1", "RSA-SHA1" })]
    4448        public string SignatureAlg
    4549        {
     
    5357
    5458        private bool sigXPathRef;
    55         [TaskPane("Use a XPath-Reference", "Use XPath References to reference the signed elements", "Signature", 4, false, DisplayLevel.Expert, ControlType.CheckBox)]
     59        [TaskPane("Use a XPath-Reference", "Use XPath References to reference the signed elements", "Signature", 4, true, DisplayLevel.Expert, ControlType.CheckBox)]
    5660        public bool SigXPathRef
    5761        {
     
    6569
    6670        private bool sigShowSteps;
    67         [TaskPane("Show Signature Steps", "Shows the single steps to create the signature", "Signature", 5, false, DisplayLevel.Expert, ControlType.CheckBox)]
     71        [TaskPane("Show Signature Steps", "Shows the single steps to create the signature", "Signature", 5, true, DisplayLevel.Expert, ControlType.CheckBox)]
    6872        public bool SigShowSteps
    6973        {
     
    7882
    7983        private int animationSpeed = 3;
    80         [TaskPane("Animationspeed", "Set the speed for animations", "Animation", 9, false, DisplayLevel.Beginner, ControlType.NumericUpDown, Cryptool.PluginBase.ValidationType.RangeInteger, 1, 5)]
     84        [TaskPane("Animationspeed", "Set the speed for animations", "Animation", 9, true, DisplayLevel.Beginner, ControlType.NumericUpDown, Cryptool.PluginBase.ValidationType.RangeInteger, 1, 5)]
    8185        public int AnimationSpeed
    8286        {
     
    9296        }
    9397
    94         [TaskPane("Pause Restart", "Starts or stops the animation","Animation", 7, false, DisplayLevel.Beginner, ControlType.Button)]
     98        [TaskPane("Pause Restart", "Starts or stops the animation", "Animation", 7, true, DisplayLevel.Beginner, ControlType.Button)]
    9599        public void playPause()
    96100        {
     
    100104        }
    101105
    102         [TaskPane("End Animation", "Stop the animation and shows the final result", "Animation", 8, false, DisplayLevel.Beginner, ControlType.Button)]
     106        [TaskPane("End Animation", "Stop the animation and shows the final result", "Animation", 8, true, DisplayLevel.Beginner, ControlType.Button)]
    103107        public void endAnimation()
    104108        {
     
    114118
    115119    //    [ContextMenu("Encryption Mode", "Choose wether to encrypt the XML-Element or the content of the XML-Element", 6, DisplayLevel.Beginner, ContextMenuControlType.ComboBox, null, new string[] { "XML-Element", "Content of XML-Element" })]
    116         [TaskPane("Encryption Mode", "Choose wether to encrypt the XML-Element or the content of the XML-Element", "Encryption", 6, false, DisplayLevel.Expert, ControlType.RadioButton, new string[] { "XML-Element", "Content of XML-Element" })]
     120        [TaskPane("Encryption Mode", "Choose wether to encrypt the XML-Element or the content of the XML-Element", "Encryption", 6, true, DisplayLevel.Expert, ControlType.RadioButton, new string[] { "XML-Element", "Content of XML-Element" })]
    117121        public int EncContentRadio
    118122        {
     
    130134
    131135        private bool encShowSteps;
    132         [TaskPane("Show Encryption Steps", "Shows the single steps to encrypt this element", "Encryption", 12, false, DisplayLevel.Expert, ControlType.CheckBox)]
     136        [TaskPane("Show Encryption Steps", "Shows the single steps to encrypt this element", "Encryption", 12, true, DisplayLevel.Expert, ControlType.CheckBox)]
    133137        public bool EncShowSteps
    134138        {
  • 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       {
  • trunk/CrypTool 2.0.sln

    r1451 r1489  
    216216EndProject
    217217Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VigenereAnalyser", "CrypPlugins\VigenereAnalyser\VigenereAnalyser.csproj", "{1696C227-2A99-4A14-AE81-6A8438D42D06}"
     218EndProject
     219Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Soap", "CrypPlugins\Soap\Soap.csproj", "{C53B0D8F-CB9C-461B-8802-062F342FFC5D}"
     220EndProject
     221Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebService", "CrypPlugins\WebService\WebService.csproj", "{4C93AC25-D344-4A35-81C8-C2A5E2C3B438}"
    218222EndProject
    219223Global
     
    10571061                {1696C227-2A99-4A14-AE81-6A8438D42D06}.Release|x86.ActiveCfg = Release|x86
    10581062                {1696C227-2A99-4A14-AE81-6A8438D42D06}.Release|x86.Build.0 = Release|x86
     1063                {C53B0D8F-CB9C-461B-8802-062F342FFC5D}.Debug|x64.ActiveCfg = Debug|x64
     1064                {C53B0D8F-CB9C-461B-8802-062F342FFC5D}.Debug|x64.Build.0 = Debug|x64
     1065                {C53B0D8F-CB9C-461B-8802-062F342FFC5D}.Debug|x86.ActiveCfg = Debug|x86
     1066                {C53B0D8F-CB9C-461B-8802-062F342FFC5D}.Debug|x86.Build.0 = Debug|x86
     1067                {C53B0D8F-CB9C-461B-8802-062F342FFC5D}.Release|x64.ActiveCfg = Release|x64
     1068                {C53B0D8F-CB9C-461B-8802-062F342FFC5D}.Release|x64.Build.0 = Release|x64
     1069                {C53B0D8F-CB9C-461B-8802-062F342FFC5D}.Release|x86.ActiveCfg = Release|x86
     1070                {C53B0D8F-CB9C-461B-8802-062F342FFC5D}.Release|x86.Build.0 = Release|x86
     1071                {4C93AC25-D344-4A35-81C8-C2A5E2C3B438}.Debug|x64.ActiveCfg = Debug|x64
     1072                {4C93AC25-D344-4A35-81C8-C2A5E2C3B438}.Debug|x64.Build.0 = Debug|x64
     1073                {4C93AC25-D344-4A35-81C8-C2A5E2C3B438}.Debug|x86.ActiveCfg = Debug|x86
     1074                {4C93AC25-D344-4A35-81C8-C2A5E2C3B438}.Debug|x86.Build.0 = Debug|x86
     1075                {4C93AC25-D344-4A35-81C8-C2A5E2C3B438}.Release|x64.ActiveCfg = Release|x64
     1076                {4C93AC25-D344-4A35-81C8-C2A5E2C3B438}.Release|x64.Build.0 = Release|x64
     1077                {4C93AC25-D344-4A35-81C8-C2A5E2C3B438}.Release|x86.ActiveCfg = Release|x86
     1078                {4C93AC25-D344-4A35-81C8-C2A5E2C3B438}.Release|x86.Build.0 = Release|x86
    10591079        EndGlobalSection
    10601080        GlobalSection(SolutionProperties) = preSolution
     
    11601180                {475E8850-4D82-4C5E-AD19-5FDA82BC7576} = {88B851F6-9E3D-484F-A317-ECED5B98C618}
    11611181                {1696C227-2A99-4A14-AE81-6A8438D42D06} = {88B851F6-9E3D-484F-A317-ECED5B98C618}
     1182                {C53B0D8F-CB9C-461B-8802-062F342FFC5D} = {88B851F6-9E3D-484F-A317-ECED5B98C618}
     1183                {4C93AC25-D344-4A35-81C8-C2A5E2C3B438} = {88B851F6-9E3D-484F-A317-ECED5B98C618}
    11621184        EndGlobalSection
    11631185EndGlobal
Note: See TracChangeset for help on using the changeset viewer.