Skip to content

Commit

Permalink
Merge pull request #71 from tfreytag/organize-libs
Browse files Browse the repository at this point in the history 
Organize libs
  • Loading branch information
@nileger
nileger authored Oct 8, 2020
2 parents 142e990 + 7658268 commit d377d6d
Show file tree
Hide file tree
Showing 42 changed files with 88 additions and 97 deletions.
22 changes: 3 additions & 19 deletions WoPeD-AProMoRe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,9 @@
<version>3.2.5.RELEASE</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>manager-client</artifactId>
<version>0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/manager-client.jar</systemPath>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>plugin-api</artifactId>
<version>1.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/plugin-api-1.1.jar</systemPath>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>manager-ws-model.jar</artifactId>
<version>0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/manager-ws-model.jar</systemPath>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
52 changes: 51 additions & 1 deletion WoPeD-CommonLibs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<repository>
<id>data-local</id>
<name>data</name>
<url>file://${project.basedir}/../repo</url>
<url>file://${project.basedir}/src/main/repo</url>
</repository>
</repositories>

Expand All @@ -39,6 +39,56 @@
<artifactId>jgraphx</artifactId>
<version>1.5.1</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>manager-client</artifactId>
<version>0</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>manager-ws-model</artifactId>
<version>0</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>plugin-api</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>ruddi</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>antlrworks</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>jbpt</artifactId>
<version>0.1.0</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>treelayout.core</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>ssj</artifactId>
<version>2.1.3</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>jcommon</artifactId>
<version>1.0.15</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>jfreechart</artifactId>
<version>1.0.12</version>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>
<artifactId>spring-ws-core</artifactId>
Expand Down
0 ...s/src/main/resources/antlrworks-1.4.0.jar → ...TER/antlrworks/1.4.0/antlrworks-1.4.0.jar
View file
File renamed without changes.
0 ...Metrics/src/main/resources/jbpt-0.1.0.jar → ...epo/PLATZHALTER/jbpt/0.1.0/jbpt-0.1.0.jar
View file
File renamed without changes.
0 ...sis/src/main/resources/jcommon-1.0.15.jar → ...ZHALTER/jcommon/1.0.15/jcommon-1.0.15.jar
View file
File renamed without changes.
0 .../src/main/resources/jfreechart-1.0.12.jar → ...R/jfreechart/1.0.12/jfreechart-1.0.12.jar
View file
File renamed without changes.
0 ...ATZHALTER/jgraph/5.10.2/jgraph-5.10.2.jar → ...ATZHALTER/jgraph/5.10.2/jgraph-5.10.2.jar
View file
File renamed without changes.
0 ...ATZHALTER/jgraphx/1.5.1/jgraphx-1.5.1.jar → ...ATZHALTER/jgraphx/1.5.1/jgraphx-1.5.1.jar
View file
File renamed without changes.
0 ...oRe/src/main/resources/manager-client.jar → ...TER/manager-client/0/manager-client-0.jar
View file
File renamed without changes.
0 ...e/src/main/resources/manager-ws-model.jar → ...manager-ws-model/0/manager-ws-model-0.jar
View file
File renamed without changes.
0 ...oRe/src/main/resources/plugin-api-1.1.jar → ...ZHALTER/plugin-api/1.1/plugin-api-1.1.jar
View file
File renamed without changes.
0 ...Editor/src/main/resources/ruddi-1.0.0.jar → ...o/PLATZHALTER/ruddi/1.0.0/ruddi-1.0.0.jar
View file
File renamed without changes.
0 ...Analysis/src/main/resources/ssj-2.1.3.jar → .../repo/PLATZHALTER/ssj/2.1.3/ssj-2.1.3.jar
View file
File renamed without changes.
0 .../main/resources/treelayout.core-1.0.1.jar → ...yout.core/1.0.1/treelayout.core-1.0.1.jar
View file
File renamed without changes.
7 changes: 0 additions & 7 deletions WoPeD-Editor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@
</properties>

