#0 feature - Upgrading log traces to log4j2

Roberto Sánchez

2014-08-27 bc2484cbd4f9e849995ad40e7f6ee3abaf7f603b

#0 feature - Upgrading log traces to log4j2

 securis/pom.xml
..
..
@@ -12,11 +12,6 @@
12
12
   		<version>2.6</version>
13
13
   	</dependency>
14
14
   	<dependency>
15
-  		<groupId>net.curisit.integrity</groupId>
16
-  		<artifactId>commons</artifactId>
17
-  		<version>0.0.1-SNAPSHOT</version>
18
-  	</dependency>
19
-  	<dependency>
20
15
   		<groupId>javax.servlet</groupId>
21
16
   		<artifactId>javax.servlet-api</artifactId>
22
17
   		<version>3.1.0</version>
..
..
@@ -49,7 +44,12 @@
49
44
   	<dependency>
50
45
   		<groupId>net.curisit</groupId>
51
46
   		<artifactId>securis-client</artifactId>
52
-  		<version>0.9.4-SNAPSHOT</version>
47
+  		<version>0.9.5-SNAPSHOT</version>
48
+  	</dependency>
49
+  	<dependency>
50
+  		<groupId>net.curisit.integrity</groupId>
51
+  		<artifactId>commons</artifactId>
52
+  		<version>0.0.1-SNAPSHOT</version>
53
53
   	</dependency>
54
54
   </dependencies>
55
55
 	  <build>
..
..
@@ -64,4 +64,24 @@
64
64
         </plugin>
65
65
 		</plugins>
66
66
 	</build>
67
+  <repositories>
68
+    <repository>
69
+      <id>internal</id>
70
+      <name>CurisIT Repository</name>
71
+      <url>http://92.54.10.233:48080/archiva/repository/internal</url>
72
+    </repository> 
73
+    <repository>
74
+      <id>curistec</id>
75
+      <name>CurisTec Corporate Repository</name>
76
+      <url>http://92.54.10.233:48080/archiva/repository/internal/</url>
77
+      <layout>default</layout>
78
+    </repository>
79
+    <repository>
80
+      <id>curistecSnapshot</id>
81
+      <name>CurisTec Snapshots</name>
82
+      <url>http://92.54.10.233:48080/archiva/repository/snapshots/</url>
83
+      <layout>default</layout>
84
+   </repository>
85
+   </repositories>
86
+   
67
87
 </project>
 securis/src/main/java/net/curisit/securis/AuthFilter.java
..
..
@@ -14,14 +14,16 @@
14
14
 import javax.servlet.http.HttpServletRequest;
15
15
 import javax.servlet.http.HttpServletRequestWrapper;
16
16
 
17
-import org.slf4j.Logger;
18
-import org.slf4j.LoggerFactory;
17
+import org.apache.logging.log4j.Logger;
18
+
19
+import org.apache.logging.log4j.LogManager;
20
+
19
21
 
20
22
 @Singleton
21
23
 @WebFilter(urlPatterns = "/*")
