Skip to content

Commit 2cdb0f6

Browse files
yin-bpyin-bp
committed
Merge remote-tracking branch 'origin/5.0.3.6'
2 parents 2534aac + f14aca5 commit 2cdb0f6

13 files changed

Lines changed: 276 additions & 309 deletions

File tree

‎commonstyle/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ dependencies {
2525
compile (
2626

2727

28-
[group: 'log4j', name: 'log4j', version: '1.2.16', transitive: false],
28+
29+
[group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.25', transitive: true],
2930
[group: 'com.bbossgroups', name: 'bboss-util', version: "${bboss_version}", transitive: false],
3031
[group: 'com.bbossgroups', name: 'bboss-data', version: "${bboss_version}", transitive: false],
3132
[group: 'com.bbossgroups', name: 'bboss-core', version: "${bboss_version}", transitive: false],
@@ -46,7 +47,7 @@ dependencies {
4647
[group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonversion}",transitive: false],
4748
[group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonversion}",transitive: false],
4849
[group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jacksonversion}",transitive: false],
49-
[group: 'commons-logging', name: 'commons-logging', version: '1.1', transitive: false],
50+
// [group: 'commons-logging', name: 'commons-logging', version: '1.1', transitive: false],
5051
[group: 'commons-collections', name: 'commons-collections', version: '3.2.1', transitive: false],
5152
[group: 'com.fasterxml.uuid', name: 'java-uuid-generator', version: '3.1.2', transitive: false],
5253
[group: 'net.sourceforge.jtds', name: 'jtds', version: '1.3.1', transitive: false],

‎gencode-core/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ sourceSets {
1313
}
1414
dependencies {
1515
compile (
16-
[group: 'log4j', name: 'log4j', version: '1.2.16', transitive: false],
16+
17+
[group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.25', transitive: true],
1718
[group: 'com.bbossgroups', name: 'bboss-util', version: "${bboss_version}", transitive: false],
1819
[group: 'com.bbossgroups', name: 'bboss-data', version: "${bboss_version}", transitive: false],
1920
[group: 'com.bbossgroups', name: 'bboss-core', version: "${bboss_version}", transitive: false],
@@ -30,7 +31,7 @@ dependencies {
3031
[group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonversion}",transitive: false],
3132
[group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonversion}",transitive: false],
3233
[group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jacksonversion}",transitive: false],
33-
[group: 'commons-logging', name: 'commons-logging', version: '1.1', transitive: false],
34+
//[group: 'commons-logging', name: 'commons-logging', version: '1.1', transitive: false],
3435
[group: 'commons-collections', name: 'commons-collections', version: '3.2.1', transitive: false],
3536
[group: 'com.fasterxml.uuid', name: 'java-uuid-generator', version: '3.1.2', transitive: false],
3637
[group: 'org.xerial', name: 'sqlite-jdbc', version: '3.8.11.2', transitive: false],

‎gencode-core/src/org/frameworkset/gencode/core/GencodeServiceImpl.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import java.util.Set;
1212
import java.util.TreeSet;
1313

14-
import org.apache.log4j.Logger;
1514
import org.eclipse.jdt.core.formatter.CodeFormatterApplication;
1615
import org.frameworkset.gencode.core.ui.GenAddJsp;
1716
import org.frameworkset.gencode.core.ui.GenI8N;
@@ -30,6 +29,8 @@
3029
import org.frameworkset.gencode.entity.MethodParam;
3130
import org.frameworkset.gencode.entity.ModuleMetaInfo;
3231
import org.frameworkset.gencode.entity.SortField;
32+
import org.slf4j.Logger;
33+
import org.slf4j.LoggerFactory;
3334

3435
import com.frameworkset.common.poolman.DBUtil;
3536
import com.frameworkset.common.poolman.sql.ColumnMetaData;
@@ -50,7 +51,7 @@
5051
*
5152
*/
5253
public class GencodeServiceImpl {
53-
private static final Logger log = Logger.getLogger(GencodeServiceImpl.class);
54+
private static final Logger log = LoggerFactory.getLogger(GencodeServiceImpl.class);
5455
public static String DEFAULT_SOURCEPATH;
5556
public static String SQLITEPATH;
5657
private ControlInfo controlInfo ;
@@ -915,7 +916,7 @@ private List<Field> getServiceImplFields(String serviceName)
915916
log4j.setFieldName("log");
916917
log4j.setType("Logger");
917918
String entityPackageInfo = javamodulePackage+".service";
918-
log4j.setDefaultValue("Logger.getLogger("+entityPackageInfo + "."+serviceName+".class)");
919+
log4j.setDefaultValue("LoggerFactory.getLogger("+entityPackageInfo + "."+serviceName+".class)");
919920
fields.add(log4j);
920921

921922
Field dao = new Field();
@@ -1909,7 +1910,8 @@ private List<String> evalServiceImplImport( ) {
19091910
imports.add(javamodulePackage+".entity.*");
19101911
imports.add("com.frameworkset.util.ListInfo");
19111912
imports.add("com.frameworkset.common.poolman.ConfigSQLExecutor");
1912-
imports.add("org.apache.log4j.Logger");
1913+
imports.add("org.slf4j.Logger");
1914+
imports.add("org.slf4j.LoggerFactory");
19131915
imports.add("java.util.List");
19141916
if(this.isPagineWithDBRownumberOver())
19151917
imports.add("com.frameworkset.common.poolman.ConfigPagineOrderby");
@@ -1935,7 +1937,8 @@ private List<String> evalActionImplImport( ) {
19351937
List<String> imports = new ArrayList<String>();
19361938
imports.add(javamodulePackage+".entity.*");
19371939
imports.add("com.frameworkset.util.ListInfo");
1938-
imports.add("org.apache.log4j.Logger");
1940+
imports.add("org.slf4j.Logger");
1941+
imports.add("org.slf4j.LoggerFactory");
19391942
imports.add("java.util.List");
19401943
imports.add("java.util.Map");
19411944
imports.add("com.frameworkset.util.StringUtil");
@@ -1976,7 +1979,7 @@ public static void main(String[] args)
19761979
}
19771980
catch (EngineException e)
19781981
{
1979-
log.error(e, e);
1982+
log.error("", e);
19801983
}
19811984

19821985
inputs = new ArrayList(2);
@@ -1990,7 +1993,7 @@ public static void main(String[] args)
19901993
}
19911994
catch (EngineException e)
19921995
{
1993-
log.error(e, e);
1996+
log.error("", e);
19941997
}
19951998
inputs = new ArrayList(2);
19961999
inputs.add("td_tableinfo_name");
@@ -2003,7 +2006,7 @@ public static void main(String[] args)
20032006
}
20042007
catch (EngineException e)
20052008
{
2006-
log.error(e, e);
2009+
log.error("", e);
20072010
}
20082011
inputs = new ArrayList(2);
20092012
inputs.add("td_tableinfo_name");
@@ -2016,7 +2019,7 @@ public static void main(String[] args)
20162019
}
20172020
catch (EngineException e)
20182021
{
2019-
log.error(e, e);
2022+
log.error("", e);
20202023
}
20212024
}
20222025

‎gencode-core/src/org/frameworkset/gencode/core/Util.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
import java.util.List;
55
import java.util.Set;
66

7-
import org.apache.log4j.Logger;
87
import org.frameworkset.gencode.entity.FieldInfo;
8+
import org.slf4j.Logger;
9+
import org.slf4j.LoggerFactory;
910

1011
import com.frameworkset.common.poolman.sql.ColumnMetaData;
1112
import com.frameworkset.common.poolman.sql.TableMetaData;
@@ -15,7 +16,7 @@
1516
import com.frameworkset.util.SimpleStringUtil;
1617

1718
public class Util {
18-
private static Logger log = Logger.getLogger(Util.class);
19+
private static Logger log = LoggerFactory.getLogger(Util.class);
1920
public final static int addpage = 0;
2021
public final static int editpage = 1;
2122
public final static int viewpage = 2;

0 commit comments

Comments
 (0)