Merge remote-tracking branch 'origin/master'

# Conflicts: # WoPeD-Starter/pom.xml
woped · Aug 30, 2020 · 142e990 · 142e990
2 parents 95076b2 + 3a487e0
commit 142e990
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 39 deletions.
diff --git a/WoPeD-Configuration/src/main/java/org/woped/config/general/WoPeDconfig.xml b/WoPeD-Configuration/src/main/java/org/woped/config/general/WoPeDconfig.xml
@@ -108,7 +108,7 @@
 	<p2t>
     	<p2tUse>true</p2tUse>
     	<p2tServerHost>woped.dhbw-karlsruhe.de</p2tServerHost>
-   	 	<p2tServerPort>8080</p2tServerPort>
+   	 	<p2tServerPort>8082</p2tServerPort>
     	<p2tServerURI>/p2t</p2tServerURI>
   	</p2t>
   	<t2p>

diff --git a/WoPeD-Core/src/main/java/org/woped/core/config/DefaultStaticConfiguration.java b/WoPeD-Core/src/main/java/org/woped/core/config/DefaultStaticConfiguration.java
@@ -84,7 +84,7 @@ public class DefaultStaticConfiguration implements IGeneralConfiguration {
 	public static boolean DEFAULT_APROMORE_USE = false;
 
 	public static String DEFAULT_PROCESS2TEXT_HOST = "woped.dhbw-karlsruhe.de";
-	public static int DEFAULT_PROCESS2TEXT_PORT = 8080;
+	public static int DEFAULT_PROCESS2TEXT_PORT = 8082;
 	public static String DEFAULT_PROCESS2TEXT_URI = "/p2t";
 	public static boolean DEFAULT_PROCESS2TEXT_USE = false;
 

diff --git a/WoPeD-IzPack/Windows/install.xml b/WoPeD-IzPack/Windows/install.xml
@@ -1,36 +1,37 @@
 <izpack:installation version="5.0"
-                     xmlns:izpack="http://izpack.org/schema/installation"
-                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                     xsi:schemaLocation="http://izpack.org/schema/installation http://izpack.org/schema/5.0/izpack-installation-5.0.xsd">
-	
+	xmlns:izpack="http://izpack.org/schema/installation"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://izpack.org/schema/installation http://izpack.org/schema/5.0/izpack-installation-5.0.xsd">
+
 	<guiprefs width="640" height="560" resizable="no">
- 	   	<modifier key="useHeadingPanel" value="yes"/>
-       	<modifier key="useHeadingForSummary" value="yes"/>
-    	<modifier key="headingLineCount" value="2"/>
-    	<modifier key="headingFontSize" value="1.5"/>
-    	<modifier key="headingBackgroundColor" value="0x00ffffff"/>
-    	<modifier key="headingPanelCounter" value="progressbar"/>
-    	<modifier key="headingPanelCounterPos" value="inNavigationPanel"/>
-    	<modifier key="langDisplayType" value="native"/>
-    	<modifier key="layoutAnchor" value="NORTHWEST"/>
+		<modifier key="useHeadingPanel" value="yes" />
+		<modifier key="useHeadingForSummary" value="yes" />
+		<modifier key="headingLineCount" value="2" />
+		<modifier key="headingFontSize" value="1.5" />
+		<modifier key="headingBackgroundColor" value="0x00ffffff" />
+		<modifier key="headingPanelCounter" value="progressbar" />
+		<modifier key="headingPanelCounterPos"
+			value="inNavigationPanel" />
+		<modifier key="langDisplayType" value="native" />
+		<modifier key="layoutAnchor" value="NORTHWEST" />
 	</guiprefs>
-	
+
 	<natives>
 		<native type="izpack" name="ShellLink.dll">
 			<os family="windows" />
-		</native> 
+		</native>
 
 		<native type="izpack" name="ShellLink_x64.dll">
 			<os family="windows" />
-		</native> 
+		</native>
 	</natives>
 
 	<locale>
-  		<langpack iso3="eng" /> 
-  		<langpack iso3="deu" /> 
-  	</locale>
-  	
-  	<resources>
+		<langpack iso3="eng" />
+		<langpack iso3="deu" />
+	</locale>
+
+	<resources>
 		<res id="LicencePanel.licence" src="License.txt"></res>
 		<res id="InfoPanel.info" src="Readme.txt"></res>
 		<res id="Installer.image.0" src="helloPanel.png" />
@@ -45,68 +46,71 @@
 		<res id="packsLang.xml_eng" src="install-eng.xml" />
 		<res id="packsLang.xml_deu" src="install-deu.xml" />
 		<res id="shortcutSpec.xml" src="shortcut-win.xml" />
-		<res id="Unix_shortcutSpec.xml" src="shortcut-unix.xml"/>
+		<res id="Unix_shortcutSpec.xml" src="shortcut-unix.xml" />
 		<res id="ProcessPanel.Spec.xml" src="process.xml" />
 	</resources>
-	
+
 	<info>
 		<appname>WoPeD</appname>
 		<appversion>@{woped.version}</appversion>
 		<authors>
-			<author name="Responsible: Thomas Freytag" email="[email protected]"></author>
+			<author name="Responsible: Thomas Freytag"
+				email="[email protected]"></author>
 		</authors>
 		<url>http://www.woped.org</url>
+		<pack200>lzma</pack200>
 	</info>
 
 	<panels>
 		<panel classname="HelloPanel"></panel>
 		<panel classname="InfoPanel"></panel>
 		<panel classname="LicencePanel"></panel>
 		<panel classname="TargetPanel"></panel>
-		<panel classname="PacksPanel"></panel>		
+		<panel classname="PacksPanel"></panel>
 		<panel classname="InstallPanel"></panel>
 		<panel classname="ShortcutPanel"></panel>
 		<panel classname="SimpleFinishPanel"></panel>
 	</panels>
-	
+
 	<packs>
 		<pack name="Executable" required="yes" id="id1">
 			<description>Executable files</description>
-			
+
 			<fileset dir="." targetdir="${INSTALL_PATH}" override="true">
 				<include name="WoPeD.exe" />
 				<include name="Readme.txt" />
 				<include name="License.txt" />
 				<include name="Changelog.txt" />
 				<os family="windows" />
 			</fileset>
-
 			<fileset dir="." targetdir="${INSTALL_PATH}" override="true">
-				<include name="WoPeD-Starter.jar" />
+				<include name="../Linux/WoPeD-Starter.jar" />
 				<include name="Readme.txt" />
 				<include name="License.txt" />
 				<include name="Changelog.txt" />
 				<include name="WoPeD.png" />
 				<os family="unix" />
 			</fileset>
 		</pack>
-		
+
 		<pack name="PDF Documentation" required="no" id="id1">
 			<description>Additional manual and user doc files</description>
-
-			<fileset dir="." targetdir="${INSTALL_PATH}/doc" override="true">
+
+			<fileset dir="." targetdir="${INSTALL_PATH}/doc"
+				override="true">
 				<include name="doc/pdf/de/*" />
 				<include name="doc/pdf/en/*" />
 			</fileset>
 		</pack>
-		
+
 		<pack name="HTML Manual" required="no" id="id1">
 			<description>Separate HTML Manual files</description>
-
-			<fileset dir="." targetdir="${INSTALL_PATH}/doc" override="true">
+
+			<fileset dir="." targetdir="${INSTALL_PATH}/doc"
+				override="true">
 				<include name="doc/html/*" />
 			</fileset>
 		</pack>
-						
+
 	</packs>
 </izpack:installation>
diff --git a/WoPeD-Starter/pom.xml b/WoPeD-Starter/pom.xml
@@ -95,7 +95,38 @@
 						</execution>
 					</executions>
 				</plugin>
-						<plugin>
+				<plugin>
+					<groupId>sh.tak.appbundler</groupId>
+					<artifactId>appbundle-maven-plugin</artifactId>
+					<version>1.2.0</version>
+					<configuration>
+						<mainClass>org.woped.starter.RunWoPeD</mainClass>
+						<generateDiskImageFile>true</generateDiskImageFile>
+						<bundleName>WoPeD</bundleName>
+						<iconFile>../WoPeD-Installer/mac/WoPeD.icns</iconFile>
+					</configuration>
+					<executions>
+						<execution>
+							<phase>package</phase>
+							<goals>
+								<goal>bundle</goal>
+							</goals>
+						</execution>
+					</executions>
+					<dependencies>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-archiver</artifactId>
+							<version>4.1.0</version>
+						</dependency>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-velocity</artifactId>
+							<version>1.2</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
 					<artifactId>maven-antrun-plugin</artifactId>
 					<executions>
 						<execution>