Skip to content
This repository was archived by the owner on Aug 11, 2020. It is now read-only.

Commit edddb8e

Browse files
ThomasJejkalThomasJejkal
committed
Removed dependency to GenericRepoClient from DataWorkflow module
Added CommandlineTools-1.1 to local maven repository at './libs/' Added dependency to CommandlineTools and fixed imports accordingly
1 parent 0a570d8 commit edddb8e

8 files changed

Lines changed: 125 additions & 11 deletions

File tree

‎.gitignore‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,35 @@
1-
/Commons/target/
1+
/Commons/target/
2+
/Authorization/target/
3+
/Core/target/
4+
/DataOrganization/target/
5+
/DataWorkflow/target/
6+
/MetaDataManagement/MDM-Admin/target/
7+
/MetaDataManagement/MDM-BaseMetaData/target/
8+
/MetaDataManagement/MDM-Content/target/
9+
/MetaDataManagement/MDM-Core/target/
10+
/MetaDataManagement/MDM-DataWorkflow/target/
11+
/MetaDataManagement/REST-BaseMetaData/target/
12+
/MetaDataManagement/REST-DataOrganization/target/
13+
/MetaDataManagement/REST-DataWorkflow/target/
14+
/MetaDataManagement/REST-Sharing/target/
15+
/MetaDataManagement/REST-UserGroupManagement/target/
16+
/RestInterfaces/BaseMetaDataRestInterface/target/
17+
/RestInterfaces/ClientBase/target/
18+
/RestInterfaces/DataOrganizationRestInterface/target/
19+
/RestInterfaces/DataWorkflowRestInterface/target/
20+
/RestInterfaces/ServiceBase/target/
21+
/RestInterfaces/SharingRestInterface/target/
22+
/RestInterfaces/StagingRestInterface/target/
23+
/RestInterfaces/UserGroupRestInterface/target/
24+
/Scheduler/REST-SchedulerService/target/
25+
/Scheduler/SchedulerJobs/target/
26+
/Scheduler/SchedulerManager/target/
27+
/Scheduler/SchedulerRestInterface/target/
28+
/Staging/Client/target/
29+
/Staging/DataTransferClient/target/
30+
/Staging/Service/target/
31+
/UserInterface/AdminUI/target/
32+
/UserInterface/SimpleMonitoringPortlet/target/
33+
/UserInterface/UICommons7/target/
34+
/Utils/target/
35+
/Documentation/target/

‎DataWorkflow/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<firstName>Thomas</firstName>
3636
<lastName>Jejkal</lastName>
3737
<nameId>jejkal</nameId>
38+
<root.relative.path>../</root.relative.path>
3839
</properties>
3940

4041

@@ -93,8 +94,8 @@
9394
<version>1.1</version>
9495
</dependency>
9596
<dependency>
96-
<groupId>edu.kit.dama.rest</groupId>
97-
<artifactId>GenericRestClient</artifactId>
97+
<groupId>edu.kit.cmdline</groupId>
98+
<artifactId>CommandlineTools</artifactId>
9899
<version>1.1</version>
99100
</dependency>
100101
</dependencies>

‎DataWorkflow/src/main/java/edu/kit/dama/dataworkflow/client/DataWorkflowClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
import com.beust.jcommander.JCommander;
1919
import com.beust.jcommander.ParameterException;
20-
import edu.kit.dama.client.status.CommandStatus;
21-
import edu.kit.dama.cmdline.generic.parameter.CommandLineParameters;
2220
import edu.kit.dama.dataworkflow.client.parameters.ProcessParameters;
21+
import edu.kit.jcommander.generic.parameter.CommandLineParameters;
22+
import edu.kit.jcommander.generic.status.CommandStatus;
2323
import java.util.ArrayList;
2424
import java.util.List;
2525

‎DataWorkflow/src/main/java/edu/kit/dama/dataworkflow/client/GenericSubmissionClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import edu.kit.dama.authorization.entities.impl.AuthorizationContext;
2020
import edu.kit.dama.authorization.exceptions.UnauthorizedAccessAttemptException;
21-
import edu.kit.dama.client.status.CommandStatus;
22-
import edu.kit.dama.client.status.Status;
2321
import edu.kit.dama.commons.exceptions.ConfigurationException;
2422
import edu.kit.dama.mdm.dataworkflow.DataWorkflowTask;
2523
import edu.kit.dama.dataworkflow.client.parameters.ProcessParameters;
@@ -31,6 +29,8 @@
3129
import edu.kit.dama.mdm.core.IMetaDataManager;
3230
import edu.kit.dama.mdm.core.MetaDataManagement;
3331
import edu.kit.dama.util.Constants;
32+
import edu.kit.jcommander.generic.status.CommandStatus;
33+
import edu.kit.jcommander.generic.status.Status;
3434
import java.io.IOException;
3535
import java.util.List;
3636
import java.util.Properties;

