Menu
▾
▴
[Mp-webinterface-svn] SF.net SVN: mp-webinterface: [30] trunk/Version2
|
From: <mas...@us...> - 2007-03-08 12:13:10
|
Revision: 30
http://svn.sourceforge.net/mp-webinterface/?rev=30&view=rev
Author: maschine
Date: 2007-03-08 04:13:06 -0800 (Thu, 08 Mar 2007)
Log Message:
-----------
-Fixed bug with startstopButton
-Set physical path on save settings
-Added TestPage
Modified Paths:
--------------
trunk/Version2/Control Center/Control_Center_App.cs
trunk/Version2/Setup/Setup.vdproj
Added Paths:
-----------
trunk/Version2/TestPage/
trunk/Version2/TestPage/Test.htm
Modified: trunk/Version2/Control Center/Control_Center_App.cs
===================================================================
--- trunk/Version2/Control Center/Control_Center_App.cs 2007-03-07 21:45:15 UTC (rev 29)
+++ trunk/Version2/Control Center/Control_Center_App.cs 2007-03-08 12:13:06 UTC (rev 30)
@@ -18,16 +18,16 @@
private ServiceController MPWServiceController = new ServiceController("MPW");
//MPW Webserver settings
- private String appPath;
private String port;
private String bindIP;
private int accesMode;
- private String file = System.AppDomain.CurrentDomain.BaseDirectory + "Configuration.xml";
+ private String file;
public Control_Center_App()
{
InitializeComponent();
+ file = System.AppDomain.CurrentDomain.BaseDirectory + "Configuration.xml";
RefreshControllers();
LoadSettings();
}
@@ -48,12 +48,12 @@
if (statusMPWServerConn.Text == "Running")
{
statusMPWServerConn.ForeColor = Color.Green;
- startstopButton.Enabled = true;
+ startstopButton.Text = "Stop";
}
else
{
statusMPWServerConn.ForeColor = Color.Red;
- startstopButton.Enabled = false;
+ startstopButton.Text = "Start";
}
//TV Server
@@ -159,6 +159,8 @@
node.InnerText = port;
node = doc.DocumentElement.SelectSingleNode("/configuration/allowedAccesMode");
node.InnerText = accesMode.ToString();
+ node = doc.DocumentElement.SelectSingleNode("/configuration/physicalPath");
+ node.InnerText = System.AppDomain.CurrentDomain.BaseDirectory + @"wwwroot\";
doc.Save(file);
}
@@ -169,8 +171,17 @@
bindIP = bindIPBox.Text;
accesMode = accessModeDropDown.SelectedIndex;
SaveSettings();
- if (statusMPWServerConn.Text == "Running")
- MPWServiceController.ExecuteCommand(0); //ReloadConfiguration
+ try
+ {
+ if (MPWServiceController.Status == ServiceControllerStatus.Running)
+ MPWServiceController.ExecuteCommand(0); //ReloadConfiguration
+ else
+ MessageBox.Show("You will need to restart the server to use the new configuration!");
+ }
+ catch
+ {
+ MessageBox.Show("Error setting the new configuration.");
+ }
linkLabel2.Text = ConstructServerURL();
}
Modified: trunk/Version2/Setup/Setup.vdproj
===================================================================
--- trunk/Version2/Setup/Setup.vdproj 2007-03-07 21:45:15 UTC (rev 29)
+++ trunk/Version2/Setup/Setup.vdproj 2007-03-08 12:13:06 UTC (rev 30)
@@ -21,18 +21,6 @@
}
"Entry"
{
- "MsmKey" = "8:_3306E9F964F5FB2F9C11CD8F2ADE103C"
- "OwnerKey" = "8:_0F712DF68ED348C597086DD86FC56227"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_3306E9F964F5FB2F9C11CD8F2ADE103C"
- "OwnerKey" = "8:_7CD9E17A5A2443F381DBF7313078D211"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_38708A2E22BC4439A7DFB5A5CC780498"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -46,7 +34,7 @@
"Entry"
{
"MsmKey" = "8:_5AA324D14C7A0BEB13CF3C6839DE8AF7"
- "OwnerKey" = "8:_3306E9F964F5FB2F9C11CD8F2ADE103C"
+ "OwnerKey" = "8:_F7CBCAAB235DF8EE243AD47CE5AE60AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -75,6 +63,24 @@
}
"Entry"
{
+ "MsmKey" = "8:_DB1EB6A709194CA9A153A70E56357E20"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_F7CBCAAB235DF8EE243AD47CE5AE60AD"
+ "OwnerKey" = "8:_0F712DF68ED348C597086DD86FC56227"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_F7CBCAAB235DF8EE243AD47CE5AE60AD"
+ "OwnerKey" = "8:_7CD9E17A5A2443F381DBF7313078D211"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_B21808006FD74A33B7D97E8F41C2A72E"
"MsmSig" = "8:_UNDEFINED"
@@ -82,7 +88,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_3306E9F964F5FB2F9C11CD8F2ADE103C"
+ "OwnerKey" = "8:_F7CBCAAB235DF8EE243AD47CE5AE60AD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -249,23 +255,43 @@
}
"File"
{
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3306E9F964F5FB2F9C11CD8F2ADE103C"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_38708A2E22BC4439A7DFB5A5CC780498"
{
+ "SourcePath" = "8:LICENSE.rtf"
+ "TargetName" = "8:LICENSE.rtf"
+ "Tag" = "8:"
+ "Folder" = "8:_3AAF0448C26C4EFC8D390F14EF2EACFB"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5AA324D14C7A0BEB13CF3C6839DE8AF7"
+ {
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:WebServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=6a8f2e8c25e1b4e0, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_3306E9F964F5FB2F9C11CD8F2ADE103C"
+ "_5AA324D14C7A0BEB13CF3C6839DE8AF7"
{
- "Name" = "8:WebServer.dll"
+ "Name" = "8:log4net.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:WebServer.dll"
+ "SourcePath" = "8:log4net.dll"
"TargetName" = "8:"
"Tag" = "8:"
- "Folder" = "8:_4AF64E14F05F48C6B6561E3A84C622CC"
+ "Folder" = "8:_3AAF0448C26C4EFC8D390F14EF2EACFB"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -280,12 +306,12 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_38708A2E22BC4439A7DFB5A5CC780498"
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DB1EB6A709194CA9A153A70E56357E20"
{
- "SourcePath" = "8:LICENSE.rtf"
- "TargetName" = "8:LICENSE.rtf"
+ "SourcePath" = "8:..\\TestPage\\Test.htm"
+ "TargetName" = "8:Test.htm"
"Tag" = "8:"
- "Folder" = "8:_3AAF0448C26C4EFC8D390F14EF2EACFB"
+ "Folder" = "8:_630010CA5B27470EBA4BEB29C8484993"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -300,23 +326,23 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5AA324D14C7A0BEB13CF3C6839DE8AF7"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F7CBCAAB235DF8EE243AD47CE5AE60AD"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"
+ "AssemblyAsmDisplayName" = "8:WebServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=6a8f2e8c25e1b4e0, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_5AA324D14C7A0BEB13CF3C6839DE8AF7"
+ "_F7CBCAAB235DF8EE243AD47CE5AE60AD"
{
- "Name" = "8:log4net.dll"
+ "Name" = "8:WebServer.dll"
"Attributes" = "3:512"
}
}
- "SourcePath" = "8:log4net.dll"
+ "SourcePath" = "8:WebServer.dll"
"TargetName" = "8:"
"Tag" = "8:"
- "Folder" = "8:_3AAF0448C26C4EFC8D390F14EF2EACFB"
+ "Folder" = "8:_4AF64E14F05F48C6B6561E3A84C622CC"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@@ -380,6 +406,17 @@
"Property" = "8:TARGETDIR"
"Folders"
{
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_630010CA5B27470EBA4BEB29C8484993"
+ {
+ "Name" = "8:wwwroot"
+ "AlwaysCreate" = "11:TRUE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_2F2F0EE650724C609BA21DC3BA41CEC6"
+ "Folders"
+ {
+ }
+ }
}
}
"{1525181F-901A-416C-8A58-119130FE478E}:_45AC748FDB2649E7871E48E65EC863D3"
@@ -420,7 +457,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:MPW"
"ProductCode" = "8:{FFA1A109-9C5B-4D11-9B85-9E8B4F5392E4}"
- "PackageCode" = "8:{9B6BD622-B13D-4D05-B187-801B6D9E200D}"
+ "PackageCode" = "8:{91217F2D-1313-4C9F-B9B7-124AA41D22C3}"
"UpgradeCode" = "8:{4F72B4EB-D91C-4E25-9ABE-C7669CDE4B98}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -1043,7 +1080,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0F712DF68ED348C597086DD86FC56227"
{
- "SourcePath" = "8:..\\Control Center\\obj\\Release\\MPW Monitor.exe"
+ "SourcePath" = "8:..\\Control Center\\obj\\Release\\MPW Control Center.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_3AAF0448C26C4EFC8D390F14EF2EACFB"
Added: trunk/Version2/TestPage/Test.htm
===================================================================
--- trunk/Version2/TestPage/Test.htm (rev 0)
+++ trunk/Version2/TestPage/Test.htm 2007-03-08 12:13:06 UTC (rev 30)
@@ -0,0 +1 @@
+Hello World!
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
