update to lasted

.gitignore

@@ -24,4 +24,7 @@ Thumbs.db
 obj/
 [Rr]elease*/
 _ReSharper*/
-[Tt]est[Rr]esult*
+[Tt]est[Rr]esult*
+packages
+vs
+.vs

.travis.yml

@@ -0,0 +1,4 @@
+language: csharp
+solution: CodeBuilder.sln
+before_install:
+  - mysql -e "create database IF NOT EXISTS easy_admin;" -uroot

CodeBuilder.Console/CodeBuilder.Console.csproj

@@ -69,10 +69,14 @@
   </ItemGroup>
   <ItemGroup>
     <ConfigFile Include="Config\DataSources.xml" />
-    <ConfigFile Include="Config\Options.xml" />
+    <ConfigFile Include="Config\Options.xml">
+      <SubType>Designer</SubType>
+    </ConfigFile>
     <ConfigFile Include="Config\Templates.xml" />
     <ConfigFile Include="Config\Settings.xml" />
-    <ConfigFile Include="Config\TypeMapping.xml" />
+    <ConfigFile Include="Config\TypeMapping.xml">
+      <SubType>Designer</SubType>
+    </ConfigFile>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

CodeBuilder.Console/Properties/AssemblyInfo.cs

@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("CodeBuilder.Console")]
 [assembly: AssemblyDescription("CodeBuilder Command Line")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("www.dengzhiwei.com")]
+[assembly: AssemblyCompany("http://www.easytoolsoft.com/")]
 [assembly: AssemblyProduct("CodeBuilder.WinForm")]
-[assembly: AssemblyCopyright("Copyright © Tom Deng 2011-2012")]
+[assembly: AssemblyCopyright("Copyright © Tom Deng 2009-2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.11.1210")]
-[assembly: AssemblyFileVersion("1.0.11.1210")]
+[assembly: AssemblyVersion("1.1.16.0602")]
+[assembly: AssemblyFileVersion("1.1.16.0602")]

CodeBuilder.Framework.Test/CodeBuilder.Framework.Test.csproj

@@ -56,9 +56,13 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\Test\UNuit2.5.10\nunit.framework.dll</HintPath>
+    <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
+      <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.2.1\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
@@ -86,6 +90,7 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ConfigFile Include="Config\DataSources.xml" />
@@ -95,7 +100,7 @@
     <ConfigFile Include="Config\TypeMapping.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-    <Target Name="BeforeBuild">
+  <Target Name="BeforeBuild">
     <Copy SourceFiles="@(ConfigFile)" DestinationFolder="$(OutputPath)\Config" />
   </Target>
 </Project>

CodeBuilder.Framework.Test/Config/DataSources.xml

@@ -4,6 +4,5 @@
     <clear/>
     <dataSource name="test_pdm" connectionString="d:\test.pdm" exporter="PowerDesigner12" />
     <dataSource name="test_db" connectionString="server=localhost;user id=root; password=ddd;database=codebook;Pooling=true" exporter="MySQL5" />
-    <dataSource name="kigg" connectionString="server=TOMDENG-PC\SQLEXPRESS;user id=sa; password=ddd;database=kigg;Pooling=true" exporter="SqlServer2008" />
   </dataSources>
 </dataSourceSection>

CodeBuilder.Framework.Test/Config/Settings.xml

@@ -5,6 +5,8 @@
     <language name="JAVA" alias="java" ext=".java" isDynamic="false"/>
     <language name="Ruby" alias="ruby" ext=".rb" isDynamic="true"/>
     <language name="PHP" alias="php" ext=".php" isDynamic="true"/>
+    <language name="XML" alias="xml" ext=".xml" isDynamic="false"/>
+    <language name="MyBatisMapper" alias="mybatisMapper" ext=".xml" isDynamic="false"/>
   </languages>
   <exporters>
     <exporter name="PowerDesigner12" type="CodeBuilder.DataSource.Exporter.PowerDesigner12Exporter,CodeBuilder.Framework"/>
@@ -36,14 +38,11 @@
   </pdmDatabases>
   <templateEngines>
     <templateEngine name="NVelocity" ext=".nv" adapter="CodeBuilder.TemplateEngine.NVelocityEngineAdapter,CodeBuilder.Framework" />
-    <templateEngine name="Razor" ext=".raz" adapter="CodeBuilder.TemplateEngine.RazorEngineAdapter,CodeBuilder.Framework" />
-    <templateEngine name="Vici" ext=".vic" adapter="CodeBuilder.TemplateEngine.ViciEngineAdapter,CodeBuilder.Framework" />
-    <templateEngine name="Ader" ext=".adr" adapter="CodeBuilder.TemplateEngine.AderEngineAdapter,CodeBuilder.Framework" />
   </templateEngines>
   <appSettings>
     <add key="typeMapper" value="CodeBuilder.TypeMapping.DefaultTypeMapper,CodeBuilder.Framework" />
