Commit Graph
504 Commits
Author SHA1 Message Date
Marek Habersack 6e3965db61 A few changes related to App_*Resources and App_Code folders
svn path=/trunk/mcs/; revision=67517
2006-11-08 13:43:06 +00:00
Marek Habersack 23ca637aab Removed unnecessary WriteLines
svn path=/trunk/mcs/; revision=67516
2006-11-08 13:14:16 +00:00
Marek Habersack b309d37d40 Implementation of the App_Code folder compiler for ASP.NET 2.0
svn path=/trunk/mcs/; revision=67511
2006-11-08 12:08:05 +00:00
Marek Habersack 01e5a48153 And the new files for the resources compiler
svn path=/trunk/mcs/; revision=66800
2006-10-18 20:31:35 +00:00
Marek Habersack 58fca48c17 Add support for App_GlobalResources and App_LocalResources
svn path=/trunk/mcs/; revision=66799
2006-10-18 20:30:10 +00:00
Igor Zelmanovich 2b394a35ea 2006-10-03 Igor Zelmanovich <[email protected]>
* TemplateControlCompiler.cs: fixed: Bind functions (Data-Binding Syntax).
	At run time, the Bind method calls the Eval method, if there is DataItem
	!= null to bind to.
	If there is DataItem == null (like InsertItemTemplate in FormView) Bind
	method don't raise exception and works properly to extract data from
	bounded controls on postback.
		

svn path=/trunk/mcs/; revision=66192
2006-10-03 14:12:38 +00:00
Gonzalo Paniagua Javier 2d4d7b56a5 2006-09-21 Gonzalo Paniagua Javier <[email protected]>
* Test/mainsoft/NunitWeb/NunitWeb/StandardUrl.cs:
	* Test/mainsoft/NunitWeb/NunitWeb/Resources/MyDerived.master:
	* Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithDerivedMaster.aspx:
	* System.Web.UI/MasterPageParser.cs:
	* System.Web.dll.sources:
	* System.Web.Compilation/MasterPageCompiler.cs:
	* System.Web.Compilation/AspGenerator.cs: add support for the MasterType
	directive for master pages.
	Patch by Joel Reed.


svn path=/trunk/mcs/; revision=65748
2006-09-21 04:54:12 +00:00
Gonzalo Paniagua Javier 8fe18069f8 2006-09-20 Gonzalo Paniagua Javier <[email protected]>
* AspGenerator.cs: if we are tracking non-server tags for
	well-formedness, handle tags that do not need to be closed (br, img,...)
	Fixes bug #79437.


svn path=/trunk/mcs/; revision=65738
2006-09-20 19:27:20 +00:00
Gonzalo Paniagua Javier aeae1b7019 2006-09-18 Gonzalo Paniagua Javier <[email protected]>
* System.Web.UI/PageParser.cs:
	* System.Web.Compilation/PageCompiler.cs: support the
	EnableEventValidation attribute.


svn path=/trunk/mcs/; revision=65610
2006-09-18 21:42:21 +00:00
Gonzalo Paniagua Javier 343a3efbcd 2006-09-08 Gonzalo Paniagua Javier <[email protected]>
* AspGenerator.cs: after parsing an include file, don't error out if we
	still have opened tags unless this was the last file to parse. Fixes
	bug #79318.


svn path=/trunk/mcs/; revision=65133
2006-09-08 20:29:24 +00:00
Konstantin Triger 0138a32700 Ensure the source file stream is closed
svn path=/trunk/mcs/; revision=64916
2006-09-05 07:28:47 +00:00
Kornél Pál 133ce64e0f Use assembly name and file version constants.
svn path=/trunk/mcs/; revision=64391
2006-08-25 20:32:53 +00:00
Vladimir Krasnov 69566b12eb * ThemeDirectoryCompiler.jvm.cs: implemented GetCompiledInstance
* MasterPageParser.jvm.cs: fixed path resolving GetCompiledMasterInstance