‎DataWorkflow/src/main/java/edu/kit/dama/dataworkflow/client/parameters/ProcessParameters.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818
import com.beust.jcommander.Parameter;
1919
import com.beust.jcommander.Parameters;
20-
import edu.kit.dama.client.status.CommandStatus;
21-
import edu.kit.dama.cmdline.generic.parameter.CommandLineParameters;
2220
import edu.kit.dama.dataworkflow.client.GenericSubmissionClient;
23-
import edu.kit.dama.util.Constants;
21+
import edu.kit.jcommander.generic.parameter.CommandLineParameters;
22+
import edu.kit.jcommander.generic.status.CommandStatus;
2423
import java.util.ArrayList;
2524
import java.util.List;
2625

‎DataWorkflow/src/main/java/edu/kit/dama/dataworkflow/scheduler/jobs/DataWorkflowExecutorJob.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import edu.kit.dama.authorization.entities.util.FindUtil;
2020
import edu.kit.dama.authorization.entities.util.PU;
2121
import edu.kit.dama.authorization.exceptions.EntityNotFoundException;
22-
import edu.kit.dama.client.status.CommandStatus;
2322
import edu.kit.dama.commons.exceptions.PropertyValidationException;
2423
import edu.kit.dama.dataworkflow.client.GenericSubmissionClient;
2524
import edu.kit.dama.dataworkflow.client.parameters.ProcessParameters;
2625
import edu.kit.dama.scheduler.quartz.jobs.AbstractConfigurableJob;
2726
import edu.kit.dama.util.Constants;
2827
import edu.kit.dama.util.PropertiesUtil;
28+
import edu.kit.jcommander.generic.status.CommandStatus;
2929
import java.util.Properties;
3030
import javax.persistence.EntityManager;
3131
import org.quartz.DisallowConcurrentExecution;

‎libs/edu/kit/cmdline/CommandlineTools/1.1/CommandlineTools-1.1.jar‎

14.9 KB
Binary file not shown.

‎libs/edu/kit/cmdline/CommandlineTools/1.1/CommandlineTools-1.1.pom‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>edu.kit.cmdline</groupId>
5+
<artifactId>CommandlineTools</artifactId>
6+
<version>1.1</version>
7+
<packaging>jar</packaging>
8+
<properties>
9+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10+
<maven.compiler.source>1.7</maven.compiler.source>
11+
<maven.compiler.target>1.7</maven.compiler.target>
12+
</properties>
13+
<scm>
14+
<developerConnection>scm:svn:svn+ssh://ipepc21.ka.fzk.de/srv/svn/Maven/CommandlineTools/tags/CommandlineTools-1.1</developerConnection>
15+
<!--url>http://ipepc21.ka.fzk.de/viewcvs/KDM/MetaDataManagement</url-->
16+
</scm>
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.beust</groupId>
20+
<artifactId>jcommander</artifactId>
21+
<version>1.30</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.slf4j</groupId>
25+
<artifactId>slf4j-api</artifactId>
26+
<version>1.7.5</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>junit</groupId>
30+
<artifactId>junit</artifactId>
31+
<version>4.10</version>
32+
<scope>test</scope>
33+
</dependency>
34+
</dependencies>
35+
<build>
36+
<extensions>
37+
<extension>
38+
<groupId>org.apache.maven.wagon</groupId>
39+
<artifactId>wagon-ssh-external</artifactId>
40+
<version>2.6</version>
41+
</extension>
42+
</extensions>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.maven.plugins</groupId>
46+
<artifactId>maven-release-plugin</artifactId>
47+
<version>2.5.1</version>
48+
<configuration>
49+
<mavenExecutorId>forked-path</mavenExecutorId>
50+
<tagBase>svn+ssh://ipepc21.ka.fzk.de/srv/svn/Maven/CommandlineTools/tags</tagBase>
51+
</configuration>
52+
</plugin>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-surefire-plugin</artifactId>
56+
<version>2.17</version>
57+
<configuration>
58+
<argLine>-XX:-UseSplitVerifier</argLine>
59+
</configuration>
60+
</plugin>
61+
</plugins>
62+
</build>
63+
<distributionManagement>
64+
<!-- *****************************************
65+
*** Repository IPE ***
66+
**********************************************-->
67+
<repository>
68+
<id>deploymentRepo</id>
69+
<name>IPE-KIT Deployment Repository</name>
70+
<url>scpexe://ipepc21.ka.fzk.de/srv/archiva/data/repositories/internal</url>
71+
</repository>
72+
<snapshotRepository>
73+
<id>snapshotRepo</id>
74+
<name>IPE-KIT Snapshot Repository</name>
75+
<url>scpexe://ipepc21.ka.fzk.de/srv/archiva/data/repositories/snapshots/</url>
76+
<uniqueVersion>false</uniqueVersion>
77+
</snapshotRepository>
78+
</distributionManagement>
79+
80+
</project>

0 commit comments

Comments
 (0)