From 5c5010f818b32b43f2c0c799ef062ef12bff66ca Mon Sep 17 00:00:00 2001
From: tknall <tknall@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>
Date: Mon, 28 Jan 2013 13:57:03 +0000
Subject: Maven build scripts enhanced.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/pdf-as/trunk@928 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
---
 pdf-as-cli/src/main/assembly/cli.xml     | 10 +++++-----
 pdf-as-cli/src/main/resources/pdf-as.bat |  4 ++--
 pdf-as-cli/src/main/resources/pdf-as.sh  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'pdf-as-cli/src')

diff --git a/pdf-as-cli/src/main/assembly/cli.xml b/pdf-as-cli/src/main/assembly/cli.xml
index 31abd3d..c4f7189 100644
--- a/pdf-as-cli/src/main/assembly/cli.xml
+++ b/pdf-as-cli/src/main/assembly/cli.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- http://maven.apache.org/plugins/maven-assembly-plugin/assembly.html -->
 <assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
 	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">
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
 	
 	<id>cli</id>
 	
@@ -23,9 +23,8 @@
 				<include>at.gv.egiz:pdf-as-lib:jar</include>
 			</includes>
 			<binaries>
-				<outputDirectory/>
 				<unpack>false</unpack>
-				<outputFileNameMapping>${module.build.finalName}.${module.extension}</outputFileNameMapping>
+				<outputFileNameMapping>pdf-as-lib-${project.version}.jar</outputFileNameMapping>
 			</binaries>
 		</moduleSet>
 		
@@ -38,6 +37,7 @@
 			<unpack>false</unpack>
 			<scope>runtime</scope>
 			<outputDirectory>lib</outputDirectory>
+			<useProjectArtifact>false</useProjectArtifact>
 			<excludes>
 				<exclude>at.gv.egiz:pdf-as-lib:jar</exclude>
 			</excludes>
@@ -69,7 +69,7 @@
 			</includes>
 		</fileSet>
 		
-		<!-- Add exampled. -->
+		<!-- Add examples. -->
 		<fileSet>
 			<directory>../dok/Anwendungsbeschreibung/Platzhalter-Beispiele</directory>
 			<outputDirectory>doc/Platzhalter-Beispiele</outputDirectory>
diff --git a/pdf-as-cli/src/main/resources/pdf-as.bat b/pdf-as-cli/src/main/resources/pdf-as.bat
index 0cadb9a..5629c7c 100644
--- a/pdf-as-cli/src/main/resources/pdf-as.bat
+++ b/pdf-as-cli/src/main/resources/pdf-as.bat
@@ -2,7 +2,7 @@
 
 rem Deploys embedded default configuration to USER_HOME/PDF-AS.
 rem Note: Configuration is not deployed if it already exists.
-java -jar ${project.build.finalName}.jar -ddc
+java -jar pdf-as-lib-${project.version}.jar -ddc
 
 rem Start commandline
-java -Xms128m -Xmx786m -XX:MaxPermSize=256m -jar ${project.build.finalName}.jar %*
+java -Xms128m -Xmx786m -XX:MaxPermSize=256m -jar pdf-as-lib-${project.version}.jar %*
diff --git a/pdf-as-cli/src/main/resources/pdf-as.sh b/pdf-as-cli/src/main/resources/pdf-as.sh
index f47bc5f..3bd7742 100644
--- a/pdf-as-cli/src/main/resources/pdf-as.sh
+++ b/pdf-as-cli/src/main/resources/pdf-as.sh
@@ -2,7 +2,7 @@
 
 # Deploys embedded default configuration to USER_HOME/PDF-AS.
 # Note: Configuration is not deployed if it already exists.
-java -jar ${project.build.finalName}.jar -ddc
+java -jar pdf-as-lib-${project.version}.jar -ddc
 
 # Start commandline
-java -Xms128m -Xmx786m -XX:MaxPermSize=256m -jar ${project.build.finalName}.jar $@
+java -Xms128m -Xmx786m -XX:MaxPermSize=256m -jar pdf-as-lib-${project.version}.jar $@
-- 
cgit v1.2.3