Menu
▾
▴
mvp-xml-cvs — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(174) |
Nov
(85) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(56) |
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
(1) |
Jul
(132) |
Aug
(5) |
Sep
|
Oct
(314) |
Nov
(133) |
Dec
(18) |
| 2006 |
Jan
(6) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-10 15:26:53
|
Update of /cvsroot/mvp-xml/Design/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10039/v1/src Added Files: .cvsignore AssemblyInfo.cs changelog.txt Design.csproj Design.csproj.user Design.sln Design.suo license.txt SR.cs SR.resx Log Message: Initial release of the Mvp.Xml.Design package. Includes project, license files, changelog, and string resources. --- NEW FILE: .cvsignore --- bin obj *.user *.suo --- NEW FILE: changelog.txt --- October 10, 2004 Initial release of the SGen custom tool. --------------------------------------------------------- April 01, 2004 Initial setup. Folder contains main project source files. --- NEW FILE: Design.sln --- Microsoft Visual Studio Solution File, Format Version 8.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Design", "Design.csproj", "{A379C40D-C984-4E63-933A-BE96E9A599B7}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {A379C40D-C984-4E63-933A-BE96E9A599B7}.Debug.ActiveCfg = Debug|.NET {A379C40D-C984-4E63-933A-BE96E9A599B7}.Debug.Build.0 = Debug|.NET {A379C40D-C984-4E63-933A-BE96E9A599B7}.Release.ActiveCfg = Release|.NET {A379C40D-C984-4E63-933A-BE96E9A599B7}.Release.Build.0 = Release|.NET EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal --- NEW FILE: Design.suo --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Design.csproj.user --- <VisualStudioProject> <CSHARP LastOpenVersion = "7.10.3077" > <Build> <Settings ReferencePath = "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\" > <Config Name = "Debug" EnableASPDebugging = "false" EnableASPXDebugging = "false" EnableUnmanagedDebugging = "false" EnableSQLServerDebugging = "false" RemoteDebugEnabled = "false" RemoteDebugMachine = "" StartAction = "Program" StartArguments = "" StartPage = "" StartProgram = "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\devenv.exe" StartURL = "" StartWorkingDirectory = "" StartWithIE = "true" > <InteropRegistration RegisteredComClassic = "true" RegisteredOutput = "Mvp.Xml.Design.dll" RegisteredTypeLib = "Mvp.Xml.Design.tlb" /> </Config> <Config Name = "Release" EnableASPDebugging = "false" EnableASPXDebugging = "false" EnableUnmanagedDebugging = "false" EnableSQLServerDebugging = "false" RemoteDebugEnabled = "false" RemoteDebugMachine = "" StartAction = "Project" StartArguments = "" StartPage = "" StartProgram = "" StartURL = "" StartWorkingDirectory = "" StartWithIE = "false" /> </Settings> </Build> <OtherProjectSettings CopyProjectDestinationFolder = "" CopyProjectUncPath = "" CopyProjectOption = "0" ProjectView = "ShowAllFiles" ProjectTrust = "0" /> </CSHARP> </VisualStudioProject> --- NEW FILE: SR.cs --- //------------------------------------------------------------------------------ // <autogenerated> // This code was generated by a tool. // Runtime Version: 1.1.4322.573 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // </autogenerated> //------------------------------------------------------------------------------ namespace Mvp.Xml.Design { using System; using System.Resources; using System.Threading; /// <summary>Contains resources for the application.</summary> sealed class SR { private static ResourceManager _resourceManager = new ResourceManager( typeof( SR ).FullName, typeof( SR ).Module.Assembly ); private SR() {} /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/>. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <returns>The object resource.</returns> internal static object GetObject( string key ) { return _resourceManager.GetObject( key ); } /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/>. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <returns>The string resource.</returns> internal static string GetString( string key ) { return _resourceManager.GetString( key ); } /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/> and /// formats it with the arguments received. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <param name='args'>The arguments to format the resource with.</param> /// <returns>The string resource.</returns> internal static string GetString ( string key, params object[] args ) { return String.Format( GetString( key ), args ); } /// <summary>The EnvDTE.ProjectItem is not set. Probably there's no item selected.</summary> public static string Tool_NoDTEProjectItem { get { return SR.GetString("Tool_NoDTEProjectItem"); } } /// <summary>Current project object retrieved by EnvDTE is not a VSProject item. See ms-help://MS.VSCC.2003/MS.MSDNQTR.2003OCT.1033/vbcon/html/vxlrfvslangprojvsproject.htm</summary> public static string Tool_UnsupportedProjectType { get { return SR.GetString("Tool_UnsupportedProjectType"); } } /// <summary>An invalid output was assigned the type OutputType.CodeDom</summary> public static string Tool_UnsupportedCodeDomOutput { get { return SR.GetString("Tool_UnsupportedCodeDomOutput"); } } /// <summary>The project isn't C# or VB.</summary> public static string Tool_NoCodeDomSupport { get { return SR.GetString("Tool_NoCodeDomSupport"); } } /// <summary>The engine run without errors.</summary> public static string Tool_Success { get { return SR.GetString("Tool_Success"); } } /// <summary>Sucess message.</summary> public static string Embedded_Success { get { return SR.GetString("Embedded_Success"); } } /// <summary>The file can't be used to generate a localized resource.</summary> public static string Embedded_NoLocaleDefined { get { return SR.GetString("Embedded_NoLocaleDefined"); } } /// <summary>Can't find the main file resource.</summary> public static string Embedded_CantFindMain { get { return SR.GetString("Embedded_CantFindMain"); } } /// <summary>Can't find the main file resource class.</summary> public static string Embedded_CantFindMainClass { get { return SR.GetString("Embedded_CantFindMainClass"); } } /// <summary></summary> public static string ValueEditor_InvalidValue { get { return SR.GetString("ValueEditor_InvalidValue"); } } /// <summary>Allows the user to click and see additional help.</summary> public static string Step_ShowHelp { get { return SR.GetString("Step_ShowHelp"); } } /// <summary>Caption of the main menu item in Tools.</summary> public static string Ide_ToolsMenu { get { return SR.GetString("Ide_ToolsMenu"); } } /// <summary></summary> public static string Ide_ToolsMenuTooltip { get { return SR.GetString("Ide_ToolsMenuTooltip"); } } /// <summary>An error happened while adding the tool menu.</summary> public static string Ide_CantInitializeMainTool { get { return SR.GetString("Ide_CantInitializeMainTool"); } } /// <summary>Filter for the open dialog.</summary> public static string XsdFileEditor_Filter { get { return SR.GetString("XsdFileEditor_Filter"); } } /// <summary>Title of the dialog.</summary> public static string XsdFileEditor_Title { get { return SR.GetString("XsdFileEditor_Title"); } } /// <summary>Config file is required for the current operation.</summary> public static string Gral_ConfigurationFileNotSet { get { return SR.GetString("Gral_ConfigurationFileNotSet"); } } /// <summary>Deploy script file is required for the current operation.</summary> public static string Gral_DeployScriptNotSet { get { return SR.GetString("Gral_DeployScriptNotSet"); } } /// <summary>The factory received an XPathNodeIterator that was not obtained from querying an XmlDocument or XmlNode.</summary> public static string XmlNodeListFactory_IHasXmlNodeMissing { get { return SR.GetString("XmlNodeListFactory_IHasXmlNodeMissing"); } } /// <summary>Generic error handling.</summary> public static string ValueEditor_Error { get { return SR.GetString("ValueEditor_Error"); } } /// <summary>Someone called Undo without executing commands first.</summary> public static string CommandService_StackEmpty { get { return SR.GetString("CommandService_StackEmpty"); } } /// <summary>Only the private class generated by the service can be used to restore its state.</summary> public static string CommandService_InvalidRestoreState { get { return SR.GetString("CommandService_InvalidRestoreState"); } } /// <summary></summary> public static string Step_ConfirmReExecution { get { return SR.GetString("Step_ConfirmReExecution"); } } /// <summary>Some command didn't execute sucessfully.</summary> public static string Step_ExecutionFailed { get { return SR.GetString("Step_ExecutionFailed"); } } /// <summary>An operation requires the component to be sited and it hasn't been yet.</summary> public static string Gral_ComponentNotSited { get { return SR.GetString("Gral_ComponentNotSited"); } } /// <summary>Checked to skip MS projects from the list.</summary> public static string SolutionClassBrowserEditor_MSAB { get { return SR.GetString("SolutionClassBrowserEditor_MSAB"); } } /// <summary>Checked to skip MS projects from the list.</summary> public static string SolutionClassBrowserEditor_SDAF { get { return SR.GetString("SolutionClassBrowserEditor_SDAF"); } } /// <summary>Title of the prompt for executing the wizard, if any.</summary> public static string WizardController_ConfirmExecution { get { return SR.GetString("WizardController_ConfirmExecution"); } } /// <summary></summary> public static string Step_NoTipProvided { get { return SR.GetString("Step_NoTipProvided"); } } /// <summary></summary> public static string XmlValidate_NoSchemaLocation { get { return SR.GetString("XmlValidate_NoSchemaLocation"); } } /// <summary></summary> public static string XmlValidate_Succeeded { get { return SR.GetString("XmlValidate_Succeeded"); } } /// <summary>No active project was found.</summary> public static string Dte_NoActiveProject { get { return SR.GetString("Dte_NoActiveProject"); } } /// <summary>The user didn't accept the command execution.</summary> public static string CommandService_CommandCanceled { get { return SR.GetString("CommandService_CommandCanceled"); } } /// <summary>A new project has to be created, but the folder wasn't selected.</summary> public static string AddOrSelectProject_PathRequiredForNew { get { return SR.GetString("AddOrSelectProject_PathRequiredForNew"); } } /// <summary>FileNotFoundException</summary> public static string ExecuteTransformation_TemplateFileNotFound { get { return SR.GetString("ExecuteTransformation_TemplateFileNotFound"); } } /// <summary>FileNotFoundException</summary> public static string ExecuteTransformation_ConfigFileNotFound { get { return SR.GetString("ExecuteTransformation_ConfigFileNotFound"); } } /// <summary>The C# language.</summary> public static string Gral_LanguageCSharp { get { return SR.GetString("Gral_LanguageCSharp"); } } /// <summary>The Visual Basic language.</summary> public static string Gral_LanguageVisualBasic { get { return SR.GetString("Gral_LanguageVisualBasic"); } } /// <summary>Output window was created.</summary> public static string OutputWindowService_InitializedMsg { get { return SR.GetString("OutputWindowService_InitializedMsg"); } } /// <summary>CustomTool-derived class doesn't implement a required attribute.</summary> public static string Tool_AttributeMissing(object arg0, object arg1) { return SR.GetString("Tool_AttributeMissing", arg0, arg1); } /// <summary>Type received as the first parameter does not implement the interface passed as the second parameter.</summary> public static string Gral_TypeMustImplementInterface(object arg0, object arg1) { return SR.GetString("Gral_TypeMustImplementInterface", arg0, arg1); } /// <summary>Type received as the first parameter does not inherit from the base class passed as the second parameter.</summary> public static string Gral_TypeMustInherit(object arg0, object arg1) { return SR.GetString("Gral_TypeMustInherit", arg0, arg1); } /// <summary>The expression receivedz in the first parameter is not in the expected format.</summary> public static string ValueBinder_InvalidExpression(object arg0) { return SR.GetString("ValueBinder_InvalidExpression", arg0); } /// <summary>First parameter is the field or property name, next the type where it's missing. Finally, the full expression and the originating target for which the expression was being evaluated.</summary> public static string ValueBinder_MemberNotFound(object arg0, object arg1, object arg2, object arg3) { return SR.GetString("ValueBinder_MemberNotFound", arg0, arg1, arg2, arg3); } /// <summary>First parameter is the method name name, next the full expression and the originating target for which the expression was being evaluated.</summary> public static string ValueBinder_MethodArgumentsInvalid(object arg0, object arg1, object arg2) { return SR.GetString("ValueBinder_MethodArgumentsInvalid", arg0, arg1, arg2); } /// <summary>Receives the indexer value that couldn't be converted to Int32.</summary> public static string ValueBinder_IndexNotNumber(object arg0) { return SR.GetString("ValueBinder_IndexNotNumber", arg0); } /// <summary>Receives the full enum indexer that failed.</summary> public static string ValueBinder_IndexEnumInvalid(object arg0) { return SR.GetString("ValueBinder_IndexEnumInvalid", arg0); } /// <summary>Receives the type that doesn't have the indexer, and the full expression.</summary> public static string ValueBinder_NoIndexerFound(object arg0, object arg1) { return SR.GetString("ValueBinder_NoIndexerFound", arg0, arg1); } /// <summary>Receives incoming value type, expected type and member name.</summary> public static string ValueBinder_CantConvertValue(object arg0, object arg1, object arg2) { return SR.GetString("ValueBinder_CantConvertValue", arg0, arg1, arg2); } /// <summary>{0}=full expression. The last segment of the expression is a method call, and the user tries to set a value on it.</summary> public static string ValueBinder_CantAssignToMethod(object arg0) { return SR.GetString("ValueBinder_CantAssignToMethod", arg0); } /// <summary>An error occurrent, and it's received as a parameter.</summary> public static string Embedded_Error(object arg0) { return SR.GetString("Embedded_Error", arg0); } /// <summary>Receives incoming value type and expected type.</summary> public static string ValueEditor_CantConvertValue(object arg0, object arg1) { return SR.GetString("ValueEditor_CantConvertValue", arg0, arg1); } /// <summary>A custom param in the .vsz file is missing. That is the first argument to the method.</summary> public static string IdeWizard_MissingParameter(object arg0) { return SR.GetString("IdeWizard_MissingParameter", arg0); } /// <summary>Receives the service that is unavailable.</summary> public static string Gral_ServiceUnavailable(object arg0) { return SR.GetString("Gral_ServiceUnavailable", arg0); } /// <summary>{0}=command name/description, {1}=exception.</summary> public static string CommandService_ExecuteError(object arg0, object arg1) { return SR.GetString("CommandService_ExecuteError", arg0, arg1); } /// <summary>{0}=command name/description, {1}=exception.</summary> public static string CommandService_UndoError(object arg0, object arg1) { return SR.GetString("CommandService_UndoError", arg0, arg1); } /// <summary>{0}=command description. Title for the dialog</summary> public static string CommandService_ConfirmCaption(object arg0) { return SR.GetString("CommandService_ConfirmCaption", arg0); } /// <summary>An expression contained an empty argument reference. {0} is the full invalid expression.</summary> public static string ExpressionEvaluator_EmptyArgumentReference(object arg0) { return SR.GetString("ExpressionEvaluator_EmptyArgumentReference", arg0); } /// <summary>An argument reference is missing the right parenthesis. {0} is the invalid open section, {1} is the full expression. </summary> public static string ExpressionEvaluator_OpenArgumentReference(object arg0, object arg1) { return SR.GetString("ExpressionEvaluator_OpenArgumentReference", arg0, arg1); } /// <summary>{0}=missing argument. {1}=command type.</summary> public static string Command_ArgumentRequired(object arg0, object arg1) { return SR.GetString("Command_ArgumentRequired", arg0, arg1); } /// <summary>{0}=argument name. {1}=argument type. {2}=command name, and {3}=concat list of valid types.</summary> public static string Command_UnsupportedArgumentType(object arg0, object arg1, object arg2, object arg3) { return SR.GetString("Command_UnsupportedArgumentType", arg0, arg1, arg2, arg3); } /// <summary>{0}=project that doesn't exist in solution.</summary> public static string Dte_ProjectDoesntExist(object arg0) { return SR.GetString("Dte_ProjectDoesntExist", arg0); } /// <summary>{0}=path for the non-existent item.</summary> public static string Dte_ParentItemNotFound(object arg0) { return SR.GetString("Dte_ParentItemNotFound", arg0); } /// <summary>{0}=invalid project kind.</summary> public static string AddProject_InvalidKind(object arg0) { return SR.GetString("AddProject_InvalidKind", arg0); } /// <summary>{0}=target file name.</summary> public static string Dte_TargetProjectExists(object arg0) { return SR.GetString("Dte_TargetProjectExists", arg0); } /// <summary>{0}=folder to remove, {1}=error message.</summary> public static string AddProject_CantDeleteFolder(object arg0, object arg1) { return SR.GetString("AddProject_CantDeleteFolder", arg0, arg1); } /// <summary>{0}=join of invalid handlers</summary> public static string HandlersConverter_InvalidHandlers(object arg0) { return SR.GetString("HandlersConverter_InvalidHandlers", arg0); } /// <summary>{0}= project failing to be added.</summary> public static string AddProject_CantAddProject(object arg0) { return SR.GetString("AddProject_CantAddProject", arg0); } /// <summary>{0}=invalid path</summary> public static string AddProject_InvalidPath(object arg0) { return SR.GetString("AddProject_InvalidPath", arg0); } /// <summary>Resource to deploy doesn't exist. {0}=resource name</summary> public static string Deployer_InvalidResource(object arg0) { return SR.GetString("Deployer_InvalidResource", arg0); } /// <summary>For some reason removing the project didn't work. {0}=project name.</summary> public static string AddProject_CantRemoveProject(object arg0) { return SR.GetString("AddProject_CantRemoveProject", arg0); } /// <summary>The project name selected is already present in the solution. {0}=project name.</summary> public static string AddProject_ProjectAlreadyExists(object arg0) { return SR.GetString("AddProject_ProjectAlreadyExists", arg0); } /// <summary>An error happened. Exception as argument 0.</summary> public static string XmlValidate_GeneralError(object arg0) { return SR.GetString("XmlValidate_GeneralError", arg0); } /// <summary>{0}=errors.</summary> public static string XmlValidate_Failed(object arg0) { return SR.GetString("XmlValidate_Failed", arg0); } /// <summary>{0}=errors.</summary> public static string Configuration_InvalidWizardConfig(object arg0) { return SR.GetString("Configuration_InvalidWizardConfig", arg0); } /// <summary>Tried to select a non-folder with a path. Receives the failing path.</summary> public static string AddOrSelectFolder_PathIsNotFolder(object arg0) { return SR.GetString("AddOrSelectFolder_PathIsNotFolder", arg0); } /// <summary>Invalid expression received as argument 0.</summary> public static string DependencyEvaluator_InvalidExpression(object arg0) { return SR.GetString("DependencyEvaluator_InvalidExpression", arg0); } /// <summary>{0}=duplicate match, {1}=full expression.</summary> public static string DependencyEvaluator_DuplicateOperator(object arg0, object arg1) { return SR.GetString("DependencyEvaluator_DuplicateOperator", arg0, arg1); } /// <summary>{0}=argument matched without operator. {1}=full expression.</summary> public static string DependencyEvaluator_OperatorMissing(object arg0, object arg1) { return SR.GetString("DependencyEvaluator_OperatorMissing", arg0, arg1); } /// <summary>An argument is used for a comparison but its value does not implement IComparable.</summary> public static string DependencyEvaluator_ValueNotComparable(object arg0) { return SR.GetString("DependencyEvaluator_ValueNotComparable", arg0); } /// <summary>{0}=the operator.</summary> public static string DependencyEvaluator_UnsupportedComparison(object arg0) { return SR.GetString("DependencyEvaluator_UnsupportedComparison", arg0); } /// <summary>{0}=the type alias that wasn't found. We know it's an alias as it doesn't contain a colon separating the assembly name for a FQTN.</summary> public static string WizardController_NonExistingAlias(object arg0) { return SR.GetString("WizardController_NonExistingAlias", arg0); } /// <summary>The template argument '{0}' can't be located as a file, and Assembly argument was not specified to load it from an embedded resource.</summary> public static string ExecuteTransformation_AssemblyNotSpecified(object arg0) { return SR.GetString("ExecuteTransformation_AssemblyNotSpecified", arg0); } /// <summary>{0}=assembly name that couldn't be loaded.</summary> public static string ExecuteTransformation_AssemblyNotFound(object arg0) { return SR.GetString("ExecuteTransformation_AssemblyNotFound", arg0); } /// <summary>{0}=resource name not found, and {1}=assembly name where we probed.</summary> public static string ExecuteTransformation_EmbeddedTemplateNotFound(object arg0, object arg1) { return SR.GetString("ExecuteTransformation_EmbeddedTemplateNotFound", arg0, arg1); } /// <summary>{0}=resource name not found, and {1}=assembly name where we probed.</summary> public static string ExecuteTransformation_EmbeddedConfigNotFound(object arg0, object arg1) { return SR.GetString("ExecuteTransformation_EmbeddedConfigNotFound", arg0, arg1); } /// <summary>An expression uses an argument that hasn't been specified.</summary> public static string ExpressionEvaluator_ArgumentMissing(object arg0) { return SR.GetString("ExpressionEvaluator_ArgumentMissing", arg0); } /// <summary>{0}=file that is not relative to {1}, which is the solution filename.</summary> public static string DteHelper_PathNotRelativeToSln(object arg0, object arg1) { return SR.GetString("DteHelper_PathNotRelativeToSln", arg0, arg1); } /// <summary>{0}=name of the non-C#/VB. project.</summary> public static string DteHelper_UnsupportedProjectKind(object arg0) { return SR.GetString("DteHelper_UnsupportedProjectKind", arg0); } } } --- NEW FILE: Design.csproj --- <VisualStudioProject> <CSHARP ProjectType = "Local" ProductVersion = "7.10.3077" SchemaVersion = "2.0" ProjectGuid = "{A379C40D-C984-4E63-933A-BE96E9A599B7}" > <Build> <Settings ApplicationIcon = "" AssemblyKeyContainerName = "" AssemblyName = "Mvp.Xml.Design" AssemblyOriginatorKeyFile = "" DefaultClientScript = "JScript" DefaultHTMLPageLayout = "Grid" DefaultTargetSchema = "IE50" DelaySign = "false" OutputType = "Library" PreBuildEvent = "" PostBuildEvent = "" RootNamespace = "Mvp.Xml.Design" RunPostBuildEvent = "OnBuildSuccess" StartupObject = "" > <Config Name = "Debug" AllowUnsafeBlocks = "false" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "DEBUG;TRACE" DocumentationFile = "" DebugSymbols = "true" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "false" OutputPath = "bin\Debug\" RegisterForComInterop = "true" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> <Config Name = "Release" AllowUnsafeBlocks = "false" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "TRACE" DocumentationFile = "" DebugSymbols = "false" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "true" OutputPath = "bin\Release\" RegisterForComInterop = "false" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> </Settings> <References> <Reference Name = "System" AssemblyName = "System" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll" /> <Reference Name = "System.Data" AssemblyName = "System.Data" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll" /> <Reference Name = "System.XML" AssemblyName = "System.Xml" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> <Reference Name = "System.Windows.Forms" AssemblyName = "System.Windows.Forms" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll" /> <Reference Name = "envdte" AssemblyName = "EnvDTE" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\envdte.dll" /> <Reference Name = "VSLangProj" AssemblyName = "VSLangProj" HintPath = "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\PublicAssemblies\VSLangProj.dll" AssemblyFolderKey = "hklm\publicassemblies" /> <Reference Name = "microsoft.visualstudio.designer.interfaces" AssemblyName = "Microsoft.VisualStudio.Designer.Interfaces" HintPath = "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\microsoft.visualstudio.designer.interfaces.dll" /> <Reference Name = "System.Drawing" AssemblyName = "System.Drawing" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll" /> <Reference Name = "VSLangProj2" AssemblyName = "VSLangProj2" HintPath = "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\PublicAssemblies\VSLangProj2.dll" AssemblyFolderKey = "hklm\publicassemblies" /> </References> </Build> <Files> <Include> <File RelPath = "AssemblyInfo.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "DebugUtils.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "ReflectionHelper.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "SR.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "SR.resx" DependentUpon = "SR.cs" BuildAction = "EmbeddedResource" /> <File RelPath = "CustomTools\Attributes.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "CustomTools\CustomTool.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "CustomTools\SGen\ClassPicker.cs" SubType = "Form" BuildAction = "Compile" /> <File RelPath = "CustomTools\SGen\ClassPicker.resx" DependentUpon = "ClassPicker.cs" BuildAction = "EmbeddedResource" /> <File RelPath = "CustomTools\SGen\SGenRunner.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "CustomTools\SGen\SGenTool.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "CustomTools\SGen\XmlSerializerGenerator.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\IProfferService.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\Readme.txt" BuildAction = "Content" /> <File RelPath = "VisualStudio\ServiceContainer.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\Site.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\BaseCodeGenerator.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\BaseCodeGeneratorWithSite.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\IObjectWithSite.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\IOleServiceProvider.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\IVsGeneratorProgress.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\IVsSingleFileGenerator.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\ServiceProvider.cs" SubType = "Code" BuildAction = "Compile" /> </Include> </Files> </CSHARP> </VisualStudioProject> --- NEW FILE: license.txt --- Common Public License Version 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS "Contribution" means: a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and b) in the case of each subsequent Contributor: i) changes to the Program, and ii) additions to the Program; where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. "Contributor" means any person or entity that distributes the Program. "Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. "Program" means the Contributions distributed in accordance with this Agreement. "Recipient" means anyone who receives the Program under this Agreement, including all Contributors. 2. GRANT OF RIGHTS a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 3. REQUIREMENTS A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: a) it complies with the terms and conditions of this Agreement; and b) its license agreement: i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. When the Program is made available in source code form: a) it must be made available under this Agreement; and b) a copy of this Agreement must be included with each copy of the Program. Contributors may not remove or alter any copyright notices contained within the Program. Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. 4. COMMERCIAL DISTRIBUTION Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. 5. NO WARRANTY EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. 6. DISCLAIMER OF LIABILITY EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 7. GENERAL If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. --- NEW FILE: SR.resx --- <?xml version="1.0" encoding="utf-8" ?> <root> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> <xsd:choice maxOccurs="unbounded"> <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" /> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> </xsd:schema> <resheader name="ResMimeType"> <value>text/microsoft-resx</value> </resheader> <resheader name="Version"> <value>1.0.0.0</value> </resheader> <resheader name="Reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="Writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <data name="Tool_AttributeMissing" type="System.String" mimetype="System.String"> <value>Type '{0}' must have the '{1}' attribute.</value> <comment>CustomTool-derived class doesn't implement a required attribute.</comment> </data> <data name="Tool_NoDTEProjectItem" type="System.String" mimetype="System.String"> <value>Can't get current project item.</value> <comment>The EnvDTE.ProjectItem is not set. Probably there's no item selected.</comment> </data> <data name="Tool_UnsupportedProjectType" type="System.String" mimetype="System.String"> <value>Current project type is unsupported for this tool.</value> <comment>Current project object retrieved by EnvDTE is not a VSProject item. See ms-help://MS.VSCC.2003/MS.MSDNQTR.2003OCT.1033/vbcon/html/vxlrfvslangprojvsproject.htm</comment> </data> <data name="Tool_UnsupportedCodeDomOutput" type="System.String" mimetype="System.String"> <value>Output of type CodeDom must be either a CodeNamespace or a CodeCompileUnit.</value> <comment>An invalid output was assigned the type OutputType.CodeDom</comment> </data> <data name="Tool_NoCodeDomSupport" type="System.String" mimetype="System.String"> <value>Current project type can't have code elements, or can't compile to a .NET language. Supported project types are C# and VB.NET.</value> <comment>The project isn't C# or VB.</comment> </data> <data name="Tool_Success" type="System.String" mimetype="System.String"> <value>Success.</value> <comment>The engine run without errors.</comment> </data> <data name="Gral_TypeMustImplementInterface" type="System.String" mimetype="System.String"> <value>Type '{0}' doesn't implement required interface '{1}'.</value> <comment>Type received as the first parameter does not implement the interface passed as the second parameter.</comment> </data> <data name="Gral_TypeMustInherit" type="System.String" mimetype="System.String"> <value>Type '{0}' doesn't inherit from required base class '{1}'.</value> <comment>Type received as the first parameter does not inherit from the base class passed as the second parameter.</comment> </data> <data name="ValueBinder_InvalidExpression" type="System.String" mimetype="System.String"> <value>Expression '{0}' is invalid. Check .NET documentation for the DataBinder.Eval expression syntax.</value> <comment>The expression receivedz in the first parameter is not in the expected format.</comment> </data> <data name="ValueBinder_MemberNotFound" type="System.String" mimetype="System.String"> <value>Field or property '{0}' was not found in type '{1}'. Expression being evaluated was '{2}', for target '{3}'.</value> <comment>First parameter is the field or property name, next the type where it's missing. Finally, the full expression and the originating target for which the expression was being evaluated.</comment> </data> <data name="ValueBinder_MethodArgumentsInvalid" type="System.String" mimetype="System.String"> <value>Method '{0}' doesn't match the arguments received. Expression being evaluated was '{1}', for target '{2}'.</value> <comment>First parameter is the method name name, next the full expression and the originating target for which the expression was being evaluated.</comment> </data> <data name="ValueBinder_IndexNotNumber" type="System.String" mimetype="System.String"> <value>Argument '{0}' is not a valid number. </value> <comment>Receives the indexer value that couldn't be converted to Int32.</comment> </data> <data name="ValueBinder_IndexEnumInvalid" type="System.String" mimetype="System.String"> <value>Enum value '{0}' is invalid.</value> <comment>Receives the full enum indexer that failed.</comment> </data> <data name="ValueBinder_NoIndexerFound" type="System.String" mimetype="System.String"> <value>Type '{0}' doesn't have an indexer. Expression being evaluated was '{1}'.</value> <comment>Receives the type that doesn't have the indexer, and the full expression.</comment> </data> <data name="ValueBinder_CantConvertValue" type="System.String" mimetype="System.String"> <value>Value of type '{0}' can't be converted to type '{1}' expected by member '{2}'.</value> <comment>Receives incoming value type, expected type and member name.</comment> </data> <data name="ValueBinder_CantAssignToMethod" type="System.String" mimetype="System.String"> <value>Can't assign a value to a method return value. Expression being evaluated was '{0}'.</value> <comment>{0}=full expression. The last segment of the expression is a method call, and the user tries to set a value on it.</comment> </data> <data name="Embedded_Success" type="System.String" mimetype="System.String"> <value>Embedded resources generated.</value> <comment>Sucess message.</comment> </data> <data name="Embedded_Error" type="System.String" mimetype="System.String"> <value>#error Couldn't generate resource. /* {0} */</value> <comment>An error occurrent, and it's received as a parameter.</comment> </data> <data name="Embedded_NoLocaleDefined" type="System.String" mimetype="System.String"> <value>The file doesn't contain a valid locale in its name.</value> <comment>The file can't be used to generate a localized resource.</comment> </data> <data name="Embedded_CantFindMain" type="System.String" mimetype="System.String"> <value>Main resource file for this localized version wasn't found.</value> <comment>Can't find the main file resource.</comment> </data> <data name="Embedded_CantFindMainClass" type="System.String" mimetype="System.String"> <value>Parent main resource file for this localized version was found, but its corresponding resource class wasn't. Check that its CustomTool property is set to the appropriate generator.</value> <comment>Can't find the main file resource class.</comment> </data> <data name="ValueEditor_CantConvertValue" type="System.String" mimetype="System.String"> <value>Value of type '{0}' can't be converted to type '{1}' expected by argument.</value> <comment>Receives incoming value type and expected type.</comment> </data> <data name="ValueEditor_InvalidValue" type="System.String" mimetype="System.String"> <value>The value specified is invalid.</value> <comment></comment> </data> <data name="Step_ShowHelp" type="System.String" mimetype="System.String"> <value>Show Help</value> <comment>Allows the user to click and see additional help.</comment> </data> <data name="IdeWizard_MissingParameter" type="System.String" mimetype="System.String"> <value>Parameter '{0}' is required. Check wizard definision file.</value> <comment>A custom param in the .vsz file is missing. That is the first argument to the method.</comment> </data> <data name="Ide_ToolsMenu" type="System.String" mimetype="System.String"> <value>Microsoft Reference Architecture</value> <comment>Caption of the main menu item in Tools.</comment> </data> <data name="Ide_ToolsMenuTooltip" type="System.String" mimetype="System.String"> <value>Provides access to the Reference Architecture wizards and design tools.</value> </data> <data name="Ide_CantInitializeMainTool" type="System.String" mimetype="System.String"> <value>Main tool menu can't be initialized.</value> <comment>An error happened while adding the tool menu.</comment> </data> <data name="Gral_ServiceUnavailable" type="System.String" mimetype="System.String"> <value>Can't perform operation because service '{0}' is not setup properly. Ensure the Microsoft IPE Wizards add-in is loaded.</value> <comment>Receives the service that is unavailable.</comment> </data> <data name="XsdFileEditor_Filter" type="System.String" mimetype="System.String"> <value>XML Schema Files (*.xsd)|*.xsd</value> <comment>Filter for the open dialog.</comment> </data> <data name="XsdFileEditor_Title" type="System.String" mimetype="System.String"> <value>Select X... [truncated message content] |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-10 15:24:34
|
Update of /cvsroot/mvp-xml/Design/v1/src/VisualStudio/GotDotNet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9595/GotDotNet Log Message: Directory /cvsroot/mvp-xml/Design/v1/src/VisualStudio/GotDotNet added to the repository |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-10 15:24:14
|
Update of /cvsroot/mvp-xml/Design/v1/src/CustomTools/SGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9447/SGen Log Message: Directory /cvsroot/mvp-xml/Design/v1/src/CustomTools/SGen added to the repository |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-10 15:23:27
|
Update of /cvsroot/mvp-xml/Design/v1/src/CustomTools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9152/CustomTools Log Message: Directory /cvsroot/mvp-xml/Design/v1/src/CustomTools added to the repository |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-10 15:23:26
|
Update of /cvsroot/mvp-xml/Design/v1/src/VisualStudio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9152/VisualStudio Log Message: Directory /cvsroot/mvp-xml/Design/v1/src/VisualStudio added to the repository |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-10 15:21:48
|
Update of /cvsroot/mvp-xml/Design/v1/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8866/doc Log Message: Directory /cvsroot/mvp-xml/Design/v1/doc added to the repository |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-10 15:21:47
|
Update of /cvsroot/mvp-xml/Design/v1/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8866/lib Log Message: Directory /cvsroot/mvp-xml/Design/v1/lib added to the repository |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-10 15:21:47
|
Update of /cvsroot/mvp-xml/Design/v1/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8866/tests Log Message: Directory /cvsroot/mvp-xml/Design/v1/tests added to the repository |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-10 15:21:47
|
Update of /cvsroot/mvp-xml/Design/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8866/src Log Message: Directory /cvsroot/mvp-xml/Design/v1/src added to the repository |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-10 15:21:05
|
Update of /cvsroot/mvp-xml/Design/v1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8701/v1 Log Message: Directory /cvsroot/mvp-xml/Design/v1 added to the repository |
|
From: Oleg T. <he...@us...> - 2004-10-09 19:57:40
|
Update of /cvsroot/mvp-xml/XPointer/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12598/v1/test Added Files: northwind.dtd northwind.xml Log Message: Test XML document with DTD. --- NEW FILE: northwind.dtd --- (This appears to be a binary file; contents omitted.) --- NEW FILE: northwind.xml --- (This appears to be a binary file; contents omitted.) |
|
From: Oleg T. <he...@us...> - 2004-10-09 19:54:14
|
Update of /cvsroot/mvp-xml/XPointer/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11971/v1/test Modified Files: EntryPoint.cs XPointerParserTests.cs XPointerReaderTests.cs XPointerTest.csproj XPointerTest.csproj.user changelog.txt Log Message: Added unit tests. Index: EntryPoint.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/test/EntryPoint.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EntryPoint.cs 28 Sep 2004 09:10:00 -0000 1.1 +++ EntryPoint.cs 9 Oct 2004 19:53:49 -0000 1.2 @@ -9,8 +9,17 @@ { public static void Main() { - XPointerParserTests pt = new XPointerParserTests(); - pt.CircumflexErrorTest(); + //XPointerParserTests pt = new XPointerParserTests(); + //pt.CircumflexErrorTest(); + XPointerReaderTests rt = new XPointerReaderTests(); + try + { + rt.XPointerSchemeScalarResultTest(); + } + catch (Exception e) + { + Console.WriteLine(e); + } } } } Index: XPointerReaderTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/test/XPointerReaderTests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- XPointerReaderTests.cs 28 Sep 2004 09:10:00 -0000 1.1 +++ XPointerReaderTests.cs 9 Oct 2004 19:53:49 -0000 1.2 @@ -1,20 +1,392 @@ using System; +using System.Xml.XPath; +using System.Xml; +using System.Text; +using System.IO; -using Mvp.Xml.Common; +using Mvp.Xml.Tests; using Mvp.Xml.XPointer; using NUnit.Framework; namespace Mvp.Xml.XPointer.Test { /// <summary> - /// Summary description for XPointerReaderTests. + /// Unit tests for XPointerReader class. /// </summary> [TestFixture] public class XPointerReaderTests - { - public XPointerReaderTests() + { + /// <summary> + /// xmlns() + xpath1() + namespaces works + /// </summary> + [Test] + public void XmlNsXPath1SchemeTest() + { + string xptr = "xmlns(m=mvp-xml)xpath1(m:dsPubs/m:publishers[m:pub_id='1389']/m:pub_name)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsNsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + StringBuilder sb = new StringBuilder(); + while (xpr.Read()) + { + sb.Append(xpr.ReadOuterXml()); + } + string expected = @"<pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name>"; + Assert.AreEqual(sb.ToString(), expected); + } + + /// <summary> + /// xpath1() + namespaces doesn't work w/o xmlns() + /// </summary> + [Test] + [ExpectedException(typeof(NoSubresourcesIdentifiedException))] + public void XPath1SchemeWithoutXmlnsTest() + { + string xptr = "xpath1(m:dsPubs/m:publishers[m:pub_id='1389']/m:pub_name)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsNsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + StringBuilder sb = new StringBuilder(); + while (xpr.Read()) { + sb.Append(xpr.ReadOuterXml()); + } + string expected = @"<pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name>"; + Assert.AreEqual(sb.ToString(), expected); + } + + /// <summary> + /// xpath1() that doesn't select a node w/o namespaces + /// </summary> + [Test] + [ExpectedException(typeof(NoSubresourcesIdentifiedException))] + public void XPath1SchemeNoSelectedNodeTest() + { + string xptr = "xpath1(no-such-node/foo)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsNsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + while (xpr.Read()) {} + } + + /// <summary> + /// xpath1() that returns scalar value, not a node + /// </summary> + [Test] + [ExpectedException(typeof(NoSubresourcesIdentifiedException))] + public void XPath1SchemeScalarResultTest() + { + string xptr = "xpath1(2+2)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsNsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + while (xpr.Read()) {} + } + + /// <summary> + /// xmlns() + xpointer() + namespaces works + /// </summary> + [Test] + public void XmlNsXPointerSchemeTest() + { + string xptr = "xmlns(m=mvp-xml)xpointer(m:dsPubs/m:publishers[m:pub_id='1389']/m:pub_name)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsNsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + StringBuilder sb = new StringBuilder(); + while (xpr.Read()) + { + sb.Append(xpr.ReadOuterXml()); + } + string expected = @"<pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name>"; + Assert.AreEqual(sb.ToString(), expected); + } + + /// <summary> + /// xpointer() + namespaces doesn't work w/o xmlns() + /// </summary> + [Test] + [ExpectedException(typeof(NoSubresourcesIdentifiedException))] + public void XPointerSchemeWithoutXmlnsTest() + { + string xptr = "xpointer(m:dsPubs/m:publishers[m:pub_id='1389']/m:pub_name)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsNsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + StringBuilder sb = new StringBuilder(); + while (xpr.Read()) + { + sb.Append(xpr.ReadOuterXml()); + } + string expected = @"<pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name>"; + Assert.AreEqual(sb.ToString(), expected); + } + + /// <summary> + /// xpointer() that doesn't select a node w/o namespaces + /// </summary> + [Test] + [ExpectedException(typeof(NoSubresourcesIdentifiedException))] + public void XPointerSchemeNoSelectedNodeTest() + { + string xptr = "xpointer(no-such-node/foo)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsNsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + while (xpr.Read()) {} + } + + /// <summary> + /// xpointer() that returns scalar value, not a node + /// </summary> + [Test] + [ExpectedException(typeof(NoSubresourcesIdentifiedException))] + public void XPointerSchemeScalarResultTest() + { + string xptr = "xpointer(2+2)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsNsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + while (xpr.Read()) {} + } + + /// <summary> + /// superfluous xmlns() doesn't hurt + /// </summary> + [Test] + public void SuperfluousXmlNsSchemeTest() { + string xptr = "xmlns(m=mvp-xml)xpointer(dsPubs/publishers[pub_id='1389']/pub_name)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + StringBuilder sb = new StringBuilder(); + while (xpr.Read()) + { + sb.Append(xpr.ReadOuterXml()); + } + string expected = @"<pub_name>Algodata Infosystems</pub_name>"; + Assert.AreEqual(sb.ToString(), expected); + } + + /// <summary> + /// xpointer() + xmlns() + namespaces doesn't work + /// </summary> + [Test] + [ExpectedException(typeof(NoSubresourcesIdentifiedException))] + public void XmlnsAfterTest() + { + string xptr = "xpointer(m:dsPubs/m:publishers[m:pub_id='1389']/m:pub_name)xmlns(m=mvp-xml)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsNsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + while (xpr.Read()) {} + } + + /// <summary> + /// namespace re3efinition doesn't hurt + /// </summary> + [Test] + public void NamespaceRedefinitionTest() + { + string xptr = "xmlns(m=mvp-xml)xmlns(m=http://foo.com)xmlns(m=mvp-xml)xpointer(m:dsPubs/m:publishers[m:pub_id='1389']/m:pub_name)"; + XmlReader reader = new XmlTextReader(Globals.GetResource(Globals.PubsNsResource)); + XPointerReader xpr = new XPointerReader(reader, xptr); + StringBuilder sb = new StringBuilder(); + while (xpr.Read()) + { + sb.Append(xpr.ReadOuterXml()); + } + string expected = @"<pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name><pub_name xmlns=""mvp-xml"">Algodata Infosystems</pub_name>"; + Assert.AreEqual(sb.ToString(), expected); + } + + /// <summary> + /// Shorthand pointer works + /// </summary> + [Test] + public void ShorthandTest() + { + string xptr = "o10535"; + XmlReader reader = new XmlTextReader("../../northwind.xml"); + XPointerReader xpr = new XPointerReader(reader, xptr); + string expected = @"<Item orderID=""o10535""> + <OrderDate> 6/13/95</OrderDate> + <ShipAddress> Mataderos 2312</ShipAddress> + </Item>"; + while (xpr.Read()) + { + Assert.AreEqual(xpr.ReadOuterXml(), expected); + return; + } + throw new InvalidOperationException("This means shorthand XPointer didn't work as expected."); + } + + /// <summary> + /// Shorthand pointer works via stream + /// </summary> + [Test] + public void ShorthandViaStreamTest() + { + string xptr = "o10535"; + FileInfo file = new FileInfo("../../northwind.xml"); + using (FileStream fs = file.OpenRead()) + { + XPointerReader xpr = new XPointerReader(new Uri(file.FullName), fs, xptr); + string expected = @"<Item orderID=""o10535""> + <OrderDate> 6/13/95</OrderDate> + <ShipAddress> Mataderos 2312</ShipAddress> + </Item>"; + while (xpr.Read()) + { + Assert.AreEqual(xpr.ReadOuterXml(), expected); + return; + } + throw new InvalidOperationException("This means shorthand XPointer didn't work as expected."); + } + } + + /// <summary> + /// Shorthand pointer points to nothing + /// </summary> + [Test] + [ExpectedException(typeof(NoSubresourcesIdentifiedException))] + public void ShorthandNotFoundTest() + { + string xptr = "no-such-id"; + XmlReader reader = new XmlTextReader("../../northwind.xml"); + XPointerReader xpr = new XPointerReader(reader, xptr); + } + + /// <summary> + /// element() scheme pointer works + /// </summary> + [Test] + public void ElementSchemeTest() + { + string xptr = "element(o10535)"; + XmlReader reader = new XmlTextReader("../../northwind.xml"); + XPointerReader xpr = new XPointerReader(reader, xptr); + string expected = @"<Item orderID=""o10535""> + <OrderDate> 6/13/95</OrderDate> + <ShipAddress> Mataderos 2312</ShipAddress> + </Item>"; + while (xpr.Read()) + { + Assert.AreEqual(xpr.ReadOuterXml(), expected); + return; + } + throw new InvalidOperationException("This means shorthand XPointer didn't work as expected."); + } + + /// <summary> + /// element() scheme pointer works + /// </summary> + [Test] + public void ElementSchemeTest2() + { + string xptr = "element(o10535/1)"; + XmlReader reader = new XmlTextReader("../../northwind.xml"); + XPointerReader xpr = new XPointerReader(reader, xptr); + string expected = @"<OrderDate> 6/13/95</OrderDate>"; + while (xpr.Read()) + { + Assert.AreEqual(xpr.ReadOuterXml(), expected); + return; + } + throw new InvalidOperationException("This means shorthand XPointer didn't work as expected."); + } + + /// <summary> + /// element() scheme pointer works + /// </summary> + [Test] + public void ElementSchemeTest3() + { + string xptr = "element(/1/1/2)"; + XmlReader reader = new XmlTextReader("../../northwind.xml"); + XPointerReader xpr = new XPointerReader(reader, xptr); + string expected = @"<CompanyName> Alfreds Futterkiste</CompanyName>"; + while (xpr.Read()) + { + Assert.AreEqual(xpr.ReadOuterXml(), expected); + return; + } + throw new InvalidOperationException("This means shorthand XPointer didn't work as expected."); + } + /// <summary> + /// element() scheme pointer points to nothing + /// </summary> + [Test] + [ExpectedException(typeof(NoSubresourcesIdentifiedException))] + public void ElementSchemeNotFoundTest() + { + string xptr = "element(no-such-id)"; + XmlReader reader = new XmlTextReader("../../northwind.xml"); + XPointerReader xpr = new XPointerReader(reader, xptr); } + + /// <summary> + /// compound pointer + /// </summary> + [Test] + public void CompoundPointerTest() + { + string xptr = "xmlns(p=12345)xpath1(/no/such/node) xpointer(/and/such) element(/1/1/2) element(o10535/1)"; + XmlReader reader = new XmlTextReader("../../northwind.xml"); + XPointerReader xpr = new XPointerReader(reader, xptr); + string expected = @"<CompanyName> Alfreds Futterkiste</CompanyName>"; + while (xpr.Read()) + { + Assert.AreEqual(xpr.ReadOuterXml(), expected); + return; + } + throw new InvalidOperationException("This means shorthand XPointer didn't work as expected."); + } + + /// <summary> + /// Unknown scheme pointer + /// </summary> + [Test] + public void UnknownSchemeTest() + { + string xptr = "dummy(foo) element(/1/1/2)"; + XmlReader reader = new XmlTextReader("../../northwind.xml"); + XPointerReader xpr = new XPointerReader(reader, xptr); + string expected = @"<CompanyName> Alfreds Futterkiste</CompanyName>"; + while (xpr.Read()) + { + Assert.AreEqual(xpr.ReadOuterXml(), expected); + return; + } + throw new InvalidOperationException("This means shorthand XPointer didn't work as expected."); + } + + /// <summary> + /// Unknown scheme pointer + /// </summary> + [Test] + [ExpectedException(typeof(XPointerSyntaxException))] + public void UnknownSchemeTest2() + { + string xptr = "foo:dummy(bar) element(/1/1/2)"; + XmlReader reader = new XmlTextReader("../../northwind.xml"); + XPointerReader xpr = new XPointerReader(reader, xptr); + string expected = @"<CompanyName> Alfreds Futterkiste</CompanyName>"; + while (xpr.Read()) + { + Assert.AreEqual(xpr.ReadOuterXml(), expected); + return; + } + throw new InvalidOperationException("This means shorthand XPointer didn't work as expected."); + } + + /// <summary> + /// Unknown scheme pointer + /// </summary> + [Test] + public void UnknownSchemeTest3() + { + string xptr = "xmlns(foo=http://foo.com/schemas)foo:dummy(bar) element(/1/1/2)"; + XmlReader reader = new XmlTextReader("../../northwind.xml"); + XPointerReader xpr = new XPointerReader(reader, xptr); + string expected = @"<CompanyName> Alfreds Futterkiste</CompanyName>"; + while (xpr.Read()) + { + Assert.AreEqual(xpr.ReadOuterXml(), expected); + return; + } + throw new InvalidOperationException("This means shorthand XPointer didn't work as expected."); + } } } Index: changelog.txt =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/test/changelog.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- changelog.txt 28 Sep 2004 09:10:00 -0000 1.1 +++ changelog.txt 9 Oct 2004 19:53:49 -0000 1.2 @@ -1,3 +1,7 @@ +October 9, 2004 + +Added unit tests. + --------------------------------------------------------- September 28, 2004 Index: XPointerTest.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/test/XPointerTest.csproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- XPointerTest.csproj 28 Sep 2004 09:10:00 -0000 1.1 +++ XPointerTest.csproj 9 Oct 2004 19:53:49 -0000 1.2 @@ -15,7 +15,7 @@ DefaultHTMLPageLayout = "Grid" DefaultTargetSchema = "IE50" DelaySign = "false" - OutputType = "Library" + OutputType = "Exe" PreBuildEvent = "" PostBuildEvent = "" RootNamespace = "Mvp.Xml.XPointer.Test" @@ -100,11 +100,23 @@ <Files> <Include> <File + RelPath = "changelog.txt" + BuildAction = "Content" + /> + <File RelPath = "EntryPoint.cs" SubType = "Code" BuildAction = "Compile" /> <File + RelPath = "northwind.dtd" + BuildAction = "None" + /> + <File + RelPath = "northwind.xml" + BuildAction = "None" + /> + <File RelPath = "XPointerParserTests.cs" SubType = "Code" BuildAction = "Compile" Index: XPointerParserTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/test/XPointerParserTests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- XPointerParserTests.cs 28 Sep 2004 09:10:00 -0000 1.1 +++ XPointerParserTests.cs 9 Oct 2004 19:53:49 -0000 1.2 @@ -62,7 +62,7 @@ [Test] public void UnknownSchemePointer() { - Pointer p = Pointer.Compile("xpath(/foo) foo(abr)"); + Pointer p = Pointer.Compile("xpath1(/foo) foo(abr)"); } } } Index: XPointerTest.csproj.user =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/test/XPointerTest.csproj.user,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- XPointerTest.csproj.user 28 Sep 2004 09:10:00 -0000 1.1 +++ XPointerTest.csproj.user 9 Oct 2004 19:53:49 -0000 1.2 @@ -40,7 +40,7 @@ CopyProjectDestinationFolder = "" CopyProjectUncPath = "" CopyProjectOption = "0" - ProjectView = "ProjectFiles" + ProjectView = "ShowAllFiles" ProjectTrust = "0" /> </CSHARP> |
|
From: Oleg T. <he...@us...> - 2004-10-09 19:53:17
|
Update of /cvsroot/mvp-xml/XPointer/v1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11805/v1 Modified Files: XPointer.suo Log Message: Well, something in suo file has been changed? Index: XPointer.suo =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/XPointer.suo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsmNpW5b and /tmp/cvs8GfgNc differ |
Update of /cvsroot/mvp-xml/XPointer/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11696/v1/src Modified Files: Pointer.cs SchemaBasedPointer.cs ShorthandPointer.cs XPointer.csproj XPointer.csproj.user XPointerReader.cs changelog.txt Log Message: Changed namespace to Mvp.Xml.XPointer. Externalized strings. Did general code review and cleanup. Simplified XPointerReader, switched to XPathDocument. Optimized by using XPathCache and XPathNavigatorReader. Index: Pointer.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/Pointer.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Pointer.cs 28 Sep 2004 09:10:00 -0000 1.1 +++ Pointer.cs 9 Oct 2004 19:52:18 -0000 1.2 @@ -20,7 +20,7 @@ /// an instance of <see cref="Pointer"/> class. /// </summary> /// <param name="xpointer">XPointer pointer</param> - /// <returns>Pars3ed and compiled XPointer</returns> + /// <returns>Parsed and compiled XPointer</returns> public static Pointer Compile(string xpointer) { return XPointerParser.ParseXPointer(xpointer); @@ -32,7 +32,7 @@ /// </summary> /// <param name="doc">Document to evaluate the /// <see cref="XPointer"/> on.</param> - /// <returns><see cref="XPathNodeIterator"/> over pointed nodes</returns> + /// <returns><see cref="XPathNodeIterator"/> over pointed nodes. Note - this iterator is moved to the first node already.</returns> public abstract XPathNodeIterator Evaluate(IXPathNavigable doc); #endregion Index: SchemaBasedPointer.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/SchemaBasedPointer.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SchemaBasedPointer.cs 4 Oct 2004 19:04:35 -0000 1.2 +++ SchemaBasedPointer.cs 9 Oct 2004 19:52:19 -0000 1.3 @@ -64,7 +64,7 @@ { PointerPart part = (PointerPart)_parts[i]; result = part.Evaluate(nav, nm); - if (result != null && result.Count > 0) + if (result != null && result.MoveNext()) return result; } throw new NoSubresourcesIdentifiedException(SR.NoSubresourcesIdentifiedException); Index: ShorthandPointer.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/ShorthandPointer.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ShorthandPointer.cs 4 Oct 2004 19:04:35 -0000 1.2 +++ ShorthandPointer.cs 9 Oct 2004 19:52:19 -0000 1.3 @@ -49,15 +49,18 @@ /// Evaluates <see cref="XPointer"/> pointer and returns /// iterator over pointed nodes. /// </summary> + /// <remarks>Note, that returned XPathNodeIterator is already moved once.</remarks> /// <param name="doc">Document to evaluate the /// <see cref="XPointer"/> on.</param> /// <returns><see cref="XPathNodeIterator"/> over pointed nodes</returns> public override XPathNodeIterator Evaluate(IXPathNavigable doc) { XPathNavigator nav = doc.CreateNavigator(); - XPathNodeIterator result = XPathCache.Select("id('"+ _NCName + "')", nav, (XmlNamespaceManager)null); - if (result != null && result.Count > 0) + XPathNodeIterator result = XPathCache.Select("id('"+ _NCName + "')", nav, (XmlNamespaceManager)null); + if (result != null && result.MoveNext()) + { return result; + } else throw new NoSubresourcesIdentifiedException(SR.NoSubresourcesIdentifiedException); } Index: changelog.txt =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/changelog.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- changelog.txt 28 Sep 2004 09:10:00 -0000 1.1 +++ changelog.txt 9 Oct 2004 19:52:19 -0000 1.2 @@ -1,3 +1,11 @@ +October 9, 2004 + +Changed namespace to Mvp.Xml.XPointer. +Externalized strings. +Did general code review and cleanup. +Simplified XPointerReader, switched to XPathDocument. +Optimized by using XPathCache and XPathNavigatorReader. + --------------------------------------------------------- September 28, 2004 Index: XPointer.csproj.user =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPointer.csproj.user,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XPointer.csproj.user 4 Oct 2004 19:04:35 -0000 1.2 +++ XPointer.csproj.user 9 Oct 2004 19:52:19 -0000 1.3 @@ -40,7 +40,7 @@ CopyProjectDestinationFolder = "" CopyProjectUncPath = "" CopyProjectOption = "0" - ProjectView = "ShowAllFiles" + ProjectView = "ProjectFiles" ProjectTrust = "0" /> </CSHARP> Index: XPointerReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPointerReader.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- XPointerReader.cs 28 Sep 2004 09:10:00 -0000 1.1 +++ XPointerReader.cs 9 Oct 2004 19:52:19 -0000 1.2 @@ -3,6 +3,7 @@ using System; using System.Xml; using System.Xml.XPath; +using System.Xml.Schema; using System.IO; using System.Collections; @@ -22,37 +23,65 @@ #region private members //Underlying reader - private XmlReader _reader, _extReader; - private Uri _uri; - private string _xpointer; - private Stream _stream; - private XmlNameTable _nt; - private XPathNodeIterator _pointedNodes; + private XmlReader _reader; + private XPathNodeIterator _pointedNodes; + + /// <summary> + /// Initializes the <c>XPointerReader</c>. + /// </summary> + private void Init(IXPathNavigable doc, string xpointer) + { + Pointer pointer = XPointerParser.ParseXPointer(xpointer); + _pointedNodes = pointer.Evaluate(doc); + //There is always at least one identified node + //XPathNodeIterator is already at the first node + _reader = new XPathNavigatorReader(_pointedNodes.Current); + } + //Dummy validation even handler + private static void ValidationCallback(object sender, ValidationEventArgs args) + { + //do nothing + } + + #endregion #region constructors /// <summary> + /// Creates <c>XPointerReader</c> instnace with given <see cref="IXpathNavigable"/> + /// and xpointer. + /// </summary> + public XPointerReader(IXPathNavigable doc, string xpointer) + { + Init(doc, xpointer); + } + + /// <summary> /// Creates <c>XPointerReader</c> instance with given uri, stream, nametable and xpointer. /// </summary> public XPointerReader(Uri uri, Stream stream, XmlNameTable nt, string xpointer) - { - _uri = uri; - _stream = stream; - _nt = nt; - _xpointer = xpointer; - } + : this (new XmlTextReader(uri.AbsoluteUri, stream, nt), xpointer) {} + + /// <summary> + /// Creates <c>XPointerReader</c> instance with given uri, stream and xpointer. + /// </summary> + public XPointerReader(Uri uri, Stream stream, string xpointer) + : this (uri, stream, new NameTable(), xpointer) {} /// <summary> - /// Creates <c>XPointerReader</c> instance with given XmlReader andxpointer. + /// Creates <c>XPointerReader</c> instance with given XmlReader and xpointer. /// </summary> - public XPointerReader(XmlReader reader, XmlNameTable nt, string xpointer) - { - _extReader = reader; - _xpointer = xpointer; - _nt = nt; - } + public XPointerReader(XmlReader reader, string xpointer) + { + XmlValidatingReader vr = new XmlValidatingReader(reader); + vr.EntityHandling = EntityHandling.ExpandEntities; + vr.ValidationType = ValidationType.None; + vr.ValidationEventHandler += new System.Xml.Schema.ValidationEventHandler(ValidationCallback); + XPathDocument doc = new XPathDocument(vr, XmlSpace.Preserve); + Init(doc, xpointer); + } #endregion @@ -245,26 +274,7 @@ } public override bool Read() - { - if (_reader == null) - { - XPathDocument doc = null; - if (_extReader == null) - { - doc = new XPathDocument(new XmlTextReader( - _uri.AbsoluteUri, new StreamReader(_stream)), - XmlSpace.Preserve); - } - else - { - doc = new XPathDocument(_extReader, XmlSpace.Preserve); - } - Pointer pointer = XPointerParser.ParseXPointer(_xpointer); - _pointedNodes = pointer.Evaluate(doc); - //There is always at least one identified node - _pointedNodes.MoveNext(); - _reader = new XPathNavigatorReader(_pointedNodes.Current); - } + { bool baseRead = _reader.Read(); if (baseRead) return true; Index: XPointer.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPointer.csproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XPointer.csproj 4 Oct 2004 19:04:35 -0000 1.2 +++ XPointer.csproj 9 Oct 2004 19:52:19 -0000 1.3 @@ -89,6 +89,10 @@ BuildAction = "Compile" /> <File + RelPath = "changelog.txt" + BuildAction = "Content" + /> + <File RelPath = "ElementSchemaPointerPart.cs" SubType = "Code" BuildAction = "Compile" |
|
From: Oleg T. <he...@us...> - 2004-10-09 19:47:13
|
Update of /cvsroot/mvp-xml/Global In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10611 Modified Files: Mvp.Xml.suo Log Message: Well, something in suo file has been changed? Index: Mvp.Xml.suo =================================================================== RCS file: /cvsroot/mvp-xml/Global/Mvp.Xml.suo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsHxcjuU and /tmp/cvsJCq8ev differ |
|
From: Oleg T. <he...@us...> - 2004-10-06 17:26:04
|
Update of /cvsroot/mvp-xml/XInclude/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16523/v1/src Modified Files: XIncludingReader.cs Log Message: Test message. Index: XIncludingReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/src/XIncludingReader.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- XIncludingReader.cs 6 Oct 2004 17:13:25 -0000 1.4 +++ XIncludingReader.cs 6 Oct 2004 17:25:45 -0000 1.5 @@ -13,16 +13,7 @@ #endregion namespace Mvp.Xml.XInclude -{ - - /* - Open Issues: - o Depth on included items? - o GetAttribute(int i)? - o MoveToAttribute(int i)? - o GetEntity on custom XmlResolver - */ - +{ internal struct FallbackState { //Fallback is being processed @@ -37,6 +28,13 @@ /// XInclude 1.0 aware XmlReader. /// </summary> /// <author>Oleg Tkachenko, ol...@tk...</author> + /// <remarks> + /// Open Issues: + /// o Depth on included items? + /// o GetAttribute(int i)? + /// o MoveToAttribute(int i)? + /// o GetEntity on custom XmlResolver + ///</remarks> public class XIncludingReader : XmlReader { #region Private fields |
|
From: Oleg T. <he...@us...> - 2004-10-06 17:13:36
|
Update of /cvsroot/mvp-xml/XInclude/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13276/v1/src Modified Files: XIncludingReader.cs Log Message: Test commit message. Index: XIncludingReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/src/XIncludingReader.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XIncludingReader.cs 29 Sep 2004 21:26:28 -0000 1.3 --- XIncludingReader.cs 6 Oct 2004 17:13:25 -0000 1.4 *************** *** 18,28 **** /* Open Issues: ! o Depth on included items? ! o GetAttribute(int i)? ! o MoveToAttribute(int i)? ! o GetEntity on custom XmlResolver ! */ ! internal struct FallbackState { //Fallback is being processed [...1729 lines suppressed...] ! } ! else ! { ! fallbackElem = true; ! SkipContent(); ! } ! } ! else ! //Ignore everything else ! SkipContent(); ! break; ! default: ! break; ! } ! } ! } // CheckAndSkipContent() ! #endregion ! } } |
