[mapguide-commits] r6529 - in trunk/Installer: . Installers/MapGuide Installers/MapGuide/Lang Libraries/CS Map Libraries/MapGuide Server Libraries/MapGuide Web Extensions Libraries/MapGuide Web Extensions/Lang Support/Web/x64 Support/Web/x64/configs/Apache2/conf Support/Web/x86 Support/Web/x86/configs/Apache2/conf

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Sun Feb 19 12:09:32 EST 2012


Author: jng
Date: 2012-02-19 09:09:31 -0800 (Sun, 19 Feb 2012)
New Revision: 6529

Added:
   trunk/Installer/Support/Web/x64/configs/Apache2/conf/tomcat.conf
   trunk/Installer/Support/Web/x64/configs/Apache2/conf/workers.properties
   trunk/Installer/Support/Web/x64/mod_jk.so
   trunk/Installer/Support/Web/x86/configs/Apache2/conf/workers.properties
   trunk/Installer/Support/Web/x86/mod_jk.so
Modified:
   trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
   trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl
   trunk/Installer/Installers/MapGuide/MapGuide.wixproj
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/Libraries/CS Map/CS Map.wixproj
   trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
   trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
   trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
   trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl
   trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
   trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
   trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
   trunk/Installer/build.bat
   trunk/Installer/build64.bat
Log:
#1805: Installer changes:
 - Use and check for .net Framework 4.0
 - Fix sample shortcuts not showing
 - Fix broken sample urls
 - Toggle initial availability for sample features depending on language chosen.
 - Add mod_jk.so required for Tomcat support (Java configuration is still currently messed up)
 - Add missing workers.properties config file and missing tomcat.conf for x64

Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl	2012-02-19 17:09:31 UTC (rev 6529)
@@ -5,7 +5,7 @@
     http://msdn.microsoft.com/en-us/library/system.globalization.cultureinfo(vs.80).aspx
     -->
     <String Id="LANG">1033</String>
-    <String Id="ProductName">MapGuide Open Source 2.2</String>
+    <String Id="ProductName">MapGuide Open Source 2.4</String>
     <String Id="ProductManufacturer">Open Source Geospatial Foundation</String>
 
     <String Id="InstallerTitle">[ProductName] Setup</String>
@@ -20,7 +20,7 @@
     <String Id="DisabledFeaturesDialog_Title">Disabled Features</String>
     <String Id="DisabledFeaturesDialog_Description">Some features will not be available</String>
     <String Id="DisabledFeaturesDialog_IIS">IIS is not installed, so it will not be available as an installation choice.</String>
-    <String Id="DisabledFeaturesDialog_DotNet">The .NET Framework 2.0 was not found, so the .NET Web Extensions for IIS will not be available</String>
+    <String Id="DisabledFeaturesDialog_DotNet">The .NET Framework 4.0 was not found, so the .NET Web Extensions for IIS will not be available</String>
     <String Id="DisabledFeaturesDialog_Instructions">If you want to use these features, click on cancel and correct the problem before proceeding with installation</String>
 
     <String Id="FastCgiDialog_Title">FastCGI is required</String>

Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl	2012-02-19 17:09:31 UTC (rev 6529)
@@ -5,7 +5,7 @@
     http://msdn.microsoft.com/en-us/library/system.globalization.cultureinfo(vs.80).aspx
     -->
     <String Id="LANG">3082</String>
-    <String Id="ProductName">MapGuide Open Source 2.2</String>
+    <String Id="ProductName">MapGuide Open Source 2.4</String>
     <String Id="ProductManufacturer">Open Source Geospatial Foundation</String>
 
     <String Id="InstallerTitle">Instalación de [ProductName]</String>
@@ -20,7 +20,7 @@
     <String Id="DisabledFeaturesDialog_Title">Características de los discapacitados</String>
     <String Id="DisabledFeaturesDialog_Description">Algunas funciones no estarán disponibles</String>
     <String Id="DisabledFeaturesDialog_IIS">IIS no está instalado, por lo que no estará disponible como una opción de instalación</String>
-    <String Id="DisabledFeaturesDialog_DotNet">Dot Net Framework 2.0 no se ha encontrado, por lo que el Asp.Net Web Extensiones no estará disponible</String>
+    <String Id="DisabledFeaturesDialog_DotNet">Dot Net Framework 4.0 no se ha encontrado, por lo que el Asp.Net Web Extensiones no estará disponible</String>
     <String Id="DisabledFeaturesDialog_Instructions">Si desea utilizar estas funciones, haga clic en cancelar y corregir el problema antes de proceder con la instalación</String>
 
     <String Id="FastCgiDialog_Title">FastCGI es necesario</String>

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wixproj
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wixproj	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wixproj	2012-02-19 17:09:31 UTC (rev 6529)
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2012-02-19 17:09:31 UTC (rev 6529)
@@ -44,12 +44,12 @@
             Key="$(var.MgRegKey)"
             Name="IIS_API_TYPE"  />
         </Property>
-        <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuideAppPool" />
         <Property Id="MGSERVER_IP" Secure="yes" Value="127.0.0.1" />
         <Property Id="APACHE_PORT" Secure="yes" Value="8008" />
         <Property Id="APACHE_VERSION" Secure="yes" Value="2.2.21" />
         <Property Id="PHP_VERSION" Secure="yes" Value="5.3.8" />
         <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.4" />
+        <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide24AppPool" />
         <!-- Server Port Settings  -->
         <Property Id="MG_ADMIN_PORT" Secure="yes" Value="2810" />
         <Property Id="MG_CLIENT_PORT" Secure="yes" Value="2811" />
@@ -168,7 +168,7 @@
 
                        IIS is not installed, so it will not be available as an installation choice.
                        
