Skip to content

Commit 2498bfb

Browse files
keinproblemabacus3
keinproblem
authored and
abacus3
committed
using new tar.gz as release artifact
1 parent f7ea535 commit 2498bfb

File tree

10 files changed

+93
-40
lines changed

10 files changed

+93
-40
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ deploy:
88
provider: releases
99
api_key:
1010
secure: NkJUa5NRIn3ylBUZ/DbEemzVADS/DSh/PT1Ds+MxUCPdYFLEx+28Y+ikei0oEUX95R5VHaUZFonSlcIIdu4oPVrpKRwCY8U9Q7t35Tcmx2pin0qhN9RWAgT97nrmk2mDNnfFUiGpe3Zg2msY9J/EDx+U8UNin4wXzanuKkI16n2gxIwr8dfqO83kzZd9vUeMLosiParw+9kqZb60Nh2O5GhPcKXd6sQrgQwdDE9gtb5Hh/QUTtwJeutKisxBqNtHOr3YGas/GZRKv+F/22kyyqp9iWVTHvwRaX2kGthz0WvmGgf/CzC3kc68XLUrNejjoUcPp5qqQy1+1zj3TN8MjybePSQsQIPPCbPJO04WAlDMlFNYRUCxONge6bVI1yJf8ltgB0Uj19dUngfRxGI0Em8X47Tjx8UHvjPB/E2X+8exlK6nm1lH+PSYcF6EMecXT/PaoPdV48LJqv4SjmxDUFHvVhsUyEkUxTFZPvudvM/6nBoWtpXaglhpgKBggcPP+IkJqHp4xBFWxbdUqdc3RMSRXiCLPlfyRSD6NZ0DbAk8Aa2UpxZGVLRCPDTtmX6EN0vJ8B7Qa0rZudQKdtAJNO0UaMV0uxYf7v7WXjGRHykeF6HzR6Psceb8czZ4VE7JDOSZv1jNheM571zkGAfKX3pBSs2quKB7y6JdmOzQfuw=
11-
file: 'target/sampling-message-server-0.1-jar-with-dependencies.jar'
11+
file: '/assembly/target/sampling-message-service.tar.gz'
1212
skip_cleanup: true

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
</properties>
2020

2121
<modules>
22+
<module>sampling-message-proto</module>
2223
<module>sampling-message-server</module>
2324
<module>sampling-message-client</module>
2425
<module>assembly</module>

‎sampling-message-client/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
</build>
115115

116116
<dependencies>
117-
<dependency>
117+
<!--<dependency>
118118
<groupId>io.grpc</groupId>
119119
<artifactId>grpc-netty</artifactId>
120120
<version>${io.grpc.version}</version>
@@ -128,7 +128,7 @@
128128
<groupId>io.grpc</groupId>
129129
<artifactId>grpc-stub</artifactId>
130130
<version>${io.grpc.version}</version>
131-
</dependency>
131+
</dependency> -->
132132
<dependency>
133133
<groupId>org.projectlombok</groupId>
134134
<artifactId>lombok</artifactId>
@@ -150,6 +150,7 @@
150150
<artifactId>log4j-slf4j-impl</artifactId>
151151
<version>${org.apache.logging.log4j.version}</version>
152152
</dependency>
153+
153154
<dependency>
154155
<groupId>commons-cli</groupId>
155156
<artifactId>commons-cli</artifactId>
@@ -163,10 +164,14 @@
163164
<version>6.14.3</version>
164165
<scope>test</scope>
165166
</dependency>
167+
168+
166169
<dependency>
167170
<groupId>de.dhbw.ravensburg.verteiltesysteme</groupId>
168-
<artifactId>sampling-message-server</artifactId>
171+
<artifactId>sampling-message-proto</artifactId>
169172
<version>0.1</version>
173+
<scope>compile</scope>
170174
</dependency>
175+
171176
</dependencies>
172177
</project>

