Skip to content
Snippets Groups Projects
Commit ac3daff9 authored by Goik Martin's avatar Goik Martin
Browse files

Fixed javadoc, log4j 1.2 --> 2.x, jdoc separately

parent 0ec857ee
No related branches found
No related tags found
No related merge requests found
......@@ -25,11 +25,15 @@
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
......@@ -49,6 +53,12 @@
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<configuration />
</plugin>
</plugins>
</build>
</project>
......@@ -4,7 +4,8 @@ import java.sql.SQLException;
import javax.naming.NamingException;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import de.hdm_stuttgart.mi.sda2.rdbms2ldap.ldap.LdapHandler;
import de.hdm_stuttgart.mi.sda2.rdbms2ldap.rdbms.RdbmsHandler;
......@@ -14,7 +15,7 @@ import de.hdm_stuttgart.mi.sda2.rdbms2ldap.rdbms.RdbmsHandler;
*
*/
public class Driver {
private static Logger log = Logger.getLogger(Driver.class);
private static Logger log = LogManager.getLogger(Driver.class);
public static void main( String[] args ) {
......
......@@ -10,12 +10,13 @@ import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import de.hdm_stuttgart.mi.sda2.rdbms2ldap.Config;
public class LdapHandler {
private static Logger log = Logger.getLogger(LdapHandler.class);
private static Logger log = LogManager.getLogger(LdapHandler.class);
InitialDirContext rootContext;
......
......@@ -6,14 +6,15 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import de.hdm_stuttgart.mi.sda2.rdbms2ldap.Config;
import de.hdm_stuttgart.mi.sda2.rdbms2ldap.ldap.LdapHandler;
public class RdbmsHandler {
private static Logger log = Logger
private static Logger log = LogManager
.getLogger(RdbmsHandler.class);
static {
......
#Set root logger level to DEBUG and its only appender to A1.
log4j.rootLogger=DEBUG, A1
# A1 is set to be a ConsoleAppender.
log4j.appender.A1=org.apache.log4j.ConsoleAppender
# A1 uses PatternLayout comforting Eclipse's debugger.
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%p: %m at %c.%M(%C{1}.java:%L)%n
# Activate per-class or package logging rules if required. For example
# reducing logging to INFO level for class de.hdm-stuttgart.mi.sda2.rdbms2ldap.App
# can be achieved by un-commenting the following line:
#log4j.logger.de.hdm-stuttgart.mi.sda2.rdbms2ldap.App.parse.Group=INFO
<?xml version="1.0" encoding="UTF-8"?>
<Configuration>
<Appenders>
<!-- No logfile yet!
<File name="A1" fileName="A1.log" append="false">
<PatternLayout pattern="%t %-5p %c{2} - %m%n"/>
</File>
-->
<Console name="STDOUT" target="SYSTEM_OUT">
<PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
</Console>
</Appenders>
<Loggers>
<!-- No logfile yet!
<Logger name="org.apache.log4j.xml" level="debug">
<AppenderRef ref="A1"/>
</Logger>
-->
<Root level="debug">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
</Configuration>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment