From ef282bd185482f2cab9648a8293aa74db85d787f Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Mon, 24 Feb 2014 16:15:17 +0000
Subject: [PATCH] #593 config - Added maven descriptor for packaging
---
src/main/java/net/curisit/securis/utils/CryptoHelper.java | 4 +
src/main/java/net/curisit/securis/utils/HWInfo.java | 4 +
etc/build/pro/mvn_descriptor.xml | 31 +++++++++++++++
pom.xml | 20 +++++++---
src/main/java/net/curisit/securis/utils/SignatureHelper.java | 5 +-
5 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/etc/build/pro/mvn_descriptor.xml b/etc/build/pro/mvn_descriptor.xml
new file mode 100644
index 0000000..16fad93
--- /dev/null
+++ b/etc/build/pro/mvn_descriptor.xml
@@ -0,0 +1,31 @@
+ <assembly
+xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>packager</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/classes</directory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <outputDirectory>${basedir}/target</outputDirectory>
+ <excludes>
+ <exclude>assembly/**</exclude>
+ <exclude>runners/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/libs</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+</assembly>
diff --git a/pom.xml b/pom.xml
index b07e561..c9461ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,12 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<configuration>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <descriptors>
+ <descriptor>/Users/cproberto/Documents/wsCurisIT/SeCurisClient/etc/build/pro/mvn_descriptor.xml</descriptor>
+ </descriptors>
<archive>
<manifest>
<mainClass>net.curisit.securis.License</mainClass>
@@ -57,11 +63,13 @@
<artifactId>log4j-core</artifactId>
<version>2.0-rc1</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <type>maven-plugin</type>
- </dependency>
</dependencies>
+ <distributionManagement>
+<!-- use the following if you're not using a snapshot version. -->
+<repository>
+ <id>local</id>
+ <name>LocalDir</name>
+ <url>file://${basedir}/target</url>
+</repository>
+</distributionManagement>
</project>
\ No newline at end of file
diff --git a/src/main/java/net/curisit/securis/CryptoHelper.java b/src/main/java/net/curisit/securis/utils/CryptoHelper.java
similarity index 98%
rename from src/main/java/net/curisit/securis/CryptoHelper.java
rename to src/main/java/net/curisit/securis/utils/CryptoHelper.java
index 8ba7532..5bef274 100644
--- a/src/main/java/net/curisit/securis/CryptoHelper.java
+++ b/src/main/java/net/curisit/securis/utils/CryptoHelper.java
@@ -1,4 +1,4 @@
-package net.curisit.securis;
+package net.curisit.securis.utils;
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
@@ -17,6 +17,8 @@
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.SecretKeySpec;
+import net.curisit.securis.SeCurisException;
+
import org.apache.commons.net.util.Base64;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/net/curisit/securis/HWInfo.java b/src/main/java/net/curisit/securis/utils/HWInfo.java
similarity index 97%
rename from src/main/java/net/curisit/securis/HWInfo.java
rename to src/main/java/net/curisit/securis/utils/HWInfo.java
index fc1d0eb..1baecdb 100644
--- a/src/main/java/net/curisit/securis/HWInfo.java
+++ b/src/main/java/net/curisit/securis/utils/HWInfo.java
@@ -1,4 +1,4 @@
-package net.curisit.securis;
+package net.curisit.securis.utils;
import java.net.InetAddress;
import java.net.NetworkInterface;
@@ -8,6 +8,8 @@
import java.util.Collections;
import java.util.List;
+import net.curisit.securis.SeCurisException;
+
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/net/curisit/securis/SignatureHelper.java b/src/main/java/net/curisit/securis/utils/SignatureHelper.java
similarity index 97%
rename from src/main/java/net/curisit/securis/SignatureHelper.java
rename to src/main/java/net/curisit/securis/utils/SignatureHelper.java
index ced9b47..dbe03a6 100644
--- a/src/main/java/net/curisit/securis/SignatureHelper.java
+++ b/src/main/java/net/curisit/securis/utils/SignatureHelper.java
@@ -1,4 +1,4 @@
-package net.curisit.securis;
+package net.curisit.securis.utils;
import java.io.File;
import java.io.IOException;
@@ -15,9 +15,8 @@
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
+import net.curisit.securis.SeCurisException;
import net.curisit.securis.beans.LicenseBean;
-import net.curisit.securis.utils.JsonUtils;
-import net.curisit.securis.utils.Params;
import org.apache.commons.io.FileUtils;
import org.apache.commons.net.util.Base64;
--
Gitblit v1.3.2