Author: mhutch
Date: 2007-09-05 08:32:04 -0400 (Wed, 05 Sep 2007)
New Revision: 85355
Modified:
trunk/monodevelop/Extras/AspNetAddIn/ChangeLog
trunk/monodevelop/Extras/AspNetAddIn/Project/XspParameters.cs
trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebControl.xft.xml
trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebForm.xft.xml
trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebHandler.xft.xml
trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebService.xft.xml
trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebControl.xft.xml
trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebForm.xft.xml
trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebHandler.xft.xml
trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebService.xft.xml
trunk/monodevelop/Extras/AspNetAddIn/Templates/MasterPageWithCodeBehind.xft.xml
trunk/monodevelop/Extras/AspNetAddIn/Templates/MasterPageWithNoCodeBehind.xft.xml
trunk/monodevelop/Extras/AspNetAddIn/Templates/WebApplication.xpt.xml
Log:
* Project/XspParameters.cs: Fix some compile warnings.
* Templates/CodeBehindWebHandler.xft.xml,
Templates/EmptyWebForm.xft.xml,
Templates/CodeBehindWebControl.xft.xml,
Templates/CodeBehindWebService.xft.xml,
Templates/CodeBehindWebForm.xft.xml,
Templates/MasterPageWithNoCodeBehind.xft.xml,
Templates/MasterPageWithCodeBehind.xft.xml,
Templates/EmptyWebHandler.xft.xml,
Templates/WebApplication.xpt.xml,
Templates/EmptyWebControl.xft.xml,
Templates/EmptyWebService.xft.xml: Use partial classes where
possible. Default to deploying ASP.NET files rather than building
them. Remove "Hello world" code. Default to 2.0 runtime.
Modified: trunk/monodevelop/Extras/AspNetAddIn/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/ChangeLog 2007-09-05 12:15:02 UTC
(rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/ChangeLog 2007-09-05 12:32:04 UTC
(rev 85355)
@@ -1,3 +1,18 @@
+2007-09-05 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * Project/XspParameters.cs: Fix some compile warnings.
+ * Templates/CodeBehindWebHandler.xft.xml,
Templates/EmptyWebForm.xft.xml,
+ Templates/CodeBehindWebControl.xft.xml,
+ Templates/CodeBehindWebService.xft.xml,
+ Templates/CodeBehindWebForm.xft.xml,
+ Templates/MasterPageWithNoCodeBehind.xft.xml,
+ Templates/MasterPageWithCodeBehind.xft.xml,
+ Templates/EmptyWebHandler.xft.xml, Templates/WebApplication.xpt.xml,
+ Templates/EmptyWebControl.xft.xml, Templates/EmptyWebService.xft.xml:
+ Use partial classes where possible. Default to deploying ASP.NET files
+ rather than building them. Remove "Hello world" code. Default to 2.0
+ runtime.
+
2007-08-31 Mike Krüger <[EMAIL PROTECTED]>
* Gui/AspNetConfigurationPanel.cs,
Gui/AspNetConfigurationPanelWidget.cs,
Modified: trunk/monodevelop/Extras/AspNetAddIn/Project/XspParameters.cs
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Project/XspParameters.cs
2007-09-05 12:15:02 UTC (rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/Project/XspParameters.cs
2007-09-05 12:32:04 UTC (rev 85355)
@@ -78,7 +78,7 @@
set {
try {
port = System.Convert.ToUInt16 (value);
- } catch (InvalidCastException e) {
+ } catch (InvalidCastException) {
throw new ArgumentException ("The port
value is outside the permitted range");
}
}
@@ -90,7 +90,7 @@
try {
System.Net.IPAddress tempAdd =
System.Net.IPAddress.Parse (value);
address = tempAdd.ToString ();
- } catch(FormatException e) {
+ } catch(FormatException) {
throw new ArgumentException ("The IP
address is invalid.");
}
}
Modified:
trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebControl.xft.xml
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebControl.xft.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebControl.xft.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -14,7 +14,7 @@
<!-- Template Content -->
<TemplateFiles>
- <AspNetFile DefaultExtension=".ascx" name="${Name}.ascx">
+ <AspNetFile DefaultExtension=".ascx" name="${Name}.ascx"
BuildAction="FileCopy">
<FileText>
<![CDATA[<%@ Control Language="${Language}" Inherits="${Namespace}.${Name}"
%>]]>
</FileText>
@@ -27,15 +27,23 @@
namespace ${Namespace} {
- public class ${Name} : UserControl
+ public partial class ${Name} : System.Web.UI.UserControl
{
- public void ButtonClick (object sender, EventArgs e)
- {
- textBox1.Text ="Hello World";
- }
}
}]]>
</CodeTranslationFile>
+ <CodeTranslationFile
name="${Name}.ascx.designer.${LanguageExtension}"
ShowAutogenerationNotice="True">
+<![CDATA[using System;
+using System.Web;
+using System.Web.UI;
+
+namespace ${Namespace} {
+
+ public partial class ${Name}
+ {
+ }
+}]]>
+ </CodeTranslationFile>
</TemplateFiles>
<FileOptions />
Modified:
trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebForm.xft.xml
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebForm.xft.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebForm.xft.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Template Originator="Michael Hutchinson"
Created="2006/06/09"
- LastModified="2006/06/18">
+ LastModified="2007/09/05">
<!-- Template Header -->
<TemplateConfiguration>
@@ -14,7 +14,7 @@
<!-- Template Content -->
<TemplateFiles>
- <AspNetFile name="${Name}.aspx">
+ <AspNetFile name="${Name}.aspx" DefaultExtension=".aspx"
BuildAction="FileCopy">
<FileText>
<![CDATA[<%@ Page Language="${Language}"
Inherits="${Namespace}.${Name}" %>
${Doctype}
@@ -24,8 +24,6 @@
</head>
<body>
<form id="form1" runat="server">
- <asp:TextBox id="textBox1" runat="server"/>
- <asp:Button id="button1" runat="server"
OnClick="onButtonClick"/>
</form>
</body>
</html>]]>
@@ -39,15 +37,25 @@
namespace ${Namespace} {
- public class ${Name} : Page
+ public partial class ${Name} : System.Web.UI.Page
{
- public void onButtonClick (object sender, EventArgs e)
- {
- textBox1.Text ="Hello World";
- }
+
}
}]]>
</CodeTranslationFile>
+ <CodeTranslationFile
name="${Name}.aspx.designer.${LanguageExtension}"
ShowAutogenerationNotice="True">
+<![CDATA[using System;
+using System.Web;
+using System.Web.UI;
+
+namespace ${Namespace} {
+
+ public partial class ${Name}
+ {
+
+ }
+}]]>
+ </CodeTranslationFile>
</TemplateFiles>
<FileOptions/>
Modified:
trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebHandler.xft.xml
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebHandler.xft.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebHandler.xft.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -14,26 +14,26 @@
<!-- Template Content -->
<TemplateFiles>
- <AspNetFile name="${Name}.ashx">
+ <AspNetFile name="${Name}.ashx" BuildAction="FileCopy">
<FileText>
<![CDATA[<%@ WebHandler Language="${Language}" Class="${Namespace}.${Name}"
%>]]>
</FileText>
</AspNetFile>
- <AspNetFile name="${Name}.ashx.${LanguageExtension}">
- <FileText>${CodeRegion:script1}</FileText>
- <CodeTranslationFile TagName="script1">
+ <CodeTranslationFile name="${Name}.ashx.${LanguageExtension}">
<![CDATA[using System;
using System.Web;
using System.Web.UI;
-namespace ${Namespace} {
+namespace ${Namespace}
+{
- public class ${Name} : IHttpHandler {
+ public class ${Name} : System.Web.IHttpHandler
+ {
- public void ProcessRequest (HttpContext context) {
- context.Response.ContentType = "text/plain";
- context.Response.Write("Hello World");
+ public void ProcessRequest (HttpContext context)
+ {
+
}
public bool IsReusable {
@@ -43,8 +43,7 @@
}
}
}]]>
- </CodeTranslationFile>
- </AspNetFile>
+ </CodeTranslationFile>
</TemplateFiles>
<FileOptions/>
Modified:
trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebService.xft.xml
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebService.xft.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/Templates/CodeBehindWebService.xft.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -14,7 +14,7 @@
<!-- Template Content -->
<TemplateFiles>
- <AspNetFile name="${Name}.asmx">
+ <AspNetFile name="${Name}.asmx" BuildAction="FileCopy">
<FileText>
<![CDATA[<%@ WebService Language="C#" Class="${Namespace}.${Name}" %>]]>
</FileText>
@@ -22,18 +22,14 @@
<CodeTranslationFile name="${Name}.asmx.${LanguageExtension}">
<![CDATA[using System;
+using System.Web;
using System.Web.Services;
namespace ${Namespace}
{
- class ${Name}
+ public class ${Name} : System.Web.Services.WebService
{
-
- [WebMethod]
- public string SayHello()
- {
- return "Hello World";
- }
+
}
}]]>
</CodeTranslationFile>
Modified: trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebControl.xft.xml
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebControl.xft.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebControl.xft.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -14,7 +14,7 @@
<!-- Template Content -->
<TemplateFiles>
- <AspNetFile name="${Name}.ascx">
+ <AspNetFile name="${Name}.ascx" BuildAction="FileCopy">
<FileText>
<![CDATA[<%@ Control Language="${Language}" ClassName="${Namespace}.${Name}" %>
Modified: trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebForm.xft.xml
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebForm.xft.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebForm.xft.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -14,7 +14,7 @@
<!-- Template Content -->
<TemplateFiles>
- <AspNetFile name="${Name}.aspx">
+ <AspNetFile name="${Name}.aspx" BuildAction="FileCopy">
<FileText>
<![CDATA[<%@ Page Language="${Language}" %>
${Doctype}
Modified: trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebHandler.xft.xml
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebHandler.xft.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebHandler.xft.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -14,7 +14,7 @@
<!-- Template Content -->
<TemplateFiles>
- <AspNetFile name="${Name}.ashx">
+ <AspNetFile name="${Name}.ashx" BuildAction="FileCopy">
<FileText>
<![CDATA[<%@ WebHandler Language="${Language}" Class="${Namespace}.${Name}" %>
${CodeRegion:script1}
@@ -23,13 +23,14 @@
<![CDATA[using System;
using System.Web;
-namespace ${Namespace} {
+namespace ${Namespace}
+{
- public class ${Name} : IHttpHandler {
+ public class ${Name} : System.Web.IHttpHandler
+ {
- public void ProcessRequest (HttpContext context) {
- context.Response.ContentType = "text/plain";
- context.Response.Write("Hello World");
+ public void ProcessRequest (HttpContext context)
+ {
}
public bool IsReusable {
Modified: trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebService.xft.xml
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebService.xft.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/Templates/EmptyWebService.xft.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -14,7 +14,7 @@
<!-- Template Content -->
<TemplateFiles>
- <AspNetFile name="${Name}.asmx">
+ <AspNetFile name="${Name}.asmx" BuildAction="FileCopy">
<FileText>
<![CDATA[<%@ WebService Language="C#" Class="${Namespace}.${Name}" %>
${CodeRegion:script1}
@@ -28,12 +28,6 @@
{
class ${Name}
{
-
- [WebMethod]
- public string SayHello()
- {
- return "Hello World";
- }
}
}]]>
</CodeTranslationFile>
Modified:
trunk/monodevelop/Extras/AspNetAddIn/Templates/MasterPageWithCodeBehind.xft.xml
===================================================================
---
trunk/monodevelop/Extras/AspNetAddIn/Templates/MasterPageWithCodeBehind.xft.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++
trunk/monodevelop/Extras/AspNetAddIn/Templates/MasterPageWithCodeBehind.xft.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -14,9 +14,9 @@
<!-- Template Content -->
<TemplateFiles>
- <AspNetFile name="${Name}.master">
+ <AspNetFile name="${Name}.master" BuildAction="FileCopy">
<FileText>
- <![CDATA[<%@ Master Language="${Language}"
CodeFile="${Name}.master.${LanguageExtension}" Inherits="Master" %>
+ <![CDATA[<%@ Master Language="${Language}"
Inherits="${Namespace}.${Name}" %>
${Doctype}
<html>
<head>
@@ -37,12 +37,23 @@
<![CDATA[using System;
using System.Web;
using System.Web.UI;
-
-public partial class ${Name} : System.Web.UI.MasterPage
-{
+namespace ${Namespace} {
+ public partial class ${Name} : System.Web.UI.MasterPage
+ {
+ }
}
]]>
</CodeTranslationFile>
- </TemplateFiles>
+ <CodeTranslationFile
name="${Name}.master.designer.${LanguageExtension}"
ShowAutogenerationNotice="True">
+<![CDATA[using System;
+using System.Web;
+using System.Web.UI;
+namespace ${Namespace} {
+ public partial class ${Name}
+ {
+ }
+}
+]]>
+ </CodeTranslationFile></TemplateFiles>
<FileOptions/>
</Template>
Modified:
trunk/monodevelop/Extras/AspNetAddIn/Templates/MasterPageWithNoCodeBehind.xft.xml
===================================================================
---
trunk/monodevelop/Extras/AspNetAddIn/Templates/MasterPageWithNoCodeBehind.xft.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++
trunk/monodevelop/Extras/AspNetAddIn/Templates/MasterPageWithNoCodeBehind.xft.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -14,7 +14,7 @@
<!-- Template Content -->
<TemplateFiles>
- <AspNetFile name="${Name}.master">
+ <AspNetFile name="${Name}.master" BuildAction="FileCopy">
<FileText>
<![CDATA[<%@ Master Language="${Language}"%>
${Doctype}
Modified: trunk/monodevelop/Extras/AspNetAddIn/Templates/WebApplication.xpt.xml
===================================================================
--- trunk/monodevelop/Extras/AspNetAddIn/Templates/WebApplication.xpt.xml
2007-09-05 12:15:02 UTC (rev 85354)
+++ trunk/monodevelop/Extras/AspNetAddIn/Templates/WebApplication.xpt.xml
2007-09-05 12:32:04 UTC (rev 85355)
@@ -26,9 +26,10 @@
<Project name = "${ProjectName}" directory = "." type =
"AspNetApp">
<Options />
<References>
- <Reference type="Gac" refto="System,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <Reference type="Gac" refto="System.Web,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <Reference type="Gac" refto="System.Xml,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <Reference type="Gac" refto="System,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <Reference type="Gac" refto="System.Web,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <Reference type="Gac" refto="System.Xml,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <Reference type="Gac"
refto="System.Web.Services, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a" />
</References>
<Files>
<AspNetFile name="Default.aspx"
BuildAction="FileCopy">
@@ -40,9 +41,7 @@
<title>${Name}</title>
</head>
<body>
- <form id="form1" runat="server">
- <asp:TextBox id="textBox1" runat="server"/>
- <asp:Button id="button1" runat="server"
OnClick="onButtonClick"/>
+ <form id="form1" runat="server">
</form>
</body>
</html>]]>
@@ -54,17 +53,27 @@
using System.Web;
using System.Web.UI;
-namespace ${Namespace} {
+namespace ${Namespace}
+{
- public class ${Name} : Page
+ public partial class ${Name} : System.Web.UI.Page
{
- public void onButtonClick (object sender, EventArgs e)
- {
- textBox1.Text ="Hello World";
- }
}
}]]>
</CodeTranslationFile>
+ <CodeTranslationFile
name="Default.aspx.designer.${LanguageExtension}"
ShowAutogenerationNotice="True">
+<![CDATA[using System;
+using System.Web;
+using System.Web.UI;
+
+namespace ${Namespace}
+{
+
+ public partial class ${Name}
+ {
+ }
+}]]>
+ </CodeTranslationFile>
</Files>
</Project>
</Combine>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
