Merge remote-tracking branch 'origin/5.0.3.6'

bbossgroups · Aug 16, 2017 · 2cdb0f6 · 2cdb0f6
2 parents 2534aac + f14aca5
commit 2cdb0f6
Show file tree

Hide file tree

Showing 13 changed files with 276 additions and 309 deletions.
diff --git a/commonstyle/build.gradle b/commonstyle/build.gradle
@@ -25,7 +25,8 @@ dependencies {
     compile (
 
 
-               [group: 'log4j', name: 'log4j', version: '1.2.16', transitive: false],
+
+           	[group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.25', transitive: true],
             [group: 'com.bbossgroups', name: 'bboss-util', version: "${bboss_version}", transitive: false],
             [group: 'com.bbossgroups', name: 'bboss-data', version: "${bboss_version}", transitive: false],
             [group: 'com.bbossgroups', name: 'bboss-core', version: "${bboss_version}", transitive: false],
@@ -46,7 +47,7 @@ dependencies {
              [group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonversion}",transitive: false],
              [group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonversion}",transitive: false],
              [group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jacksonversion}",transitive: false],
-              [group: 'commons-logging', name: 'commons-logging', version: '1.1', transitive: false],
+            //  [group: 'commons-logging', name: 'commons-logging', version: '1.1', transitive: false],
             [group: 'commons-collections', name: 'commons-collections', version: '3.2.1', transitive: false],
              [group: 'com.fasterxml.uuid', name: 'java-uuid-generator', version: '3.1.2', transitive: false],
              [group: 'net.sourceforge.jtds', name: 'jtds', version: '1.3.1', transitive: false],

diff --git a/gencode-core/build.gradle b/gencode-core/build.gradle
@@ -13,7 +13,8 @@ sourceSets {
 }
 dependencies {
     compile (
-            [group: 'log4j', name: 'log4j', version: '1.2.16', transitive: false],
+
+           	[group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.25', transitive: true],
             [group: 'com.bbossgroups', name: 'bboss-util', version: "${bboss_version}", transitive: false],
             [group: 'com.bbossgroups', name: 'bboss-data', version: "${bboss_version}", transitive: false],
             [group: 'com.bbossgroups', name: 'bboss-core', version: "${bboss_version}", transitive: false],
@@ -30,7 +31,7 @@ dependencies {
              [group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonversion}",transitive: false],
              [group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonversion}",transitive: false],
              [group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jacksonversion}",transitive: false],
-              [group: 'commons-logging', name: 'commons-logging', version: '1.1', transitive: false],
+             //[group: 'commons-logging', name: 'commons-logging', version: '1.1', transitive: false],
             [group: 'commons-collections', name: 'commons-collections', version: '3.2.1', transitive: false],
              [group: 'com.fasterxml.uuid', name: 'java-uuid-generator', version: '3.1.2', transitive: false],
             [group: 'org.xerial', name: 'sqlite-jdbc', version: '3.8.11.2', transitive: false],

diff --git a/gencode-core/src/org/frameworkset/gencode/core/GencodeServiceImpl.java b/gencode-core/src/org/frameworkset/gencode/core/GencodeServiceImpl.java
@@ -11,7 +11,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jdt.core.formatter.CodeFormatterApplication;
 import org.frameworkset.gencode.core.ui.GenAddJsp;
 import org.frameworkset.gencode.core.ui.GenI8N;
@@ -30,6 +29,8 @@
 import org.frameworkset.gencode.entity.MethodParam;
 import org.frameworkset.gencode.entity.ModuleMetaInfo;
 import org.frameworkset.gencode.entity.SortField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.frameworkset.common.poolman.DBUtil;
 import com.frameworkset.common.poolman.sql.ColumnMetaData;
@@ -50,7 +51,7 @@
  *
  */
 public class GencodeServiceImpl {
-	private static final Logger log = Logger.getLogger(GencodeServiceImpl.class);
+	private static final Logger log = LoggerFactory.getLogger(GencodeServiceImpl.class);
 	public static String DEFAULT_SOURCEPATH;
 	public static String SQLITEPATH;
 	private ControlInfo controlInfo ;
@@ -915,7 +916,7 @@ private List<Field> getServiceImplFields(String serviceName)
 		log4j.setFieldName("log");
 		log4j.setType("Logger");
 		String entityPackageInfo = javamodulePackage+".service";
-		log4j.setDefaultValue("Logger.getLogger("+entityPackageInfo + "."+serviceName+".class)");
+		log4j.setDefaultValue("LoggerFactory.getLogger("+entityPackageInfo + "."+serviceName+".class)");
 		fields.add(log4j);
 
 		Field dao = new Field(); 
@@ -1909,7 +1910,8 @@ private List<String> evalServiceImplImport( ) {
 		imports.add(javamodulePackage+".entity.*");
 		imports.add("com.frameworkset.util.ListInfo");
 		imports.add("com.frameworkset.common.poolman.ConfigSQLExecutor");
-		imports.add("org.apache.log4j.Logger");		
+		imports.add("org.slf4j.Logger");
+		imports.add("org.slf4j.LoggerFactory");
 		imports.add("java.util.List");
 		if(this.isPagineWithDBRownumberOver())
 			imports.add("com.frameworkset.common.poolman.ConfigPagineOrderby");
@@ -1935,7 +1937,8 @@ private List<String> evalActionImplImport( ) {
 		List<String> imports = new ArrayList<String>();
 		imports.add(javamodulePackage+".entity.*");
 		imports.add("com.frameworkset.util.ListInfo");
-		imports.add("org.apache.log4j.Logger");		
+		imports.add("org.slf4j.Logger");
+		imports.add("org.slf4j.LoggerFactory");
 		imports.add("java.util.List");
 		imports.add("java.util.Map");
 		imports.add("com.frameworkset.util.StringUtil");
@@ -1976,7 +1979,7 @@ public static void main(String[] args)
          }
          catch (EngineException e)
          {
-             log.error(e, e);
+             log.error("", e);
          }
 
            inputs = new ArrayList(2);
@@ -1990,7 +1993,7 @@ public static void main(String[] args)
          }
          catch (EngineException e)
          {
-             log.error(e, e);
+             log.error("", e);
          }
          inputs = new ArrayList(2);
          inputs.add("td_tableinfo_name");
@@ -2003,7 +2006,7 @@ public static void main(String[] args)
          }
          catch (EngineException e)
          {
-             log.error(e, e);
+             log.error("", e);
          }
          inputs = new ArrayList(2);
          inputs.add("td_tableinfo_name");
@@ -2016,7 +2019,7 @@ public static void main(String[] args)
          }
          catch (EngineException e)
          {
-             log.error(e, e);
+             log.error("", e);
          }
 	}
 

diff --git a/gencode-core/src/org/frameworkset/gencode/core/Util.java b/gencode-core/src/org/frameworkset/gencode/core/Util.java
@@ -4,8 +4,9 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.frameworkset.gencode.entity.FieldInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.frameworkset.common.poolman.sql.ColumnMetaData;
 import com.frameworkset.common.poolman.sql.TableMetaData;
@@ -15,7 +16,7 @@
 import com.frameworkset.util.SimpleStringUtil;
 
 public class Util {
-	private static Logger log = Logger.getLogger(Util.class);
+	private static Logger log = LoggerFactory.getLogger(Util.class);
 	public final static int addpage = 0;
 	public final static int editpage = 1;
 	public final static int viewpage = 2;