Changeset 6050

Timestamp:

04/25/11 17:42:59 (14 years ago)

Author:

wtollsch

Message:

#1433 menue entries and views for OKB Admin created / adapted, each view contains a listbox

Location:

branches/WebApplication/MVC2/HLWebOKBAdminPlugin

Files:

• Controllers/AdminController.cs (added)
• Controllers/AlgorithmClassController.cs (deleted)
• Controllers/HomeController.cs (added)
• Controllers/ServiceTestController.cs (deleted)
• HLWebOKBAdminPlugin.csproj (modified) (6 diffs)
• Helpers/Admin.cs (added)
• Models/AdminModel.cs (added)
• Models/AlgorithmClass.cs (deleted)
• Properties/AssemblyInfo.cs (modified) (1 diff)
• ViewModels/AlgorithmClassBrowseViewModel.cs (deleted)
• ViewModels/AlgorithmClassIndexViewModel.cs (deleted)
• ViewModels/AlgorithmClassViewModel.cs (deleted)
• Views/Admin (added)
• Views/Admin/Algorithm.aspx (added)
• Views/Admin/AlgorithmClass.aspx (added)
• Views/Admin/Index.aspx (added)
• Views/Admin/Menu.ascx (added)
• Views/Admin/Problem.aspx (added)
• Views/Admin/ProblemClass.aspx (added)
• Views/Home (added)
• Views/Home/About.aspx (added)
• Views/Home/Index.aspx (added)
• Web.config (modified) (2 diffs)
• bin (modified) (1 prop)
• bin/HLWebOKBAdminPlugin.pdb (modified) (previous)
• obj/Plugin/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• obj/Plugin/HLWebOKBAdminPlugin.pdb (modified) (previous)
• obj/Plugin/TempPE (modified) (1 prop)

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/HLWebOKBAdminPlugin.csproj

@@ -88 +88 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Controllers\AlgorithmClassController.cs" />
-    <Compile Include="Controllers\ServiceTestController.cs" />
+    <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
+    <Compile Include="Helpers\Admin.cs" />
     <Compile Include="Helpers\HtmlHelpers.cs" />
     <Compile Include="Models\AccountModels.cs" />
+    <Compile Include="Models\AdminModel.cs" />
     <Compile Include="Models\AlgorithmClassModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -102 +104 @@
       <DependentUpon>Reference.svcmap</DependentUpon>
     </Compile>
-    <Compile Include="ViewModels\AlgorithmClassViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -133 +134 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
-    <Content Include="Views\AlgorithmClass\Create.aspx" />
-    <Content Include="Views\AlgorithmClass\Delete.aspx" />
-    <Content Include="Views\AlgorithmClass\Details.aspx" />
-    <Content Include="Views\AlgorithmClass\Edit.aspx" />
-    <Content Include="Views\AlgorithmClass\Index.aspx" />
+    <EmbeddedResource Include="Views\Admin\Menu.ascx" />
+    <Content Include="Views\Admin\Algorithm.aspx" />
+    <Content Include="Views\Admin\AlgorithmClass.aspx" />
+    <Content Include="Views\Admin\Index.aspx" />
+    <Content Include="Views\Admin\Problem.aspx" />
+    <Content Include="Views\Admin\ProblemClass.aspx" />
+    <Content Include="Views\Home\About.aspx" />
+    <Content Include="Views\Home\Index.aspx" />
     <Content Include="Views\ServiceTest\Index.aspx" />
     <Content Include="Web.config">
@@ -166 +170 @@
     <Content Include="Views\Web.config" />
     <None Include="Service References\OKBAdministrationService\AdministrationService.wsdl" />
+    <None Include="Service References\OKBAdministrationService\AdministrationService.xsd">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Service References\OKBAdministrationService\AdministrationService1.xsd">
       <SubType>Designer</SubType>