-    <add key="onlineTemplateUrl" value="http://www.dengzhiwei.com/category/codebuilder/templates"/>
-    <add key="helpUrl" value="http://www.dengzhiwei.com/category/codebuilder"/>
-    <add key="feedbackUrl" value="http://www.dengzhiwei.com/category/codebuilder-feedback"/>
+    <add key="onlineTemplateUrl" value="https://github.com/xianrendzw/CodeBuilder/tree/master/CodeBuilder.WinForm/Templates"/>
+    <add key="helpUrl" value="https://github.com/xianrendzw/CodeBuilder/blob/master/README.MD"/>
+    <add key="feedbackUrl" value="https://github.com/xianrendzw/CodeBuilder/issues"/>
   </appSettings>
 </settingsSection>

CodeBuilder.Framework.Test/Config/TypeMapping.xml

@@ -117,6 +117,35 @@
       <add name="varbinary" langtype="Byte[]" default="" />
       <add name="varchar" langtype="String" default="" />
     </typeMapping>
+    <typeMapping name="mysql5-mybatismapper" database="mysql5" language="xml">
+      <add name="default" langtype="VARCHAR" default="" />
+      <add name="nvarchar" langtype="NVARCHAR" default="" />
+      <add name="bigint" langtype="BIGINT" default="" />
+      <add name="binary" langtype="BINARY" default="" />
+      <add name="bit" langtype="BIT" default="" />
+      <add name="char" langtype="CHAR" default="" />
+      <add name="datetime" langtype="TIMESTAMP" default="" />
+      <add name="decimal" langtype="DECIMAL" default="" />
+      <add name="float" langtype="FLOAT" default="" />
+      <add name="image" langtype="VARBINARY" default="" />
+      <add name="int" langtype="INTEGER" default="" />
+      <add name="money" langtype="DECIMAL" default="" />
+      <add name="nchar" langtype="NCHAR" default="" />
+      <add name="ntext" langtype="LONGVARCHAR" default="" />
+      <add name="numeric" langtype="NUMERIC" default="" />
+      <add name="nvarchar" langtype="NVARCHAR" default="" />
+      <add name="real" langtype="REAL" default="" />
+      <add name="smalldatetime" langtype="DATE" default="" />
+      <add name="smallint" langtype="SMALLINT" default="" />
+      <add name="smallmoney" langtype="DOUBLE" default="" />
+      <add name="sql_variant" langtype="VARBINARY" default="" />
+      <add name="text" langtype="LONGVARCHAR" default="" />
+      <add name="timestamp" langtype="TIMESTAMP" default="" />
+      <add name="tinyint" langtype="TINYINT" default="" />
+      <add name="uniqueidentifier" langtype="Guid" default="" />
+      <add name="varbinary" langtype="VARBINARY" default="" />
+      <add name="varchar" langtype="VARCHAR" default="" />
+    </typeMapping>
     <typeMapping name="oracle-csharp" database="oracle" language="C#">
       <add name="default" langtype="String" default="" />
       <add name="bfile" langtype="Byte[]" default="" />

CodeBuilder.Framework.Test/Properties/AssemblyInfo.cs

@@ -10,11 +10,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("CodeBuilder.Framework.Test")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("CodeBuilder Framework Test")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("http://www.easytoolsoft.com/")]
 [assembly: AssemblyProduct("CodeBuilder.Framework.Test")]
-[assembly: AssemblyCopyright("Copyright 2011")]
+[assembly: AssemblyCopyright("Copyright © Tom Deng 2009-2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -28,4 +28,4 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.1.16.0602")]

CodeBuilder.Framework.Test/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Moq" version="4.2.1510.2205" targetFramework="net40" />
+  <package id="NUnit" version="3.2.1" targetFramework="net40" />
+</packages>

CodeBuilder.Framework/CodeBuilder.Framework.csproj

@@ -32,9 +32,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Oracle.DataAccess, Version=4.112.3.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\ADO.NET\oracle\4\Oracle.DataAccess.dll</HintPath>
+    <Reference Include="MySql.Data, Version=6.9.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.6.9.8\lib\net40\MySql.Data.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NVelocity, Version=1.1.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.NVelocity.1.1.1\lib\net40\NVelocity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Oracle.DataAccess, Version=4.112.3.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=AMD64">
+      <HintPath>..\packages\odp.net.x64.112.3.20\lib\net40\Oracle.DataAccess.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
@@ -46,33 +54,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="mysql.data, Version=6.4.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\ADO.NET\mysql\v4\mysql.data.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NVelocity">
-      <HintPath>..\lib\TemplateEngines\NVelocity-1.1.1\net40\NVelocity.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="RazorEngine">
-      <HintPath>..\lib\TemplateEngines\Razor2.1\RazorEngine.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\TemplateEngines\Razor2.1\System.Web.Razor.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="TemplateEngine">
-      <HintPath>..\lib\TemplateEngines\AderV2\TemplateEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="Vici.Core">
-      <HintPath>..\lib\TemplateEngines\Vici.Engine.1.0.0\Vici.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Configuration\ConfigManager.cs" />
     <Compile Include="Configuration\DataSource\DataSourceElement.cs" />
