Author: brett
Date: Wed Aug 10 10:40:25 2011
New Revision: 1156097
URL: http://svn.apache.org/viewvc?rev=1156097&view=rev
Log:
fix line endings
Removed:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/VBWebApplication_Wix.vbproj.user
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WIXVBWebApp08.suo
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/Web.config
(props changed)
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/web.config
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT001/Sample.wxs
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
(contents, props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestAppInstaller/IT003.wxs
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestAppInstaller/src/main/wix/IT005.wxs
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/Web.config
(contents, props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/Product.wxs
(contents, props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/SampleWebDir.wixobj
(contents, props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/WixMSI.wixproj
(contents, props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/LocalizationInstaller/LocalizationInstaller.wixproj
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/LocalizationInstaller/Product.wxs
(props changed)
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT008/Sample.wxs
(props changed)
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/WebSiteWithCSProj/WebApplication1/Web.config
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/flat-multi-module-web-application-vb/web.config
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT001/Sample.wxs
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj?rev=1156097&r1=1156096&r2=1156097&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
(original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
Wed Aug 10 10:40:25 2011
@@ -1,19 +1,19 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<?xml version="1.0" encoding="utf-8"?><wixObject version="3.0.2002.0"
xmlns="http://schemas.microsoft.com/wix/2006/objects";><section
id="{6E390708-A2AD-4269-8CE0-561D72DFCFF3}" type="product"
codepage="1252"><table name="_SummaryInformation"><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>1</field><field>1252</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>2</field><field>Installation
Database</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>3</field><field>Sample
Inc's Thing 1.0 Installer</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>4</field><field>Sample
Inc.</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>5</field><field>Installer</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>6</f
ield><field>Thing is a registered trademark of Sample Inc.</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>7</field><field>Intel;1033</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>9</field><field>{5902BCD6-12B9-4F38-BF6B-2C30F825FFED}</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>14</field><field>100</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>15</field><field>2</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*6"><field>19</field><field>2</field></row></table><table
name="Component"><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*18"><field>MainExecutable</field><field>{059035F2-A47C-4407-8459-0597276DF276}</field><field>INSTALLDIR</field><field>4</field><field
/><field>regAE2619ED6104800F210A1CB6511
A5F82</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*29"><field>HelperLibrary</field><field>{DFEB88F1-A60F-45E9-80F1-1AB62E66D73C}</field><field>INSTALLDIR</field><field>0</field><field
/><field>HelperDLL</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*33"><field>Manual</field><field>{B6277FF6-CA9E-481E-9619-758FD725A752}</field><field>INSTALLDIR</field><field>4</field><field
/><field>regB6A8F75963CF49F3026E3E7D48AD2E48</field></row></table><table
name="Directory"><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*16"><field>INSTALLDIR</field><field>Sample</field><field>dkshdkwd|Thing
1.0</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*15"><field>Sample</field><field>ProgramFilesFolder</field><field>Sample</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*14"><field>ProgramFilesFolder</fiel
d><field>TARGETDIR</field><field>PFiles</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*47"><field>ProgramMenuDir</field><field>ProgramMenuFolder</field><field>iljk7ior|Thing
1.0</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*46"><field>ProgramMenuFolder</field><field>TARGETDIR</field><field>Programs</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*50"><field>DesktopFolder</field><field>TARGETDIR</field><field>Desktop</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*13"><field>TARGETDIR</field><field
/><field>SourceDir</field></row></table><table name="Feature"><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*53"><field>Complete</field><field
/><field /><field /><field>2</field><field>1</field><field
/><field>0</field></row></table><table name="File"><row
sourceLineNumber="F:\git\npanday-
wix-plugin\target\it\IT001\Sample.wxs*19"><field>ThingEXE</field><field>MainExecutable</field><field>Thing10.exe</field><field>0</field><field
/><field /><field>512</field><field /></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*30"><field>HelperDLL</field><field>HelperLibrary</field><field>Helper.dll</field><field>0</field><field
/><field /><field>512</field><field /></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*34"><field>Manual</field><field>Manual</field><field>Manual.pdf</field><field>0</field><field
/><field /><field>512</field><field /></row></table><table name="Icon"><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*59"><field>Thing10.exe</field><field>ThingAppl10.exe</field></row></table><table
name="Media"><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*11"><field>1</field><field>0</field><field>CD-ROM
#1</field><field>#Sample.cab</field><fiel
d /><field /></row></table><table name="Property"><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*3"><field>Manufacturer</field><field>Sample
Inc.</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*3"><field>ProductCode</field><field>{6E390708-A2AD-4269-8CE0-561D72DFCFF3}</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*3"><field>ProductLanguage</field><field>1033</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*3"><field>ProductName</field><field>Thing
1.0</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*3"><field>ProductVersion</field><field>1.0.0</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*12"><field>DiskPrompt</field><field>Sample's
Thing 1.0 Installation [1]</field></row></table><table name="Registry"><row
sourceLineNumber="F:\git\npanday-wix-
plugin\target\it\IT001\Sample.wxs*24"><field>regAE2619ED6104800F210A1CB6511A5F82</field><field>1</field><field>Software\Sample\Thing
1.0</field><field>Version</field><field>[ProductVersion]</field><field>MainExecutable</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*23"><field>regAEBE2C6DE64848B16991CC928A3CF4D2</field><field>1</field><field>Software\Sample\Thing
1.0</field><field>*</field><field /><field>MainExecutable</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*38"><field>regB6A8F75963CF49F3026E3E7D48AD2E48</field><field>1</field><field>Software\Sample\Thing
1.0\Manual</field><field>Version</field><field>[ProductVersion]</field><field>Manual</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*37"><field>regDE59C526B5EBABCEAE14699DDF9DB54D</field><field>1</field><field>Software\Sample\Thing
1.0\Manual</field><field>*</field><field /><field>Manual</field
></row></table><table name="RemoveFile"><row
>sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*26"><field>MainExecutable_RemoveShortcutFolder</field><field>MainExecutable</field><field
> /><field>ProgramMenuDir</field><field>2</field></row></table><table
>name="Shortcut"><row
>sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*20"><field>startmenuThing10</field><field>ProgramMenuDir</field><field>_35syt_d.0|Thing
> 1.0</field><field>MainExecutable</field><field>[#ThingEXE]</field><field
>/><field /><field /><field>Thing10.exe</field><field>0</field><field
>/><field>INSTALLDIR</field><field /><field /><field /><field /></row><row
>sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*21"><field>desktopThing10</field><field>DesktopFolder</field><field>hgatnytt.0|Thing
> 1.0</field><field>MainExecutable</field><field>[#ThingEXE]</field><field
>/><field /><field /><field>Thing10.exe</field><field>0</field><field
>/><field>INSTALLDIR</
field><field /><field /><field /><field /></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*35"><field>startmenuManual</field><field>ProgramMenuDir</field><field>Manual|Instruction
Manual</field><field>Manual</field><field>[#Manual]</field><field /><field
/><field /><field /><field /><field /><field /><field /><field /><field
/><field /></row></table><table name="WixComplexReference"><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*54"><field>Complete</field><field>1</field><field
/><field>MainExecutable</field><field>1</field><field>0</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*55"><field>Complete</field><field>1</field><field
/><field>HelperLibrary</field><field>1</field><field>0</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*56"><field>Complete</field><field>1</field><field
/><field>Manual</field><field>1</field><field>0</field>
</row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*53"><field>{6E390708-A2AD-4269-8CE0-561D72DFCFF3}</field><field>5</field><field
/><field>Complete</field><field>2</field><field>0</field></row></table><table
name="WixFile"><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*19"><field>ThingEXE</field><field
/><field /><field
/><field>INSTALLDIR</field><field>1</field><field>ThingAppl10.exe</field><field
/><field>-1</field><field>0</field><field>0</field><field /><field /><field
/><field /></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*30"><field>HelperDLL</field><field
/><field /><field
/><field>INSTALLDIR</field><field>1</field><field>Helper.dll</field><field
/><field>-1</field><field>0</field><field>0</field><field /><field /><field
/><field /></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*34"><field>Manual</field><field
/><field /><field /><field>I
NSTALLDIR</field><field>1</field><field>Manual.pdf</field><field
/><field>-1</field><field>0</field><field>0</field><field /><field /><field
/><field /></row></table><table name="WixGroup"><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*54"><field>Complete</field><field>Feature</field><field>MainExecutable</field><field>Component</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*55"><field>Complete</field><field>Feature</field><field>HelperLibrary</field><field>Component</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*56"><field>Complete</field><field>Feature</field><field>Manual</field><field>Component</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*53"><field>{6E390708-A2AD-4269-8CE0-561D72DFCFF3}</field><field>Product</field><field>Complete</field><field>Feature</field></row></table><table
name="WixSimpleReference"><row sourc
eLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*11"><field>Property</field><field>DiskPrompt</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*20"><field>Directory</field><field>ProgramMenuDir</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*20"><field>Icon</field><field>Thing10.exe</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*21"><field>Directory</field><field>DesktopFolder</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*21"><field>Icon</field><field>Thing10.exe</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*19"><field>Media</field><field>1</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*26"><field>Directory</field><field>ProgramMenuDir</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\
Sample.wxs*30"><field>Media</field><field>1</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*35"><field>Directory</field><field>ProgramMenuDir</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*34"><field>Media</field><field>1</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*54"><field>Component</field><field>MainExecutable</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*55"><field>Component</field><field>HelperLibrary</field></row><row
sourceLineNumber="F:\git\npanday-wix-plugin\target\it\IT001\Sample.wxs*56"><field>Component</field><field>Manual</field></row></table></section></wixObject>
\ No newline at end of file
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT002/Sample.wixobj
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT003/TestAppInstaller/IT003.wxs
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT005/TestAppInstaller/src/main/wix/IT005.wxs
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/Web.config
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/Web.config?rev=1156097&r1=1156096&r2=1156097&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/Web.config
(original)
+++
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/Web.config
Wed Aug 10 10:40:25 2011
@@ -1,77 +1,77 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<configuration>
-
- <appSettings/>
- <connectionStrings/>
-
- <system.web>
- <!--
- Set compilation debug="true" to insert debugging
- symbols into the compiled page. Because this
- affects performance, set this value to true only
- during development.
-
- Visual Basic options:
- Set strict="true" to disallow all data type conversions
- where data loss can occur.
- Set explicit="true" to force declaration of all variables.
- -->
- <compilation debug="true" strict="false" explicit="true" />
- <pages>
- <namespaces>
- <clear />
- <add namespace="System" />
- <add namespace="System.Collections" />
- <add namespace="System.Collections.Specialized" />
- <add namespace="System.Configuration" />
- <add namespace="System.Text" />
- <add namespace="System.Text.RegularExpressions" />
- <add namespace="System.Web" />
- <add namespace="System.Web.Caching" />
- <add namespace="System.Web.SessionState" />
- <add namespace="System.Web.Security" />
- <add namespace="System.Web.Profile" />
- <add namespace="System.Web.UI" />
- <add namespace="System.Web.UI.WebControls" />
- <add namespace="System.Web.UI.WebControls.WebParts" />
- <add namespace="System.Web.UI.HtmlControls" />
- </namespaces>
- </pages>
- <!--
- The <authentication> section enables configuration
- of the security authentication mode used by
- ASP.NET to identify an incoming user.
- -->
- <authentication mode="Windows" />
- <!--
- The <customErrors> section enables configuration
- of what to do if/when an unhandled error occurs
- during the execution of a request. Specifically,
- it enables developers to configure html error pages
- to be displayed in place of a error stack trace.
-
- <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
- <error statusCode="403" redirect="NoAccess.htm" />
- <error statusCode="404" redirect="FileNotFound.htm" />
- </customErrors>
- -->
- </system.web>
-</configuration>
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<configuration>
+
+ <appSettings/>
+ <connectionStrings/>
+
+ <system.web>
+ <!--
+ Set compilation debug="true" to insert debugging
+ symbols into the compiled page. Because this
+ affects performance, set this value to true only
+ during development.
+
+ Visual Basic options:
+ Set strict="true" to disallow all data type conversions
+ where data loss can occur.
+ Set explicit="true" to force declaration of all variables.
+ -->
+ <compilation debug="true" strict="false" explicit="true" />
+ <pages>
+ <namespaces>
+ <clear />
+ <add namespace="System" />
+ <add namespace="System.Collections" />
+ <add namespace="System.Collections.Specialized" />
+ <add namespace="System.Configuration" />
+ <add namespace="System.Text" />
+ <add namespace="System.Text.RegularExpressions" />
+ <add namespace="System.Web" />
+ <add namespace="System.Web.Caching" />
+ <add namespace="System.Web.SessionState" />
+ <add namespace="System.Web.Security" />
+ <add namespace="System.Web.Profile" />
+ <add namespace="System.Web.UI" />
+ <add namespace="System.Web.UI.WebControls" />
+ <add namespace="System.Web.UI.WebControls.WebParts" />
+ <add namespace="System.Web.UI.HtmlControls" />
+ </namespaces>
+ </pages>
+ <!--
+ The <authentication> section enables configuration
+ of the security authentication mode used by
+ ASP.NET to identify an incoming user.
+ -->
+ <authentication mode="Windows" />
+ <!--
+ The <customErrors> section enables configuration
+ of what to do if/when an unhandled error occurs
+ during the execution of a request. Specifically,
+ it enables developers to configure html error pages
+ to be displayed in place of a error stack trace.
+
+ <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
+ <error statusCode="403" redirect="NoAccess.htm" />
+ <error statusCode="404" redirect="FileNotFound.htm" />
+ </customErrors>
+ -->
+ </system.web>
+</configuration>
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/VBWebApplication_Wix/Web.config
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/Product.wxs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/Product.wxs?rev=1156097&r1=1156096&r2=1156097&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/Product.wxs
(original)
+++
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/Product.wxs
Wed Aug 10 10:40:25 2011
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";
xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension";>
- <Product Id="03d5af5f-94db-4bd7-829c-7c24ac85e25d" Name="WixMSI"
Language="1033" Version="1.0.0.0" Manufacturer="WixMSI"
UpgradeCode="920b0288-6713-4ee3-858d-45c5c1dcb2bd">
- <?define source2.dir="VBWebApplication_Wix\target\VBWebApplication_Wix"?>
- <Package InstallerVersion="200" Compressed="yes" />
-
-
-
-<Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="ProgramFilesFolder" Name="PFiles">
- <Directory Id="test" Name="test">
- <Component Id="test" Guid="B9E39626-B6F1-4942-B13D-30487E89E036"
- SharedDllRefCount="no" KeyPath="no" NeverOverwrite="no" Permanent="no"
Transitive="no"
- Win64="no" Location="either">
- <CreateFolder/>
- </Component>
- </Directory>
- </Directory>
-</Directory>
-
-
- <Feature Id="test" Title="testfolder" Level="1">
- <ComponentRef Id="test"/>
- </Feature>
-
- </Product>
-</Wix>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";
xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension";>
+ <Product Id="03d5af5f-94db-4bd7-829c-7c24ac85e25d" Name="WixMSI"
Language="1033" Version="1.0.0.0" Manufacturer="WixMSI"
UpgradeCode="920b0288-6713-4ee3-858d-45c5c1dcb2bd">
+ <?define source2.dir="VBWebApplication_Wix\target\VBWebApplication_Wix"?>
+ <Package InstallerVersion="200" Compressed="yes" />
+
+
+
+<Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="ProgramFilesFolder" Name="PFiles">
+ <Directory Id="test" Name="test">
+ <Component Id="test" Guid="B9E39626-B6F1-4942-B13D-30487E89E036"
+ SharedDllRefCount="no" KeyPath="no" NeverOverwrite="no" Permanent="no"
Transitive="no"
+ Win64="no" Location="either">
+ <CreateFolder/>
+ </Component>
+ </Directory>
+ </Directory>
+</Directory>
+
+
+ <Feature Id="test" Title="testfolder" Level="1">
+ <ComponentRef Id="test"/>
+ </Feature>
+
+ </Product>
+</Wix>
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/Product.wxs
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/SampleWebDir.wixobj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/SampleWebDir.wixobj?rev=1156097&r1=1156096&r2=1156097&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/SampleWebDir.wixobj
(original)
+++
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/SampleWebDir.wixobj
Wed Aug 10 10:40:25 2011
@@ -1,61 +1,61 @@
-<?xml version='1.0' encoding='windows-1252'?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
- <Product Name='Foobar 1.0' Id='YOURGUID-86C7-4D14-AEC0-86416A69ABDE'
- Language='1033' Codepage='1252' Version='1.0.0' Manufacturer='Acme Ltd.'>
-
- <Package Id='????????-????-????-????-????????????' Keywords='Installer'
- Description="Acme's Foobar 1.0 Installer"
- Comments='Foobar is a registered trademark of Acme Ltd.'
Manufacturer='Acme Ltd.'
- InstallerVersion='100' Languages='1033' Compressed='yes'
SummaryCodepage='1252' />
-
- <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
- <Property Id='DiskPrompt' Value="Acme's Foobar 1.0 Installation [1]" />
-
- <Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='ProgramFilesFolder' Name='PFiles'>
- <Directory Id='InstallDir' Name='Acme'>
-
- <Component Id='default.htmlComponent'
Guid='YOURGUID-5314-4689-83CA-9DB5C04D5742'>
- <File Id='default.htmFile' Name='default.htm'
LongName='default.htm' KeyPath='yes' DiskId='1' Source='default.htm' />
- </Component>
-
- </Directory>
- </Directory>
-
- <Component Id='TestWebVirtualDirComponent'
Guid='YOURGUID-6304-410E-A808-E3585379EADB'>
- <WebVirtualDir Id='TestWebVirtualDir' Alias='Test'
Directory='InstallDir' WebSite='DefaultWebSite'>
- <WebApplication Id='TestWebApplication' Name='Test' />
- </WebVirtualDir>
- </Component>
-
- </Directory>
-
- <WebSite Id='DefaultWebSite' Description='Default Web Site'>
- <WebAddress Id='AllUnassigned' Port='80' />
- </WebSite>
-
- <Feature Id='TestFeature' Title='TestFeature' Level='1'>
- <ComponentRef Id='TestWebVirtualDirComponent' />
- <ComponentRef Id='default.htmlComponent' />
- </Feature>
-
- </Product>
-</Wix>
+<?xml version='1.0' encoding='windows-1252'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
+ <Product Name='Foobar 1.0' Id='YOURGUID-86C7-4D14-AEC0-86416A69ABDE'
+ Language='1033' Codepage='1252' Version='1.0.0' Manufacturer='Acme Ltd.'>
+
+ <Package Id='????????-????-????-????-????????????' Keywords='Installer'
+ Description="Acme's Foobar 1.0 Installer"
+ Comments='Foobar is a registered trademark of Acme Ltd.'
Manufacturer='Acme Ltd.'
+ InstallerVersion='100' Languages='1033' Compressed='yes'
SummaryCodepage='1252' />
+
+ <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
+ <Property Id='DiskPrompt' Value="Acme's Foobar 1.0 Installation [1]" />
+
+ <Directory Id='TARGETDIR' Name='SourceDir'>
+ <Directory Id='ProgramFilesFolder' Name='PFiles'>
+ <Directory Id='InstallDir' Name='Acme'>
+
+ <Component Id='default.htmlComponent'
Guid='YOURGUID-5314-4689-83CA-9DB5C04D5742'>
+ <File Id='default.htmFile' Name='default.htm'
LongName='default.htm' KeyPath='yes' DiskId='1' Source='default.htm' />
+ </Component>
+
+ </Directory>
+ </Directory>
+
+ <Component Id='TestWebVirtualDirComponent'
Guid='YOURGUID-6304-410E-A808-E3585379EADB'>
+ <WebVirtualDir Id='TestWebVirtualDir' Alias='Test'
Directory='InstallDir' WebSite='DefaultWebSite'>
+ <WebApplication Id='TestWebApplication' Name='Test' />
+ </WebVirtualDir>
+ </Component>
+
+ </Directory>
+
+ <WebSite Id='DefaultWebSite' Description='Default Web Site'>
+ <WebAddress Id='AllUnassigned' Port='80' />
+ </WebSite>
+
+ <Feature Id='TestFeature' Title='TestFeature' Level='1'>
+ <ComponentRef Id='TestWebVirtualDirComponent' />
+ <ComponentRef Id='default.htmlComponent' />
+ </Feature>
+
+ </Product>
+</Wix>
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/SampleWebDir.wixobj
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/WixMSI.wixproj
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/WixMSI.wixproj?rev=1156097&r1=1156096&r2=1156097&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/WixMSI.wixproj
(original)
+++
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/WixMSI.wixproj
Wed Aug 10 10:40:25 2011
@@ -1,64 +1,64 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
- <ProductVersion>3.0</ProductVersion>
- <ProjectGuid>{4150f2a9-45d0-4e6d-9cc4-4d7297bd51db}</ProjectGuid>
- <SchemaVersion>2.0</SchemaVersion>
- <OutputName>WixMSI</OutputName>
- <OutputType>Package</OutputType>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND
'$(MSBuildExtensionsPath32)' != ''
">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == ''
">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
- <OutputPath>bin\$(Configuration)\</OutputPath>
- <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>Debug</DefineConstants>
- <VerboseOutput>True</VerboseOutput>
- <CompilerAdditionalOptions>-ext WixIISExtension</CompilerAdditionalOptions>
- <LinkerAdditionalOptions>-ext WixIISExtension</LinkerAdditionalOptions>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
- <OutputPath>bin\$(Configuration)\</OutputPath>
- <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
- <Cultures>en-US</Cultures>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
- <Cultures>en-US</Cultures>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="Product.wxs" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="pom.xml" />
- </ItemGroup>
- <Import Project="$(WixTargetsPath)" />
- <!--
- To modify your build process, add your task inside one of the targets
below and uncomment it.
- Other similar extension points exist, see Wix.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+ <ProductVersion>3.0</ProductVersion>
+ <ProjectGuid>{4150f2a9-45d0-4e6d-9cc4-4d7297bd51db}</ProjectGuid>
+ <SchemaVersion>2.0</SchemaVersion>
+ <OutputName>WixMSI</OutputName>
+ <OutputType>Package</OutputType>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND
'$(MSBuildExtensionsPath32)' != ''
">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == ''
">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <OutputPath>bin\$(Configuration)\</OutputPath>
+ <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+ <DefineConstants>Debug</DefineConstants>
+ <VerboseOutput>True</VerboseOutput>
+ <CompilerAdditionalOptions>-ext WixIISExtension</CompilerAdditionalOptions>
+ <LinkerAdditionalOptions>-ext WixIISExtension</LinkerAdditionalOptions>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <OutputPath>bin\$(Configuration)\</OutputPath>
+ <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+ <Cultures>en-US</Cultures>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+ <Cultures>en-US</Cultures>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Include="Product.wxs" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="pom.xml" />
+ </ItemGroup>
+ <Import Project="$(WixTargetsPath)" />
+ <!--
+ To modify your build process, add your task inside one of the targets
below and uncomment it.
+ Other similar extension points exist, see Wix.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
</Project>
\ No newline at end of file
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT006/WixMSI/WixMSI.wixproj
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/LocalizationInstaller/LocalizationInstaller.wixproj
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT007/LocalizationInstaller/Product.wxs
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/it/IT008/Sample.wxs
------------------------------------------------------------------------------
svn:eol-style = native