svn path=/trunk/mcs/; revision=64097
2006-08-20 12:57:38 +00:00
Gonzalo Paniagua Javier 1a310ca05e 2006-08-10 Gonzalo Paniagua Javier <[email protected]>
* System.Web.Hosting/BareApplicationHost.cs:
	* System.Web.Hosting/ApplicationManager.cs: remove unloaded domains.

	* System.Web.Compilation/ClientBuildManager.cs: handle domain shutdown
	and unload. Implemented some properties. Commented.


svn path=/trunk/mcs/; revision=63627
2006-08-10 22:06:30 +00:00
Andrew Skiba a9221254d5 render CSS path as a virtual path
svn path=/trunk/mcs/; revision=63576
2006-08-10 08:32:56 +00:00
Vladimir Krasnov 9db7e539f5 * added ThemeDirectoryCompiler.jvm.cs
svn path=/trunk/mcs/; revision=63498
2006-08-08 17:00:23 +00:00
Gonzalo Paniagua Javier 3f0f39e498 2006-07-28 Gonzalo Paniagua Javier <[email protected]>
* PageThemeCompiler.cs: Don't generate a 'Items.Clear ()' call if
	the property Items does not exist. Patch by Marek Habersack that fixes
	bug #78971.


svn path=/trunk/mcs/; revision=63097
2006-07-28 19:06:41 +00:00
Gonzalo Paniagua Javier 828f21b0ff 2006-07-28 Gonzalo Paniagua Javier <[email protected]>
* TemplateControlCompiler.cs: support assigning nullable types.
	Patch by Marek Habersack that fixes bug #78970.


svn path=/trunk/mcs/; revision=63094
2006-07-28 18:50:22 +00:00
Gonzalo Paniagua Javier 155d66b68a 2006-07-13 Gonzalo Paniagua Javier <[email protected]>
* TemplateControlCompiler.cs: make password work again.


svn path=/trunk/mcs/; revision=62584
2006-07-13 21:44:46 +00:00
Juraj Skripsky 4940e7d5b0 2006-06-21 Juraj Skripsky <[email protected]>
* AspTokenizer.cs (ReadAttValue), AspParser.cs (GetAttributes):
	MS.NET handles nested quotes differently for server controls and
	for "normal" controls. Add a property "AlternatingQuotes" to the
	tokenizer and let the parser decide whether it is well-formed or not.

--This line, and thoae below, will be ignored--
M    System.Web.Compilation/AspTokenizer.cs
M    System.Web.Compilation/AspParser.cs
M    System.Web.Compilation/ChangeLog

svn path=/trunk/mcs/; revision=61894
2006-06-21 08:50:43 +00:00
Andrew Skiba a61790c0cd take care of UrlPropertyAttribute
svn path=/trunk/mcs/; revision=61875
2006-06-20 14:11:42 +00:00
Andrew Skiba 1d80fed29a Check IsWritablePropertyOrField before generating code for assignment statement and DataBind event.
svn path=/trunk/mcs/; revision=61826
2006-06-18 10:51:24 +00:00
Juraj Skripsky 1a1d81583a 2006-06-15 Juraj Skripsky <[email protected]>
* AspTokenizer.cs (ReadAttValue), AspParser.cs (GetAttributes):
	Don't allow an attribute value to contain the same quote characters
	as the ones used for delimiting the value itself. Add a token
	NOTWELLFORMED to signal that case to AspParser. Fixes bug #78643.