@@ -125,10 +106,12 @@
     <Compile Include="PhysicalDataModel\View.cs" />
     <Compile Include="PhysicalDataModel\Views.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TemplateEngine\Adapters\AderEngineAdapter.cs" />
+    <Compile Include="Properties\Resource.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resource.resx</DependentUpon>
+    </Compile>
     <Compile Include="TemplateEngine\Adapters\NVelocityEngineAdapter.cs" />
-    <Compile Include="TemplateEngine\Adapters\RazorEngineAdapter.cs" />
-    <Compile Include="TemplateEngine\Adapters\ViciEngineAdapter.cs" />
     <Compile Include="TemplateEngine\ITemplateEngine.cs" />
     <Compile Include="TemplateEngine\TemplateData.cs" />
     <Compile Include="TemplateEngine\TemplateDataBuilder.cs" />
@@ -145,7 +128,20 @@
     <Compile Include="Util\SerializeHelper.cs" />
     <Compile Include="Util\StringExtension.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resource.zh-CN.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.zh-CN.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resource.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resource.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

CodeBuilder.Framework/Configuration/ConfigManager.cs

@@ -1,17 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Reflection;
 using System.Configuration;
+using System.IO;
 
 namespace CodeBuilder.Configuration
 {
-    using Util;
-    using Exceptions;
+    using Framework.Properties;
 
     public class ConfigManager
     {
@@ -196,7 +189,7 @@ public static void Save()
             }
             catch (Exception ex)
             {
-                throw new ConfigurationErrorsException("Save configuration failure", ex);
+                throw new ConfigurationErrorsException(Resource.SaveConfigurationFailure, ex);
             }
         }
 
@@ -212,7 +205,7 @@ private static void LoadConfiguration()
             }
             catch (Exception ex)
             {
-                throw new ConfigurationErrorsException("Load configuration failure", ex);
+                throw new ConfigurationErrorsException(Resource.LoadConfigurationFailure, ex);
             }
         }
 
@@ -224,7 +217,7 @@ private static T GetConfigSection<T>(string name) where T:ConfigurationSection
             }
             catch (Exception ex)
             {
-                throw new ConfigurationErrorsException(string.Format("ConfigurationSection {0} load failure", name), ex);
+                throw new ConfigurationErrorsException(string.Format(Resource.ConfigurationSectionLoadFailure, name), ex);
             }
         }
 

CodeBuilder.Framework/Configuration/Generation/GenerationSettings.cs

@@ -19,7 +19,7 @@ public class GenerationSettings
         private string[] _templateNames;
         private string _encoding;
         private bool _isOmitTablePrefix;
-        private bool _isStandardizeName;
+        private bool _isCamelCaseName;
 
         public GenerationSettings() { }
 
@@ -31,7 +31,7 @@ public GenerationSettings(string language, string templateEngine)
 
         public GenerationSettings(string language, string templateEngine, string package,
             string tablePrefix, string author, string version, string[] templateNames, string encoding,
-            bool isOmitTablePrefix, bool isStandardizeName)
+            bool isOmitTablePrefix, bool isCamelCaseName)
         {
             this._language = language;
             this._templateEngine = templateEngine;
@@ -42,7 +42,7 @@ public GenerationSettings(string language, string templateEngine, string package
             this._templateNames = templateNames;
             this._encoding = encoding;
             this._isOmitTablePrefix = isOmitTablePrefix;
-            this._isStandardizeName = isStandardizeName;
+            this._isCamelCaseName = isCamelCaseName;
         }
 
         [XmlElement("Language")]
@@ -109,11 +109,11 @@ public bool IsOmitTablePrefix
             set { this._isOmitTablePrefix = value; }
         }
 
-        [XmlElement("IsStandardizeName")]
-        public bool IsStandardizeName
+        [XmlElement("IsCamelCaseName")]
+        public bool IsCamelCaseName
         {
-            get { return this._isStandardizeName; }
-            set { this._isStandardizeName = value; }
+            get { return this._isCamelCaseName; }
+            set { this._isCamelCaseName = value; }
         }
     }
 }

CodeBuilder.Framework/Configuration/Template/TemplateElement.cs

@@ -71,6 +71,20 @@ public string Description
             set { base["desc"] = value; }
         }
 
+        [ConfigurationProperty("category", IsRequired = true)]
+        public string Category
+        {
+            get { return base["category"].ToString(); }
+            set { base["category"] = value; }
+        }
+
+        [ConfigurationProperty("version", IsRequired = true)]
+        public string Version
+        {
+            get { return base["version"].ToString(); }
+            set { base["version"] = value; }
+        }
+
         [ConfigurationProperty("parser", IsRequired = false)]
         public string Parser
         {