From 3a06463280429d89d6e26972c4702da6bc9974f7 Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459>
Date: Wed, 31 Oct 2012 16:36:20 +0000
Subject: Move izpack stuff to resources, add icons dir

git-svn-id: https://svn.iaik.tugraz.at/svn/egiz/prj/current/12PDF-OVER-4.0@12661 3a0b52a2-8410-0410-bc02-ff6273a87459
---
 trunk/pdf-over-gui/pom.xml                         |  4 +-
 trunk/pdf-over-gui/src/main/izpack/install.xml     | 68 ----------------------
 .../src/main/izpack/unix_shortcutSpec.xml          | 29 ---------
 .../src/main/izpack/win_shortcutSpec.xml           | 29 ---------
 .../src/main/resources/icons/delete_me             |  0
 .../src/main/resources/izpack/install.xml          | 68 ++++++++++++++++++++++
 .../main/resources/izpack/unix_shortcutSpec.xml    | 29 +++++++++
 .../src/main/resources/izpack/win_shortcutSpec.xml | 29 +++++++++
 .../src/main/resources/scripts/pdfover_linux.sh    |  2 +
 .../src/main/resources/scripts/pdfover_mac.sh      |  2 +
 .../src/main/resources/scripts/pdfover_win.bat     |  1 +
 .../pdf-over-gui/src/main/scripts/pdfover_linux.sh |  2 -
 trunk/pdf-over-gui/src/main/scripts/pdfover_mac.sh |  2 -
 .../pdf-over-gui/src/main/scripts/pdfover_win.bat  |  1 -
 14 files changed, 133 insertions(+), 133 deletions(-)
 delete mode 100644 trunk/pdf-over-gui/src/main/izpack/install.xml
 delete mode 100644 trunk/pdf-over-gui/src/main/izpack/unix_shortcutSpec.xml
 delete mode 100644 trunk/pdf-over-gui/src/main/izpack/win_shortcutSpec.xml
 create mode 100644 trunk/pdf-over-gui/src/main/resources/icons/delete_me
 create mode 100644 trunk/pdf-over-gui/src/main/resources/izpack/install.xml
 create mode 100644 trunk/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml
 create mode 100644 trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
 create mode 100644 trunk/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh
 create mode 100644 trunk/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh
 create mode 100644 trunk/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat
 delete mode 100644 trunk/pdf-over-gui/src/main/scripts/pdfover_linux.sh
 delete mode 100644 trunk/pdf-over-gui/src/main/scripts/pdfover_mac.sh
 delete mode 100644 trunk/pdf-over-gui/src/main/scripts/pdfover_win.bat

(limited to 'trunk')

diff --git a/trunk/pdf-over-gui/pom.xml b/trunk/pdf-over-gui/pom.xml
index 646493e4..d08d48ef 100644
--- a/trunk/pdf-over-gui/pom.xml
+++ b/trunk/pdf-over-gui/pom.xml
@@ -134,14 +134,14 @@
 							<outputDirectory>${staging.dir}</outputDirectory>
 							<resources>
 								<resource>
