Commit Graph
12 Commits
Author SHA1 Message Date
Igor Zelmanovich 43dd011987 added TARGET_JVM ifdefs
svn path=/trunk/mcs/; revision=94044
2008-01-27 12:24:31 +00:00
Marek Habersack e71f514f40 2008-01-24 Marek Habersack <[email protected]>
* WebHandlerBuildProvider.cs: derive from the new
	SimpleBuildProvider class.

	* BuildManager.cs: full implementation of the batch compilation
	for the 2.0 profile. The implementation is most probably different
	to MS.NET's but the effects are the same (or nearly the same -
	there are some minor differences). There are missing bits and
	pieces, but minor ones - to be added later.

	* SimpleBuildProvider.cs: new build provider abstract class
	deriving from the GenericBuildProvider that implements common code
	for building web handlers and web services.

	* GenericBuildProvider.cs: new generic abstract class used to
	implement base builder code for all the build provider types and
	maximize code reuse.

	* PageBuildProvider.cs: derive from the new TemplateBuildProvider
	class and implement all the necessary abstract members. 
	Handle "fake" virtual paths, to properly support generating of the
	WSDL helper code.

	* BuildProvider.cs: SetVirtualPath now converts the passed path to
	absolute URL.
	Added internal virtual method GenerateCode, used by derived
	classes.
	SetCommonParameters no longer sets the referenced assemblies, this
	is done in BuildManager now.
	Added an internal virtual property CodeUnit which returns the
	build provider's compilation unit.

	* PageCompiler.cs: fix assignment of base types for asynchronous
	pages, to match MS.NET.
	For asynchronous pages, add the necessary methods generation.

	* BaseCompiler.cs: default namespace is now set using a constant.
	Renamed the Init method into ConstructType, to better reflect its
	purpose and made the method internal - it is used by the build
	providers.
	Added several CreateProvider overloads for easier and more unified
	compilation provider creation.
	Added an internal MainClassType property to enable class type name
	retrieval from other parts of the class hierarchy.

	* ApplicationFileBuildProvider.cs: new build provider deriving
	from the TemplateBuildProvider class to compile the global.asax
	file.

	* AspGenerator.cs: properly handle parsers which have no input
	file path given, but use TextReader instead.
	Dependencies are virtual paths now, convert them to physical ones
	before creating cache dependency.

	* CachingCompiler.cs: parser dependencies are virtual paths now,
	convert them to physical ones before creating cache dependency.

	* AssemblyBuilder.cs: full implementation of the documented
	functionality as well as a lot of internal build code
	added. Produces assemblies using the same style what MS.NET for
	temporary and target file naming. Handles partial type squashing
	if the same partial type is used by several code compile units
	added to the same builder instance.

	* MasterPageBuildProvider.cs: use the new TemplateBuildProvider
	base class and add implementation of all the abstract methods
	required by it.

	* ThemeDirectoryBuildProvider.cs: new build provider to compile
	theme directories. Replaces the old ThemeDirectoryCompiler class.

	* UserControlBuildProvider.cs: use the new TemplateBuildProvider
	base class and add implementation of all the abstract methods
	required by it.

	* TemplateBuildProvider.cs: new internal abstract class which
	implements the common tasks for all the template control build
	providers.

	* WebServiceBuildProvider.cs: use the new SimpleBuildProvider base
	type to implement building.