‎sampling-message-client/src/main/java/de/dhbw/ravensburg/verteiltesysteme/client/Main.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ public class Main {
1212

1313
//TODO; implement Apache CLI https://stackoverflow.com/a/367714/876724
1414
public static void main(String[] args) throws InterruptedException {
15+
//TODO; parametrize server addr & server tcp port
16+
1517
ManagedChannelBuilder<?> managedChannelBuilder = ManagedChannelBuilder.forAddress("127.0.0.1", 8080).usePlaintext();
1618
ManagedChannel managedChannel = managedChannelBuilder.build();
1719
SamplingMessageGrpc.SamplingMessageStub samplingMessageStub = SamplingMessageGrpc.newStub(managedChannel);

‎sampling-message-proto/pom.xml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>sampling-message-service</artifactId>
7+
<groupId>de.dhbw.ravensburg.verteiltesysteme</groupId>
8+
<version>0.1</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>sampling-message-proto</artifactId>
13+
14+
<properties>
15+
<io.grpc.version>1.12.0</io.grpc.version>
16+
</properties>
17+
18+
<build>
19+
<plugins>
20+
<plugin>
21+
<groupId>org.xolstice.maven.plugins</groupId>
22+
<artifactId>protobuf-maven-plugin</artifactId>
23+
<version>0.5.1</version>
24+
<configuration>
25+
<protocArtifact>com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier}</protocArtifact>
26+
<pluginId>grpc-java</pluginId>
27+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.11.0:exe:${os.detected.classifier}</pluginArtifact>
28+
</configuration>
29+
<executions>
30+
<execution>
31+
<goals>
32+
<goal>compile</goal>
33+
<goal>compile-custom</goal>
34+
</goals>
35+
</execution>
36+
</executions>
37+
</plugin>
38+
</plugins>
39+
</build>
40+
<dependencies>
41+
<dependency>
42+
<groupId>io.grpc</groupId>
43+
<artifactId>grpc-netty</artifactId>
44+
<version>${io.grpc.version}</version>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.grpc</groupId>
48+
<artifactId>grpc-protobuf</artifactId>
49+
<version>${io.grpc.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.grpc</groupId>
53+
<artifactId>grpc-stub</artifactId>
54+
<version>${io.grpc.version}</version>
55+
</dependency>
56+
</dependencies>
57+
58+
</project>

sampling-message-server/src/main/proto/service.proto renamed to sampling-message-proto/src/main/proto/service.proto

File renamed without changes.

‎sampling-message-server/pom.xml‎

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,6 @@
3232
</extension>
3333
</extensions>
3434
<plugins>
35-
<plugin>
36-
<groupId>org.xolstice.maven.plugins</groupId>
37-
<artifactId>protobuf-maven-plugin</artifactId>
38-
<version>0.5.1</version>
39-
<configuration>
40-
<protocArtifact>com.google.protobuf:protoc:3.5.1-1:exe:${os.detected.classifier}</protocArtifact>
41-
<pluginId>grpc-java</pluginId>
42-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.11.0:exe:${os.detected.classifier}</pluginArtifact>
43-
</configuration>
44-
<executions>
45-
<execution>
46-
<goals>
47-
<goal>compile</goal>
48-
<goal>compile-custom</goal>
49-
</goals>
50-
</execution>
51-
</executions>
52-
</plugin>
5335
<plugin>
5436
<groupId>org.apache.maven.plugins</groupId>
5537
<artifactId>maven-compiler-plugin</artifactId>
@@ -60,7 +42,7 @@
6042
<configuration>
6143
<archive>
6244
<manifest>
63-
<mainClass>Main</mainClass>
45+
<mainClass>de.dhbw.ravensburg.verteiltesysteme.server.Main</mainClass>
6446
</manifest>
6547
</archive>
6648
<descriptorRefs>
@@ -114,21 +96,6 @@
11496
</build>
11597

11698
<dependencies>
117-
<dependency>
118-
<groupId>io.grpc</groupId>
119-
<artifactId>grpc-netty</artifactId>
120-
<version>${io.grpc.version}</version>
121-
</dependency>
122-
<dependency>
123-
<groupId>io.grpc</groupId>
124-
<artifactId>grpc-protobuf</artifactId>
125-
<version>${io.grpc.version}</version>
126-
</dependency>
127-
<dependency>
128-
<groupId>io.grpc</groupId>
129-
<artifactId>grpc-stub</artifactId>
130-
<version>${io.grpc.version}</version>
131-
</dependency>
13299
<dependency>
133100
<groupId>org.projectlombok</groupId>
134101
<artifactId>lombok</artifactId>
@@ -166,12 +133,26 @@
166133
<version>1.4</version>
167134
</dependency>
168135

136+
<!-- https://mvnrepository.com/artifact/org.jboss.weld.se/weld-se-core -->
137+
<dependency>
138+
<groupId>org.jboss.weld.se</groupId>
139+
<artifactId>weld-se-core</artifactId>
140+
<version>3.0.4.Final</version>
141+
</dependency>
169142

170143
<dependency>
171144
<groupId>org.testng</groupId>
172145
<artifactId>testng</artifactId>
173146
<version>6.14.3</version>
174147
<scope>test</scope>
175148
</dependency>
149+
150+
<dependency>
151+
<groupId>de.dhbw.ravensburg.verteiltesysteme</groupId>
152+
<artifactId>sampling-message-proto</artifactId>
153+
<version>0.1</version>
154+
<scope>compile</scope>
155+
</dependency>
156+
176157
</dependencies>
177158
</project>

‎sampling-message-server/src/main/java/de/dhbw/ravensburg/verteiltesysteme/server/Main.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public class Main {
88

99
//TODO; implement Apache CLI https://stackoverflow.com/a/367714/876724
1010
public static void main(String[] args) {
11+
1112
final ServiceConfig serviceConfig = new ServiceConfig(255, 32, 32, 8080);
1213
final ServiceEndpoint serviceEndpoint = new ServiceEndpoint(serviceConfig);
1314

‎sampling-message-server/src/main/java/de/dhbw/ravensburg/verteiltesysteme/server/persistence/model/DatabaseSamplingMessage.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package de.dhbw.ravensburg.verteiltesysteme.server.persistence.model;
22

33

4-
import lombok.*;
4+
import lombok.Builder;
5+
import lombok.Data;
6+
import lombok.EqualsAndHashCode;
7+
import lombok.ToString;
58
import lombok.experimental.Accessors;
69

710
import java.time.Duration;
@@ -11,7 +14,6 @@
1114
@Builder
1215
@ToString
1316
@EqualsAndHashCode
14-
@AllArgsConstructor
1517
@Accessors(chain = true)
1618
public class DatabaseSamplingMessage {
1719
private String messageName;

‎sampling-message-server/src/main/java/de/dhbw/ravensburg/verteiltesysteme/server/service/ServiceConfig.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@
88
import lombok.EqualsAndHashCode;
99
import lombok.ToString;
1010

11+
import javax.enterprise.inject.Alternative;
12+
1113
@Data
1214
@ToString
1315
@EqualsAndHashCode
1416
@AllArgsConstructor
17+
@Alternative
1518
public class ServiceConfig {
1619

1720
public static final Integer DEFAULT_MAXIMUM_SAMPLING_MESSAGE_NAME_SIZE = 32;

0 commit comments

Comments
 (0)