From bc2484cbd4f9e849995ad40e7f6ee3abaf7f603b Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Wed, 27 Aug 2014 09:40:01 +0000
Subject: [PATCH] #0 feature - Upgrading log traces to log4j2
---
securis/src/main/java/net/curisit/securis/RestServicesApplication.java | 6 +-
securis/src/main/java/net/curisit/securis/services/ApiResource.java | 6 +-
securis/src/main/java/net/curisit/securis/AuthFilter.java | 8 +-
securis/src/main/java/net/curisit/securis/MainApp.java | 6 +-
securis/src/main/java/net/curisit/securis/services/BasicServices.java | 6 +-
securis/src/main/java/net/curisit/securis/services/ApplicationResource.java | 6 +-
securis/src/main/java/net/curisit/securis/services/PackResource.java | 6 +-
securis/src/main/java/net/curisit/securis/services/LicenseServices.java | 6 +-
securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java | 6 +-
securis/pom.xml | 32 ++++++++--
securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java | 6 +-
securis/src/main/java/net/curisit/securis/utils/TokenHelper.java | 6 +-
securis/src/main/java/net/curisit/securis/db/Organization.java | 6 +-
securis/src/main/java/net/curisit/securis/services/UserResource.java | 6 +-
securis/src/main/resources/log4j.xml | 9 +++
securis/src/main/java/net/curisit/securis/utils/CacheTTL.java | 6 +-
securis/src/main/java/net/curisit/securis/services/LicenseResource.java | 6 +-
securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java | 6 +-
securis/src/patch/java/net/curisit/securis/LicenseGenerator.java | 19 ++---
securis/src/main/java/net/curisit/securis/db/LicenseType.java | 6 +-
securis/src/main/java/net/curisit/securis/services/OrganizationResource.java | 6 +-
securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java | 6 +-
22 files changed, 102 insertions(+), 74 deletions(-)
diff --git a/securis/pom.xml b/securis/pom.xml
index 31ab19f..37c405a 100644
--- a/securis/pom.xml
+++ b/securis/pom.xml
@@ -12,11 +12,6 @@
<version>2.6</version>
</dependency>
<dependency>
- <groupId>net.curisit.integrity</groupId>
- <artifactId>commons</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
@@ -49,7 +44,12 @@
<dependency>
<groupId>net.curisit</groupId>
<artifactId>securis-client</artifactId>
- <version>0.9.4-SNAPSHOT</version>
+ <version>0.9.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>net.curisit.integrity</groupId>
+ <artifactId>commons</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
@@ -64,4 +64,24 @@
</plugin>
</plugins>
</build>
+ <repositories>
+ <repository>
+ <id>internal</id>
+ <name>CurisIT Repository</name>
+ <url>http://92.54.10.233:48080/archiva/repository/internal</url>
+ </repository>
+ <repository>
+ <id>curistec</id>
+ <name>CurisTec Corporate Repository</name>
+ <url>http://92.54.10.233:48080/archiva/repository/internal/</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <id>curistecSnapshot</id>
+ <name>CurisTec Snapshots</name>
+ <url>http://92.54.10.233:48080/archiva/repository/snapshots/</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+
</project>
\ No newline at end of file
diff --git a/securis/src/main/java/net/curisit/securis/AuthFilter.java b/securis/src/main/java/net/curisit/securis/AuthFilter.java
index 9f086a5..8dfb27e 100644
--- a/securis/src/main/java/net/curisit/securis/AuthFilter.java
+++ b/securis/src/main/java/net/curisit/securis/AuthFilter.java
@@ -14,14 +14,16 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+
+import org.apache.logging.log4j.LogManager;
+
@Singleton
@WebFilter(urlPatterns = "/*")
public class AuthFilter implements Filter {
- private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
+ private static final Logger log = LogManager.getLogger(AuthFilter.class);
@Override
public void init(FilterConfig fc) throws ServletException {
diff --git a/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java b/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java
index e8fc260..9c193a1 100644
--- a/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java
+++ b/securis/src/main/java/net/curisit/securis/DefaultExceptionHandler.java
@@ -12,12 +12,12 @@
import net.curisit.securis.services.exception.SeCurisServiceException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
@Provider
public class DefaultExceptionHandler implements ExceptionMapper<Exception> {
- private static final Logger log = LoggerFactory.getLogger(DefaultExceptionHandler.class);
+ private static final Logger log = LogManager.getLogger(DefaultExceptionHandler.class);
public static final String ERROR_MESSAGE_HEADER = "X-SECURIS-ERROR";
diff --git a/securis/src/main/java/net/curisit/securis/MainApp.java b/securis/src/main/java/net/curisit/securis/MainApp.java
index deb8cab..6839254 100644
--- a/securis/src/main/java/net/curisit/securis/MainApp.java
+++ b/securis/src/main/java/net/curisit/securis/MainApp.java
@@ -20,8 +20,8 @@
import org.eclipse.jetty.util.resource.Resource;
import org.jboss.resteasy.plugins.guice.GuiceResteasyBootstrapServletContextListener;
import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -32,7 +32,7 @@
public class MainApp {
- static final Logger log = LoggerFactory.getLogger(MainApp.class);
+ static final Logger log = LogManager.getLogger(MainApp.class);
private static Server server;
private static Injector injector = null;
diff --git a/securis/src/main/java/net/curisit/securis/RestServicesApplication.java b/securis/src/main/java/net/curisit/securis/RestServicesApplication.java
index 164d029..9ca0111 100644
--- a/securis/src/main/java/net/curisit/securis/RestServicesApplication.java
+++ b/securis/src/main/java/net/curisit/securis/RestServicesApplication.java
@@ -8,12 +8,12 @@
import net.curisit.securis.services.BasicServices;
import net.curisit.securis.services.LicenseServices;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
public class RestServicesApplication extends Application {
- private static final Logger log = LoggerFactory.getLogger(RestServicesApplication.class);
+ private static final Logger log = LogManager.getLogger(RestServicesApplication.class);
@Override
public Set<Class<?>> getClasses() {
diff --git a/securis/src/main/java/net/curisit/securis/db/LicenseType.java b/securis/src/main/java/net/curisit/securis/db/LicenseType.java
index d75fb7e..b0be062 100644
--- a/securis/src/main/java/net/curisit/securis/db/LicenseType.java
+++ b/securis/src/main/java/net/curisit/securis/db/LicenseType.java
@@ -18,8 +18,8 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* Entity implementation class for Entity: license_type
@@ -34,7 +34,7 @@
{ @NamedQuery(name = "list-license_types", query = "SELECT lt FROM LicenseType lt") })
public class LicenseType implements Serializable {
- private static final Logger log = LoggerFactory.getLogger(LicenseType.class);
+ private static final Logger log = LogManager.getLogger(LicenseType.class);
private static final long serialVersionUID = 1L;
@Id
diff --git a/securis/src/main/java/net/curisit/securis/db/Organization.java b/securis/src/main/java/net/curisit/securis/db/Organization.java
index a2fe5fa..df31a60 100644
--- a/securis/src/main/java/net/curisit/securis/db/Organization.java
+++ b/securis/src/main/java/net/curisit/securis/db/Organization.java
@@ -25,8 +25,8 @@
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* Entity implementation class for Entity: organization
@@ -42,7 +42,7 @@
public class Organization implements Serializable {
@SuppressWarnings("unused")
- private static final Logger log = LoggerFactory.getLogger(Organization.class);
+ private static final Logger log = LogManager.getLogger(Organization.class);
private static final long serialVersionUID = 1L;
diff --git a/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java b/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
index ce82b61..21ebfe3 100644
--- a/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
+++ b/securis/src/main/java/net/curisit/securis/ioc/SecurisModule.java
@@ -14,8 +14,8 @@
import javax.ws.rs.core.UriBuilderException;
import org.h2.jdbcx.JdbcDataSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
@@ -25,7 +25,7 @@
private static final int DEFAULT_PORT = 9997;
private static final String PROPERTIES_FILE_NAME = "/server.properties";
- private static final Logger log = LoggerFactory.getLogger(SecurisModule.class);
+ private static final Logger log = LogManager.getLogger(SecurisModule.class);
@Override
protected void configure() {
diff --git a/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java b/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java
index 9150be8..1240819 100644
--- a/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java
+++ b/securis/src/main/java/net/curisit/securis/security/SecurityInterceptor.java
@@ -27,14 +27,14 @@
import org.jboss.resteasy.spi.Failure;
import org.jboss.resteasy.spi.HttpRequest;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
@Provider
// @PreMatching
@Priority(Priorities.AUTHENTICATION)
public class SecurityInterceptor implements javax.ws.rs.container.ContainerRequestFilter {
- private static final Logger log = LoggerFactory.getLogger(SecurityInterceptor.class);
+ private static final Logger log = LogManager.getLogger(SecurityInterceptor.class);
@Inject
private TokenHelper tokenHelper;
diff --git a/securis/src/main/java/net/curisit/securis/services/ApiResource.java b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
index bb85548..adc0495 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApiResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApiResource.java
@@ -11,8 +11,8 @@
import net.curisit.securis.utils.TokenHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* External API to be accessed by third parties
@@ -23,7 +23,7 @@
public class ApiResource {
@SuppressWarnings("unused")
- private static final Logger log = LoggerFactory.getLogger(ApiResource.class);
+ private static final Logger log = LogManager.getLogger(ApiResource.class);
@Inject
TokenHelper tokenHelper;
diff --git a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
index 8b4f6fe..ee9c676 100644
--- a/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/ApplicationResource.java
@@ -27,8 +27,8 @@
import net.curisit.securis.db.Application;
import net.curisit.securis.utils.TokenHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import com.google.inject.persist.Transactional;
@@ -46,7 +46,7 @@
@Inject
Provider<EntityManager> emProvider;
- private static final Logger log = LoggerFactory.getLogger(ApplicationResource.class);
+ private static final Logger log = LogManager.getLogger(ApplicationResource.class);
public ApplicationResource() {
}
diff --git a/securis/src/main/java/net/curisit/securis/services/BasicServices.java b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
index efa8907..9dbdd84 100644
--- a/securis/src/main/java/net/curisit/securis/services/BasicServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/BasicServices.java
@@ -24,8 +24,8 @@
import net.curisit.securis.security.Securable;
import net.curisit.securis.utils.TokenHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* Basic services for login and basic app wrkflow
@@ -36,7 +36,7 @@
@Singleton
public class BasicServices {
- private static final Logger log = LoggerFactory.getLogger(BasicServices.class);
+ private static final Logger log = LogManager.getLogger(BasicServices.class);
@Inject
TokenHelper tokenHelper;
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
index 346dea0..0c04736 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseResource.java
@@ -34,8 +34,8 @@
import net.curisit.securis.utils.TokenHelper;
import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import com.google.inject.persist.Transactional;
@@ -47,7 +47,7 @@
@Path("/license")
public class LicenseResource {
- private static final Logger log = LoggerFactory.getLogger(LicenseResource.class);
+ private static final Logger log = LogManager.getLogger(LicenseResource.class);
@Inject
TokenHelper tokenHelper;
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseServices.java b/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
index f4d6a08..4a146f9 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseServices.java
@@ -25,15 +25,15 @@
import org.apache.commons.io.IOUtils;
import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;
import org.jboss.resteasy.annotations.providers.multipart.PartType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
// The Java class will be hosted at the URI path "/myresource"
@Path("/test")
public class LicenseServices {
// private LicenseHelper licenseHelper = InjectorFactory.getInjector().getInstance(LicenseHelper.class);
- private static final Logger log = LoggerFactory.getLogger(LicenseServices.class);
+ private static final Logger log = LogManager.getLogger(LicenseServices.class);
private static final int DEFAULT_LICENSE_EXPIRATION = 365;
private static final String LICENSE_STRING = "CurisIntegrity Config Server v{0}.{1}";
diff --git a/securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java b/securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java
index 122515d..45dedbe 100644
--- a/securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/LicenseTypeResource.java
@@ -28,8 +28,8 @@
import net.curisit.securis.db.LicenseType;
import net.curisit.securis.utils.TokenHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import com.google.inject.persist.Transactional;
@@ -41,7 +41,7 @@
@Path("/licensetype")
public class LicenseTypeResource {
- private static final Logger log = LoggerFactory.getLogger(LicenseTypeResource.class);
+ private static final Logger log = LogManager.getLogger(LicenseTypeResource.class);
@Inject
TokenHelper tokenHelper;
diff --git a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
index 7553977..b956327 100644
--- a/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/OrganizationResource.java
@@ -33,8 +33,8 @@
import net.curisit.securis.utils.TokenHelper;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import com.google.inject.persist.Transactional;
@@ -46,7 +46,7 @@
@Path("/organization")
public class OrganizationResource {
- private static final Logger log = LoggerFactory.getLogger(OrganizationResource.class);
+ private static final Logger log = LogManager.getLogger(OrganizationResource.class);
@Inject
private Provider<EntityManager> emProvider;
diff --git a/securis/src/main/java/net/curisit/securis/services/PackResource.java b/securis/src/main/java/net/curisit/securis/services/PackResource.java
index 7356ae9..82c2dd8 100644
--- a/securis/src/main/java/net/curisit/securis/services/PackResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/PackResource.java
@@ -32,8 +32,8 @@
import net.curisit.securis.security.Securable;
import net.curisit.securis.utils.TokenHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import com.google.inject.persist.Transactional;
@@ -45,7 +45,7 @@
@Path("/pack")
public class PackResource {
- private static final Logger log = LoggerFactory.getLogger(PackResource.class);
+ private static final Logger log = LogManager.getLogger(PackResource.class);
@Inject
TokenHelper tokenHelper;
diff --git a/securis/src/main/java/net/curisit/securis/services/UserResource.java b/securis/src/main/java/net/curisit/securis/services/UserResource.java
index c7e8349..f533283 100644
--- a/securis/src/main/java/net/curisit/securis/services/UserResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/UserResource.java
@@ -32,8 +32,8 @@
import net.curisit.securis.db.User;
import net.curisit.securis.utils.TokenHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import com.google.inject.persist.Transactional;
@@ -52,7 +52,7 @@
Provider<EntityManager> emProvider;
// private LicenseHelper licenseHelper = InjectorFactory.getInjector().getInstance(LicenseHelper.class);
- private static final Logger log = LoggerFactory.getLogger(UserResource.class);
+ private static final Logger log = LogManager.getLogger(UserResource.class);
public UserResource() {
}
diff --git a/securis/src/main/java/net/curisit/securis/utils/CacheTTL.java b/securis/src/main/java/net/curisit/securis/utils/CacheTTL.java
index 6561517..9f7ea3d 100644
--- a/securis/src/main/java/net/curisit/securis/utils/CacheTTL.java
+++ b/securis/src/main/java/net/curisit/securis/utils/CacheTTL.java
@@ -9,8 +9,8 @@
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* Cache implementation with TTL (time To Live) The objects are removed from cache when TTL is reached.
@@ -20,7 +20,7 @@
@Singleton
public class CacheTTL {
- private static final Logger log = LoggerFactory.getLogger(CacheTTL.class);
+ private static final Logger log = LogManager.getLogger(CacheTTL.class);
/**
* Period before token expires, set in seconds.
diff --git a/securis/src/main/java/net/curisit/securis/utils/TokenHelper.java b/securis/src/main/java/net/curisit/securis/utils/TokenHelper.java
index 19a1e9a..ec477a8 100644
--- a/securis/src/main/java/net/curisit/securis/utils/TokenHelper.java
+++ b/securis/src/main/java/net/curisit/securis/utils/TokenHelper.java
@@ -14,13 +14,13 @@
import org.apache.commons.lang3.StringUtils;
import org.jboss.resteasy.util.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
@Singleton
public class TokenHelper {
- private static final Logger log = LoggerFactory.getLogger(TokenHelper.class);
+ private static final Logger log = LogManager.getLogger(TokenHelper.class);
/**
* Period before token expires, set in hours.
diff --git a/securis/src/main/resources/log4j.xml b/securis/src/main/resources/log4j.xml
index 4ffc345..720addf 100644
--- a/securis/src/main/resources/log4j.xml
+++ b/securis/src/main/resources/log4j.xml
@@ -9,9 +9,18 @@
<param name="ConversionPattern" value="%-5p %c{1} - %m%n"/>
</layout>
</appender>
+<appender name="default.file" class="org.apache.log4j.FileAppender">
+ <param name="file" value="${user.home}/.CurisIntegrity/log/configserver.log" />
+ <param name="append" value="false" />
+ <param name="threshold" value="info" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{1}] - %m%n" />
+ </layout>
+ </appender>
<logger name="net.curisit">
<level value="INFO"/>
+ <appender-ref ref="default.file" />
</logger>
<logger name="sandbox">
diff --git a/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java b/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
index 3675c26..d57a8ca 100644
--- a/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
+++ b/securis/src/patch/java/net/curisit/securis/LicenseGenerator.java
@@ -133,20 +133,17 @@
}
public static void main(String[] args) throws SeCurisException {
- Paths.get(new File("/Users/cproberto/Documents/wsCurisIT/SeCurisClient/license.req").toURI());
- RequestBean req = ReqGenerator.getInstance().loadRequest(new File("/Users/cproberto/Downloads/license-2.req"));
+ RequestBean req = ReqGenerator.getInstance().loadRequest(new File("/Users/cproberto/Documents/wsCurisIT/SeCurisClient/license.req"));
Map<String, Object> metadata = new TreeMap<>();
- metadata.put("maxUsers", 0);
- metadata.put("maxInstances", 0);
- metadata.put("timeThreshold", 0);
- metadata.put("datasetPrefix", "BP");
- metadata.put("extendedMode", true);
+ metadata.put("maxUsers", 20);
+ metadata.put("maxSessionUsers", 2);
+ Date expirationDate = new Date(new Date().getTime() + (1000L * 3600 * 24 * 365 * 10));
+ LicenseBean lic = LicenseGenerator.getInstance().generateLicense(req, metadata, expirationDate, "CD-01", "LIC-CURISTEC-0001");
+ LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Desktop/YanFei.lic"));
- LicenseBean lic = LicenseGenerator.getInstance().generateLicense(req, metadata, new Date(new Date().getTime() + 3600 * 1000), "CI-CS-01", "LIC-CESAR-00001");
- LicenseGenerator.getInstance().save(lic, new File("/Users/cproberto/Desktop/license_cesar.lic"));
-
- System.out.print("os.arch: " + System.getProperty("os.arch") + " " + System.getProperty("os.name"));
+ System.out.print("License expires at: " + expirationDate.getTime());
+
}
}
--
Gitblit v1.3.2