<dependencies>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>ruddi</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/ruddi-1.0.0.jar</systemPath>
</dependency>
<dependency>
<groupId>com.toedter</groupId>
<artifactId>jcalendar</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion WoPeD-Installer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<configuration>
<headerType>gui</headerType>
<jar>target/WoPeD-Starter.jar</jar>
<outfile>./../WoPeD-IzPack/Windows/WoPeD.exe</outfile>
<outfile>./../WoPeD-IzPack/InstallFiles/WoPeD.exe</outfile>
<priority>normal</priority>
<stayAlive>false</stayAlive>
<icon>WoPeD.ico</icon>
Expand Down
0 WoPeD-IzPack/Windows/Changelog.txt → WoPeD-IzPack/InstallFiles/Changelog.txt
View file
File renamed without changes.
0 WoPeD-IzPack/Windows/License.txt → WoPeD-IzPack/InstallFiles/License.txt
View file
File renamed without changes.
0 WoPeD-IzPack/Windows/Readme.txt → WoPeD-IzPack/InstallFiles/Readme.txt
View file
File renamed without changes.
0 WoPeD-IzPack/Windows/WoPeD-logo.jpg → WoPeD-IzPack/InstallFiles/WoPeD-logo.jpg
View file
File renamed without changes
0 WoPeD-IzPack/Linux/WoPeD.png → WoPeD-IzPack/InstallFiles/WoPeD.png
View file
File renamed without changes
0 WoPeD-IzPack/Windows/finishPanel.png → WoPeD-IzPack/InstallFiles/finishPanel.png
View file
File renamed without changes
0 WoPeD-IzPack/Windows/helloPanel.png → WoPeD-IzPack/InstallFiles/helloPanel.png
View file
File renamed without changes
0 WoPeD-IzPack/Windows/infoPanel.png → WoPeD-IzPack/InstallFiles/infoPanel.png
View file
File renamed without changes
0 WoPeD-IzPack/Windows/install-deu.xml → WoPeD-IzPack/InstallFiles/install-deu.xml
View file
File renamed without changes.
0 WoPeD-IzPack/Windows/install-eng.xml → WoPeD-IzPack/InstallFiles/install-eng.xml
View file
File renamed without changes.
9 changes: 5 additions & 4 deletions WoPeD-IzPack/Windows/install.xml → WoPeD-IzPack/InstallFiles/install.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
<res id="Installer.image.4" src="targetPanel.png" />
<res id="Installer.image.5" src="installPanel.png" />
<res id="Installer.image.6" src="shortcutPanel.png" />
<res id="ProcessPanel.Spec.xml" src="process.xml" />
<res id="Installer.image.7" src="finishPanel.png" />
<res id="installer.langsel.img" src="WoPeD-logo.jpg" />
<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="ProcessPanel.Spec.xml" src="process.xml" />
</resources>

<info>
Expand All @@ -69,6 +69,7 @@
<panel classname="PacksPanel"></panel>
<panel classname="InstallPanel"></panel>
<panel classname="ShortcutPanel"></panel>
<panel classname="ProcessPanel"></panel>
<panel classname="SimpleFinishPanel"></panel>
</panels>

Expand All @@ -84,7 +85,7 @@
<os family="windows" />
</fileset>
<fileset dir="." targetdir="${INSTALL_PATH}" override="true">
<include name="../Linux/WoPeD-Starter.jar" />
<include name="WoPeD-Starter.jar" />
<include name="Readme.txt" />
<include name="License.txt" />
<include name="Changelog.txt" />
Expand All @@ -93,7 +94,7 @@
</fileset>
</pack>

<pack name="PDF Documentation" required="no" id="id1">
<pack name="PDF Documentation" required="no" id="id2">
<description>Additional manual and user doc files</description>

<fileset dir="." targetdir="${INSTALL_PATH}/doc"
Expand All @@ -103,7 +104,7 @@
</fileset>
</pack>

<pack name="HTML Manual" required="no" id="id1">
<pack name="HTML Manual" required="no" id="id3">
<description>Separate HTML Manual files</description>

<fileset dir="." targetdir="${INSTALL_PATH}/doc"
Expand Down
0 WoPeD-IzPack/Windows/installPanel.png → WoPeD-IzPack/InstallFiles/installPanel.png
View file
File renamed without changes
0 WoPeD-IzPack/Windows/licencePanel.png → WoPeD-IzPack/InstallFiles/licencePanel.png
View file
File renamed without changes
0 WoPeD-IzPack/Windows/packsPanel.png → WoPeD-IzPack/InstallFiles/packsPanel.png
View file
File renamed without changes
18 changes: 18 additions & 0 deletions WoPeD-IzPack/InstallFiles/process.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<izpack:processing version="5.0"
xmlns:izpack="http://izpack.org/schema/processing"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://izpack.org/schema/processing http://izpack.org/schema/5.0/izpack-processing-5.0.xsd">

