Skip to content

Commit 4c95275

Browse files
author
kadary DEMBELE
committed
Project packages and artifact renaming
Downgrade the source code level from 1.7 to 1.5 for compatibility with older jre Remove of the test package Add of MIT license
1 parent 5119092 commit 4c95275

25 files changed

Lines changed: 90 additions & 151 deletions

‎.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<attribute name="maven.pomderived" value="true"/>
1212
</attributes>
1313
</classpathentry>
14-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
14+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
1515
<attributes>
1616
<attribute name="maven.pomderived" value="true"/>
1717
</attributes>

LICENSE renamed to LICENSE.md

File renamed without changes.

‎javaLogger.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ loggers=esiea, demkada
5151
#Example of a fully configured logger
5252
esiea.Name=fr.esiea.JavaLogger
5353
esiea.Level=DEBUG
54-
esiea.Handlers=project.architecture.javaLogger.modules.output.handler.ConsoleHandler, project.architecture.javaLogger.modules.output.handler.FileHandler
54+
esiea.Handlers=org.thesoftwarecraftsman.logging.javaLogger.modules.output.handler.ConsoleHandler, org.thesoftwarecraftsman.logging.javaLogger.modules.output.handler.FileHandler
5555
esiea.LogFilePath=D:/logs/log_esiea.log
5656
esiea.LogFileSize=5
57-
esiea.Formater= project.architecture.javaLogger.modules.output.formater.DefaultFormater
57+
esiea.Formater= org.thesoftwarecraftsman.logging.javaLogger.modules.output.formater.DefaultFormater
5858

5959
#Example of only declared logger, this logger will use default config or java Config
6060
demkada.Name=com.demkada.test

