From eebdaf95511cd8db1208273c8b3097928936bfb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Aar=C3=B8e=20Dam?= Date: Tue, 28 Apr 2015 11:58:23 +0200 Subject: [PATCH] Rename: RDSFactorWeb -> web, RDSFactor -> server --- .gitignore | 6 ++---- install-server.bat | 9 ++++++--- install-web.bat | 4 ++-- {RDSFactor => server}/Conversion.vb | 0 {RDSFactor => server}/IniFileVb.vb | 0 {RDSFactor => server}/Log.vb | 0 .../My Project/Application.Designer.vb | 0 {RDSFactor => server}/My Project/Application.myapp | 0 {RDSFactor => server}/My Project/AssemblyInfo.vb | 0 .../My Project/Resources.Designer.vb | 0 {RDSFactor => server}/My Project/Resources.resx | 0 .../My Project/Settings.Designer.vb | 0 {RDSFactor => server}/My Project/Settings.settings | 0 {RDSFactor => server}/My Project/app.manifest | 0 {RDSFactor => server}/ProjectInstaller.Designer.vb | 0 {RDSFactor => server}/ProjectInstaller.resx | 0 {RDSFactor => server}/ProjectInstaller.vb | 0 {RDSFactor => server}/RDSFactor.Designer.vb | 0 {RDSFactor => server}/RDSFactor.resx | 0 {RDSFactor => server}/RDSFactor.sln | 0 {RDSFactor => server}/RDSFactor.vb | 0 {RDSFactor => server}/RDSFactor.vbproj | 0 {RDSFactor => server}/RDSFactor.vbproj.user | 0 {RDSFactor => server}/SMSModem.vb | 0 {RDSFactor => server}/VSA.vb | 0 {RDSFactor => server}/app.config | 0 {RDSFactor => server}/conf/RDSFactor.ini | 0 .../exceptions/MissingRadiusSecret.vb | 0 {RDSFactor => server}/exceptions/MissingUser.vb | 0 {RDSFactor => server}/handlers/RDSHandler.vb | 0 uninstall-server.bat | 2 +- {RDSFactorWeb => web}/RDSFactorWeb.sln | 2 +- .../RDWeb/Pages/App_Data/ASPNETDB.MDF | Bin .../RDWeb/Pages/App_Data/allusers_tswa.log | Bin .../RDWeb/Pages/App_Data/aspnetdb_log.ldf | Bin {RDSFactorWeb => web}/RDWeb/Pages/Bin/RADAR.dll | Bin {RDSFactorWeb => web}/RDWeb/Pages/Bin/RADAR.pdb | Bin {RDSFactorWeb => web}/RDWeb/Pages/Bin/RADAR.xml | 0 .../Pages/Bin/en/TSPortalWebPart.resources.dll | Bin .../RDWeb/Pages/Bin/tsportalwebpart.dll | Bin {RDSFactorWeb => web}/RDWeb/Pages/Default.aspx | 0 {RDSFactorWeb => web}/RDWeb/Pages/Default.aspx.cs | 0 {RDSFactorWeb => web}/RDWeb/Pages/RenderFail.css | 0 {RDSFactorWeb => web}/RDWeb/Pages/Site.xsl | 0 {RDSFactorWeb => web}/RDWeb/Pages/Web.config | 0 {RDSFactorWeb => web}/RDWeb/Pages/WebFeed.aspx | 0 {RDSFactorWeb => web}/RDWeb/Pages/WebFeed.aspx.cs | 0 .../RDWeb/Pages/en-US/Default.aspx | 0 .../RDWeb/Pages/en-US/Desktops.aspx | 0 .../RDWeb/Pages/en-US/RDWAStrings.xml | 0 .../RDWeb/Pages/en-US/checktoken.aspx | 0 .../RDWeb/Pages/en-US/checktoken.aspx.cs | 0 {RDSFactorWeb => web}/RDWeb/Pages/en-US/cook.aspx | 0 .../RDWeb/Pages/en-US/cook.aspx.cs | 0 {RDSFactorWeb => web}/RDWeb/Pages/en-US/login.aspx | 0 {RDSFactorWeb => web}/RDWeb/Pages/en-US/logoff.aspx | 0 .../RDWeb/Pages/en-US/password.aspx | Bin .../RDWeb/Pages/en-US/rap-help.htm | 0 .../RDWeb/Pages/en-US/tokenform.aspx | Bin .../RDWeb/Pages/en-US/tokenform.aspx.cs | 0 {RDSFactorWeb => web}/RDWeb/Pages/en-US/tswa.css | 0 {RDSFactorWeb => web}/RDWeb/Pages/images/Ivmo.png | Bin {RDSFactorWeb => web}/RDWeb/Pages/images/WS_h_c.png | Bin .../RDWeb/Pages/images/Warning24.png | Bin .../RDWeb/Pages/images/banner_01.jpg | Bin .../RDWeb/Pages/images/banner_02.jpg | Bin {RDSFactorWeb => web}/RDWeb/Pages/images/bar_03.jpg | Bin .../RDWeb/Pages/images/bg_globe_01.jpg | Bin .../RDWeb/Pages/images/bottom_left.png | Bin .../RDWeb/Pages/images/bottom_mid.png | Bin .../RDWeb/Pages/images/bottom_right.png | Bin {RDSFactorWeb => web}/RDWeb/Pages/images/clear.gif | Bin .../RDWeb/Pages/images/erroricon.png | Bin {RDSFactorWeb => web}/RDWeb/Pages/images/folder.png | Bin .../RDWeb/Pages/images/left_mid.png | Bin .../RDWeb/Pages/images/logo_01.png | Bin .../RDWeb/Pages/images/logo_02.png | Bin .../RDWeb/Pages/images/mslogo_black.png | Bin .../RDWeb/Pages/images/rapwait.gif | Bin .../RDWeb/Pages/images/right_mid.png | Bin .../RDWeb/Pages/images/top_left.png | Bin .../RDWeb/Pages/images/top_mid.png | Bin .../RDWeb/Pages/images/top_right.png | Bin {RDSFactorWeb => web}/RDWeb/Pages/images/up.png | Bin .../RDWeb/Pages/jquery-1.11.2.min.js | 0 {RDSFactorWeb => web}/RDWeb/Pages/renderscripts.js | 0 {RDSFactorWeb => web}/RDWeb/Pages/tswf.xsd | 0 .../RDWeb/Pages/webscripts-domain.js | 0 88 files changed, 12 insertions(+), 11 deletions(-) rename {RDSFactor => server}/Conversion.vb (100%) rename {RDSFactor => server}/IniFileVb.vb (100%) rename {RDSFactor => server}/Log.vb (100%) rename {RDSFactor => server}/My Project/Application.Designer.vb (100%) rename {RDSFactor => server}/My Project/Application.myapp (100%) rename {RDSFactor => server}/My Project/AssemblyInfo.vb (100%) rename {RDSFactor => server}/My Project/Resources.Designer.vb (100%) rename {RDSFactor => server}/My Project/Resources.resx (100%) rename {RDSFactor => server}/My Project/Settings.Designer.vb (100%) rename {RDSFactor => server}/My Project/Settings.settings (100%) rename {RDSFactor => server}/My Project/app.manifest (100%) rename {RDSFactor => server}/ProjectInstaller.Designer.vb (100%) rename {RDSFactor => server}/ProjectInstaller.resx (100%) rename {RDSFactor => server}/ProjectInstaller.vb (100%) rename {RDSFactor => server}/RDSFactor.Designer.vb (100%) rename {RDSFactor => server}/RDSFactor.resx (100%) rename {RDSFactor => server}/RDSFactor.sln (100%) rename {RDSFactor => server}/RDSFactor.vb (100%) rename {RDSFactor => server}/RDSFactor.vbproj (100%) rename {RDSFactor => server}/RDSFactor.vbproj.user (100%) rename {RDSFactor => server}/SMSModem.vb (100%) rename {RDSFactor => server}/VSA.vb (100%) rename {RDSFactor => server}/app.config (100%) rename {RDSFactor => server}/conf/RDSFactor.ini (100%) rename {RDSFactor => server}/exceptions/MissingRadiusSecret.vb (100%) rename {RDSFactor => server}/exceptions/MissingUser.vb (100%) rename {RDSFactor => server}/handlers/RDSHandler.vb (100%) rename {RDSFactorWeb => web}/RDSFactorWeb.sln (98%) rename {RDSFactorWeb => web}/RDWeb/Pages/App_Data/ASPNETDB.MDF (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/App_Data/allusers_tswa.log (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/App_Data/aspnetdb_log.ldf (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/Bin/RADAR.dll (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/Bin/RADAR.pdb (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/Bin/RADAR.xml (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/Bin/en/TSPortalWebPart.resources.dll (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/Bin/tsportalwebpart.dll (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/Default.aspx (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/Default.aspx.cs (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/RenderFail.css (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/Site.xsl (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/Web.config (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/WebFeed.aspx (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/WebFeed.aspx.cs (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/Default.aspx (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/Desktops.aspx (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/RDWAStrings.xml (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/checktoken.aspx (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/checktoken.aspx.cs (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/cook.aspx (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/cook.aspx.cs (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/login.aspx (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/logoff.aspx (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/password.aspx (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/rap-help.htm (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/tokenform.aspx (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/tokenform.aspx.cs (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/en-US/tswa.css (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/Ivmo.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/WS_h_c.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/Warning24.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/banner_01.jpg (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/banner_02.jpg (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/bar_03.jpg (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/bg_globe_01.jpg (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/bottom_left.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/bottom_mid.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/bottom_right.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/clear.gif (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/erroricon.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/folder.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/left_mid.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/logo_01.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/logo_02.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/mslogo_black.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/rapwait.gif (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/right_mid.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/top_left.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/top_mid.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/top_right.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/images/up.png (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/jquery-1.11.2.min.js (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/renderscripts.js (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/tswf.xsd (100%) rename {RDSFactorWeb => web}/RDWeb/Pages/webscripts-domain.js (100%) diff --git a/.gitignore b/.gitignore index 5018068..f3bacb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,7 @@ *.suo *.TMP *.Cache -RDSFactor/bin _pages_old obj -RDSFactorWeb/RDWeb/Pages/Log -RDSFactor/bin/* -RDSFactorConfig/bin +web/RDWeb/Pages/Log +server/bin/* diff --git a/install-server.bat b/install-server.bat index 4e9acda..f014476 100644 --- a/install-server.bat +++ b/install-server.bat @@ -1,8 +1,11 @@ @echo off set PATH=%PATH%;%windir%\Microsoft.NET\Framework\v4.0.30319 -:: build the rdsfactor radius server -msbuild RDSFactor/RDSFactor.sln /property:Configuration=release +:: build the radius server +msbuild server/RDSFactor.sln /property:Configuration=release :: install it -InstallUtil RDSFactor\bin\Release\RDSFactor.exe \ No newline at end of file +InstallUtil server\bin\Release\RDSFactor.exe + +:: start it +net start RDSFactor \ No newline at end of file diff --git a/install-web.bat b/install-web.bat index 661e28d..6d46b68 100644 --- a/install-web.bat +++ b/install-web.bat @@ -2,13 +2,13 @@ :: Replace RDS Pages directory with ours set PAGES=%SystemDrive%\Windows\Web\RDWeb\Pages -set RDSFACTOR_PAGES=%~dp0RDSFactorWeb\RDWeb\Pages +set RDSFACTOR_PAGES=%~dp0web\RDWeb\Pages :: Add IIS AppCmd to path set PATH=%PATH%;%windir%\system32\inetsrv\ echo ==^> Removing %PAGES% -move %PAGES% %~dp0_pages_old +::move %PAGES% %~dp0_pages_old appcmd delete app "Default Web Site/RDWeb/Pages" diff --git a/RDSFactor/Conversion.vb b/server/Conversion.vb similarity index 100% rename from RDSFactor/Conversion.vb rename to server/Conversion.vb diff --git a/RDSFactor/IniFileVb.vb b/server/IniFileVb.vb similarity index 100% rename from RDSFactor/IniFileVb.vb rename to server/IniFileVb.vb diff --git a/RDSFactor/Log.vb b/server/Log.vb similarity index 100% rename from RDSFactor/Log.vb rename to server/Log.vb diff --git a/RDSFactor/My Project/Application.Designer.vb b/server/My Project/Application.Designer.vb similarity index 100% rename from RDSFactor/My Project/Application.Designer.vb rename to server/My Project/Application.Designer.vb diff --git a/RDSFactor/My Project/Application.myapp b/server/My Project/Application.myapp similarity index 100% rename from RDSFactor/My Project/Application.myapp rename to server/My Project/Application.myapp diff --git a/RDSFactor/My Project/AssemblyInfo.vb b/server/My Project/AssemblyInfo.vb similarity index 100% rename from RDSFactor/My Project/AssemblyInfo.vb rename to server/My Project/AssemblyInfo.vb diff --git a/RDSFactor/My Project/Resources.Designer.vb b/server/My Project/Resources.Designer.vb similarity index 100% rename from RDSFactor/My Project/Resources.Designer.vb rename to server/My Project/Resources.Designer.vb diff --git a/RDSFactor/My Project/Resources.resx b/server/My Project/Resources.resx similarity index 100% rename from RDSFactor/My Project/Resources.resx rename to server/My Project/Resources.resx diff --git a/RDSFactor/My Project/Settings.Designer.vb b/server/My Project/Settings.Designer.vb similarity index 100% rename from RDSFactor/My Project/Settings.Designer.vb rename to server/My Project/Settings.Designer.vb diff --git a/RDSFactor/My Project/Settings.settings b/server/My Project/Settings.settings similarity index 100% rename from RDSFactor/My Project/Settings.settings rename to server/My Project/Settings.settings diff --git a/RDSFactor/My Project/app.manifest b/server/My Project/app.manifest similarity index 100% rename from RDSFactor/My Project/app.manifest rename to server/My Project/app.manifest diff --git a/RDSFactor/ProjectInstaller.Designer.vb b/server/ProjectInstaller.Designer.vb similarity index 100% rename from RDSFactor/ProjectInstaller.Designer.vb rename to server/ProjectInstaller.Designer.vb diff --git a/RDSFactor/ProjectInstaller.resx b/server/ProjectInstaller.resx similarity index 100% rename from RDSFactor/ProjectInstaller.resx rename to server/ProjectInstaller.resx diff --git a/RDSFactor/ProjectInstaller.vb b/server/ProjectInstaller.vb similarity index 100% rename from RDSFactor/ProjectInstaller.vb rename to server/ProjectInstaller.vb diff --git a/RDSFactor/RDSFactor.Designer.vb b/server/RDSFactor.Designer.vb similarity index 100% rename from RDSFactor/RDSFactor.Designer.vb rename to server/RDSFactor.Designer.vb diff --git a/RDSFactor/RDSFactor.resx b/server/RDSFactor.resx similarity index 100% rename from RDSFactor/RDSFactor.resx rename to server/RDSFactor.resx diff --git a/RDSFactor/RDSFactor.sln b/server/RDSFactor.sln similarity index 100% rename from RDSFactor/RDSFactor.sln rename to server/RDSFactor.sln diff --git a/RDSFactor/RDSFactor.vb b/server/RDSFactor.vb similarity index 100% rename from RDSFactor/RDSFactor.vb rename to server/RDSFactor.vb diff --git a/RDSFactor/RDSFactor.vbproj b/server/RDSFactor.vbproj similarity index 100% rename from RDSFactor/RDSFactor.vbproj rename to server/RDSFactor.vbproj diff --git a/RDSFactor/RDSFactor.vbproj.user b/server/RDSFactor.vbproj.user similarity index 100% rename from RDSFactor/RDSFactor.vbproj.user rename to server/RDSFactor.vbproj.user diff --git a/RDSFactor/SMSModem.vb b/server/SMSModem.vb similarity index 100% rename from RDSFactor/SMSModem.vb rename to server/SMSModem.vb diff --git a/RDSFactor/VSA.vb b/server/VSA.vb similarity index 100% rename from RDSFactor/VSA.vb rename to server/VSA.vb diff --git a/RDSFactor/app.config b/server/app.config similarity index 100% rename from RDSFactor/app.config rename to server/app.config diff --git a/RDSFactor/conf/RDSFactor.ini b/server/conf/RDSFactor.ini similarity index 100% rename from RDSFactor/conf/RDSFactor.ini rename to server/conf/RDSFactor.ini diff --git a/RDSFactor/exceptions/MissingRadiusSecret.vb b/server/exceptions/MissingRadiusSecret.vb similarity index 100% rename from RDSFactor/exceptions/MissingRadiusSecret.vb rename to server/exceptions/MissingRadiusSecret.vb diff --git a/RDSFactor/exceptions/MissingUser.vb b/server/exceptions/MissingUser.vb similarity index 100% rename from RDSFactor/exceptions/MissingUser.vb rename to server/exceptions/MissingUser.vb diff --git a/RDSFactor/handlers/RDSHandler.vb b/server/handlers/RDSHandler.vb similarity index 100% rename from RDSFactor/handlers/RDSHandler.vb rename to server/handlers/RDSHandler.vb diff --git a/uninstall-server.bat b/uninstall-server.bat index 2c76844..32476d9 100644 --- a/uninstall-server.bat +++ b/uninstall-server.bat @@ -1,4 +1,4 @@ @echo off set PATH=%PATH%;%windir%\Microsoft.NET\Framework\v4.0.30319 -InstallUtil /uninstall RDSFactor\bin\Release\RDSFactor.exe \ No newline at end of file +InstallUtil /uninstall server\bin\Release\RDSFactor.exe \ No newline at end of file diff --git a/RDSFactorWeb/RDSFactorWeb.sln b/web/RDSFactorWeb.sln similarity index 98% rename from RDSFactorWeb/RDSFactorWeb.sln rename to web/RDSFactorWeb.sln index 5bf1410..1bd8d9a 100644 --- a/RDSFactorWeb/RDSFactorWeb.sln +++ b/web/RDSFactorWeb.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RADAR", "..\radar-radius\RADAR\RADAR.vbproj", "{3AB08A4E-C4FA-4571-A5D4-32BBA807C31D}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RDSFactor", "..\RDSFactor\RDSFactor.vbproj", "{04C6C533-9FEA-41B2-B554-A166C7C7FE32}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RDSFactor", "..\server\RDSFactor.vbproj", "{04C6C533-9FEA-41B2-B554-A166C7C7FE32}" EndProject Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Pages", "http://localhost/RDWeb/Pages", "{B31FB884-C42E-417D-AF0D-409FE7D30351}" ProjectSection(WebsiteProperties) = preProject diff --git a/RDSFactorWeb/RDWeb/Pages/App_Data/ASPNETDB.MDF b/web/RDWeb/Pages/App_Data/ASPNETDB.MDF similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/App_Data/ASPNETDB.MDF rename to web/RDWeb/Pages/App_Data/ASPNETDB.MDF diff --git a/RDSFactorWeb/RDWeb/Pages/App_Data/allusers_tswa.log b/web/RDWeb/Pages/App_Data/allusers_tswa.log similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/App_Data/allusers_tswa.log rename to web/RDWeb/Pages/App_Data/allusers_tswa.log diff --git a/RDSFactorWeb/RDWeb/Pages/App_Data/aspnetdb_log.ldf b/web/RDWeb/Pages/App_Data/aspnetdb_log.ldf similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/App_Data/aspnetdb_log.ldf rename to web/RDWeb/Pages/App_Data/aspnetdb_log.ldf diff --git a/RDSFactorWeb/RDWeb/Pages/Bin/RADAR.dll b/web/RDWeb/Pages/Bin/RADAR.dll similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/Bin/RADAR.dll rename to web/RDWeb/Pages/Bin/RADAR.dll diff --git a/RDSFactorWeb/RDWeb/Pages/Bin/RADAR.pdb b/web/RDWeb/Pages/Bin/RADAR.pdb similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/Bin/RADAR.pdb rename to web/RDWeb/Pages/Bin/RADAR.pdb diff --git a/RDSFactorWeb/RDWeb/Pages/Bin/RADAR.xml b/web/RDWeb/Pages/Bin/RADAR.xml similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/Bin/RADAR.xml rename to web/RDWeb/Pages/Bin/RADAR.xml diff --git a/RDSFactorWeb/RDWeb/Pages/Bin/en/TSPortalWebPart.resources.dll b/web/RDWeb/Pages/Bin/en/TSPortalWebPart.resources.dll similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/Bin/en/TSPortalWebPart.resources.dll rename to web/RDWeb/Pages/Bin/en/TSPortalWebPart.resources.dll diff --git a/RDSFactorWeb/RDWeb/Pages/Bin/tsportalwebpart.dll b/web/RDWeb/Pages/Bin/tsportalwebpart.dll similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/Bin/tsportalwebpart.dll rename to web/RDWeb/Pages/Bin/tsportalwebpart.dll diff --git a/RDSFactorWeb/RDWeb/Pages/Default.aspx b/web/RDWeb/Pages/Default.aspx similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/Default.aspx rename to web/RDWeb/Pages/Default.aspx diff --git a/RDSFactorWeb/RDWeb/Pages/Default.aspx.cs b/web/RDWeb/Pages/Default.aspx.cs similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/Default.aspx.cs rename to web/RDWeb/Pages/Default.aspx.cs diff --git a/RDSFactorWeb/RDWeb/Pages/RenderFail.css b/web/RDWeb/Pages/RenderFail.css similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/RenderFail.css rename to web/RDWeb/Pages/RenderFail.css diff --git a/RDSFactorWeb/RDWeb/Pages/Site.xsl b/web/RDWeb/Pages/Site.xsl similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/Site.xsl rename to web/RDWeb/Pages/Site.xsl diff --git a/RDSFactorWeb/RDWeb/Pages/Web.config b/web/RDWeb/Pages/Web.config similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/Web.config rename to web/RDWeb/Pages/Web.config diff --git a/RDSFactorWeb/RDWeb/Pages/WebFeed.aspx b/web/RDWeb/Pages/WebFeed.aspx similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/WebFeed.aspx rename to web/RDWeb/Pages/WebFeed.aspx diff --git a/RDSFactorWeb/RDWeb/Pages/WebFeed.aspx.cs b/web/RDWeb/Pages/WebFeed.aspx.cs similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/WebFeed.aspx.cs rename to web/RDWeb/Pages/WebFeed.aspx.cs diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/Default.aspx b/web/RDWeb/Pages/en-US/Default.aspx similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/Default.aspx rename to web/RDWeb/Pages/en-US/Default.aspx diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/Desktops.aspx b/web/RDWeb/Pages/en-US/Desktops.aspx similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/Desktops.aspx rename to web/RDWeb/Pages/en-US/Desktops.aspx diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/RDWAStrings.xml b/web/RDWeb/Pages/en-US/RDWAStrings.xml similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/RDWAStrings.xml rename to web/RDWeb/Pages/en-US/RDWAStrings.xml diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/checktoken.aspx b/web/RDWeb/Pages/en-US/checktoken.aspx similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/checktoken.aspx rename to web/RDWeb/Pages/en-US/checktoken.aspx diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/checktoken.aspx.cs b/web/RDWeb/Pages/en-US/checktoken.aspx.cs similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/checktoken.aspx.cs rename to web/RDWeb/Pages/en-US/checktoken.aspx.cs diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/cook.aspx b/web/RDWeb/Pages/en-US/cook.aspx similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/cook.aspx rename to web/RDWeb/Pages/en-US/cook.aspx diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/cook.aspx.cs b/web/RDWeb/Pages/en-US/cook.aspx.cs similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/cook.aspx.cs rename to web/RDWeb/Pages/en-US/cook.aspx.cs diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/login.aspx b/web/RDWeb/Pages/en-US/login.aspx similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/login.aspx rename to web/RDWeb/Pages/en-US/login.aspx diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/logoff.aspx b/web/RDWeb/Pages/en-US/logoff.aspx similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/logoff.aspx rename to web/RDWeb/Pages/en-US/logoff.aspx diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/password.aspx b/web/RDWeb/Pages/en-US/password.aspx similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/password.aspx rename to web/RDWeb/Pages/en-US/password.aspx diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/rap-help.htm b/web/RDWeb/Pages/en-US/rap-help.htm similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/rap-help.htm rename to web/RDWeb/Pages/en-US/rap-help.htm diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/tokenform.aspx b/web/RDWeb/Pages/en-US/tokenform.aspx similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/tokenform.aspx rename to web/RDWeb/Pages/en-US/tokenform.aspx diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/tokenform.aspx.cs b/web/RDWeb/Pages/en-US/tokenform.aspx.cs similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/tokenform.aspx.cs rename to web/RDWeb/Pages/en-US/tokenform.aspx.cs diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/tswa.css b/web/RDWeb/Pages/en-US/tswa.css similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/en-US/tswa.css rename to web/RDWeb/Pages/en-US/tswa.css diff --git a/RDSFactorWeb/RDWeb/Pages/images/Ivmo.png b/web/RDWeb/Pages/images/Ivmo.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/Ivmo.png rename to web/RDWeb/Pages/images/Ivmo.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/WS_h_c.png b/web/RDWeb/Pages/images/WS_h_c.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/WS_h_c.png rename to web/RDWeb/Pages/images/WS_h_c.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/Warning24.png b/web/RDWeb/Pages/images/Warning24.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/Warning24.png rename to web/RDWeb/Pages/images/Warning24.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/banner_01.jpg b/web/RDWeb/Pages/images/banner_01.jpg similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/banner_01.jpg rename to web/RDWeb/Pages/images/banner_01.jpg diff --git a/RDSFactorWeb/RDWeb/Pages/images/banner_02.jpg b/web/RDWeb/Pages/images/banner_02.jpg similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/banner_02.jpg rename to web/RDWeb/Pages/images/banner_02.jpg diff --git a/RDSFactorWeb/RDWeb/Pages/images/bar_03.jpg b/web/RDWeb/Pages/images/bar_03.jpg similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/bar_03.jpg rename to web/RDWeb/Pages/images/bar_03.jpg diff --git a/RDSFactorWeb/RDWeb/Pages/images/bg_globe_01.jpg b/web/RDWeb/Pages/images/bg_globe_01.jpg similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/bg_globe_01.jpg rename to web/RDWeb/Pages/images/bg_globe_01.jpg diff --git a/RDSFactorWeb/RDWeb/Pages/images/bottom_left.png b/web/RDWeb/Pages/images/bottom_left.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/bottom_left.png rename to web/RDWeb/Pages/images/bottom_left.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/bottom_mid.png b/web/RDWeb/Pages/images/bottom_mid.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/bottom_mid.png rename to web/RDWeb/Pages/images/bottom_mid.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/bottom_right.png b/web/RDWeb/Pages/images/bottom_right.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/bottom_right.png rename to web/RDWeb/Pages/images/bottom_right.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/clear.gif b/web/RDWeb/Pages/images/clear.gif similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/clear.gif rename to web/RDWeb/Pages/images/clear.gif diff --git a/RDSFactorWeb/RDWeb/Pages/images/erroricon.png b/web/RDWeb/Pages/images/erroricon.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/erroricon.png rename to web/RDWeb/Pages/images/erroricon.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/folder.png b/web/RDWeb/Pages/images/folder.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/folder.png rename to web/RDWeb/Pages/images/folder.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/left_mid.png b/web/RDWeb/Pages/images/left_mid.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/left_mid.png rename to web/RDWeb/Pages/images/left_mid.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/logo_01.png b/web/RDWeb/Pages/images/logo_01.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/logo_01.png rename to web/RDWeb/Pages/images/logo_01.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/logo_02.png b/web/RDWeb/Pages/images/logo_02.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/logo_02.png rename to web/RDWeb/Pages/images/logo_02.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/mslogo_black.png b/web/RDWeb/Pages/images/mslogo_black.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/mslogo_black.png rename to web/RDWeb/Pages/images/mslogo_black.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/rapwait.gif b/web/RDWeb/Pages/images/rapwait.gif similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/rapwait.gif rename to web/RDWeb/Pages/images/rapwait.gif diff --git a/RDSFactorWeb/RDWeb/Pages/images/right_mid.png b/web/RDWeb/Pages/images/right_mid.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/right_mid.png rename to web/RDWeb/Pages/images/right_mid.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/top_left.png b/web/RDWeb/Pages/images/top_left.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/top_left.png rename to web/RDWeb/Pages/images/top_left.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/top_mid.png b/web/RDWeb/Pages/images/top_mid.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/top_mid.png rename to web/RDWeb/Pages/images/top_mid.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/top_right.png b/web/RDWeb/Pages/images/top_right.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/top_right.png rename to web/RDWeb/Pages/images/top_right.png diff --git a/RDSFactorWeb/RDWeb/Pages/images/up.png b/web/RDWeb/Pages/images/up.png similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/images/up.png rename to web/RDWeb/Pages/images/up.png diff --git a/RDSFactorWeb/RDWeb/Pages/jquery-1.11.2.min.js b/web/RDWeb/Pages/jquery-1.11.2.min.js similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/jquery-1.11.2.min.js rename to web/RDWeb/Pages/jquery-1.11.2.min.js diff --git a/RDSFactorWeb/RDWeb/Pages/renderscripts.js b/web/RDWeb/Pages/renderscripts.js similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/renderscripts.js rename to web/RDWeb/Pages/renderscripts.js diff --git a/RDSFactorWeb/RDWeb/Pages/tswf.xsd b/web/RDWeb/Pages/tswf.xsd similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/tswf.xsd rename to web/RDWeb/Pages/tswf.xsd diff --git a/RDSFactorWeb/RDWeb/Pages/webscripts-domain.js b/web/RDWeb/Pages/webscripts-domain.js similarity index 100% rename from RDSFactorWeb/RDWeb/Pages/webscripts-domain.js rename to web/RDWeb/Pages/webscripts-domain.js