<job name="Start WoPeD">
<os family="windows" />
<executefile name="$INSTALL_PATH/WoPeD.exe"
workingDir="$INSTALL_PATH" />
</job>
<job name="Start WoPeD">
<os family="unix" />
<executefile name="$INSTALL_PATH/WoPeD-Starter.jar"
workingDir="$INSTALL_PATH" />
</job>
<!-- <onFail previous="true" next="false" /> <onSuccess previous="true"
next="true" /> -->
</izpack:processing>
0 WoPeD-IzPack/Windows/shortcut-unix.xml → WoPeD-IzPack/InstallFiles/shortcut-unix.xml
View file
File renamed without changes.
0 WoPeD-IzPack/Windows/shortcut-win.xml → WoPeD-IzPack/InstallFiles/shortcut-win.xml
View file
File renamed without changes.
0 WoPeD-IzPack/Windows/shortcutPanel.png → WoPeD-IzPack/InstallFiles/shortcutPanel.png
View file
File renamed without changes
0 WoPeD-IzPack/Windows/targetPanel.png → WoPeD-IzPack/InstallFiles/targetPanel.png
View file
File renamed without changes
14 changes: 0 additions & 14 deletions WoPeD-IzPack/Windows/process.xml
View file

This file was deleted.

13 changes: 7 additions & 6 deletions WoPeD-IzPack/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<artifactId>WoPeD-IzPack</artifactId>

<properties>
<izpack.version>5.0.9</izpack.version>
<izpack.version>5.1.3</izpack.version>
<izpack.staging>${project.build.directory}/staging</izpack.staging>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<woped.version>${revision}</woped.version>
Expand All @@ -33,14 +33,11 @@
<configuration>
<tasks>
<copy todir="${izpack.staging}">
<fileset dir="${basedir}/Windows" />
<fileset dir="${basedir}/InstallFiles" />
</copy>
<copy todir="${izpack.staging}/doc">
<fileset dir="${basedir}/doc" />
</copy>
<copy todir="${izpack.staging}">
<fileset dir="${basedir}/Linux" />
</copy>
</tasks>
</configuration>
</execution>
Expand All @@ -58,8 +55,12 @@
</goals>
<configuration>
<baseDir>${izpack.staging}</baseDir>
<installFile>${basedir}/Windows/install.xml</installFile>
<installFile>${basedir}/InstallFiles/install.xml</installFile>
<output>${project.build.directory}/WoPeD-Installer.jar</output>
<!-- Benötigt für Update auf IzPack 5.1.3
https://stackoverflow.com/questions/52870386/an-attached-artifact-must-have-a-different-id-than-its-corresponding-main-artifa/53132888
-->
<classifier>BugFix</classifier>
</configuration>
</execution>
</executions>
Expand Down
14 changes: 0 additions & 14 deletions WoPeD-ProcessMetrics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,6 @@
</repositories>

<dependencies>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>jbpt</artifactId>
<version>0.1.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/jbpt-0.1.0.jar</systemPath>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>antlrworks</artifactId>
<version>1.4.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/antlrworks-1.4.0.jar</systemPath>
</dependency>
<dependency>
<groupId>de.dhbw.woped</groupId>
<artifactId>WoPeD-GUI</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions WoPeD-ProcessMetrics/src/main/java/org/woped/metrics/builder/CustomTableModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ public class CustomTableModel extends DefaultTableModel{
private static final long serialVersionUID = -8152725519048713038L;
private boolean editable = true;

public CustomTableModel(Vector<?> object, Vector<String> columns) {
super();
public CustomTableModel(Vector<? extends Vector> data, Vector<String> columns) {
super(data, columns);
}

@Override
Expand Down
7 changes: 0 additions & 7 deletions WoPeD-QualAnalysis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>treelayout.core</artifactId>
<version>1.0.1</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/treelayout.core-1.0.1.jar</systemPath>
</dependency>
<dependency>
<groupId>de.dhbw.woped</groupId>
<artifactId>WoPeD-CommonLibs</artifactId>
Expand Down
21 changes: 0 additions & 21 deletions WoPeD-QuantAnalysis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,6 @@
<artifactId>gson</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>ssj</artifactId>
<version>2.1.3</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/ssj-2.1.3.jar</systemPath>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>jcommon</artifactId>
<version>1.0.15</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/jcommon-1.0.15.jar</systemPath>
</dependency>
<dependency>
<groupId>PLATZHALTER</groupId>
<artifactId>jfreechart</artifactId>
<version>1.0.12</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/jfreechart-1.0.12.jar</systemPath>
</dependency>
<dependency>
<groupId>de.dhbw.woped</groupId>
<artifactId>WoPeD-CommonLibs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion WoPeD-Starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
tofile="${basedir}/../WoPeD-Installer/target/WoPeD-Starter.jar" />
<copy
file="${basedir}/target/WoPeD-Starter-${project.version}-jar-with-dependencies.jar"
tofile="${basedir}/../WoPeD-IzPack/Linux/WoPeD-Starter.jar" />
tofile="${basedir}/../WoPeD-IzPack/InstallFiles/WoPeD-Starter.jar" />
</tasks>
</configuration>
</execution>
Expand Down

0 comments on commit d377d6d

Please sign in to comment.