From f9d5b28372b06a8460e001af8c543bb3018eb66e Mon Sep 17 00:00:00 2001
From: "Paul@PaulSony" <unknown@kiln.example.com>
Date: Sat, 2 Feb 2013 06:21:20 +0800
Subject: [PATCH] Updates to WPI XML paramters and manifest, handles
 connectionStrings

---
 src/WebPi/manifest.xml   |  2 ++
 src/WebPi/parameters.xml | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/WebPi/manifest.xml b/src/WebPi/manifest.xml
index 326beb5f71..cfd5740051 100644
--- a/src/WebPi/manifest.xml
+++ b/src/WebPi/manifest.xml
@@ -28,6 +28,8 @@
      setAclAccess="Read" />
   <setAcl path="umbraco/usercontrols"
      setAclAccess="Read" />
+  <setAcl path="umbraco/views"
+   setAclAccess="Read, Write, Modify" />
   <setAcl path="umbraco/xslt"
      setAclAccess="Read, Write, Modify" />
   <setAcl path="umbraco/web.config"
diff --git a/src/WebPi/parameters.xml b/src/WebPi/parameters.xml
index ae1b4135e9..f6fe243f25 100644
--- a/src/WebPi/parameters.xml
+++ b/src/WebPi/parameters.xml
@@ -41,11 +41,6 @@
     <parameterEntry type="ProviderPath" scope="setAcl" match="umbraco/css$" />
   </parameter>
   
-  <!-- This is the parameter that is used to set ACLs on the data folder -->
-  <parameter name="SetAclParameter6" description="Sets the ACL on the data folder" defaultValue="{Application Path}/data" tags="Hidden">
-    <parameterEntry type="ProviderPath" scope="setAcl" match="^umbraco/data$" />
-  </parameter>
-  
   <!-- This is the parameter that is used to set ACLs on the masterpages folder -->
   <parameter name="SetAclParameter7" description="Sets the ACL on the masterpages folder" defaultValue="{Application Path}/masterpages" tags="Hidden">
     <parameterEntry type="ProviderPath" scope="setAcl" match="^umbraco/masterpages$" />
@@ -86,6 +81,11 @@
     <parameterEntry type="ProviderPath" scope="setAcl" match="^umbraco/web.config$" />
   </parameter>
 
+  <!-- This is the parameter that is used to set ACLs, it's set to the application path filled in by the user -->
+  <parameter name="SetAclParameter17" description="Sets the ACL on the views folder" defaultValue="{Application Path}/views" tags="Hidden">
+    <parameterEntry type="ProviderPath" scope="setAcl" match="^umbraco/views$" />
+  </parameter>
+
   <!-- Prompts for database server name, this is used in the connection string parameter later -->
   <parameter name="Database Server" description="Location of your database server." defaultValue=".\sqlexpress" tags="DBServer, SQL">
   </parameter>
@@ -136,9 +136,9 @@
     <parameterEntry type="ProviderPath" scope="dbfullsql" match="installSQL2.sql" />
   </parameter>
 
-  <parameter name="SQLCE Database Location" defaultValue="datalayer=SQLCE4Umbraco.SqlCEHelper,SQLCE4Umbraco;data source=|DataDirectory|\Umbraco.sdf" 
+  <parameter name="SQLCE Database Preparation" defaultValue="local" 
              tags="SQLCE, Hidden">
-    <parameterEntry type="XmlFile" scope="\\web.config$" match="//appSettings/add[@key='umbracoDbDSN']/@value" />
+    <parameterEntry type="XmlFile" scope="\\web.config$" match="//connectionStrings/add/@name" />
   </parameter>
   
   <!-- This is the hidden connection string with the newly created db account that is used in the web.config -->
@@ -146,7 +146,7 @@
              defaultValue="server={Database Server};database={Database Name};user id={Database Username};password={Database Password}" 
              tags="SQL, Hidden">
     <!-- scope=”web.config” will look for all web.config files under the root directory . Using scope=”\\web.config$” will select only the root web.config -->
-    <parameterEntry type="XmlFile" scope="\\web.config$" match="//appSettings/add[@key='umbracoDbDSN']/@value" />
+    <parameterEntry type="XmlFile" scope="\\web.config$" match="//connectionStrings/add[@name='umbracoDbDSN']/@connectionString" />
   </parameter>
 
 </parameters>