svn path=/trunk/mcs/; revision=61758
2006-06-15 15:08:41 +00:00
Konstantin Triger 8799f00b45 load themes relative to context root
svn path=/trunk/mcs/; revision=61560
2006-06-08 11:35:11 +00:00
Andrew Skiba db448f91e1 use UrlUtils.Combine to combine pathes
svn path=/trunk/mcs/; revision=59813
2006-04-24 14:20:05 +00:00
Andrew Skiba 0a4655895b Scan css files from theme directory and put them into __linkedStyleSheets field of generated theme page
svn path=/trunk/mcs/; revision=59787
2006-04-23 08:12:59 +00:00
Chris Toshok cef1d6fc41 2006-04-20 Chris Toshok <[email protected]>
* BaseCompiler.cs: for 2.0, emit the correct namespace and class
        names in the case where you use "NS.ClassName" in the Inherits
        attribute.  Fixes bug #78135.


svn path=/trunk/mcs/; revision=59706
2006-04-20 17:14:45 +00:00
Gonzalo Paniagua Javier eee8a87b49 2006-04-20 Gonzalo Paniagua Javier <[email protected]>
* CachingCompiler.cs: no need to play the Wait/PulseAll game, as we
	already acquired the lock even when we might have not created the 'key'
	to the compilation ticket.


svn path=/trunk/mcs/; revision=59705
2006-04-20 16:32:38 +00:00
Andrew Skiba 4ac1860607 add to the directory parser all the assemblies found by theme file parsers
svn path=/trunk/mcs/; revision=59521
2006-04-16 11:44:14 +00:00
Lluis Sanchez 0f8b236ef8 2006-04-12 Lluis Sanchez Gual <[email protected]>
* TemplateControlCompiler.cs: Properly read all content of
	string properties.


svn path=/trunk/mcs/; revision=59382
2006-04-11 22:05:23 +00:00
Andrew Skiba 99d20dcc77 fix for partial parsers
svn path=/trunk/mcs/; revision=59363
2006-04-11 15:21:58 +00:00
Andrew Skiba 2f9f5035cb map the virtual path to the physical path
svn path=/trunk/mcs/; revision=59345
2006-04-11 07:35:58 +00:00
Miguel de Icaza cfe5abfc83 2006-04-08 Miguel de Icaza <[email protected]>
* TemplateControlCompiler.cs: An attempt to fix the regression
	introduced in r58505 (a bug fix for 77762).   This was reported in
	the mailing list with a batch of new 2.0 failures.

	We really need a test suite in NUnit to check on ASP.NET aspx

svn path=/trunk/mcs/; revision=59249
2006-04-08 18:39:54 +00:00
Robert Jordan 009188af4b 2006-03-27 Robert Jordan <[email protected]>
* CachingCompiler.cs:  change the compilation locking scheme
	from "one mcs per process" to "one mcs per file".


svn path=/trunk/mcs/; revision=58595
2006-03-27 16:52:01 +00:00
Gonzalo Paniagua Javier 915d986f09 2006-03-24 Gonzalo Paniagua Javier <[email protected]>
* System.Web.UI/ControlBuilder.cs: when creating a default property
	builder, handle strings specially.

	* System.Web.UI/StringPropertyBuilder.cs: new builder used in
	TextBox 2.0.
	* System.Web.dll.sources: add StringPropertyBuilder.
	* System.Web.Compilation/TemplateControlCompiler.cs: handle the new
	StringPropertyBuilder.

	Fixes bug #77762.


svn path=/trunk/mcs/; revision=58505
2006-03-24 23:11:09 +00:00
Chris Toshok 360328e019 fix another NRE
svn path=/trunk/mcs/; revision=58496
2006-03-24 21:26:26 +00:00
Chris Toshok 8237bb2866 2006-03-24 Chris Toshok <[email protected]>
* BaseCompiler.cs (GetCompiledType): fall back to CodeDomProvider
	if system.web/compilation doesn't list a compiler for our
	language.


svn path=/trunk/mcs/; revision=58493
2006-03-24 21:20:01 +00:00
Chris Toshok e40c1de28e 2006-03-13 Chris Toshok <[email protected]>
* TemplateControlCompiler.cs (InitMethod): when generating the
	call to ApplyStyleSheetSkin, don't just blindly pass "this" as the
	argument to it.  Only do that if the class we're compiling is
	actually a subclass of Page.  If it's not, pass this.Page.