-									<directory>src/main</directory>
+									<directory>src/main/resources</directory>
 									<includes>
 										<include>scripts/*</include>
 										<include>icons/*</include>
 									</includes>
 								</resource>
 								<resource>
-									<directory>src/main/izpack</directory>
+									<directory>src/main/resources/izpack</directory>
 								</resource>
 							</resources>
 						</configuration>
diff --git a/trunk/pdf-over-gui/src/main/izpack/install.xml b/trunk/pdf-over-gui/src/main/izpack/install.xml
deleted file mode 100644
index 002584ca..00000000
--- a/trunk/pdf-over-gui/src/main/izpack/install.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<installation version="1.0">
-
-	<info>
-		<appname>PDFOver</appname>
-		<appversion>4.0</appversion>
-		<uninstaller write="no" />
-		<javaversion>1.6</javaversion>
-		<authors>
-			<author name="A-SIT (Secure Information Technology Center - Austria)" email="" />
-		</authors>
-		<uninstaller/>
-		<url>http://www.a-sit.at/</url>
-		<pack200 />
-		<run-privileged condition="izpack.windowsinstall.vista|izpack.macinstall|izpack.windowsinstall.7"/>
-	</info>
-
-	<guiprefs resizable="no" width="480" height="360">
-		<laf name="looks">
-			<param name="variant" value="windows" />
-			<os family="windows" />
-		</laf>
-	</guiprefs>
-
-	<locale>
-		<langpack iso3="eng" />
-	</locale>
-	<resources>
-		<res src="./unix_shortcutSpec.xml" id="Unix_shortcutSpec.xml" />
-		<res src="./win_shortcutSpec.xml" id="Win_shortcutSpec.xml" />
-	</resources>
-	
-	<native type="izpack" name="ShellLink.dll">
-		<os family="windows" />
-	</native>
-	<native type="izpack" name="ShellLink_x64.dll">
-		<os family="windows" />
-	</native>
-	
-	<variables>
-		<variable name="DesktopShortcutCheckboxEnabled" value="true" />
-	</variables>
-
-	<panels>
-		<panel classname="HelloPanel" />
-		<panel classname="TargetPanel" />
-		<panel classname="InstallPanel" />
-		<panel classname="ShortcutPanel" />
-		<panel classname="SimpleFinishPanel" />
-	</panels>
-
-	<packs>
-		<pack name="main" required="yes">
-			<description>Main Installation</description>
-			<file src="lib" targetdir="$INSTALL_PATH" />
-			<file src="scripts" targetdir="$INSTALL_PATH" />
-			<file src="icons" targetdir="$INSTALL_PATH" />
-			<executable targetfile="$INSTALL_PATH/scripts/pdfover_linux.sh"
-				os="unix" stage="never"></executable>
-			<executable targetfile="$INSTALL_PATH/scripts/pdfover_win.bat"
-				os="windows" stage="never"></executable>
-			<executable targetfile="$INSTALL_PATH/scripts/pdfover_mac.sh"
-				os="mac" stage="never"></executable>
-		</pack>
-	</packs>
-
-</installation>
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/izpack/unix_shortcutSpec.xml b/trunk/pdf-over-gui/src/main/izpack/unix_shortcutSpec.xml
deleted file mode 100644
index 05e8bee8..00000000
--- a/trunk/pdf-over-gui/src/main/izpack/unix_shortcutSpec.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-
-<shortcuts>
-	<!-- <skipIfNotSupported/>  -->
-  <programGroup defaultName="PDFOver"
-  location="applications"/>
-
-  <shortcut
-     name="PDFOver"
-     programGroup="yes"
-     desktop="yes"
-     applications="no"
-     startMenu="yes"
-     startup="no"
-     target="$INSTALL_PATH/scripts/pdfover_linux.sh"
-     commandLine=""
-     workingDirectory="$INSTALL_PATH"
-     description="PDFOver 4.0"
-     iconFile="$INSTALL_PATH/icons/pdfover.png"
-     iconIndex="0"
-     type="Application"
-     encoding="UTF-8"
-     terminal="false"
-     KdeSubstUID="false"
-     initialState="normal">
-     <createForPack name="main"/>
-   </shortcut>
-
-</shortcuts>
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/izpack/win_shortcutSpec.xml b/trunk/pdf-over-gui/src/main/izpack/win_shortcutSpec.xml
deleted file mode 100644
index 8ad6666f..00000000
--- a/trunk/pdf-over-gui/src/main/izpack/win_shortcutSpec.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-
-<shortcuts>
-	<!-- <skipIfNotSupported/>  -->
-  <programGroup defaultName="PDFOver"
-  location="applications"/>
-
-  <shortcut
-     name="PDFOver"
-     programGroup="yes"
-     desktop="yes"
-     applications="no"
-     startMenu="yes"
-     startup="no"
-     target="$INSTALL_PATH/scripts/pdfover_win.bat"
-     commandLine=""
-     workingDirectory="$INSTALL_PATH/lib"
-     description="PDFOver 4.0"
-     iconFile="$INSTALL_PATH/icons/pdfover.ico"
-     iconIndex="0"
-     type="Application"
-     encoding="UTF-8"
-     terminal="false"
-     KdeSubstUID="false"
-     initialState="normal">
-     <createForPack name="main"/>
-   </shortcut>
-
-</shortcuts>
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/resources/icons/delete_me b/trunk/pdf-over-gui/src/main/resources/icons/delete_me
new file mode 100644
index 00000000..e69de29b
diff --git a/trunk/pdf-over-gui/src/main/resources/izpack/install.xml b/trunk/pdf-over-gui/src/main/resources/izpack/install.xml
new file mode 100644
index 00000000..002584ca
--- /dev/null
+++ b/trunk/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<installation version="1.0">
+
+	<info>
+		<appname>PDFOver</appname>
+		<appversion>4.0</appversion>
+		<uninstaller write="no" />
+		<javaversion>1.6</javaversion>
+		<authors>
+			<author name="A-SIT (Secure Information Technology Center - Austria)" email="" />
+		</authors>
+		<uninstaller/>
+		<url>http://www.a-sit.at/</url>
+		<pack200 />
+		<run-privileged condition="izpack.windowsinstall.vista|izpack.macinstall|izpack.windowsinstall.7"/>
+	</info>
+
+	<guiprefs resizable="no" width="480" height="360">
+		<laf name="looks">
+			<param name="variant" value="windows" />
+			<os family="windows" />
+		</laf>
+	</guiprefs>
+
+	<locale>
+		<langpack iso3="eng" />
+	</locale>
+	<resources>
+		<res src="./unix_shortcutSpec.xml" id="Unix_shortcutSpec.xml" />
+		<res src="./win_shortcutSpec.xml" id="Win_shortcutSpec.xml" />
+	</resources>
+	
+	<native type="izpack" name="ShellLink.dll">
+		<os family="windows" />
+	</native>
+	<native type="izpack" name="ShellLink_x64.dll">
+		<os family="windows" />
+	</native>
+	
+	<variables>
+		<variable name="DesktopShortcutCheckboxEnabled" value="true" />
+	</variables>
+
+	<panels>
+		<panel classname="HelloPanel" />
+		<panel classname="TargetPanel" />
+		<panel classname="InstallPanel" />
+		<panel classname="ShortcutPanel" />
+		<panel classname="SimpleFinishPanel" />
+	</panels>
+
+	<packs>
+		<pack name="main" required="yes">
+			<description>Main Installation</description>
+			<file src="lib" targetdir="$INSTALL_PATH" />
+			<file src="scripts" targetdir="$INSTALL_PATH" />
+			<file src="icons" targetdir="$INSTALL_PATH" />
+			<executable targetfile="$INSTALL_PATH/scripts/pdfover_linux.sh"
+				os="unix" stage="never"></executable>
+			<executable targetfile="$INSTALL_PATH/scripts/pdfover_win.bat"
+				os="windows" stage="never"></executable>
+			<executable targetfile="$INSTALL_PATH/scripts/pdfover_mac.sh"
+				os="mac" stage="never"></executable>
+		</pack>
+	</packs>
+
+</installation>
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml b/trunk/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml
new file mode 100644
index 00000000..05e8bee8
--- /dev/null
+++ b/trunk/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<shortcuts>
+	<!-- <skipIfNotSupported/>  -->
+  <programGroup defaultName="PDFOver"
+  location="applications"/>
+
+  <shortcut
+     name="PDFOver"
+     programGroup="yes"
+     desktop="yes"
+     applications="no"
+     startMenu="yes"
+     startup="no"
+     target="$INSTALL_PATH/scripts/pdfover_linux.sh"
+     commandLine=""
+     workingDirectory="$INSTALL_PATH"
+     description="PDFOver 4.0"
+     iconFile="$INSTALL_PATH/icons/pdfover.png"
+     iconIndex="0"
+     type="Application"
+     encoding="UTF-8"
+     terminal="false"
+     KdeSubstUID="false"
+     initialState="normal">
+     <createForPack name="main"/>
+   </shortcut>
+
+</shortcuts>
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml b/trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
new file mode 100644
index 00000000..8ad6666f
--- /dev/null
+++ b/trunk/pdf-over-gui/src/main/resources/izpack/win_shortcutSpec.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<shortcuts>
+	<!-- <skipIfNotSupported/>  -->
+  <programGroup defaultName="PDFOver"
+  location="applications"/>
+
+  <shortcut
+     name="PDFOver"
+     programGroup="yes"
+     desktop="yes"
+     applications="no"
+     startMenu="yes"
+     startup="no"
+     target="$INSTALL_PATH/scripts/pdfover_win.bat"
+     commandLine=""
+     workingDirectory="$INSTALL_PATH/lib"
+     description="PDFOver 4.0"
+     iconFile="$INSTALL_PATH/icons/pdfover.ico"
+     iconIndex="0"
+     type="Application"
+     encoding="UTF-8"
+     terminal="false"
+     KdeSubstUID="false"
+     initialState="normal">
+     <createForPack name="main"/>
+   </shortcut>
+
+</shortcuts>
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh
new file mode 100644
index 00000000..b785db7c
--- /dev/null
+++ b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -cp "lib/*" at.asit.pdfover.gui.Main
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh
new file mode 100644
index 00000000..b785db7c
--- /dev/null
+++ b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -cp "lib/*" at.asit.pdfover.gui.Main
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat
new file mode 100644
index 00000000..222bd263
--- /dev/null
+++ b/trunk/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat
@@ -0,0 +1 @@
+..\lib\pdf-over-gui-4.0.0-SNAPSHOT.jar %*
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/scripts/pdfover_linux.sh b/trunk/pdf-over-gui/src/main/scripts/pdfover_linux.sh
deleted file mode 100644
index b785db7c..00000000
--- a/trunk/pdf-over-gui/src/main/scripts/pdfover_linux.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -cp "lib/*" at.asit.pdfover.gui.Main
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/scripts/pdfover_mac.sh b/trunk/pdf-over-gui/src/main/scripts/pdfover_mac.sh
deleted file mode 100644
index b785db7c..00000000
--- a/trunk/pdf-over-gui/src/main/scripts/pdfover_mac.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -cp "lib/*" at.asit.pdfover.gui.Main
\ No newline at end of file
diff --git a/trunk/pdf-over-gui/src/main/scripts/pdfover_win.bat b/trunk/pdf-over-gui/src/main/scripts/pdfover_win.bat
deleted file mode 100644
index 222bd263..00000000
--- a/trunk/pdf-over-gui/src/main/scripts/pdfover_win.bat
+++ /dev/null
@@ -1 +0,0 @@
-..\lib\pdf-over-gui-4.0.0-SNAPSHOT.jar %*
\ No newline at end of file
-- 
cgit v1.2.3