From 55462432b6a0d1ced5df4276cb2ae3bca3e32c85 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 23 Oct 2013 21:11:49 +0200 Subject: [PATCH] [Project] set a parent to li.strolch.parent for easier managing --- pom.xml | 117 ++---------------- .../li/strolch/command/AbstractCommand.java | 2 +- .../li/strolch/service/AbstractService.java | 2 +- src/main/java/li/strolch/service/Service.java | 2 +- .../li/strolch/service/ServiceArgument.java | 2 +- .../li/strolch/service/ServiceResult.java | 2 +- .../strolch/service/ServiceResultState.java | 2 +- .../strolch/service/SimpleServiceHandler.java | 9 +- 8 files changed, 18 insertions(+), 120 deletions(-) diff --git a/pom.xml b/pom.xml index 9031f06a2..b2a94ae31 100644 --- a/pom.xml +++ b/pom.xml @@ -1,123 +1,54 @@ - 4.0.0 - li.strolch + + li.strolch + li.strolch.parent + 0.1.0-SNAPSHOT + ../li.strolch.parent/pom.xml + + li.strolch.service - 0.1.0-SNAPSHOT Service API for Strolch Service API for Strolch https://github.com/eitch/li.strolch.service - - UTF-8 - - - - 2011 - - - GNU Lesser General Public License - http://www.gnu.org/licenses/lgpl.html - repo - - - - eitchnet.ch - http://blog.eitchnet.ch - - - - eitch - Robert von Vurg - eitch@eitchnet.ch - http://blog.eitchnet.ch - eitchnet.ch - http://blog.eitchnet.ch - - architect - developer - - +1 - - http://localhost - - - Github Issues https://github.com/eitch/li.strolch.service/issues - - scm:git:https://github.com/eitch/li.strolch.service.git scm:git:git@github.com:eitch/li.strolch.service.git https://github.com/eitch/li.strolch.service - - li.strolch li.strolch.model - 1.0-SNAPSHOT li.strolch li.strolch.persistence.api - 0.1.0-SNAPSHOT ch.eitchnet ch.eitchnet.xmlpers - 0.2.0-SNAPSHOT ch.eitchnet ch.eitchnet.privilege - 0.2.0-SNAPSHOT - - junit - junit - 4.10 - test - - - ch.eitchnet - ch.eitchnet.utils - 0.2.0-SNAPSHOT - - - org.slf4j - slf4j-api - 1.7.2 - - - org.slf4j - slf4j-log4j12 - 1.7.2 - test - @@ -125,60 +56,26 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.9 - - true - true - org.apache.maven.plugins maven-compiler-plugin - 3.0 - - 1.7 - 1.7 - org.apache.maven.plugins maven-source-plugin - 2.1.2 - - - attach-sources - verify - - jar-no-fork - - - org.apache.maven.plugins maven-jar-plugin - 2.4 - - - - true - true - - - - org.apache.maven.plugins maven-site-plugin - 2.3 - - UTF-8 - diff --git a/src/main/java/li/strolch/command/AbstractCommand.java b/src/main/java/li/strolch/command/AbstractCommand.java index 69fd43018..304f62381 100644 --- a/src/main/java/li/strolch/command/AbstractCommand.java +++ b/src/main/java/li/strolch/command/AbstractCommand.java @@ -17,7 +17,7 @@ * along with ????????????????. If not, see . * */ -package ch.eitchnet.command; +package li.strolch.command; import ch.eitchnet.privilege.model.Restrictable; diff --git a/src/main/java/li/strolch/service/AbstractService.java b/src/main/java/li/strolch/service/AbstractService.java index 11f520316..53409944a 100644 --- a/src/main/java/li/strolch/service/AbstractService.java +++ b/src/main/java/li/strolch/service/AbstractService.java @@ -17,7 +17,7 @@ * along with ????????????????. If not, see . * */ -package ch.eitchnet.service; +package li.strolch.service; /** * @author Robert von Burg diff --git a/src/main/java/li/strolch/service/Service.java b/src/main/java/li/strolch/service/Service.java index 4b4a5ce5d..3c84a533a 100644 --- a/src/main/java/li/strolch/service/Service.java +++ b/src/main/java/li/strolch/service/Service.java @@ -17,7 +17,7 @@ * along with ????????????????. If not, see . * */ -package ch.eitchnet.service; +package li.strolch.service; import java.io.Serializable; diff --git a/src/main/java/li/strolch/service/ServiceArgument.java b/src/main/java/li/strolch/service/ServiceArgument.java index 95841dbac..1e0aca9c7 100644 --- a/src/main/java/li/strolch/service/ServiceArgument.java +++ b/src/main/java/li/strolch/service/ServiceArgument.java @@ -17,7 +17,7 @@ * along with ????????????????. If not, see . * */ -package ch.eitchnet.service; +package li.strolch.service; import java.io.Serializable; diff --git a/src/main/java/li/strolch/service/ServiceResult.java b/src/main/java/li/strolch/service/ServiceResult.java index 6a7fde078..8c55fb5f1 100644 --- a/src/main/java/li/strolch/service/ServiceResult.java +++ b/src/main/java/li/strolch/service/ServiceResult.java @@ -17,7 +17,7 @@ * along with ????????????????. If not, see . * */ -package ch.eitchnet.service; +package li.strolch.service; /** * @author Robert von Burg diff --git a/src/main/java/li/strolch/service/ServiceResultState.java b/src/main/java/li/strolch/service/ServiceResultState.java index d6e7981e1..5b9fd233e 100644 --- a/src/main/java/li/strolch/service/ServiceResultState.java +++ b/src/main/java/li/strolch/service/ServiceResultState.java @@ -17,7 +17,7 @@ * along with ????????????????. If not, see . * */ -package ch.eitchnet.service; +package li.strolch.service; /** * @author Robert von Burg diff --git a/src/main/java/li/strolch/service/SimpleServiceHandler.java b/src/main/java/li/strolch/service/SimpleServiceHandler.java index 54ef842b4..7f38de053 100644 --- a/src/main/java/li/strolch/service/SimpleServiceHandler.java +++ b/src/main/java/li/strolch/service/SimpleServiceHandler.java @@ -17,14 +17,15 @@ * along with ????????????????. If not, see . * */ -package ch.eitchnet.service; +package li.strolch.service; + +import java.text.MessageFormat; import ch.eitchnet.privilege.handler.PrivilegeHandler; import ch.eitchnet.privilege.model.Certificate; /** * @author Robert von Burg - * */ public class SimpleServiceHandler { @@ -39,8 +40,8 @@ public class SimpleServiceHandler { return service.doService(argument); } catch (Exception e) { - String error = "Failed to perform service " + service.getClass().getName() + " due to exception " - + e.getLocalizedMessage(); + String msg = "Failed to perform service {0} due to exception {1}"; //$NON-NLS-1$ + String error = MessageFormat.format(msg, service.getClass().getName(), e.getMessage()); return ServiceResult.failed(error, e); } }