svn path=/trunk/mcs/; revision=57910
2006-03-13 21:29:02 +00:00
Chris Toshok a41dc6da6b 2006-03-07 Chris Toshok <[email protected]>
* AspGenerator.cs: refactor the parsing code so that we can
	initiate parsing from outside this class.

	* PageCompiler.cs (PrependStatementsToFrameworkInitialize): new
	method, add our StyleSheetTheme assignment here.
	(AppendStatementsToFrameworkInitialize): rename AddStatements* to
	this.

	* TemplateControlCompiler.cs (EnsureID): make protected.
	(CreateAssignStatementsFromAttributes): same
	(AddChildCall): same.
	(CreateControlTree): same.
	(CreateFrameworkInitializeMethod): change
	"AddStatementsToFrameworkInitialize" to
	"AppendStatementsToFrameworkInitialize", and add call to
	"PrependStatementsToFrameworkInitialize" before the generation of
	"base.FrameworkInitialize()."

	* PageThemeCompiler.cs (CreateControlSkinMethod): remove spew.


svn path=/trunk/mcs/; revision=57674
2006-03-07 22:27:51 +00:00
Chris Toshok f28eecd2e1 2006-03-07 Chris Toshok <[email protected]>
* ThemeDirectoryCompiler.cs: new file.

	* PageThemeCompiler.cs: new file.


svn path=/trunk/mcs/; revision=57671
2006-03-07 22:00:21 +00:00
Chris Toshok ffcc362a42 2006-03-07 Chris Toshok <[email protected]>
* BaseCompiler.cs: fix typo in "initialize" in multiple places.
	(Init): move the CreateMethods call here.


svn path=/trunk/mcs/; revision=57669
2006-03-07 21:58:01 +00:00
Chris Toshok 9cd26e2c03 In System.Web.UI:
2006-03-02  Chris Toshok  <[email protected]>

	* Control.cs (ApplyStyleSheetTheme): remove the exception, and add
	a MonoTODO.

	* Page.cs (Theme): implement setter/getter.
	(StyleSheetTheme): same.
	
	* PageParser.cs (ProcessMainAttributes): parse the Theme and
	StyleSheetTheme attributes.

In System.Web.UI.WebControls:
2006-03-02  Chris Toshok  <[email protected]>

	* WebControl.cs (SkinID): implement setter/getter, and have them
	just chain up to base.SkinID.

In System.Web.Compilation:
2006-03-02  Chris Toshok  <[email protected]>

	* TemplateControlCompiler.cs (InitMethod): emit an assignment for
	SkinID just after the creation of our object, and right after that
	call "_ctrl.ApplyStyleSheetSkin (page)".
	(CreateAssignStatementsFromAttributes): split out the majority of
	this code to CreateAssignStatementFromAttribute, and change this
	method to simply a loop over the attribute keys.  In the 2.0 case,
	skip the SkinID property, since that's handled explicitly in
	InitMethod.

	* PageCompiler.cs (AddStatementsToInitMethod): emit assignments
	for Theme and StyleSheetTheme.


svn path=/trunk/mcs/; revision=57516
2006-03-02 19:30:08 +00:00
Chris Toshok a381748f0b oops
svn path=/trunk/mcs/; revision=57223
2006-02-23 23:19:16 +00:00
Chris Toshok 553bc8d055 In System.Web.Compilation:
2006-02-23  Chris Toshok  <[email protected]>

	* TemplateControlCompiler.cs (AddContentTemplateInvocation): track
	change from ContentControlBuilderInternal to
	ContentBuilderInternal.
	(AddCodeRender): same.

In System.Web.UI.WebControls:
	* CheckBox.cs, ContentControlBuilderInternal.cs, Content.cs,
	ContentPlaceHolderBuilder.cs, ContentPlaceHolder.cs,
	DataControlFieldHeaderCell.cs, DataGridColumn.cs,
	HierarchicalDataBoundControl.cs, HyperLinkField.cs,
	ImageButton.cs, ImageField.cs, Literal.cs,
	ObjectDataSourceView.cs, TextBox.cs: more corcompare work.


