From 632a396b7b6d533b3103372a6621ba49edd337b8 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Tue, 20 May 2014 11:55:04 +0000
Subject: [PATCH] #593 config - Configuration for right packaging system using maven
---
etc/build/files/config/securis-client.properties | 2
etc/build/files/config/log4j2.xml | 16 ++++++++
README | 21 ++++++++++
config/log4j2.xml | 16 ++++++++
config/securis-client.properties | 9 ++++
assembly.xml | 3 +
etc/build/files/securis.sh | 5 +-
pom.xml | 11 ++---
src/main/resources/log4j2.xml | 2
9 files changed, 75 insertions(+), 10 deletions(-)
diff --git a/README b/README
new file mode 100644
index 0000000..9eb1bf8
--- /dev/null
+++ b/README
@@ -0,0 +1,21 @@
+SeCuris client
+==============
+
+Updated doc: https://redmine.curistec.com/projects/securis/wiki/HowToSeCurisClient
+
+Creation of a request file
+For a manual activation, a request file should be sent to SeCuris administrator, to create a request file we can execute:
+
+ $ ./securis.sh --gen_request --rfile=/tmp/curisapp.req
+
+Validate license file
+
+ $ ./securis.sh --validate=/path/to/license/file/curisapp.lic
+
+Request a new license to server
+
+ $ ./securis.sh --create=/path/to/license/file/curisapp.lic --server="http://server:0000/securis/api/create"
+
+Renew an existing license
+
+ $ securis.sh --renew=/path/to/license/file/curisapp.lic --server="http://server:0000/securis/api/create"
diff --git a/assembly.xml b/assembly.xml
index 1e7cd66..1266dc2 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -10,4 +10,7 @@
<outputDirectory>output</outputDirectory>
</fileSet>
</fileSets>
+ <sources>
+ <excludes/>
+ </sources>
</assembly>
\ No newline at end of file
diff --git a/config/log4j2.xml b/config/log4j2.xml
new file mode 100644
index 0000000..74f7466
--- /dev/null
+++ b/config/log4j2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+ <Appenders>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+
+ <Logger name="net.curisit" level="info"/>
+
+ <Root level="debug">
+ <AppenderRef ref="STDOUT"/>
+ </Root>
+ </Loggers>
+</Configuration>
diff --git a/config/securis-client.properties b/config/securis-client.properties
new file mode 100644
index 0000000..b1ab22b
--- /dev/null
+++ b/config/securis-client.properties
@@ -0,0 +1,9 @@
+#########################################################################
+# #
+# Modify the current file using the proper values for you environment #
+# #
+#########################################################################
+
+public.key.file = /Path/to/public/key/file/securis.pub
+app.code = AP01
+customer.code = XX
diff --git a/etc/build/files/config/log4j2.xml b/etc/build/files/config/log4j2.xml
new file mode 100644
index 0000000..74f7466
--- /dev/null
+++ b/etc/build/files/config/log4j2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+ <Appenders>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+
+ <Logger name="net.curisit" level="info"/>
+
+ <Root level="debug">
+ <AppenderRef ref="STDOUT"/>
+ </Root>
+ </Loggers>
+</Configuration>
diff --git a/etc/build/files/config/securis-client.properties b/etc/build/files/config/securis-client.properties
index 2a2011d..b1ab22b 100644
--- a/etc/build/files/config/securis-client.properties
+++ b/etc/build/files/config/securis-client.properties
@@ -6,4 +6,4 @@
public.key.file = /Path/to/public/key/file/securis.pub
app.code = AP01
-customer.code = XX
\ No newline at end of file
+customer.code = XX
diff --git a/etc/build/files/securis.sh b/etc/build/files/securis.sh
index e850570..d1baf9d 100644
--- a/etc/build/files/securis.sh
+++ b/etc/build/files/securis.sh
@@ -1,3 +1,4 @@
#!/bin/bash
-export CLASSPATH=libs/*.jar:config/securis-client.properties
-java -cp $CLASSPATH -jar libs/securis-client-*.jar $@
+
+export CLASSPATH="config:libs/*"
+java -cp "$CLASSPATH" net.curisit.securis.License $@
diff --git a/pom.xml b/pom.xml
index df6e0e3..ec54ab0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,14 +18,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <archive>
- <manifest>
- <mainClass>net.curisit.securis.License</mainClass>
- </manifest>
- </archive>
+ <excludes>
+ <exclude>*.properties</exclude>
+ </excludes>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
@@ -73,6 +71,7 @@
<version>2.0-rc1</version>
</dependency>
</dependencies>
+
<distributionManagement>
<!-- use the following if you're not using a snapshot version. -->
<repository>
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 74f7466..2de3c59 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -9,7 +9,7 @@
<Logger name="net.curisit" level="info"/>
- <Root level="debug">
+ <Root level="info">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
--
Gitblit v1.3.2