From a8fae67dc0a292d8b6aadb53c5f32f5ea63dfa9b Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Tue, 4 Jan 2011 17:46:59 +0100
Subject: [PATCH] use our namespace

---
 CSharpTranslator/antlr3/UpdateTxFiles/Main.cs | 4 +++-
 CSharpTranslator/antlr3/src/cs2j/CLR/cs2j.cs  | 8 +++++---
 CSharpTranslator/antlr3/src/cs2j/cs2j.csproj  | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CSharpTranslator/antlr3/UpdateTxFiles/Main.cs b/CSharpTranslator/antlr3/UpdateTxFiles/Main.cs
index 486e477..e4ba2a4 100644
--- a/CSharpTranslator/antlr3/UpdateTxFiles/Main.cs
+++ b/CSharpTranslator/antlr3/UpdateTxFiles/Main.cs
@@ -9,6 +9,8 @@ using RusticiSoftware.Translator;
 using OldT = RusticiSoftware.Translator.TypeRepTemplate;
 using NewT = RusticiSoftware.Translator.CLR.TypeRepTemplate;
 
+using CS2JConstants = RusticiSoftware.Translator.Utils.Constants;
+
 namespace UpdateTxFiles
 {
 	class MainClass
@@ -79,7 +81,7 @@ namespace UpdateTxFiles
 						{
 							Directory.CreateDirectory(xmlFDir);
 						}
-						XmlSerializer s = new XmlSerializer(txTemplate.GetType());
+						XmlSerializer s = new XmlSerializer(txTemplate.GetType(), CS2JConstants.TranslationTemplateNamespace);
 						TextWriter w = new StreamWriter(xmlFName);
 						s.Serialize(w, txTemplate);
 						w.Close();
diff --git a/CSharpTranslator/antlr3/src/cs2j/CLR/cs2j.cs b/CSharpTranslator/antlr3/src/cs2j/CLR/cs2j.cs
index b282db8..b9ade91 100644
--- a/CSharpTranslator/antlr3/src/cs2j/CLR/cs2j.cs
+++ b/CSharpTranslator/antlr3/src/cs2j/CLR/cs2j.cs
@@ -15,11 +15,13 @@ using RusticiSoftware.Translator.Utils;
 using RusticiSoftware.Translator.AntlrUtils;
 using RusticiSoftware.Translator.CLR;
 
+using CS2JConstants = RusticiSoftware.Translator.Utils.Constants;
+
 namespace RusticiSoftware.Translator.CSharp
 {
     class CS2J
     {
-        private const string VERSION = "2009.1.1.x";
+        private const string VERSION = "2011.1.1.x";
         private static DirectoryHT<TypeRepTemplate> AppEnv { get; set; }
         private static CS2JSettings cfg = new CS2JSettings();
  		private static StringTemplateGroup templates = null;
@@ -56,7 +58,7 @@ namespace RusticiSoftware.Translator.CSharp
         private static void addDirectories(IList<string> strs, string rawStr) {
             string[] argDirs = rawStr.Split(';');
             for (int i = 0; i < argDirs.Length; i++)
-                strs.Add(Path.GetFullPath(argDirs[i]).ToLower());
+                strs.Add(Path.GetFullPath(argDirs[i]));
         }
 		
         public static void CS2JMain(string[] args)
@@ -131,7 +133,7 @@ namespace RusticiSoftware.Translator.CSharp
                             {
                                 Directory.CreateDirectory(xmlFDir);
                             }
-                            XmlSerializer s = new XmlSerializer(de.Value.GetType());
+                            XmlSerializer s = new XmlSerializer(de.Value.GetType(), CS2JConstants.TranslationTemplateNamespace);
                             TextWriter w = new StreamWriter(xmlFName);
                             s.Serialize(w, de.Value);
                             w.Close();
diff --git a/CSharpTranslator/antlr3/src/cs2j/cs2j.csproj b/CSharpTranslator/antlr3/src/cs2j/cs2j.csproj
index 842be22..b7a10ff 100644
--- a/CSharpTranslator/antlr3/src/cs2j/cs2j.csproj
+++ b/CSharpTranslator/antlr3/src/cs2j/cs2j.csproj
@@ -39,7 +39,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Commandlineparameters>-warnings -debug 10 -dumpxmls -xmldir=/tmp/xml/se -odir=/tmp/java/se /Users/keving/svnrepos/ScormEngineNet/src/app/ScormEngine.Core/DataHelp/Db2OleDataHelper.cs</Commandlineparameters>
+    <Commandlineparameters>-warnings -debug 10 -netdir=/Users/keving/gitrepos/cs2j/CS2JLibrary/NetFramework/ -dumpxmls -xmldir=/tmp/xml/se -odir=/tmp/java/se /Users/keving/svnrepos/ScormEngineNet/src/app/ScormEngine.Core/DataHelp/Db2OleDataHelper.cs</Commandlineparameters>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>