@@ -180 +187 @@
     <Folder Include="App_LocalResources\" />
     <Folder Include="Resources\" />
+    <Folder Include="ViewModels\" />
   </ItemGroup>
   <ItemGroup>
@@ -186 +194 @@
   <ItemGroup>
     <WCFMetadataStorage Include="Service References\OKBAdministrationService\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Service References\OKBAdministrationService\AdministrationService.xsd">
-      <SubType>Designer</SubType>
-    </None>
   </ItemGroup>
   <Choose>

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Properties/AssemblyInfo.cs

@@ -41 +41 @@
 [assembly: WebResource("HLWebOKBAdminPlugin.Resources.Update.bmp", "image/bmp")]
 [assembly: HLWebPluginViewLocations(
-    new string[] { "~/Plugins/HLWebOKBAdminPlugin.dll/HLWebOKBAdminPlugin.Views.{1}.{0}.aspx" },
+    new string[] { "~/Plugins/HLWebOKBAdminPlugin.dll/HLWebOKBAdminPlugin.Views.{1}.{0}.aspx", "~/Plugins/HLWebOKBAdminPlugin.dll/HLWebOKBAdminPlugin.Views.{1}.{0}.ascx" },
     true,
     action = "index",
-    controller = "AlgorithmClass",
-    name = "OKB Administrator"
+    controller = "Admin",
+    name = "OKB Admin"
     )]

branches/WebApplication/MVC2/HLWebOKBAdminPlugin/Web.config

@@ -93 +93 @@
               algorithmSuite="Default" />
           </security>
-        </binding>        
+        </binding>
+        <binding name="AdministrationService1" closeTimeout="00:01:00"
+          openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
+          bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
+          maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text"
+          textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
+            maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00"
+            enabled="false" />
+          <security mode="Message">
+            <transport clientCredentialType="Windows" proxyCredentialType="None"
+              realm="" />
+            <message clientCredentialType="UserName" negotiateServiceCredential="true"
+              algorithmSuite="Default" />
+          </security>
+        </binding>
       </wsHttpBinding>
     </bindings>
@@ -103 +119 @@
           <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ==" />
         </identity>
-      </endpoint>      
+      </endpoint>
+      <endpoint address="http://services.heuristiclab.com/OKB.SPR-3.3/AdministrationService.svc"
+        binding="wsHttpBinding" bindingConfiguration="AdministrationService1"
+        contract="OKBAdministrationService.IAdministrationService" name="AdministrationService1">
+        <identity>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAwK1+2oAmcy/mI2P2QjyiJRh0y60gAAAAAQAAACoCAAAwggImMIIBj6ADAgECAhAIkseQ2EEhgU720qJA61gqMA0GCSqGSIb3DQEBBAUAMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb20wHhcNMTAwNTExMTExNDAyWhcNMzkxMjMxMjM1OTU5WjAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq26Bwmwc7k+4W30qLQ2j+FInEL5BuH6opDY6CSlrtt3xQS/anrhvpbf3QghLDVINzcHkzbPmm/SguG4F85QLB6xO+tJaOvRo0iEK5g3c307vMIru7FJwk/OhplEQ5J1hbDgL3zOJlrWlgtqRVxCtVdF3XroI9BctOt1NkeKv9ewIDAQABo1kwVzBVBgNVHQEETjBMgBCjbgdYd4j5JgUuJ1Wo/GxroSYwJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbYIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFAAOBgQAb/2xk2uQad68shSPl/uixWgvFI8WkxOTBopOLaLtDxwCeZ3mWVHdV9VnixHtThubnEBXAhYOCQSIXWtQuXFWO+gH3YyjTRJY5kTmXyuvBRTn3/so5SrQ7Rdlm9hf6E5YVX3tCjAy7ybUyaDUkQfmH5vmvgvpMzRfsJ1qhnUpJiQ==" />
+        </identity>
+      </endpoint>
     </client>
   </system.serviceModel>