Rename: RDSFactorWeb -> web, RDSFactor -> server

jakobadam · Apr 28, 2015 · eebdaf9 · eebdaf9
1 parent c3c10e1
commit eebdaf9
Show file tree

Hide file tree

Showing 88 changed files with 12 additions and 11 deletions.
diff --git 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
@@ -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
+InstallUtil server\bin\Release\RDSFactor.exe
+
+:: start it
+net start RDSFactor
diff --git 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 → server/Conversion.vb b/RDSFactor/Conversion.vb → server/Conversion.vb
diff --git a/RDSFactor/IniFileVb.vb → server/IniFileVb.vb b/RDSFactor/IniFileVb.vb → server/IniFileVb.vb
diff --git a/RDSFactor/Log.vb → server/Log.vb b/RDSFactor/Log.vb → server/Log.vb
diff --git a/RDSFactor/My Project/Application.Designer.vb → server/My Project/Application.Designer.vb b/RDSFactor/My Project/Application.Designer.vb → server/My Project/Application.Designer.vb
diff --git a/RDSFactor/My Project/Application.myapp → server/My Project/Application.myapp b/RDSFactor/My Project/Application.myapp → server/My Project/Application.myapp
diff --git a/RDSFactor/My Project/AssemblyInfo.vb → server/My Project/AssemblyInfo.vb b/RDSFactor/My Project/AssemblyInfo.vb → server/My Project/AssemblyInfo.vb
diff --git a/RDSFactor/My Project/Resources.Designer.vb → server/My Project/Resources.Designer.vb b/RDSFactor/My Project/Resources.Designer.vb → server/My Project/Resources.Designer.vb
diff --git a/RDSFactor/My Project/Resources.resx → server/My Project/Resources.resx b/RDSFactor/My Project/Resources.resx → server/My Project/Resources.resx
diff --git a/RDSFactor/My Project/Settings.Designer.vb → server/My Project/Settings.Designer.vb b/RDSFactor/My Project/Settings.Designer.vb → server/My Project/Settings.Designer.vb
diff --git a/RDSFactor/My Project/Settings.settings → server/My Project/Settings.settings b/RDSFactor/My Project/Settings.settings → server/My Project/Settings.settings
diff --git a/RDSFactor/My Project/app.manifest → server/My Project/app.manifest b/RDSFactor/My Project/app.manifest → server/My Project/app.manifest
diff --git a/RDSFactor/ProjectInstaller.Designer.vb → server/ProjectInstaller.Designer.vb b/RDSFactor/ProjectInstaller.Designer.vb → server/ProjectInstaller.Designer.vb
diff --git a/RDSFactor/ProjectInstaller.resx → server/ProjectInstaller.resx b/RDSFactor/ProjectInstaller.resx → server/ProjectInstaller.resx
diff --git a/RDSFactor/ProjectInstaller.vb → server/ProjectInstaller.vb b/RDSFactor/ProjectInstaller.vb → server/ProjectInstaller.vb
diff --git a/RDSFactor/RDSFactor.Designer.vb → server/RDSFactor.Designer.vb b/RDSFactor/RDSFactor.Designer.vb → server/RDSFactor.Designer.vb
diff --git a/RDSFactor/RDSFactor.resx → server/RDSFactor.resx b/RDSFactor/RDSFactor.resx → server/RDSFactor.resx
diff --git a/RDSFactor/RDSFactor.sln → server/RDSFactor.sln b/RDSFactor/RDSFactor.sln → server/RDSFactor.sln
diff --git a/RDSFactor/RDSFactor.vb → server/RDSFactor.vb b/RDSFactor/RDSFactor.vb → server/RDSFactor.vb
diff --git a/RDSFactor/RDSFactor.vbproj → server/RDSFactor.vbproj b/RDSFactor/RDSFactor.vbproj → server/RDSFactor.vbproj
diff --git a/RDSFactor/RDSFactor.vbproj.user → server/RDSFactor.vbproj.user b/RDSFactor/RDSFactor.vbproj.user → server/RDSFactor.vbproj.user
diff --git a/RDSFactor/SMSModem.vb → server/SMSModem.vb b/RDSFactor/SMSModem.vb → server/SMSModem.vb
diff --git a/RDSFactor/VSA.vb → server/VSA.vb b/RDSFactor/VSA.vb → server/VSA.vb
diff --git a/RDSFactor/app.config → server/app.config b/RDSFactor/app.config → server/app.config
diff --git a/RDSFactor/conf/RDSFactor.ini → server/conf/RDSFactor.ini b/RDSFactor/conf/RDSFactor.ini → server/conf/RDSFactor.ini
diff --git a/RDSFactor/exceptions/MissingRadiusSecret.vb → server/exceptions/MissingRadiusSecret.vb b/RDSFactor/exceptions/MissingRadiusSecret.vb → server/exceptions/MissingRadiusSecret.vb
diff --git a/RDSFactor/exceptions/MissingUser.vb → server/exceptions/MissingUser.vb b/RDSFactor/exceptions/MissingUser.vb → server/exceptions/MissingUser.vb
diff --git a/RDSFactor/handlers/RDSHandler.vb → server/handlers/RDSHandler.vb b/RDSFactor/handlers/RDSHandler.vb → server/handlers/RDSHandler.vb
diff --git 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
+InstallUtil /uninstall server\bin\Release\RDSFactor.exe
diff --git a/RDSFactorWeb/RDSFactorWeb.sln → web/RDSFactorWeb.sln b/RDSFactorWeb/RDSFactorWeb.sln → 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/...ctorWeb/RDWeb/Pages/App_Data/ASPNETDB.MDF → web/RDWeb/Pages/App_Data/ASPNETDB.MDF b/...ctorWeb/RDWeb/Pages/App_Data/ASPNETDB.MDF → web/RDWeb/Pages/App_Data/ASPNETDB.MDF
diff --git a/...eb/RDWeb/Pages/App_Data/allusers_tswa.log → web/RDWeb/Pages/App_Data/allusers_tswa.log b/...eb/RDWeb/Pages/App_Data/allusers_tswa.log → web/RDWeb/Pages/App_Data/allusers_tswa.log
diff --git a/...Web/RDWeb/Pages/App_Data/aspnetdb_log.ldf → web/RDWeb/Pages/App_Data/aspnetdb_log.ldf b/...Web/RDWeb/Pages/App_Data/aspnetdb_log.ldf → web/RDWeb/Pages/App_Data/aspnetdb_log.ldf
diff --git a/RDSFactorWeb/RDWeb/Pages/Bin/RADAR.dll → web/RDWeb/Pages/Bin/RADAR.dll b/RDSFactorWeb/RDWeb/Pages/Bin/RADAR.dll → web/RDWeb/Pages/Bin/RADAR.dll
diff --git a/RDSFactorWeb/RDWeb/Pages/Bin/RADAR.pdb → web/RDWeb/Pages/Bin/RADAR.pdb b/RDSFactorWeb/RDWeb/Pages/Bin/RADAR.pdb → web/RDWeb/Pages/Bin/RADAR.pdb
diff --git a/RDSFactorWeb/RDWeb/Pages/Bin/RADAR.xml → web/RDWeb/Pages/Bin/RADAR.xml b/RDSFactorWeb/RDWeb/Pages/Bin/RADAR.xml → web/RDWeb/Pages/Bin/RADAR.xml
diff --git a/...ages/Bin/en/TSPortalWebPart.resources.dll → ...ages/Bin/en/TSPortalWebPart.resources.dll b/...ages/Bin/en/TSPortalWebPart.resources.dll → ...ages/Bin/en/TSPortalWebPart.resources.dll
diff --git a/...orWeb/RDWeb/Pages/Bin/tsportalwebpart.dll → web/RDWeb/Pages/Bin/tsportalwebpart.dll b/...orWeb/RDWeb/Pages/Bin/tsportalwebpart.dll → web/RDWeb/Pages/Bin/tsportalwebpart.dll
diff --git a/RDSFactorWeb/RDWeb/Pages/Default.aspx → web/RDWeb/Pages/Default.aspx b/RDSFactorWeb/RDWeb/Pages/Default.aspx → web/RDWeb/Pages/Default.aspx
diff --git a/RDSFactorWeb/RDWeb/Pages/Default.aspx.cs → web/RDWeb/Pages/Default.aspx.cs b/RDSFactorWeb/RDWeb/Pages/Default.aspx.cs → web/RDWeb/Pages/Default.aspx.cs
diff --git a/RDSFactorWeb/RDWeb/Pages/RenderFail.css → web/RDWeb/Pages/RenderFail.css b/RDSFactorWeb/RDWeb/Pages/RenderFail.css → web/RDWeb/Pages/RenderFail.css
diff --git a/RDSFactorWeb/RDWeb/Pages/Site.xsl → web/RDWeb/Pages/Site.xsl b/RDSFactorWeb/RDWeb/Pages/Site.xsl → web/RDWeb/Pages/Site.xsl
diff --git a/RDSFactorWeb/RDWeb/Pages/Web.config → web/RDWeb/Pages/Web.config b/RDSFactorWeb/RDWeb/Pages/Web.config → web/RDWeb/Pages/Web.config
diff --git a/RDSFactorWeb/RDWeb/Pages/WebFeed.aspx → web/RDWeb/Pages/WebFeed.aspx b/RDSFactorWeb/RDWeb/Pages/WebFeed.aspx → web/RDWeb/Pages/WebFeed.aspx
diff --git a/RDSFactorWeb/RDWeb/Pages/WebFeed.aspx.cs → web/RDWeb/Pages/WebFeed.aspx.cs b/RDSFactorWeb/RDWeb/Pages/WebFeed.aspx.cs → web/RDWeb/Pages/WebFeed.aspx.cs
diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/Default.aspx → web/RDWeb/Pages/en-US/Default.aspx b/RDSFactorWeb/RDWeb/Pages/en-US/Default.aspx → web/RDWeb/Pages/en-US/Default.aspx
diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/Desktops.aspx → web/RDWeb/Pages/en-US/Desktops.aspx b/RDSFactorWeb/RDWeb/Pages/en-US/Desktops.aspx → web/RDWeb/Pages/en-US/Desktops.aspx
diff --git a/...ctorWeb/RDWeb/Pages/en-US/RDWAStrings.xml → web/RDWeb/Pages/en-US/RDWAStrings.xml b/...ctorWeb/RDWeb/Pages/en-US/RDWAStrings.xml → web/RDWeb/Pages/en-US/RDWAStrings.xml
diff --git a/...ctorWeb/RDWeb/Pages/en-US/checktoken.aspx → web/RDWeb/Pages/en-US/checktoken.aspx b/...ctorWeb/RDWeb/Pages/en-US/checktoken.aspx → web/RDWeb/Pages/en-US/checktoken.aspx
diff --git a/...rWeb/RDWeb/Pages/en-US/checktoken.aspx.cs → web/RDWeb/Pages/en-US/checktoken.aspx.cs b/...rWeb/RDWeb/Pages/en-US/checktoken.aspx.cs → web/RDWeb/Pages/en-US/checktoken.aspx.cs
diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/cook.aspx → web/RDWeb/Pages/en-US/cook.aspx b/RDSFactorWeb/RDWeb/Pages/en-US/cook.aspx → web/RDWeb/Pages/en-US/cook.aspx
diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/cook.aspx.cs → web/RDWeb/Pages/en-US/cook.aspx.cs b/RDSFactorWeb/RDWeb/Pages/en-US/cook.aspx.cs → web/RDWeb/Pages/en-US/cook.aspx.cs
diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/login.aspx → web/RDWeb/Pages/en-US/login.aspx b/RDSFactorWeb/RDWeb/Pages/en-US/login.aspx → web/RDWeb/Pages/en-US/login.aspx
diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/logoff.aspx → web/RDWeb/Pages/en-US/logoff.aspx b/RDSFactorWeb/RDWeb/Pages/en-US/logoff.aspx → web/RDWeb/Pages/en-US/logoff.aspx
diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/password.aspx → web/RDWeb/Pages/en-US/password.aspx b/RDSFactorWeb/RDWeb/Pages/en-US/password.aspx → web/RDWeb/Pages/en-US/password.aspx
diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/rap-help.htm → web/RDWeb/Pages/en-US/rap-help.htm b/RDSFactorWeb/RDWeb/Pages/en-US/rap-help.htm → web/RDWeb/Pages/en-US/rap-help.htm
diff --git a/...actorWeb/RDWeb/Pages/en-US/tokenform.aspx → web/RDWeb/Pages/en-US/tokenform.aspx b/...actorWeb/RDWeb/Pages/en-US/tokenform.aspx → web/RDWeb/Pages/en-US/tokenform.aspx
diff --git a/...orWeb/RDWeb/Pages/en-US/tokenform.aspx.cs → web/RDWeb/Pages/en-US/tokenform.aspx.cs b/...orWeb/RDWeb/Pages/en-US/tokenform.aspx.cs → web/RDWeb/Pages/en-US/tokenform.aspx.cs
diff --git a/RDSFactorWeb/RDWeb/Pages/en-US/tswa.css → web/RDWeb/Pages/en-US/tswa.css b/RDSFactorWeb/RDWeb/Pages/en-US/tswa.css → web/RDWeb/Pages/en-US/tswa.css
diff --git a/RDSFactorWeb/RDWeb/Pages/images/Ivmo.png → web/RDWeb/Pages/images/Ivmo.png b/RDSFactorWeb/RDWeb/Pages/images/Ivmo.png → web/RDWeb/Pages/images/Ivmo.png
diff --git a/RDSFactorWeb/RDWeb/Pages/images/WS_h_c.png → web/RDWeb/Pages/images/WS_h_c.png b/RDSFactorWeb/RDWeb/Pages/images/WS_h_c.png → web/RDWeb/Pages/images/WS_h_c.png
diff --git a/...actorWeb/RDWeb/Pages/images/Warning24.png → web/RDWeb/Pages/images/Warning24.png b/...actorWeb/RDWeb/Pages/images/Warning24.png → web/RDWeb/Pages/images/Warning24.png
diff --git a/...actorWeb/RDWeb/Pages/images/banner_01.jpg → web/RDWeb/Pages/images/banner_01.jpg b/...actorWeb/RDWeb/Pages/images/banner_01.jpg → web/RDWeb/Pages/images/banner_01.jpg
diff --git a/...actorWeb/RDWeb/Pages/images/banner_02.jpg → web/RDWeb/Pages/images/banner_02.jpg b/...actorWeb/RDWeb/Pages/images/banner_02.jpg → web/RDWeb/Pages/images/banner_02.jpg
diff --git a/RDSFactorWeb/RDWeb/Pages/images/bar_03.jpg → web/RDWeb/Pages/images/bar_03.jpg b/RDSFactorWeb/RDWeb/Pages/images/bar_03.jpg → web/RDWeb/Pages/images/bar_03.jpg
diff --git a/...torWeb/RDWeb/Pages/images/bg_globe_01.jpg → web/RDWeb/Pages/images/bg_globe_01.jpg b/...torWeb/RDWeb/Pages/images/bg_globe_01.jpg → web/RDWeb/Pages/images/bg_globe_01.jpg
diff --git a/...torWeb/RDWeb/Pages/images/bottom_left.png → web/RDWeb/Pages/images/bottom_left.png b/...torWeb/RDWeb/Pages/images/bottom_left.png → web/RDWeb/Pages/images/bottom_left.png
diff --git a/...ctorWeb/RDWeb/Pages/images/bottom_mid.png → web/RDWeb/Pages/images/bottom_mid.png b/...ctorWeb/RDWeb/Pages/images/bottom_mid.png → web/RDWeb/Pages/images/bottom_mid.png
diff --git a/...orWeb/RDWeb/Pages/images/bottom_right.png → web/RDWeb/Pages/images/bottom_right.png b/...orWeb/RDWeb/Pages/images/bottom_right.png → web/RDWeb/Pages/images/bottom_right.png
diff --git a/RDSFactorWeb/RDWeb/Pages/images/clear.gif → web/RDWeb/Pages/images/clear.gif b/RDSFactorWeb/RDWeb/Pages/images/clear.gif → web/RDWeb/Pages/images/clear.gif
diff --git a/...actorWeb/RDWeb/Pages/images/erroricon.png → web/RDWeb/Pages/images/erroricon.png b/...actorWeb/RDWeb/Pages/images/erroricon.png → web/RDWeb/Pages/images/erroricon.png
diff --git a/RDSFactorWeb/RDWeb/Pages/images/folder.png → web/RDWeb/Pages/images/folder.png b/RDSFactorWeb/RDWeb/Pages/images/folder.png → web/RDWeb/Pages/images/folder.png
diff --git a/RDSFactorWeb/RDWeb/Pages/images/left_mid.png → web/RDWeb/Pages/images/left_mid.png b/RDSFactorWeb/RDWeb/Pages/images/left_mid.png → web/RDWeb/Pages/images/left_mid.png
diff --git a/RDSFactorWeb/RDWeb/Pages/images/logo_01.png → web/RDWeb/Pages/images/logo_01.png b/RDSFactorWeb/RDWeb/Pages/images/logo_01.png → web/RDWeb/Pages/images/logo_01.png
diff --git a/RDSFactorWeb/RDWeb/Pages/images/logo_02.png → web/RDWeb/Pages/images/logo_02.png b/RDSFactorWeb/RDWeb/Pages/images/logo_02.png → web/RDWeb/Pages/images/logo_02.png
diff --git a/...orWeb/RDWeb/Pages/images/mslogo_black.png → web/RDWeb/Pages/images/mslogo_black.png b/...orWeb/RDWeb/Pages/images/mslogo_black.png → web/RDWeb/Pages/images/mslogo_black.png
diff --git a/RDSFactorWeb/RDWeb/Pages/images/rapwait.gif → web/RDWeb/Pages/images/rapwait.gif b/RDSFactorWeb/RDWeb/Pages/images/rapwait.gif → web/RDWeb/Pages/images/rapwait.gif
diff --git a/...actorWeb/RDWeb/Pages/images/right_mid.png → web/RDWeb/Pages/images/right_mid.png b/...actorWeb/RDWeb/Pages/images/right_mid.png → web/RDWeb/Pages/images/right_mid.png
diff --git a/RDSFactorWeb/RDWeb/Pages/images/top_left.png → web/RDWeb/Pages/images/top_left.png b/RDSFactorWeb/RDWeb/Pages/images/top_left.png → web/RDWeb/Pages/images/top_left.png
diff --git a/RDSFactorWeb/RDWeb/Pages/images/top_mid.png → web/RDWeb/Pages/images/top_mid.png b/RDSFactorWeb/RDWeb/Pages/images/top_mid.png → web/RDWeb/Pages/images/top_mid.png
diff --git a/...actorWeb/RDWeb/Pages/images/top_right.png → web/RDWeb/Pages/images/top_right.png b/...actorWeb/RDWeb/Pages/images/top_right.png → web/RDWeb/Pages/images/top_right.png
diff --git a/RDSFactorWeb/RDWeb/Pages/images/up.png → web/RDWeb/Pages/images/up.png b/RDSFactorWeb/RDWeb/Pages/images/up.png → web/RDWeb/Pages/images/up.png
diff --git a/...actorWeb/RDWeb/Pages/jquery-1.11.2.min.js → web/RDWeb/Pages/jquery-1.11.2.min.js b/...actorWeb/RDWeb/Pages/jquery-1.11.2.min.js → web/RDWeb/Pages/jquery-1.11.2.min.js
diff --git a/RDSFactorWeb/RDWeb/Pages/renderscripts.js → web/RDWeb/Pages/renderscripts.js b/RDSFactorWeb/RDWeb/Pages/renderscripts.js → web/RDWeb/Pages/renderscripts.js
diff --git a/RDSFactorWeb/RDWeb/Pages/tswf.xsd → web/RDWeb/Pages/tswf.xsd b/RDSFactorWeb/RDWeb/Pages/tswf.xsd → web/RDWeb/Pages/tswf.xsd
diff --git a/...actorWeb/RDWeb/Pages/webscripts-domain.js → web/RDWeb/Pages/webscripts-domain.js b/...actorWeb/RDWeb/Pages/webscripts-domain.js → web/RDWeb/Pages/webscripts-domain.js