Lots of little fixes relating to install settings

adlnet-archive · Feb 23, 2012 · 996bb15 · 996bb15
1 parent 0987028
commit 996bb15
Show file tree

Hide file tree

Showing 23 changed files with 14 additions and 10 deletions.
diff --git a/3d.service.host/Web.config.installer.template b/3d.service.host/Web.config.installer.template
@@ -94,6 +94,7 @@ limitations under the License.
         <add key="fedoraPassword" value="[[FedoraPassword]]" />
         <add key="fedoraUrl" value="[[FedoraUrl]]" />
         <add key="LibraryLocation" value="[[3DToolsDir]]" />
+		<add key="ProcessLocation" value="[[ProcessLocation]]" />
         <add key="fedoraNamespace" value="[[FedoraNamespace]]"/>
 		<add key="DefaultAdminName" value="[[DefaultAdminName]]"/>
         <add key="AssumeAnonymousUserWhenMissingAuthHeader" value="true"/>

diff --git a/3d.service.implementation/_3DRAPI_Imp.cs b/3d.service.implementation/_3DRAPI_Imp.cs
@@ -1098,7 +1098,7 @@ private static Stream ConvertFileToO3D(Stream data)
             }
             f.Close();
             //Get the path to the o3d tool
-            var application = ConfigurationManager.AppSettings["LibraryLocation"] + "/o3dConverter.exe";//Path.Combine(Path.Combine(request.PhysicalApplicationPath, "bin"), "o3dConverter.exe");
+            var application = ConfigurationManager.AppSettings["ProcessLocation"] + "/o3dConverter.exe";//Path.Combine(Path.Combine(request.PhysicalApplicationPath, "bin"), "o3dConverter.exe");
 
             //Set the params and run
             System.Diagnostics.ProcessStartInfo processInfo = new System.Diagnostics.ProcessStartInfo(application);

diff --git a/3d.service.implementation/bin/Debug/OrbitOne.OpenId.MembershipProvider.dll b/3d.service.implementation/bin/Debug/OrbitOne.OpenId.MembershipProvider.dll
diff --git a/3d.service.implementation/bin/Debug/OrbitOne.OpenId.MembershipProvider.pdb b/3d.service.implementation/bin/Debug/OrbitOne.OpenId.MembershipProvider.pdb
diff --git a/FederatedAPI/bin/3d.service.host.dll b/FederatedAPI/bin/3d.service.host.dll
diff --git a/FederatedAPI/bin/3d.service.host.pdb b/FederatedAPI/bin/3d.service.host.pdb
diff --git a/FederatedAPI/bin/3d.service.implementation.dll b/FederatedAPI/bin/3d.service.implementation.dll
diff --git a/FederatedAPI/bin/3d.service.implementation.pdb b/FederatedAPI/bin/3d.service.implementation.pdb
diff --git a/FederatedAPI/bin/Simple.Providers.MySQL.dll b/FederatedAPI/bin/Simple.Providers.MySQL.dll
diff --git a/FederatedAPI/bin/Simple.Providers.MySQL.pdb b/FederatedAPI/bin/Simple.Providers.MySQL.pdb
diff --git a/FederatedAPI/bin/vwarDAL.dll b/FederatedAPI/bin/vwarDAL.dll
diff --git a/FederatedAPI/bin/vwarDAL.pdb b/FederatedAPI/bin/vwarDAL.pdb
diff --git a/Installer/IISConfigure.exe b/Installer/IISConfigure.exe
diff --git a/Installer/IISConfigure.pdb b/Installer/IISConfigure.pdb
diff --git a/Installer/IISConfigure/IISConfigure/IISConfigure.suo b/Installer/IISConfigure/IISConfigure/IISConfigure.suo
diff --git a/Installer/IISConfigure/IISConfigure/IISConfigure/IISConfigure.csproj.user b/Installer/IISConfigure/IISConfigure/IISConfigure/IISConfigure.csproj.user
@@ -3,6 +3,6 @@
     <StartArguments>"C:\Program Files (x86)\3D Repository"</StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <StartArguments>/stop</StartArguments>
+    <StartArguments>/i</StartArguments>
   </PropertyGroup>
 </Project>