svn path=/trunk/mcs/; revision=57221
2006-02-23 23:04:09 +00:00
Gonzalo Paniagua Javier ca6da00798 2006-02-16 Gonzalo Paniagua Javier <[email protected]>
* AssemblyBuilder.cs:
	* BuildManager.cs: compile the assembly from AssemblyBuilder and use
	GetGeneratedType() on the BuildProvider instead of loading the assembly
	and trying a wild guess at the type name.


svn path=/trunk/mcs/; revision=56964
2006-02-16 20:45:20 +00:00
Gonzalo Paniagua Javier f269a83e07 2006-02-14 Gonzalo Paniagua Javier <[email protected]>
* System.Web.UI/WebHandlerParser.cs:
	* System.Web.UI/WebServiceParser.cs:
	* System.Web.UI/UserControlParser.cs:
	* System.Web.UI/PageParser.cs: added new ctor that uses a TextReader
	as input.

	* System.Web.UI/TemplateControlParser.cs: new Reader property.
	* System.Web.UI/SimpleWebHandlerParser.cs: new Reader property and
	ctor.

	* System.Web.dll.sources: added new files.

	* System.Web.Compilation/GlobalAsaxCompiler.cs:
	* System.Web.Compilation/PageCompiler.cs:
	* System.Web.Compilation/TemplateControlCompiler.cs: CreateMethods is
	now internal.

	* System.Web.Compilation/WebServiceBuildProvider.cs:
	* System.Web.Compilation/PageBuildProvider.cs:
	* System.Web.Compilation/UserControlBuildProvider.cs:
	* System.Web.Compilation/WebHandlerBuildProvider.cs: new build
	providers.

	* System.Web.Compilation/BuildProvider.cs: add assemblies.

	* System.Web.Compilation/BaseCompiler.cs: expose the provider and the
	compile unit through properties.

svn path=/trunk/mcs/; revision=56878
2006-02-14 22:02:15 +00:00
Gonzalo Paniagua Javier 6be4ffb621 2006-02-10 Gonzalo Paniagua Javier <[email protected]>
* System.Web.Configuration_2.0/Compiler.cs:
	* System.Web.Configuration_2.0/CompilerCollection.cs: removed
	compatibility code.

	* System.Web.Configuration_2.0/BuildProviderCollection.cs: add
	GetProviderForExtension().

	* System.Web.UI/IThemeResolutionService.cs: this is now added to the
	sources file, but some other stuff does not compile yet as the
	interface changed after the beta.

	* System.Web.UI/ObjectConverter.cs: removed extra attribute.

	* System.Web.UI/ObjectStateFormatter.cs: add IStateFormatter for 2.0.

	* System.Web.UI/ICallbackEventHandler.cs: update the interface, but
	commented the 'good' stuff out, since other files need to be fixed
	too.

	* System.Web.dll.sources: add new files.

	* System.Web.Configuration/CompilationConfiguration.cs:
	* System.Web.Configuration/CompilationConfigurationHandler.cs: only
	compile these for pre-2.0 assemblies.

	* System.Web.Hosting/DefaultVirtualPathProvider.cs: add some
	comments/TODO.
	* System.Web.Hosting/HostingEnvironment.cs: initialize the
	default value for VirtualPathProvider.

	* System.Web.Compilation/CompilerType.cs: implemented.

	* System.Web.Compilation/AssemblyBuilder.cs: implemented most of it.

	* System.Web.Compilation/WebServiceCompiler.cs:
	* System.Web.Compilation/CachingCompiler.cs: update 2.0 compiler
	instance creation code.

	* System.Web.Compilation/ClientBuildManager.cs: implemented some of
	its methods. Not yet ready.

	* System.Web.Compilation/BuildManager.cs: the more interesting methods
	are implemented now.

	* System.Web.Compilation/BaseCompiler.cs: delete the temporary files
	in case of error.

	* System.Web.Compilation/BuildProvider.cs: implemented the
	Get*Compiler* protected methods.