-                       The .NET Framework 2.0 was not found, so the .NET Web Extensions for IIS will not be available
+                       The .NET Framework 4.0 was not found, so the .NET Web Extensions for IIS will not be available
                     
                 -->
                 <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}!(loc.DisabledFeaturesDialog_Title)" />
@@ -180,7 +180,7 @@
                     <Condition Action="hide">NOT IISVERSIONMAJOR=&quot;#0&quot;</Condition>
                 </Control>
                 <Control Id="TxtMessageDotNet" Type="Text" X="30" Y="150" Width="302" Height="30" Text="!(loc.DisabledFeaturesDialog_DotNet)">
-                    <Condition Action="hide">NETFRAMEWORK20</Condition>
+                    <Condition Action="hide">NETFRAMEWORK40FULL</Condition>
                 </Control>
                 <Control Id="TxtMessageInstructions" Type="Text" X="22" Y="64" Width="318" Height="27" Text="!(loc.DisabledFeaturesDialog_Instructions)" />
                 
@@ -460,7 +460,7 @@
             
             <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
             <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="ServerConfigDlg" Order="1">LicenseAccepted=&quot;1&quot;</Publish>
-            <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="DisabledFeaturesDialog" Order="2">LicenseAccepted=&quot;1&quot; AND (IISVERSIONMAJOR=&quot;#0&quot; OR (NOT NETFRAMEWORK20))</Publish>
+            <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="DisabledFeaturesDialog" Order="2">LicenseAccepted=&quot;1&quot; AND (IISVERSIONMAJOR=&quot;#0&quot; OR (NOT NETFRAMEWORK40FULL))</Publish>
 
             <Publish Dialog="DisabledFeaturesDialog" Control="Next" Event="NewDialog" Value="ServerConfigDlg" Order="1">1</Publish>
             <Publish Dialog="DisabledFeaturesDialog" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
@@ -480,22 +480,32 @@
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="FdoMySqlProviderFeature" Order="5">1</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="FdoPostgreSqlProviderFeature" Order="7">1</Publish>
             <!-- If Apache, or IIS and the .Net Framework is not installed, set feature default for the ASPX viewer to not install -->
-            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerASPXFeature" Order="7">(MGWEB_CONFIG=&quot;APACHE&quot;) OR (MGWEB_CONFIG=&quot;IIS&quot; AND NOT NETFRAMEWORK20)</Publish>
+            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerASPXFeature" Order="7">(MGWEB_CONFIG=&quot;APACHE&quot;) OR (MGWEB_CONFIG=&quot;IIS&quot; AND NOT NETFRAMEWORK40FULL)</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="ApacheConfigDlg" Order="8">MGWEB_CONFIG=&quot;APACHE&quot;</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="FastCgiWarningDlg" Order="9">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
             <!-- If IIS, set feature defaults for Apache, Tomcat, and JSP viewer to not install -->
+            <!-- 
+            Turn off:
+                - Apache
+                - Tomcat
+                - Java Viewer
+                - Java Viewer Sample
+                - Java DevGuide Sample
+            -->
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtApacheFeature" Order="10">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtTomcatFeature" Order="11">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerJSPFeature" Order="12">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
+            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtJavaDevGuideSamplesFeature" Order="13">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
+            <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtJavaViewerSampleFeature" Order="14">MGWEB_CONFIG=&quot;IIS&quot;</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="13">MGWEB_CONFIG=&quot;MANUAL&quot;</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
             <Publish Dialog="WebServerConfigDlgIIS" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
 
             <!-- Show the FastCGI warning before advancing to any IIS configuration dialog -->
-            <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IISLangConfigDlg" Order="1">MGWEB_CONFIG=&quot;IIS&quot; AND NETFRAMEWORK20</Publish>
-            <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="2">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#5&quot; AND (NOT NETFRAMEWORK20)</Publish>
-            <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IIS6ConfigDlg" Order="3">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#6&quot; AND (NOT NETFRAMEWORK20)</Publish>
-            <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IIS7ConfigDlg" Order="4">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#7&quot; AND (NOT NETFRAMEWORK20)</Publish>
+            <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IISLangConfigDlg" Order="1">MGWEB_CONFIG=&quot;IIS&quot; AND NETFRAMEWORK40FULL</Publish>
+            <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="2">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#5&quot; AND (NOT NETFRAMEWORK40FULL)</Publish>
+            <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IIS6ConfigDlg" Order="3">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#6&quot; AND (NOT NETFRAMEWORK40FULL)</Publish>
+            <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IIS7ConfigDlg" Order="4">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#7&quot; AND (NOT NETFRAMEWORK40FULL)</Publish>
             <Publish Dialog="FastCgiWarningDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS">1</Publish>
             <Publish Dialog="FastCgiWarningDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
 
@@ -508,20 +518,57 @@
             <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="Remove" Value="FdoMySqlProviderFeature" Order="5">1</Publish>
             <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="Remove" Value="FdoPostGisProviderFeature" Order="6">1</Publish>
             <!-- If Apache, set feature default for the ASPX viewer to not install -->
+            <!-- 
+            Turn off:
+                - .net Viewer
+                - .net Viewer Sample
+                - .net DevGuide Sample
+            -->
             <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="Remove" Value="WebExtMapViewerASPXFeature" Order="7">MGWEB_CONFIG=&quot;APACHE&quot;</Publish>
-            <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="NewDialog" Value="ApacheConfigDlg" Order="8">MGWEB_CONFIG=&quot;APACHE&quot;</Publish>
-            <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="9">MGWEB_CONFIG=&quot;MANUAL&quot;</Publish>
+            <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="Remove" Value="WebExtDotNetViewerSampleFeature" Order="8">MGWEB_CONFIG=&quot;APACHE&quot;</Publish>
+            <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="Remove" Value="WebExtDotNetDevGuideSamplesFeature" Order="9">MGWEB_CONFIG=&quot;APACHE&quot;</Publish>
+            <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="NewDialog" Value="ApacheConfigDlg" Order="10">MGWEB_CONFIG=&quot;APACHE&quot;</Publish>
+            <Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="11">MGWEB_CONFIG=&quot;MANUAL&quot;</Publish>
             <Publish Dialog="WebServerConfigDlgNoIIS" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
             <Publish Dialog="WebServerConfigDlgNoIIS" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
 
             <Publish Dialog="ApacheConfigDlg" Control="Next" Event="NewDialog" Value="IPConfigDlg">1</Publish>
             <!-- Set default features based on Java API choice - AddLocal required in case user changes mind and comes back -->
+            <!-- 
+            Turn off:
+                - .net Viewer
+                - PHP Viewer
+                - .net Viewer Sample
+                - PHP Viewer Sample
+                - .net DevGuide Sample
+                - PHP DevGuide Sample
+            -->
             <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtMapViewerPHPFeature">APACHE_API_TYPE=&quot;JAVA&quot;</Publish>
+            <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtMapViewerASPXFeature">APACHE_API_TYPE=&quot;JAVA&quot;</Publish>
+            <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtDotNetDevGuideSamplesFeature">APACHE_API_TYPE=&quot;JAVA&quot;</Publish>
+            <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtPhpDevGuideSamplesFeature">APACHE_API_TYPE=&quot;JAVA&quot;</Publish>
+            <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtDotNetViewerSampleFeature">APACHE_API_TYPE=&quot;JAVA&quot;</Publish>
+            <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtPhpViewerSampleFeature">APACHE_API_TYPE=&quot;JAVA&quot;</Publish>
             <Publish Dialog="ApacheConfigDlg" Control="Next" Event="AddLocal" Value="WebExtTomcatFeature">APACHE_API_TYPE=&quot;JAVA&quot;</Publish>
             <Publish Dialog="ApacheConfigDlg" Control="Next" Event="AddLocal" Value="WebExtMapViewerJSPFeature">APACHE_API_TYPE=&quot;JAVA&quot;</Publish>
             <!-- Set default features based on PHP API choice - AddLocal required in case user changes mind and comes back -->
+            <!-- 
+            Turn off:
+                - .net Viewer
+                - Java Viewer
+                - Tomcat
+                - .net Viewer Sample
+                - Java Viewer Sample
+                - .net DevGuide Sample
+                - Java DevGuide Sample
+            -->
             <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtTomcatFeature">APACHE_API_TYPE=&quot;PHP&quot;</Publish>
             <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtMapViewerJSPFeature">APACHE_API_TYPE=&quot;PHP&quot;</Publish>
+            <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtMapViewerASPXFeature">APACHE_API_TYPE=&quot;PHP&quot;</Publish>
+            <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtJavaDevGuideSamplesFeature">APACHE_API_TYPE=&quot;PHP&quot;</Publish>
+            <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtDotNetDevGuideSamplesFeature">APACHE_API_TYPE=&quot;PHP&quot;</Publish>
+            <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtJavaViewerSampleFeature">APACHE_API_TYPE=&quot;PHP&quot;</Publish>
+            <Publish Dialog="ApacheConfigDlg" Control="Next" Event="Remove" Value="WebExtDotNetViewerSampleFeature">APACHE_API_TYPE=&quot;PHP&quot;</Publish>
             <Publish Dialog="ApacheConfigDlg" Control="Next" Event="AddLocal" Value="WebExtMapViewerPHPFeature">APACHE_API_TYPE=&quot;PHP&quot;</Publish>
             <!-- Handle special "Back" actions to set UI properties -->
             <Publish Dialog="ApacheConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_NoIIS_CA" Order="1">IISVERSIONMAJOR=&quot;#0&quot;</Publish> 
@@ -545,24 +592,24 @@
             <Publish Dialog="IISLangConfigDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
             
             <Publish Dialog="IIS6ConfigDlg" Control="Next" Event="NewDialog" Value="IPConfigDlg">1</Publish>
-            <Publish Dialog="IIS6ConfigDlg" Control="Back" Event="NewDialog" Value="IISLangConfigDlg" Order="1">NETFRAMEWORK20</Publish>
-            <Publish Dialog="IIS6ConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_IIS_CA" Order="2">NOT NETFRAMEWORK20</Publish>
-            <Publish Dialog="IIS6ConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="3">NOT NETFRAMEWORK20</Publish>
+            <Publish Dialog="IIS6ConfigDlg" Control="Back" Event="NewDialog" Value="IISLangConfigDlg" Order="1">NETFRAMEWORK40FULL</Publish>
+            <Publish Dialog="IIS6ConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_IIS_CA" Order="2">NOT NETFRAMEWORK40FULL</Publish>
+            <Publish Dialog="IIS6ConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="3">NOT NETFRAMEWORK40FULL</Publish>
             <Publish Dialog="IIS6ConfigDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
 
             <Publish Dialog="IIS7ConfigDlg" Control="Next" Event="NewDialog" Value="IPConfigDlg">1</Publish>
-            <Publish Dialog="IIS7ConfigDlg" Control="Back" Event="NewDialog" Value="IISLangConfigDlg" Order="1">NETFRAMEWORK20</Publish>
-            <Publish Dialog="IIS7ConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_IIS_CA" Order="2">NOT NETFRAMEWORK20</Publish>
-            <Publish Dialog="IIS7ConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="3">NOT NETFRAMEWORK20</Publish>
+            <Publish Dialog="IIS7ConfigDlg" Control="Back" Event="NewDialog" Value="IISLangConfigDlg" Order="1">NETFRAMEWORK40FULL</Publish>
+            <Publish Dialog="IIS7ConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_IIS_CA" Order="2">NOT NETFRAMEWORK40FULL</Publish>
+            <Publish Dialog="IIS7ConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="3">NOT NETFRAMEWORK40FULL</Publish>
             <Publish Dialog="IIS7ConfigDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
 
             <Publish Dialog="IPConfigDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">1</Publish>
-            <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="IISLangConfigDlg" Order="1">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#5&quot; AND NETFRAMEWORK20</Publish>
+            <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="IISLangConfigDlg" Order="1">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#5&quot; AND NETFRAMEWORK40FULL</Publish>
             <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="IIS6ConfigDlg" Order="2">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#6&quot;</Publish>
             <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="IIS7ConfigDlg" Order="3">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#7&quot;</Publish>
             <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="ApacheConfigDlg" Order="4">MGWEB_CONFIG=&quot;APACHE&quot;</Publish>
-            <Publish Dialog="IPConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_IIS_CA" Order="5">(NOT IISVERSIONMAJOR=&quot;#0&quot;) AND ( (IISVERSIONMAJOR=&quot;#5&quot; AND (NOT NETFRAMEWORK20)) OR (MGWEB_CONFIG=&quot;MANUAL&quot; ))</Publish>
-            <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="6">(NOT IISVERSIONMAJOR=&quot;#0&quot;) AND ( (IISVERSIONMAJOR=&quot;#5&quot; AND (NOT NETFRAMEWORK20) AND MGWEB_CONFIG=&quot;IIS&quot; ) OR (MGWEB_CONFIG=&quot;MANUAL&quot; ))</Publish>
+            <Publish Dialog="IPConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_IIS_CA" Order="5">(NOT IISVERSIONMAJOR=&quot;#0&quot;) AND ( (IISVERSIONMAJOR=&quot;#5&quot; AND (NOT NETFRAMEWORK40FULL)) OR (MGWEB_CONFIG=&quot;MANUAL&quot; ))</Publish>
+            <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS" Order="6">(NOT IISVERSIONMAJOR=&quot;#0&quot;) AND ( (IISVERSIONMAJOR=&quot;#5&quot; AND (NOT NETFRAMEWORK40FULL) AND MGWEB_CONFIG=&quot;IIS&quot; ) OR (MGWEB_CONFIG=&quot;MANUAL&quot; ))</Publish>
             <Publish Dialog="IPConfigDlg" Control="Back" Event="DoAction" Value="MgWeb_Config_To_NoIIS_CA" Order="7">IISVERSIONMAJOR=&quot;#0&quot;</Publish>
             <Publish Dialog="IPConfigDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgNoIIS" Order="8">IISVERSIONMAJOR=&quot;#0&quot; AND MGWEB_CONFIG=&quot;MANUAL&quot;</Publish>
             <Publish Dialog="IPConfigDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
@@ -705,11 +752,11 @@
             <Custom Action="MapGuideIIS7_U_DeleteAppPool" After="MapGuideIIS7_U_RemoveMapGuide">MGWEB_CONFIG=&quot;IIS&quot; AND IISVERSIONMAJOR=&quot;#7&quot; AND &amp;WebExtensionsFeature=2</Custom>
 
           <!-- IIS6 properties for deferred actions -->
-            <Custom Action="AspNetRegIIS_Cmd" After="CostFinalize">NETFRAMEWORK20 AND MGWEB_CONFIG=&quot;IIS&quot; AND (IISVERSIONMAJOR=&quot;#5&quot; OR IISVERSIONMAJOR=&quot;#6&quot;) AND &amp;WebExtensionsFeature&gt;2</Custom>
+            <Custom Action="AspNetRegIIS_Cmd" After="CostFinalize">NETFRAMEWORK40FULL AND MGWEB_CONFIG=&quot;IIS&quot; AND (IISVERSIONMAJOR=&quot;#5&quot; OR IISVERSIONMAJOR=&quot;#6&quot;) AND &amp;WebExtensionsFeature&gt;2</Custom>
 
           <!-- IIS6 deferred actions  ConfigureIIS is a WiX built-in action; I'm overriding and making the action conditional -->
             <Custom Action="ConfigureIIs" After="InstallFiles">MGWEB_CONFIG=&quot;IIS&quot; AND (IISVERSIONMAJOR=&quot;#5&quot; OR IISVERSIONMAJOR=&quot;#6&quot;) AND (&amp;WebExtensionsFeature&gt;2 OR &amp;WebExtensionsFeature=2)</Custom>
-            <Custom Action="AspNetRegIIS" After="ConfigureIIs">NETFRAMEWORK20 AND MGWEB_CONFIG=&quot;IIS&quot; AND (IISVERSIONMAJOR=&quot;#5&quot; OR IISVERSIONMAJOR=&quot;#6&quot;) AND &amp;WebExtensionsFeature&gt;2</Custom>
+            <Custom Action="AspNetRegIIS" After="ConfigureIIs">NETFRAMEWORK40FULL AND MGWEB_CONFIG=&quot;IIS&quot; AND (IISVERSIONMAJOR=&quot;#5&quot; OR IISVERSIONMAJOR=&quot;#6&quot;) AND &amp;WebExtensionsFeature&gt;2</Custom>
 
             
             <Custom Action="FdoRegCmd" After="InstallInitialize"></Custom>

Modified: trunk/Installer/Libraries/CS Map/CS Map.wixproj
===================================================================
--- trunk/Installer/Libraries/CS Map/CS Map.wixproj	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Libraries/CS Map/CS Map.wixproj	2012-02-19 17:09:31 UTC (rev 6529)
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

Modified: trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Libraries/MapGuide Server/MapGuide Server.wixproj	2012-02-19 17:09:31 UTC (rev 6529)
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs	2012-02-19 17:09:31 UTC (rev 6529)
@@ -137,7 +137,7 @@
 
             <!-- IIS5 DotNet MapViewer component -->
             <Component Id="IIS5DotNetViewerComponent" Win64="$(var.Win64)" Guid="EC460125-D5D4-4596-BD03-B8D920F02E7F" Directory="WEBEXTENSIONSLOCATION">
-                <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#5&quot;</Condition>
+                <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#5&quot;</Condition>
                 <CreateFolder />
                 <iis:WebVirtualDir Id="IIS5DotNetViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
                     <iis:WebDirProperties Id="IIS5DotNetViewerDocument" DefaultDocuments="ajaxviewer.aspx"  AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
@@ -147,7 +147,7 @@
 
             <!-- IIS5 DotNet MapViewer component -->
             <Component Id="IIS5DotNetViewerComponent2" Win64="$(var.Win64)" Guid="DAEBD87A-CAC4-45AA-A5FD-0AF8472EB13C" Directory="WEBEXTENSIONSLOCATION">
-                <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#5&quot;</Condition>
+                <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#5&quot;</Condition>
                 <CreateFolder />
                 <iis:WebVirtualDir Id="IIS5DotNetViewerVDir2" Alias="[VIRTUALDIR]/mapviewernet" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
                     <iis:WebDirProperties Id="IIS5DotNetViewerDocument2" DefaultDocuments="ajaxviewer.aspx"  AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
@@ -157,7 +157,7 @@
 
             <!-- IIS5 DotNet Viewer Sample component -->
             <Component Id="IIS5DotNetViewerSampleComponent" Win64="$(var.Win64)" Guid="81AE3F12-5CC5-48F6-AC62-5F225A9743EB" Directory="WEBEXTENSIONSLOCATION">
-                <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#5&quot; AND &amp;WebExtDotNetViewerSampleFeature&gt;2</Condition>
+                <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#5&quot; AND &amp;WebExtDotNetViewerSampleFeature&gt;2</Condition>
                 <CreateFolder />
                 <iis:WebVirtualDir Id="IIS5DotNetViewerSampleVDir" Alias="[VIRTUALDIR]/dotnetviewersample" Directory="dir_dotnetviewersample_0" WebSite="IISDefaultWebSite">
                     <iis:WebDirProperties Id="IIS5DotNetViewerSampleDocument" DefaultDocuments="ajaxviewersample.aspx"  AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
@@ -167,7 +167,7 @@
 
             <!-- IIS5 DotNet DevGuide Sample component -->
             <Component Id="IIS5DotNetDevGuideSampleComponent" Win64="$(var.Win64)" Guid="91FA4F55-0673-4043-BEBD-19E4094A8A32" Directory="WEBEXTENSIONSLOCATION">
-                <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#5&quot; AND &amp;WebExtDotNetDevGuideSamplesFeature&gt;2</Condition>
+                <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#5&quot; AND &amp;WebExtDotNetDevGuideSamplesFeature&gt;2</Condition>
                 <CreateFolder />
                 <iis:WebVirtualDir Id="IIS5DotNetDevGuideSampleVDir" Alias="[VIRTUALDIR]/dotnetsamples" Directory="dir_dotnetsamples_0" WebSite="IISDefaultWebSite">
                     <iis:WebDirProperties Id="IIS5DotNetDevGuideSampleDocument" DefaultDocuments="main.aspx"  AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
@@ -250,7 +250,7 @@
 
             <!-- IIS6 DotNet MapViewer component -->
             <Component Id="IIS6DotNetViewerComponent" Win64="$(var.Win64)" Guid="357E1C68-9E29-474F-A783-6F8FD8BCEAB4" Directory="WEBEXTENSIONSLOCATION">
-                <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#6&quot;</Condition>
+                <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#6&quot;</Condition>
                 <CreateFolder />
                 <iis:WebVirtualDir Id="IIS6DotNetViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
                     <iis:WebDirProperties Id="IIS6DotNetViewerDocument" DefaultDocuments="ajaxviewer.aspx"  AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
@@ -260,7 +260,7 @@
 
             <!-- IIS6 DotNet MapViewer component -->
             <Component Id="IIS6DotNetViewerComponent2" Win64="$(var.Win64)" Guid="44807D96-F0FB-4D2E-A863-335AA034ECB4" Directory="WEBEXTENSIONSLOCATION">
-                <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#6&quot;</Condition>
+                <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#6&quot;</Condition>
                 <CreateFolder />
                 <iis:WebVirtualDir Id="IIS6DotNetViewerVDir2" Alias="[VIRTUALDIR]/mapviewernet" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
                     <iis:WebDirProperties Id="IIS6DotNetViewerDocument2" DefaultDocuments="ajaxviewer.aspx"  AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
@@ -270,7 +270,7 @@
 
             <!-- IIS6 DotNet Viewer Sample component -->
             <Component Id="IIS6DotNetViewerSampleComponent" Win64="$(var.Win64)" Guid="E2330508-5E84-4451-9D34-F813B452039D" Directory="WEBEXTENSIONSLOCATION">
-                <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#6&quot; AND &amp;WebExtDotNetViewerSampleFeature&gt;2</Condition>
+                <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#6&quot; AND &amp;WebExtDotNetViewerSampleFeature&gt;2</Condition>
                 <CreateFolder />
                 <iis:WebVirtualDir Id="IIS6DotNetViewerSampleVDir" Alias="[VIRTUALDIR]/dotnetviewersample" Directory="dir_dotnetviewersample_0" WebSite="IISDefaultWebSite">
                     <iis:WebDirProperties Id="IIS6DotNetViewerSampleDocument" DefaultDocuments="ajaxviewersample.aspx"  AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
@@ -280,7 +280,7 @@
 
             <!-- IIS6 DotNet DevGuide Sample component -->
             <Component Id="IIS6DotNetDevGuideSampleComponent" Win64="$(var.Win64)" Guid="71EDDC8E-A1BA-4c69-B7E3-F52E32FB3CA1" Directory="WEBEXTENSIONSLOCATION">
-                <Condition>NETFRAMEWORK20 AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#6&quot; AND &amp;WebExtDotNetDevGuideSamplesFeature&gt;2</Condition>
+                <Condition>NETFRAMEWORK40FULL AND MGWEB_CONFIG=&quot;IIS&quot; AND IIS_API_TYPE=&quot;DOTNET&quot; AND IISVERSIONMAJOR=&quot;#6&quot; AND &amp;WebExtDotNetDevGuideSamplesFeature&gt;2</Condition>
                 <CreateFolder />
                 <iis:WebVirtualDir Id="IIS6DotNetDevGuideSampleVDir" Alias="[VIRTUALDIR]/dotnetsamples" Directory="dir_dotnetsamples_0" WebSite="IISDefaultWebSite">
                     <iis:WebDirProperties Id="IIS6DotNetDevGuideSampleDocument" DefaultDocuments="main.aspx"  AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl	2012-02-19 17:09:31 UTC (rev 6529)
@@ -47,6 +47,7 @@
     <String Id="WebTempFeature">Temp Directory</String>
     <String Id="WebTempFeature_Description">You may choose a location where MapGuide will store temporary files.</String>
 
+    <String Id="Shortcut_DevGuide">MapGuide Developer's Guide</String>
     <String Id="Shortcut_WebAPI">Web API Documentation</String>
     <String Id="Shortcut_PhpViewerSample">PHP Viewer Sample</String>
     <String Id="Shortcut_PhpDevGuideSample">PHP Developer's Guide Samples</String>

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl	2012-02-19 17:09:31 UTC (rev 6529)
@@ -47,6 +47,7 @@
     <String Id="WebTempFeature">Archivos temporales</String>
     <String Id="WebTempFeature_Description">Usted puede elegir un lugar donde MapGuide almacenará los archivos temporales</String>
 
+    <String Id="Shortcut_DevGuide">MapGuide Developer's Guide</String>
     <String Id="Shortcut_WebAPI">Web de documentación de la API</String>
     <String Id="Shortcut_WikiHelp">Autodesk WikiHelp</String>
     <String Id="Shortcut_PhpViewerSample">PHP Viewer Sample</String>

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj	2012-02-19 17:09:31 UTC (rev 6529)
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs	2012-02-19 17:09:31 UTC (rev 6529)
@@ -10,7 +10,7 @@
     <?endif ?>
     <Fragment>
 
-        <PropertyRef Id="NETFRAMEWORK20"/>
+        <PropertyRef Id="NETFRAMEWORK40FULL"/>
         <PropertyRef Id="MGWEB_CONFIG"/>
         <PropertyRef Id="IIS_API_TYPE"/>
 
@@ -58,6 +58,7 @@
                 <Directory Id="PHPLOCATION" Name="Php">
                     <Component Id="WebExtPhpComponent" Win64="$(var.Win64)" Guid="88814E96-07DC-4fb7-A993-F31FC1E000CB" Feature="WebExtPhpFeature">
                         <CreateFolder />
+                        <!--
                         <Environment Id="PhpEnvVar"
                                      Action="set"
                                      Name="PATH"
@@ -65,6 +66,7 @@
                                      Permanent="no"
                                      System="yes"
                                      Value="[PHPLOCATION]" />
+                        -->
                         <RegistryKey Id="PhpRegistryKey"
                                      Action="createAndRemoveOnUninstall"
                                      Root="HKLM"
@@ -156,6 +158,8 @@
                 <ComponentRef Id="IISWebApiShortcutComponent"/>
                 <ComponentRef Id="ApacheViewerApiShortcutComponent"/>
                 <ComponentRef Id="IISViewerApiShortcutComponent"/>
+                <ComponentRef Id="ApacheDevGuideShortcutComponent"/>
+                <ComponentRef Id="IISDevGuideShortcutComponent"/>
             </Feature>
             <Feature Id="WebExtMapViewerFeature" Title="!(loc.WebExtMapViewerFeature)" Display="hidden" Level="1" Description="!(loc.WebExtMapViewerFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local" >
                 <ComponentGroupRef Id="group_MAPVIEWERFILES"/>

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs	2012-02-19 17:09:31 UTC (rev 6529)
@@ -36,6 +36,20 @@
                     KeyPath="yes" />
           </RegistryKey>
         </Component>
+        <Component Id="ApacheDevGuideShortcutComponent" Win64="$(var.Win64)" Guid="4DC72C73-8CF0-49B3-8558-5E7CAFA7B6CE">
+          <Condition>MGWEB_CONFIG=&quot;APACHE&quot;</Condition>
+          <CreateFolder />
+          <util:InternetShortcut Id="ApacheDevGuide"
+                                 Directory="MapGuideOpenSourceMenuLocation"
+                                 Name="!(loc.Shortcut_DevGuide)"
+                                 Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/help/devguide/index.html" />
+          <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheDevGuideShortcut">
+            <RegistryValue
+                    Value="Installed"
+                    Type="string"
+                    KeyPath="yes" />
+          </RegistryKey>
+        </Component>
         <Component Id="ApacheViewerApiShortcutComponent" Win64="$(var.Win64)" Guid="4AABF916-33FC-440D-9D6F-8CE95F2ADE7A">
             <Condition>MGWEB_CONFIG=&quot;APACHE&quot;</Condition>
             <CreateFolder />
@@ -72,11 +86,11 @@
           </RegistryKey>
         </Component>
           <Component Id="WebApachePHPViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="E3D81381-6B4A-41AD-B83A-CE686455D3DC">
-              <Condition>MGWEB_CONFIG=&quot;APACHE&quot; AND &amp;WebExtPhpViewerSampleFeature&gt;2</Condition>
+              <Condition>MGWEB_CONFIG=&quot;APACHE&quot;</Condition>
               <util:InternetShortcut Id="ApachePhpViewerSampleShortcut"
                                  Directory="MapGuideOpenSourceMenuLocation"
                                  Name="!(loc.Shortcut_PhpViewerSample)"
-                                 Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/phpviewersample/ajaxviewer.php" />
+                                 Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/phpviewersample/ajaxviewersample.php" />
               <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApachePHPViewerSampleShortcutComponent">
                   <RegistryValue
                           Value="Installed"
@@ -85,7 +99,7 @@
               </RegistryKey>
           </Component>
           <Component Id="WebApachePHPDevGuideSampleShortcutComponent" Win64="$(var.Win64)" Guid="F2F3F90B-D033-47FA-9DDD-943E594ABE98">
-              <Condition>MGWEB_CONFIG=&quot;APACHE&quot; AND &amp;WebExtPhpDevGuideSamplesFeature&gt;2</Condition>
+              <Condition>MGWEB_CONFIG=&quot;APACHE&quot;</Condition>
               <util:InternetShortcut Id="ApachePhpDevGuideSampleShortcut"
                                  Directory="MapGuideOpenSourceMenuLocation"
                                  Name="!(loc.Shortcut_PhpDevGuideSample)"
@@ -98,11 +112,11 @@
               </RegistryKey>
           </Component>
           <Component Id="WebApacheJavaViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="4D0D9A31-2BB5-4DE8-881A-53A5371BF93D">
-              <Condition>MGWEB_CONFIG=&quot;APACHE&quot; AND &amp;WebExtJavaViewerSampleFeature&gt;2</Condition>
+              <Condition>MGWEB_CONFIG=&quot;APACHE&quot;</Condition>
               <util:InternetShortcut Id="ApacheJavaViewerSampleShortcut"
                                  Directory="MapGuideOpenSourceMenuLocation"
                                  Name="!(loc.Shortcut_JavaViewerSample)"
-                                 Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/javaviewersample/ajaxviewer.jsp" />
+                                 Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/javaviewersample/ajaxviewersample.jsp" />
               <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheJavaViewerSampleShortcutComponent">
                   <RegistryValue
                           Value="Installed"
@@ -111,7 +125,7 @@
               </RegistryKey>
           </Component>
           <Component Id="WebApacheJavaDevGuideSampleShortcutComponent" Win64="$(var.Win64)" Guid="4DB97F1C-D225-4437-B2B8-69ECDE4F4168">
-              <Condition>MGWEB_CONFIG=&quot;APACHE&quot; AND &amp;WebExtJavaDevGuideSamplesFeature&gt;2</Condition>
+              <Condition>MGWEB_CONFIG=&quot;APACHE&quot;</Condition>
               <util:InternetShortcut Id="ApacheJavaDevGuideSampleShortcut"
                                  Directory="MapGuideOpenSourceMenuLocation"
                                  Name="!(loc.Shortcut_JavaDevGuideSample)"
@@ -137,6 +151,20 @@
                     KeyPath="yes" />
           </RegistryKey>
         </Component>
+        <Component Id="IISDevGuideShortcutComponent" Win64="$(var.Win64)" Guid="BA2B2FE0-F11E-41D0-9939-D774C1D3171A">
+          <Condition>MGWEB_CONFIG=&quot;IIS&quot;</Condition>
+          <CreateFolder />
+          <util:InternetShortcut Id="IISDevGuide"
+                                 Directory="MapGuideOpenSourceMenuLocation"
+                                 Name="!(loc.Shortcut_DevGuide)"
+                                 Target="http://localhost/[VIRTUALDIR]/help/devguide/index.html" />
+          <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISDevGuideShortcut">
+            <RegistryValue
+                    Value="Installed"
+                    Type="string"
+                    KeyPath="yes" />
+          </RegistryKey>
+        </Component>
           <Component Id="IISViewerApiShortcutComponent" Win64="$(var.Win64)" Guid="F2CCA279-4C99-48CE-9F79-7465449E2B33">
               <Condition>MGWEB_CONFIG=&quot;IIS&quot;</Condition>
               <CreateFolder />
@@ -152,7 +180,7 @@
               </RegistryKey>
           </Component>
           <Component Id="WebIISPHPViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="F1B2C345-52F8-4179-8CDC-34D2D3E22418">
-              <Condition>MGWEB_CONFIG=&quot;IIS&quot; AND &amp;WebExtPhpViewerSampleFeature&gt;2</Condition>
+              <Condition>MGWEB_CONFIG=&quot;IIS&quot;</Condition>
               <util:InternetShortcut Id="IISPhpViewerSampleShortcut"
                                  Directory="MapGuideOpenSourceMenuLocation"
                                  Name="!(loc.Shortcut_PhpViewerSample)"
@@ -165,7 +193,7 @@
               </RegistryKey>
           </Component>
           <Component Id="WebIISPHPDevGuideSampleShortcutComponent" Win64="$(var.Win64)" Guid="EEAB8D50-3ECA-4CBF-8D80-3F02219CB797">
-              <Condition>MGWEB_CONFIG=&quot;IIS&quot; AND &amp;WebExtPhpDevGuideSamplesFeature&gt;2</Condition>
+              <Condition>MGWEB_CONFIG=&quot;IIS&quot;</Condition>
               <util:InternetShortcut Id="IISPhpDevGuideSampleShortcut"
                                  Directory="MapGuideOpenSourceMenuLocation"
                                  Name="!(loc.Shortcut_PhpDevGuideSample)"
@@ -178,11 +206,11 @@
               </RegistryKey>
           </Component>
           <Component Id="WebIISDotNetViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="BE2DD022-04C2-45AF-95A6-87E652BE52CA">
-              <Condition>MGWEB_CONFIG=&quot;IIS&quot; AND &amp;WebExtDotNetViewerSampleFeature&gt;2</Condition>
+              <Condition>MGWEB_CONFIG=&quot;IIS&quot;</Condition>
               <util:InternetShortcut Id="IISDotNetViewerSampleShortcut"
                                  Directory="MapGuideOpenSourceMenuLocation"
                                  Name="!(loc.Shortcut_DotNetViewerSample)"
-                                 Target="http://localhost/[VIRTUALDIR]/dotnetviewersample/ajaxviewer.aspx" />
+                                 Target="http://localhost/[VIRTUALDIR]/dotnetviewersample/ajaxviewersample.aspx" />
               <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISDotNetViewerSampleShortcutComponent">
                   <RegistryValue
                           Value="Installed"
@@ -191,7 +219,7 @@
               </RegistryKey>
           </Component>
           <Component Id="WebIISDotNetDevGuideSampleShortcutComponent" Win64="$(var.Win64)" Guid="0B766EEB-FA31-4833-91F6-87C2A653FD33">
-              <Condition>MGWEB_CONFIG=&quot;IIS&quot; AND &amp;WebExtDotNetDevGuideSamplesFeature&gt;2</Condition>
+              <Condition>MGWEB_CONFIG=&quot;IIS&quot;</Condition>
               <util:InternetShortcut Id="IISDotNetDevGuideSampleShortcut"
                                  Directory="MapGuideOpenSourceMenuLocation"
                                  Name="!(loc.Shortcut_DotNetDevGuideSample)"

Added: trunk/Installer/Support/Web/x64/configs/Apache2/conf/tomcat.conf
===================================================================
--- trunk/Installer/Support/Web/x64/configs/Apache2/conf/tomcat.conf	                        (rev 0)
+++ trunk/Installer/Support/Web/x64/configs/Apache2/conf/tomcat.conf	2012-02-19 17:09:31 UTC (rev 6529)
@@ -0,0 +1,21 @@
+# Load mod_jk module
+# Update this path to match your modules location
+LoadModule    jk_module  modules/mod_jk.so
+# Declare the module for <IfModule directive> (remove this line on Apache 2.x)
+# AddModule     mod_jk.c
+# Where to find workers.properties
+# Update this path to match your conf directory location (put workers.properties next to httpd.conf)
+JkWorkersFile "%MG_WEB_APACHE%/conf/workers.properties"
+# Where to put jk logs
+# Update this path to match your logs directory location (put mod_jk.log next to access_log)
+JkLogFile     "%MG_WEB_APACHE%/logs/mod_jk.log"
+# Set the jk log level [debug/error/info]
+JkLogLevel    info
+# Select the log format
+JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
+# JkOptions indicate to send SSL KEY SIZE, 
+JkOptions     +ForwardKeySize +ForwardURICompat -ForwardDirectories
+# JkRequestLogFormat set the request format 
+JkRequestLogFormat     "%w %V %T"
+# Send everything for context /examples to worker named worker1 (ajp13)
+JkMount  /%MG_VIRTUAL_DIR%/mapviewerjava/* worker1
\ No newline at end of file

Added: trunk/Installer/Support/Web/x64/configs/Apache2/conf/workers.properties
===================================================================
--- trunk/Installer/Support/Web/x64/configs/Apache2/conf/workers.properties	                        (rev 0)
+++ trunk/Installer/Support/Web/x64/configs/Apache2/conf/workers.properties	2012-02-19 17:09:31 UTC (rev 6529)
@@ -0,0 +1,12 @@
+# Define 1 real worker using ajp13
+worker.list=worker1
+
+# Set properties for worker1 (ajp13)
+worker.worker1.type=ajp13
+worker.worker1.host=localhost
+worker.worker1.port=8009
+worker.worker1.lbfactor=50
+worker.worker1.cachesize=10
+worker.worker1.cache_timeout=600
+worker.worker1.socket_keepalive=1
+worker.worker1.recycle_timeout=300

Added: trunk/Installer/Support/Web/x64/mod_jk.so
===================================================================
(Binary files differ)


Property changes on: trunk/Installer/Support/Web/x64/mod_jk.so
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Installer/Support/Web/x86/configs/Apache2/conf/workers.properties
===================================================================
--- trunk/Installer/Support/Web/x86/configs/Apache2/conf/workers.properties	                        (rev 0)
+++ trunk/Installer/Support/Web/x86/configs/Apache2/conf/workers.properties	2012-02-19 17:09:31 UTC (rev 6529)
@@ -0,0 +1,12 @@
+# Define 1 real worker using ajp13
+worker.list=worker1
+
+# Set properties for worker1 (ajp13)
+worker.worker1.type=ajp13
+worker.worker1.host=localhost
+worker.worker1.port=8009
+worker.worker1.lbfactor=50
+worker.worker1.cachesize=10
+worker.worker1.cache_timeout=600
+worker.worker1.socket_keepalive=1
+worker.worker1.recycle_timeout=300

Added: trunk/Installer/Support/Web/x86/mod_jk.so
===================================================================
(Binary files differ)


Property changes on: trunk/Installer/Support/Web/x86/mod_jk.so
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/build.bat	2012-02-19 17:09:31 UTC (rev 6529)
@@ -235,6 +235,7 @@
 rd /S /Q Tomcat
 popd
 pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
+copy /Y mod_jk.so "%MG_SOURCE%\Web\Apache2\modules"
 REM we unpack to root because Tomcat is the root dir in the zip file
 7z x %TOMCAT_PACKAGE% -y -o"%MG_SOURCE%\Web"
 popd

Modified: trunk/Installer/build64.bat
===================================================================
--- trunk/Installer/build64.bat	2012-02-19 10:43:13 UTC (rev 6528)
+++ trunk/Installer/build64.bat	2012-02-19 17:09:31 UTC (rev 6529)
@@ -257,6 +257,7 @@
 rd /S /Q Tomcat
 popd
 pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
+copy /Y mod_jk.so "%MG_SOURCE%\Web\Apache2\modules"
 REM we unpack to root because Tomcat is the root dir in the zip file
 7z x %TOMCAT_PACKAGE% -y -o"%MG_SOURCE%\Web"
 popd



More information about the mapguide-commits mailing list