diff --git a/Installer/IISConfigure/IISConfigure/IISConfigure/Program.cs b/Installer/IISConfigure/IISConfigure/IISConfigure/Program.cs
@@ -14,9 +14,9 @@ static void Main(string[] args)
             {
                 try
                 {
-                    Site mySite = serverManager.Sites.Add("3DR", args[args.Length], 80);
-                    mySite.Applications.Add("/3DR", args[0] + "\\VwarWeb\\");
-                    mySite.Applications.Add("/API", args[0] + "\\3d.service.host\\");
+                    Site mySite = serverManager.Sites.Add("3DR", args[args.Length-1], 80);
+                    mySite.Applications.Add("/3DR", args[args.Length - 1] + "\\VwarWeb\\");
+                    mySite.Applications.Add("/API", args[args.Length - 1] + "\\3d.service.host\\");
 
                     try
                     {
@@ -31,7 +31,7 @@ static void Main(string[] args)
                 }
                 catch (Exception e)
                 {
-
+                    Console.WriteLine(e.Message);
                 }
             }
             else if(args[0] == "/uninstall" || args[0] == "/u")

diff --git a/Installer/IISConfigure/IISConfigure/IISConfigure/obj/Release/IISConfigure.exe b/Installer/IISConfigure/IISConfigure/IISConfigure/obj/Release/IISConfigure.exe
diff --git a/Installer/IISConfigure/IISConfigure/IISConfigure/obj/Release/IISConfigure.pdb b/Installer/IISConfigure/IISConfigure/IISConfigure/obj/Release/IISConfigure.pdb
diff --git a/Installer/setup.nsi b/Installer/setup.nsi
@@ -105,7 +105,7 @@ Section -Main SEC0000
 	SectionIn 1
     SetOutPath $INSTDIR
     SetOverwrite on
-    File /a /r /x *.git* /x *.svn* /x 3dr_setup* /x IISConfigure /x vwardal /x 3d.service.implementation /x assemblies /x away3D_viewer /x build_tools /x config /x ConverterWrapper /x DMG_Forums_3-2 /x FederatedAPI /x FederatedAPI.implementation /x OrbitOne.OpenId.Controls /x OrbitOne.OpenId.MembershipProvider /x _UpgradeReport_Files /x *vwarsolution.* /x SimpleMySqlProvider /x testing /x vwar.uploader ..\*
+    File /a /r /x *.git* /x *.config /x *.svn* /x 3dr_setup* /x IISConfigure /x vwardal /x 3d.service.implementation /x assemblies /x away3D_viewer /x build_tools /x config /x ConverterWrapper /x DMG_Forums_3-2 /x FederatedAPI /x FederatedAPI.implementation /x OrbitOne.OpenId.Controls /x OrbitOne.OpenId.MembershipProvider /x _UpgradeReport_Files /x *vwarsolution.* /x SimpleMySqlProvider /x testing /x vwar.uploader ..\*
     File /a /oname=$INSTDIR\Vwarweb\web.config ..\VwarWeb\web.config.installer.template
     File /a /oname=$INSTDIR\3d.service.host\web.config ..\3d.service.host\web.config.installer.template
     SetOutPath $INSTDIR\Vwarweb\Bin
@@ -130,7 +130,7 @@ Section -Upgrade UPGRADESEC
 	SetOverwrite on
 	strcpy $INSTDIR $UpgradePath
 	SetOutPath $INSTDIR
-    File /a /r /x *.git* /x *.svn* /x 3dr_setup* /x IISConfigure /x vwardal /x 3d.service.implementation /x assemblies /x away3D_viewer /x build_tools /x config /x ConverterWrapper /x DMG_Forums_3-2 /x FederatedAPI /x FederatedAPI.implementation /x OrbitOne.OpenId.Controls /x OrbitOne.OpenId.MembershipProvider /x _UpgradeReport_Files /x *vwarsolution.* /x SimpleMySqlProvider /x testing /x vwar.uploader ..\*
+    File /a /r /x *.git* /x *.svn* /x 3dr_setup* /x IISConfigure /x vwardal /x 3d.service.implementation /x assemblies /x away3D_viewer /x build_tools /x config /x ConverterWrapper /x DMG_Forums_3-2 /x FederatedAPI /x FederatedAPI.implementation /x OrbitOne.OpenId.Controls /x OrbitOne.OpenId.MembershipProvider /x _UpgradeReport_Files /x *vwarsolution.* /x SimpleMySqlProvider /x 3DTools /x testing /x vwar.uploader ..\*
     File /a /oname=$INSTDIR\Vwarweb\web.config ..\VwarWeb\web.config.installer.template
     File /a /oname=$INSTDIR\3d.service.host\web.config ..\3d.service.host\web.config.installer.template
     SetOutPath $INSTDIR\Vwarweb\Bin
@@ -830,8 +830,11 @@ Function WriteConfigFile
         !insertmacro _ReplaceInFile "$INSTDIR\Vwarweb\web.config" "[[SMTPServer]]" $SMTPServer        
         !insertmacro _ReplaceInFile "$INSTDIR\Vwarweb\web.config" "[[3DToolsDir]]" "$Instdir\Vwarweb\Bin"
 
-        !insertmacro _ReplaceInFile "$INSTDIR\Vwarweb\web.config" "[[APILocation]]" "http://localhost/API/_3DRAPI.svc/"
+        !insertmacro _ReplaceInFile "$INSTDIR\Vwarweb\web.config" "[[APIPATH]]" "$instdir/3d.service.host/"
+        !insertmacro _ReplaceInFile "$INSTDIR\Vwarweb\web.config" "[[LR_APIBaseURL]]" "http://localhost/API/_3DRAPI.svc/"
 
+
+        !insertmacro _ReplaceInFile "$INSTDIR\3d.service.host\web.config" "[[ProcessLocation]]" "$instdir/Vwarweb/processes"
         !insertmacro _ReplaceInFile "$INSTDIR\3d.service.host\web.config" "[[FedoraUsername]]" $FedoraUsername
         !insertmacro _ReplaceInFile "$INSTDIR\3d.service.host\web.config" "[[FedoraPassword]]" $FedoraPassword
         !insertmacro _ReplaceInFile "$INSTDIR\3d.service.host\web.config" "[[FedoraUrl]]" $FedoraURL

diff --git a/VwarWeb/Administrators/APIControl.aspx.cs b/VwarWeb/Administrators/APIControl.aspx.cs
@@ -432,7 +432,7 @@ protected void SaveFedoraSettings_Click(object sender, EventArgs e)
         doc.Save(APIPath.Text + "web.config");
 
         BlankStatus();
-        testMySQLStatus.Text = "Saved";
+        TestFedoraStatus.Text = "Saved";
         ResetDefaultText(FedoraURL);
         ResetDefaultText(FedoraUserName);
         ResetDefaultText(FedoraPassword1);

diff --git a/VwarWeb/Bin/3d.service.implementation.dll b/VwarWeb/Bin/3d.service.implementation.dll
diff --git a/VwarWeb/Bin/OrbitOne.OpenId.MembershipProvider.dll b/VwarWeb/Bin/OrbitOne.OpenId.MembershipProvider.dll