‎pom.xml‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>fr.esiea.project.logging</groupId>
5-
<artifactId>java-logger</artifactId>
6-
<version>1.0</version>
7-
<build>
8-
<sourceDirectory>src</sourceDirectory>
9-
<plugins>
10-
<plugin>
11-
<artifactId>maven-compiler-plugin</artifactId>
12-
<version>3.1</version>
13-
<configuration>
14-
<source>1.7</source>
15-
<target>1.7</target>
16-
<excludes>
17-
<exclude>**project/architecture/javaLogger/test/*</exclude>
18-
</excludes>
19-
</configuration>
20-
</plugin>
21-
</plugins>
22-
</build>
4+
<parent>
5+
<groupId>org.thesoftwarecraftsman.parent</groupId>
6+
<artifactId>tsc-conventions</artifactId>
7+
<version>1.0.0</version>
8+
</parent>
9+
10+
<groupId>org.thesoftwarecraftsman.logging</groupId>
11+
<artifactId>javaLogger</artifactId>
12+
<version>1.0.1</version>
13+
<name>Java Logging Framework</name>
14+
<description>A simple and powerful logging framework to use as an alternative to Log4J, javaUtilLogging ...</description>
15+
<url>https://github.com/demkada/Java-Logger</url>
16+
17+
18+
<scm>
19+
<url>https://github.com/demkada/Java-Logger.git</url>
20+
</scm>
2321
</project>

src/project/architecture/javaLogger/core/AbstractLevel.java renamed to src/org/thesoftwarecraftsman/logging/javaLogger/core/AbstractLevel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package project.architecture.javaLogger.core;
1+
package org.thesoftwarecraftsman.logging.javaLogger.core;
22

33
/**
44
* @author kadary

src/project/architecture/javaLogger/core/AbstractLogger.java renamed to src/org/thesoftwarecraftsman/logging/javaLogger/core/AbstractLogger.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
package project.architecture.javaLogger.core;
1+
package org.thesoftwarecraftsman.logging.javaLogger.core;
22

33
import java.util.HashMap;
44
import java.util.Iterator;
55
import java.util.Map;
66
import java.util.Properties;
77
import java.util.Set;
88

9-
import project.architecture.javaLogger.modules.config.Key;
10-
import project.architecture.javaLogger.modules.output.formater.DefaultFormater;
11-
import project.architecture.javaLogger.modules.output.formater.Formater;
12-
import project.architecture.javaLogger.modules.output.handler.ConsoleHandler;
13-
import project.architecture.javaLogger.modules.output.handler.DataBaseHandler;
14-
import project.architecture.javaLogger.modules.output.handler.FileHandler;
15-
import project.architecture.javaLogger.modules.output.handler.Handler;
9+
import org.thesoftwarecraftsman.logging.javaLogger.modules.config.Key;
10+
import org.thesoftwarecraftsman.logging.javaLogger.modules.output.formater.DefaultFormater;
11+
import org.thesoftwarecraftsman.logging.javaLogger.modules.output.formater.Formater;
12+
import org.thesoftwarecraftsman.logging.javaLogger.modules.output.handler.ConsoleHandler;
13+
import org.thesoftwarecraftsman.logging.javaLogger.modules.output.handler.DataBaseHandler;
14+
import org.thesoftwarecraftsman.logging.javaLogger.modules.output.handler.FileHandler;
15+
import org.thesoftwarecraftsman.logging.javaLogger.modules.output.handler.Handler;
1616

1717

1818
/**

src/project/architecture/javaLogger/core/DefaultLogger.java renamed to src/org/thesoftwarecraftsman/logging/javaLogger/core/DefaultLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package project.architecture.javaLogger.core;
1+
package org.thesoftwarecraftsman.logging.javaLogger.core;
22

33

44

src/project/architecture/javaLogger/core/Level.java renamed to src/org/thesoftwarecraftsman/logging/javaLogger/core/Level.java

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package project.architecture.javaLogger.core;
1+
package org.thesoftwarecraftsman.logging.javaLogger.core;
22

33

44
/**
@@ -22,17 +22,36 @@ public Level(String name, int value) {
2222

2323
public static Level getLevel(String levelName) {
2424
Level level;
25-
switch (levelName) {
26-
case "INFO":
25+
int value = 0;
26+
//Transform string to Int for switch case compatibility (Java 5)
27+
if (levelName.equalsIgnoreCase("INFO")) {
28+
value = 1;
29+
}
30+
else if (levelName.equalsIgnoreCase("WARN")) {
31+
value= 2;
32+
}
33+
else if (levelName.equalsIgnoreCase("DEBUG")) {
34+
value = 3;
35+
}
36+
37+
else if (levelName.equalsIgnoreCase("ERROR")) {
38+
value = 4;
39+
}
40+
else {
41+
value = 5;
42+
}
43+
44+
switch (value) {
45+
case 1:
2746
level = Level.INFO;
2847
break;
29-
case "WARN":
48+
case 2:
3049
level = Level.WARN;
3150
break;
32-
case "DEBUG":
51+
case 3:
3352
level = Level.DEBUG;
3453
break;
35-
case "ERROR":
54+
case 4:
3655
level = Level.ERROR;
3756
break;
3857
default:

src/project/architecture/javaLogger/core/LogManager.java renamed to src/org/thesoftwarecraftsman/logging/javaLogger/core/LogManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package project.architecture.javaLogger.core;
1+
package org.thesoftwarecraftsman.logging.javaLogger.core;
22

33
import java.util.HashMap;
44
import java.util.Map;
55

6-
import project.architecture.javaLogger.modules.config.Configurator;
7-
import project.architecture.javaLogger.modules.config.DefaultConfigurator;
6+
import org.thesoftwarecraftsman.logging.javaLogger.modules.config.Configurator;
7+
import org.thesoftwarecraftsman.logging.javaLogger.modules.config.DefaultConfigurator;
88

99
/**
1010
* Principal class of Logger. it's must be imported in project by customer

src/project/architecture/javaLogger/core/Logger.java renamed to src/org/thesoftwarecraftsman/logging/javaLogger/core/Logger.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package project.architecture.javaLogger.core;
1+
package org.thesoftwarecraftsman.logging.javaLogger.core;
22

3-
import project.architecture.javaLogger.modules.output.formater.Formater;
4-
import project.architecture.javaLogger.modules.output.handler.Handler;
3+
import org.thesoftwarecraftsman.logging.javaLogger.modules.output.formater.Formater;
4+
import org.thesoftwarecraftsman.logging.javaLogger.modules.output.handler.Handler;
55

66

77

0 commit comments

Comments
 (0)