2008-01-24  Marek Habersack  <[email protected]>

	* PageThemeFileParser.cs: the DefaultBaseType property removed.

	* ApplicationFileParser.cs: added constructor which takes a
	TextReader.
	Removed the DefaultBaseType property.
	Added the Reader property.

	* MasterPage.cs: use BuildManager to create page instance.

	* WebHandlerParser.cs: added a compatibility constructor.

	* TemplateControl.cs: GetTypeFromControlPath uses
	BuildManager.GetCompiledType for the 2.0+ profile.

	* WebServiceParser.cs: added a compatibility internal
	constructor.

	* SimpleWebHandlerParser.cs: properly treat context and
	physicalPath parameters to the constructor, especially for the
	2.0+ profile where they are obsolete.
	Dependencies are added using virtual paths.

	* PageThemeParser.cs: DefaultBaseType property removed.

	* Page.cs: Style sheets and themes are compiled using
	BuildManager.
	Previous page instance is compiled using BuildManager for the 2.0+
	profile.

	* MasterPageParser.cs: Use BuildManager to create instance and
	compile types.
	Dependencies are added using virtual paths.

	* SimpleHandlerFactory.cs: Use
	BuildManager.CreateInstanceFromVirtualPath for the 2.0+ profile.

	* UserControlParser.cs: if the parser is created using a
	TextReader, take the input file path from the virtual path.
	Added a new internal constructor which takes both a TextReader and
	an inputFile parameters.
	Set base type to the default in the constructors.
	Use virtual path when setting master page dependency.
	DefaultBaseTypename doesn't use a literal string in the 2.0+
	profile, it gets the base type from the application
	configuration.

	* TemplateControlParser.cs: Dependency on a control/page mentioned
	in the Reference directive is registered using the virtual path.
	TextReader property is an override now.

	* TemplateParser.cs: RegisterCustomControl adds a dependency on
	the virtual path, not the physical path. The custom control is
	compiled using BuildManager.GetCompiledType for the 2.0+ profile.
	RegisterNamespace does not add a dependency on the assembly.
	LoadType does not add a dependency on the assembly.
	Legacy Src attribute is handled properly now.
	Dependency on code-behind (Src and CodeFile directive attributes)
	is added using the code-behind file's virtual path.
	GetAssemblyFromSource adds a dependency using the virtual path.
	DefaultBaseType implemented here, using DefaultBaseTypeName which
	is implemented in the descendant classes.
	Added internal CodeBehindSource property, used by build
	providers.
	ClassName property works correctly if inputFile is missing
	(e.g. when the parser has been created using a TextReader)
	Added a virtual internal property TextReader to return the readed
	which has been used to create the parser instance.

	* PageHandlerFactory.cs: GetHandler uses
	BuildManager.CreateInstanceFromVirtualPath for the 2.0+ profile.

	* PageParser.cs: set the default base type in the constructors.
	If the input file is not passed to a constructor, take the input
	file path from the virtual path.
	GetCompiledPageInstance uses BuildManager.CreateInstanceFromVirtualPath
	for the 2.0+ profile.
	MasterPage dependency is set using the virtual path of the master
	page.
	MasterPage is compiled into a type using BuildManager.GetCompiledType.
	GetCompiledPageType uses BuildManager.GetCompiledType for the 2.0
	profile.
	DefaultBaseType override removed, it is implemented in the
	TemplateParser class.
	DefaultBaseTypename doesn't use a literal string in the 2.0+
	profile, it gets the base type from the application
	configuration.

2008-01-24  Marek Habersack  <[email protected]>

	* HttpApplicationFactory.cs: use BuildManager.GetCompiledType to
	build the application (global.asax) file.

svn path=/trunk/mcs/; revision=93848
2008-01-24 21:55:44 +00:00
Marek Habersack 54ba93e32d 2007-08-20 Marek Habersack <[email protected]>
* MasterPage.cs: use the place holder IDs collection instead of
	the placholder collection to see if we have the place holder in
	the master page. Fixes bug #82485.

	* MasterPageParser.cs: store the content place holder ids in the
	internal cache to gain access to them when needed.

2007-08-20  Marek Habersack  <[email protected]>

	* ContentPlaceHolderBuilder.cs: store place holder id in the
	parser's internal place holder id list for later reference. Fixes
	bug #82485.

svn path=/trunk/mcs/; revision=84441
2007-08-20 10:38:56 +00:00
Gert Driesen c344c3b5d8 * MasterPage.cs: Include relative URL of MasterPage in exception
message.

svn path=/trunk/mcs/; revision=84347
2007-08-18 07:43:59 +00:00
Marek Habersack 8ad2ae5809 2007-08-18 Marek Habersack <[email protected]>
* MasterPage.cs: if a ContentPlaceHolder ID is not found in the
            associated MasterPage, throw an exception. This is compatible with
            what MS.NET does. Fixes bug #82447.

svn path=/trunk/mcs/; revision=84342
2007-08-18 01:34:40 +00:00
Vladimir Krasnov c7513d3651 * MasterPage.cs: fixed default values, fixed AddContentTemplate
svn path=/trunk/mcs/; revision=63171
2006-07-31 11:29:43 +00:00
Chris Toshok b6274ae5d5 2006-03-13 Chris Toshok <[email protected]>
* UserControl.cs: rework InitializeAsUserControl and
	InitializeAsUserControlInternal - the Internal variety doesn't set
	this.page to null now.

	* MasterPage.cs (CreateMasterPage): map the masterPageFile path,
	and also remove a line of spew.