22
24
 public class AuthFilter implements Filter {
23
25
 
24
-	private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
26
+	private static final Logger log = LogManager.getLogger(AuthFilter.class);
25
27
 
26
28
 	@Override
27
29
 	public void init(FilterConfig fc) throws ServletException {
 securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java
..
..
@@ -12,12 +12,12 @@
12
12
 
13
13
 import net.curisit.securis.services.exception.SeCurisServiceException;
14
14
 
15
-import org.slf4j.Logger;
16
-import org.slf4j.LoggerFactory;
15
+import org.apache.logging.log4j.Logger;
16
+import org.apache.logging.log4j.LogManager;
17
17
 
18
18
 @Provider
19
19
 public class DefaultExceptionHandler implements ExceptionMapper<Exception> {
20
-	private static final Logger log = LoggerFactory.getLogger(DefaultExceptionHandler.class);
20
+	private static final Logger log = LogManager.getLogger(DefaultExceptionHandler.class);
21
21
 
22
22
 	public static final String ERROR_MESSAGE_HEADER = "X-SECURIS-ERROR";
23
23
 
 securis/src/main/java/net/curisit/securis/MainApp.java
..
..
@@ -20,8 +20,8 @@
20
20
 import org.eclipse.jetty.util.resource.Resource;
21
21
 import org.jboss.resteasy.plugins.guice.GuiceResteasyBootstrapServletContextListener;
22
22
 import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
23
-import org.slf4j.Logger;
24
-import org.slf4j.LoggerFactory;
23
+import org.apache.logging.log4j.Logger;
24
+import org.apache.logging.log4j.LogManager;
25
25
 
26
26
 import com.google.inject.Guice;
27
27
 import com.google.inject.Injector;
..
..
@@ -32,7 +32,7 @@
32
32
 
33
33
 public class MainApp {
34
34
 
35
-	static final Logger log = LoggerFactory.getLogger(MainApp.class);
35
+	static final Logger log = LogManager.getLogger(MainApp.class);
36
36
 
37
37
 	private static Server server;
38
38
 	private static Injector injector = null;

 securis/src/main/java/net/curisit/securis/RestServicesApplication.java
..
..
@@ -8,12 +8,12 @@
8
8
 import net.curisit.securis.services.BasicServices;
9
9
 import net.curisit.securis.services.LicenseServices;
10
10
 
11
-import org.slf4j.Logger;
12
-import org.slf4j.LoggerFactory;
11
+import org.apache.logging.log4j.Logger;
12
+import org.apache.logging.log4j.LogManager;
13
13
 
14
14
 public class RestServicesApplication extends Application {
15
15
 
16
-	private static final Logger log = LoggerFactory.getLogger(RestServicesApplication.class);
16
+	private static final Logger log = LogManager.getLogger(RestServicesApplication.class);
17
17
 
18
18
 	@Override
19
19
 	public Set<Class<?>> getClasses() {

 securis/src/main/java/net/curisit/securis/db/LicenseType.java
..
..
@@ -18,8 +18,8 @@
18
18
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
19
19
 import org.codehaus.jackson.annotate.JsonProperty;
20
20
 import org.codehaus.jackson.map.annotate.JsonSerialize;
21
-import org.slf4j.Logger;
22
-import org.slf4j.LoggerFactory;
21
+import org.apache.logging.log4j.Logger;
22
+import org.apache.logging.log4j.LogManager;
23
23
 
24
24
 /**
25
25
  * Entity implementation class for Entity: license_type
..
..
@@ -34,7 +34,7 @@
34
34
 	{ @NamedQuery(name = "list-license_types", query = "SELECT lt FROM LicenseType lt") })
35
35
 public class LicenseType implements Serializable {
36
36
 
37
-	private static final Logger log = LoggerFactory.getLogger(LicenseType.class);
37
+	private static final Logger log = LogManager.getLogger(LicenseType.class);
38
38
 	private static final long serialVersionUID = 1L;
39
39
 
40
40
 	@Id
 securis/src/main/java/net/curisit/securis/db/Organization.java
..
..
@@ -25,8 +25,8 @@
25
25
 import org.codehaus.jackson.annotate.JsonIgnore;
26
26
 import org.codehaus.jackson.annotate.JsonProperty;
27
27
 import org.codehaus.jackson.map.annotate.JsonSerialize;
28
-import org.slf4j.Logger;
29
-import org.slf4j.LoggerFactory;
28
+import org.apache.logging.log4j.Logger;
29
+import org.apache.logging.log4j.LogManager;
30
30
 
31
31
 /**
32
32
  * Entity implementation class for Entity: organization
..
..
@@ -42,7 +42,7 @@
42
42
 public class Organization implements Serializable {
43
43
 
44
44
 	@SuppressWarnings("unused")
45
-	private static final Logger log = LoggerFactory.getLogger(Organization.class);
45
+	private static final Logger log = LogManager.getLogger(Organization.class);
46
46
 
47
47
 	private static final long serialVersionUID = 1L;
48
48
 
 securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
..
..
@@ -14,8 +14,8 @@
14
14
 import javax.ws.rs.core.UriBuilderException;
15
15
 
16
16
 import org.h2.jdbcx.JdbcDataSource;
17
-import org.slf4j.Logger;
18
-import org.slf4j.LoggerFactory;
17
+import org.apache.logging.log4j.Logger;
18
+import org.apache.logging.log4j.LogManager;
19
19
 
20
20
 import com.google.inject.AbstractModule;
21
21
 import com.google.inject.Provides;
..
..
@@ -25,7 +25,7 @@
25
25
 	private static final int DEFAULT_PORT = 9997;
26
26
 	private static final String PROPERTIES_FILE_NAME = "/server.properties";
27
27
 
28
-	private static final Logger log = LoggerFactory.getLogger(SecurisModule.class);
28
+	private static final Logger log = LogManager.getLogger(SecurisModule.class);
29
29
 
30
30
 	@Override
31
31
 	protected void configure() {
 securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java
..
..
@@ -27,14 +27,14 @@
27
27
 import org.jboss.resteasy.spi.Failure;
28
28
 import org.jboss.resteasy.spi.HttpRequest;
29
29
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
30
-import org.slf4j.Logger;
31
-import org.slf4j.LoggerFactory;
30
+import org.apache.logging.log4j.Logger;
31
+import org.apache.logging.log4j.LogManager;
32
32
 
33
33
 @Provider
34
34
 // @PreMatching
35
35
 @Priority(Priorities.AUTHENTICATION)
36
36
 public class SecurityInterceptor implements javax.ws.rs.container.ContainerRequestFilter {
37
-	private static final Logger log = LoggerFactory.getLogger(SecurityInterceptor.class);
37
+	private static final Logger log = LogManager.getLogger(SecurityInterceptor.class);
38
38
 
39
39
 	@Inject
40
40
 	private TokenHelper tokenHelper;
 securis/src/main/java/net/curisit/securis/services/ApiResource.java
..
..
@@ -11,8 +11,8 @@
11
11
 
12
12
 import net.curisit.securis.utils.TokenHelper;
13
13
 
14
-import org.slf4j.Logger;
15
-import org.slf4j.LoggerFactory;
14
+import org.apache.logging.log4j.Logger;
15
+import org.apache.logging.log4j.LogManager;
16
16
 
17
17
 /**
18
18
  * External API to be accessed by third parties
..
..
@@ -23,7 +23,7 @@
23
23
 public class ApiResource {
24
24
 
25
25
 	@SuppressWarnings("unused")
26
-	private static final Logger log = LoggerFactory.getLogger(ApiResource.class);
26
+	private static final Logger log = LogManager.getLogger(ApiResource.class);
27
27
 
28
28
 	@Inject
29
29
 	TokenHelper tokenHelper;
 securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
..
..
@@ -27,8 +27,8 @@
27
27
 import net.curisit.securis.db.Application;
28
28
 import net.curisit.securis.utils.TokenHelper;
29
29
 
30
-import org.slf4j.Logger;
31
-import org.slf4j.LoggerFactory;
30
+import org.apache.logging.log4j.Logger;
31
+import org.apache.logging.log4j.LogManager;
32
32
 
33
33
 import com.google.inject.persist.Transactional;
34
34
 
..
..
@@ -46,7 +46,7 @@
46
46
 	@Inject
47
47
 	Provider<EntityManager> emProvider;
48
48
 
49
-	private static final Logger log = LoggerFactory.getLogger(ApplicationResource.class);
49
+	private static final Logger log = LogManager.getLogger(ApplicationResource.class);
50
50
 
51
51
 	public ApplicationResource() {
52
52
 	}
 securis/src/main/java/net/curisit/securis/services/BasicServices.java
..
..
@@ -24,8 +24,8 @@
24
24
 import net.curisit.securis.security.Securable;
25
25
 import net.curisit.securis.utils.TokenHelper;
26
26
 
27
-import org.slf4j.Logger;
28
-import org.slf4j.LoggerFactory;
27
+import org.apache.logging.log4j.Logger;
28
+import org.apache.logging.log4j.LogManager;
29
29
 
30
30
 /**
31
31
  * Basic services for login and basic app wrkflow
..
..
@@ -36,7 +36,7 @@
36
36
 @Singleton
37
37
 public class BasicServices {
38
38
 
39
-	private static final Logger log = LoggerFactory.getLogger(BasicServices.class);
39
+	private static final Logger log = LogManager.getLogger(BasicServices.class);
40
40
 
41
41
 	@Inject
42
42
 	TokenHelper tokenHelper;
 securis/src/main/java/net/curisit/securis/services/LicenseResource.java
..
..
@@ -34,8 +34,8 @@
34
34
 import net.curisit.securis.utils.TokenHelper;
35
35
 
36
36
 import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
37
-import org.slf4j.Logger;
38
-import org.slf4j.LoggerFactory;
37
+import org.apache.logging.log4j.Logger;
38
+import org.apache.logging.log4j.LogManager;
39
39
 
40
40
 import com.google.inject.persist.Transactional;
41
41
 
..
..
@@ -47,7 +47,7 @@
47
47
 @Path("/license")
48
48
 public class LicenseResource {
49
49
 
50
-	private static final Logger log = LoggerFactory.getLogger(LicenseResource.class);
50
+	private static final Logger log = LogManager.getLogger(LicenseResource.class);
51
51
 
52
52
 	@Inject
53
53
 	TokenHelper tokenHelper;
 securis/src/main/java/net/curisit/securis/services/LicenseServices.java
..
..
@@ -25,15 +25,15 @@
25
25
 import org.apache.commons.io.IOUtils;
26
26
 import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;
27
27
 import org.jboss.resteasy.annotations.providers.multipart.PartType;
28
-import org.slf4j.Logger;
29
-import org.slf4j.LoggerFactory;
28
+import org.apache.logging.log4j.Logger;
29
+import org.apache.logging.log4j.LogManager;
30
30
 
31
31
 // The Java class will be hosted at the URI path "/myresource"
32
32
 @Path("/test")
33
33
 public class LicenseServices {
34
34
 
35
35
 	// private LicenseHelper licenseHelper = InjectorFactory.getInjector().getInstance(LicenseHelper.class);
36
-	private static final Logger log = LoggerFactory.getLogger(LicenseServices.class);
36
+	private static final Logger log = LogManager.getLogger(LicenseServices.class);
37
37
 
38
38
 	private static final int DEFAULT_LICENSE_EXPIRATION = 365;
39
39
 	private static final String LICENSE_STRING = "CurisIntegrity Config Server v{0}.{1}";
 securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java
..
..
@@ -28,8 +28,8 @@
28
28
 import net.curisit.securis.db.LicenseType;
29
29
 import net.curisit.securis.utils.TokenHelper;
30
30
 
31
-import org.slf4j.Logger;
32
-import org.slf4j.LoggerFactory;
31
+import org.apache.logging.log4j.Logger;
32
+import org.apache.logging.log4j.LogManager;
33
33
 
34
34
 import com.google.inject.persist.Transactional;
35
35
 
..
..
@@ -41,7 +41,7 @@
41
41
 @Path("/licensetype")
42
42
 public class LicenseTypeResource {
43
43
 
44
-	private static final Logger log = LoggerFactory.getLogger(LicenseTypeResource.class);
44
+	private static final Logger log = LogManager.getLogger(LicenseTypeResource.class);
45
45
 
46
46
 	@Inject
47
47
 	TokenHelper tokenHelper;
 securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
..
..
@@ -33,8 +33,8 @@
33
33
 import net.curisit.securis.utils.TokenHelper;
34
34
 
35
35
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
36
-import org.slf4j.Logger;
37
-import org.slf4j.LoggerFactory;
36
+import org.apache.logging.log4j.Logger;
37
+import org.apache.logging.log4j.LogManager;
38
38
 
39
39
 import com.google.inject.persist.Transactional;
40
40
 
..
..
@@ -46,7 +46,7 @@
46
46
 @Path("/organization")
47
47
 public class OrganizationResource {
48
48
 
49
-	private static final Logger log = LoggerFactory.getLogger(OrganizationResource.class);
49
+	private static final Logger log = LogManager.getLogger(OrganizationResource.class);
50
50
 
51
51
 	@Inject
52
52
 	private Provider<EntityManager> emProvider;
 securis/src/main/java/net/curisit/securis/services/PackResource.java
..
..
@@ -32,8 +32,8 @@
32
32
 import net.curisit.securis.security.Securable;
33
33
 import net.curisit.securis.utils.TokenHelper;
34
34
 
35
-import org.slf4j.Logger;
36
-import org.slf4j.LoggerFactory;
35
+import org.apache.logging.log4j.Logger;
36
+import org.apache.logging.log4j.LogManager;
37
37
 
38
38
 import com.google.inject.persist.Transactional;
39
39
 
..
..
@@ -45,7 +45,7 @@
45
45
 @Path("/pack")
46
46
 public class PackResource {
47
47
 
48
-	private static final Logger log = LoggerFactory.getLogger(PackResource.class);
48
+	private static final Logger log = LogManager.getLogger(PackResource.class);
49
49
 
50
50
 	@Inject
51
51
 	TokenHelper tokenHelper;
 securis/src/main/java/net/curisit/securis/services/UserResource.java
..
..
@@ -32,8 +32,8 @@
32
32
 import net.curisit.securis.db.User;
33
33
 import net.curisit.securis.utils.TokenHelper;
34
34
 
35
-import org.slf4j.Logger;
36
-import org.slf4j.LoggerFactory;
35
+import org.apache.logging.log4j.Logger;
36
+import org.apache.logging.log4j.LogManager;
37
37
 
38
38
 import com.google.inject.persist.Transactional;
39
39
 
..
..
@@ -52,7 +52,7 @@
52
52
 	Provider<EntityManager> emProvider;
53
53
 
54
54
 	// private LicenseHelper licenseHelper = InjectorFactory.getInjector().getInstance(LicenseHelper.class);
55
-	private static final Logger log = LoggerFactory.getLogger(UserResource.class);
55
+	private static final Logger log = LogManager.getLogger(UserResource.class);
56
56
 
57
57
 	public UserResource() {
58
58
 	}
 securis/src/main/java/net/curisit/securis/utils/CacheTTL.java
..
..
@@ -9,8 +9,8 @@
9
9
 import javax.inject.Inject;
10
10
 import javax.inject.Singleton;
11
11
 
12
-import org.slf4j.Logger;
13
-import org.slf4j.LoggerFactory;
12
+import org.apache.logging.log4j.Logger;
13
+import org.apache.logging.log4j.LogManager;
14
14
 
15
15
 /**
16
16
  * Cache implementation with TTL (time To Live) The objects are removed from cache when TTL is reached.
..
..
@@ -20,7 +20,7 @@
20
20
 @Singleton
21
21
 public class CacheTTL {
22
22
 
23
-	private static final Logger log = LoggerFactory.getLogger(CacheTTL.class);
23
+	private static final Logger log = LogManager.getLogger(CacheTTL.class);
24
24
 
25
25
 	/**
26
26
 	 * Period before token expires, set in seconds.
 securis/src/main/java/net/curisit/securis/utils/TokenHelper.java
..
..
@@ -14,13 +14,13 @@
14
14
 
15
15
 import org.apache.commons.lang3.StringUtils;
16
16
 import org.jboss.resteasy.util.Base64;
17
-import org.slf4j.Logger;
18
-import org.slf4j.LoggerFactory;
17
+import org.apache.logging.log4j.Logger;
18
+import org.apache.logging.log4j.LogManager;
19
19
 
20
20
 @Singleton
21
21
 public class TokenHelper {
22
22
 
23
-	private static final Logger log = LoggerFactory.getLogger(TokenHelper.class);
23
+	private static final Logger log = LogManager.getLogger(TokenHelper.class);
24
24
 
25
25
 	/**
26
26
 	 * Period before token expires, set in hours.
 securis/src/main/resources/log4j.xml
..
..
@@ -9,9 +9,18 @@
9
9
             <param name="ConversionPattern" value="%-5p %c{1} - %m%n"/>
10
10
         </layout>
11
11
     </appender>
12
+<appender name="default.file" class="org.apache.log4j.FileAppender">
13
+        <param name="file" value="${user.home}/.CurisIntegrity/log/configserver.log" />
14
+        <param name="append" value="false" />
15
+        <param name="threshold" value="info" />
16
+        <layout class="org.apache.log4j.PatternLayout">
17
+            <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1}] - %m%n" />
18
+        </layout>
19
+    </appender>
12
20
 
13
21
     <logger name="net.curisit">
14
22
         <level value="INFO"/>
23
+        <appender-ref ref="default.file" />
15
24
     </logger>
16
25
 
17
26
     <logger name="sandbox">

 securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
..
..
@@ -133,20 +133,17 @@
133
133
 	}
134
134
 
135
135
 	public static void main(String[] args) throws SeCurisException {
136
-		Paths.get(new File("/Users/cproberto/Documents/wsCurisIT/SeCurisClient/license.req").toURI());
137
136
 
138
-		RequestBean req = ReqGenerator.getInstance().loadRequest(new File("/Users/cproberto/Downloads/license-2.req"));
137
+		RequestBean req = ReqGenerator.getInstance().loadRequest(new File("/Users/cproberto/Documents/wsCurisIT/SeCurisClient/license.req"));
139
138
 		Map<String, Object> metadata = new TreeMap<>();
140
-		metadata.put("maxUsers", 0);
141
-		metadata.put("maxInstances", 0);
142
-		metadata.put("timeThreshold", 0);
143
-		metadata.put("datasetPrefix", "BP");
144
-		metadata.put("extendedMode", true);
139
+		metadata.put("maxUsers", 20);
140
+		metadata.put("maxSessionUsers", 2);
141
+		Date expirationDate = new Date(new Date().getTime() + (1000L * 3600 * 24 * 365 * 10));
142
+		LicenseBean lic = LicenseGenerator.getInstance().generateLicense(req, metadata, expirationDate, "CD-01", "LIC-CURISTEC-0001");
143
+		LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Desktop/YanFei.lic"));
145
144
 
146
-		LicenseBean lic = LicenseGenerator.getInstance().generateLicense(req, metadata, new Date(new Date().getTime() + 3600 * 1000), "CI-CS-01", "LIC-CESAR-00001");
147
-		LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Desktop/license_cesar.lic"));
148
-
149
-		System.out.print("os.arch: " + System.getProperty("os.arch") + " " + System.getProperty("os.name"));
145
+		System.out.print("License expires at: " + expirationDate.getTime());
146
+ 
150
147
 
151
148
 	}
152
149
 }