svn path=/trunk/mcs/; revision=56781
2006-02-10 23:43:09 +00:00
Chris Toshok 09e8f2a763 2006-02-07 Chris Toshok <[email protected]>
* TemplateControlCompiler.cs (AddParsedSubObjectStmt): append the
	calls to AddParsedSubObject to a special statement collection --
	builder.flushOutputStatements -- not to builder.method.Statements.
	(InitMethod): initially, set flushOutputStatements to
	method.Statements.  If we're dealing with a ContentPlaceHolder,
	set flushOutputStatements to be the else block of a conditional we
	create.  This causes the compiled control to fall back to the
	ContentPlaceHolder's child controls in case there's no
	corresponding Content template.
	(AddChildCall): use methodStatements instead of method.Statements.
	(CreateControlTree): same.

	* PageCompiler.cs (CreatePropertyAssign): factor out the
	string,string implementation and add one that also takes a
	CodeExpression; make the string,string implementation call the
	three arg one with thisRef.
	(AddStatementsToInitMethod): make use of the 3-arg form of
	CreatePropertyAssign to reduce code.  Also, add support for
	setting the page's Title from the parser's Title.


svn path=/trunk/mcs/; revision=56639
2006-02-07 20:42:35 +00:00
Chris Toshok 800a78cd46 2006-02-07 Chris Toshok <[email protected]>
* TemplateControlCompiler.cs (AddParsedSubObjectStmt): append the
	calls to AddParsedSubObject to a special statement collection --
	builder.flushOutputStatements -- not to builder.method.Statements.
	(InitMethod): initially, set flushOutputStatements to
	method.Statements.  If we're dealing with a ContentPlaceHolder,
	set flushOutputStatements to be the else block of a conditional we
	create.  This causes the compiled control to fall back to the
	ContentPlaceHolder's child controls in case there's no
	corresponding Content template.

	* PageCompiler.cs (CreatePropertyAssign): factor out the
	string,string implementation and add one that also takes a
	CodeExpression; make the string,string implementation call the
	three arg one with thisRef.
	(AddStatementsToInitMethod): make use of the 3-arg form of
	CreatePropertyAssign to reduce code.  Also, add support for
	setting the page's Title from the parser's Title.


svn path=/trunk/mcs/; revision=56635
2006-02-07 20:10:07 +00:00
Chris Toshok e210711eea 2006-02-07 Chris Toshok <[email protected]>
* UserControlCompiler.cs (AddStatementsToInitMethod): emit code to
	assign __ctrl.MasterPageFile to our master page, if we have one.

	* PageCompiler.cs (CreateContructor): remove the MasterPageFile
	assignment from here.
	(AddStatementsToInitMethod): and move it here.
	
	* TemplateControlCompiler.cs (InitMethod): in the case where
	builder is a RootBuilder (we're building the __BuildControlTree
	method), call a virtual method so that subclasses can add their
	own statements to the method (used by both Page and MasterPage);
	Also, in the RootBuilder case, the argument should be the
	parser.ClassName type (the class we're building); lastly, expand
	the ContentPlaceHolder logic to include all the
	ContentTemplates/InstantiateIn magic.
	(AddStatementsToInitMethod): empty virtual method.
	(AddContentTemplateInvocation): ContentControlBuilder ->
	ContentControlBuilderInternal.
	(CreateControlTree): same.
	(CallBaseFrameworkInitialize): new function, create call to
	base.FrameworkInitialize.
	(CreateFrameworkInitializeMethod): call CallBaseFrameworkIniitialize.


svn path=/trunk/mcs/; revision=56619
2006-02-07 16:48:02 +00:00