svn path=/trunk/mcs/; revision=57909
2006-03-13 21:27:00 +00:00
Chris Toshok b5cb597758 2006-02-07 Chris Toshok <[email protected]>
* MasterPage.cs (CreateMasterPage): don't nullref on null
	contentTemplateCollection.

	* ControlBuilder.cs: add a flushOutputStatements field.

	* PageParser.cs (ProcessMainAttributes): handle Title attribute.
	(Title): add getter.
	
	* Page.cs (Title): implement getter/setter.
	(InternalProcessRequest): after calling ApplyMasterPage, apply the
	page's Title directive if there is one.
	(AddContentTemplate): make the EditorBrowsable attribute apply to
	the method, not the field.


svn path=/trunk/mcs/; revision=56634
2006-02-07 20:04:15 +00:00
Chris Toshok 20ca96da5a 2006-02-07 Chris Toshok <[email protected]>
* MasterPage.cs: rework this file, adding some static methods
	gleaned from MS stack traces, and clear up the propogation of
	content templates between nested master pages.

	* Control.cs (TemplateControl): implement.

	* TemplateControl.cs: re-indent some of the code.
	(ReadStringRecource): according to msdn2, these throw
	NotSupportedException.

	* MasterPageParser.cs (HandleOption): implement.  assign our
	master page's MasterPageFile from the UserControl property.

	* UserControl.cs (InitializeAsUserControlInternal): new method
	that allows initialization without a page.

	* UserControlParser.cs (ProcessMainAttributes): for 2.0 handle
	MasterPageFile attributes, so we can have nested master pages.
	(MasterPageFile): add a 2.0 specific property.
	
	* TemplateControlParser.cs: in .net 2.0, our base class is
	BaseTemplateParser.
	(HandleOptions): be consistent and call base.HandleOptions.

	* BaseTemplateParser.cs: new (stubbed) class.

	* MasterPageControlBuilder.cs: new file, not filled in (and really
	not used either.)

	* Page.cs (InternalProcessRequest): call ApplyMasterPage.
	(SaveExistingContentTemplates): nuke.
	(ReapplyExistingContentTemplate): nuke.
	(ApplyMasterPage): if we have a master page, call
	MasterPage.ApplyMasterPageRecursive with it and add it to our
	controls.
	(set_MasterPageFile): remove call to SaveExistingContentTemplates.
	(get_Master): call MasterPage.CreateMasterPage.
	(AddContentTemplate): keep track of the page's content templates
	in a local Hashtable - they aren't our master page's content
	templates.


svn path=/trunk/mcs/; revision=56620
2006-02-07 16:49:01 +00:00
Chris Toshok f958ab101c 2006-01-27 Chris Toshok <[email protected]>
* MasterPage.cs (ContentTemplatesInternal): add get/set for the
	actual Hashtable.

	* Page.cs (SaveExistingContentTemplates): store off the existing
	MasterPage content templates so they can be reapplied when setting
	MasterPageFile to something else.
	(ReapplyExistingContentTemplates): set masterPage's
	ContentTemplates to our saved copy.
	(set_MasterPageFile): save off the current content templates
	before clearing masterPage.
	(get_Master): reapply the saved content templates after we create
	the new MasterPage.


svn path=/trunk/mcs/; revision=56185
2006-01-27 19:36:29 +00:00
Lluis Sanchez d2c9dd8b5a 2005-06-13 Lluis Sanchez Gual <[email protected]>
* MasterPage.cs: Clear the default content of placeholders before
	adding the page content. Fixes bug #75193.


svn path=/trunk/mcs/; revision=45886
2005-06-13 17:16:14 +00:00
Lluis Sanchez 5064e23220 2005-01-21 Lluis Sanchez Gual <[email protected]>
* PageParser.cs: Read the MasterPageFile attribute.
	* UserControlParser.cs: Not sealed any more since we need to inherit from
	it. Added new constructor with an additional "type" parameter.
	* MasterPageParser.cs: Parser for master pages.
	* Page.cs: Added support for master pages.
	* MasterPage.cs: Implemented.


svn path=/trunk/mcs/; revision=39318
2005-01-21 18:03:15 +00:00