unify/simplify transport module names

actoron · Feb 22, 2021 · e637409 · e637409
1 parent 163191d
commit e637409
Show file tree

Hide file tree

Showing 34 changed files with 19 additions and 21 deletions.
diff --git a/applications/bdi/build.gradle b/applications/bdi/build.gradle
@@ -16,8 +16,8 @@ dependencies
 
 	testImplementation project(':platform:base')
 	testImplementation project(':transports:intravm')
-	testImplementation project(':transports:websockettransport')
-	testImplementation project(':transports:relaytransport')
+	testImplementation project(':transports:websocket')
+	testImplementation project(':transports:relay')
 
 	api 'com.toedter:jcalendar:1.3.2' 
 	api 'de.huxhorn.sulky:de.huxhorn.sulky.3rdparty.jlayer:1.0'

diff --git a/applications/bdiv3/build.gradle b/applications/bdiv3/build.gradle
@@ -12,8 +12,8 @@ dependencies
 	api project(':kernels:application')
 
 	testImplementation project(':platform:base')
-	testImplementation project(':transports:websockettransport')
-	testImplementation project(':transports:relaytransport')
+	testImplementation project(':transports:websocket')
+	testImplementation project(':transports:relay')
 	testImplementation project(':transports:intravm')
 
 

diff --git a/applications/bpmn/build.gradle b/applications/bpmn/build.gradle
@@ -6,6 +6,6 @@ dependencies
 
 	testImplementation project(':platform:base')
 	testImplementation project(':transports:intravm')
-	testImplementation project(':transports:websockettransport')
-	testImplementation project(':transports:relaytransport')
+	testImplementation project(':transports:websocket')
+	testImplementation project(':transports:relay')
 }
diff --git a/applications/micro/build.gradle b/applications/micro/build.gradle
@@ -34,8 +34,8 @@ dependencies
 	testImplementation project(':platform:base')
 	testImplementation project(':transports:intravm')
 	testImplementation project(':transports:tcp')
-	testImplementation project(':transports:websockettransport')
-	testImplementation project(':transports:relaytransport')
+	testImplementation project(':transports:websocket')
+	testImplementation project(':transports:relay')
 
 	api 'com.github.sarxos:webcam-capture:0.3.9'
 	api 'org.jcodec:jcodec:0.1.5'

diff --git a/distributions/minimal/build.gradle b/distributions/minimal/build.gradle
@@ -17,8 +17,8 @@ dependencies
 	api project(':platform:base')
 	api project(':transports:base')
 	api project(':transports:tcp')
-	api project(':transports:relaytransport')
-	api project(':transports:websockettransport')
+	api project(':transports:relay')
+	api project(':transports:websocket')
 }
 
 // Add uptodate applications-quickstart sources to example project

diff --git a/platform/base/build.gradle b/platform/base/build.gradle
@@ -22,11 +22,9 @@ dependencies
 	// Add transpors for testing
 	testImplementation project(':transports:intravm')
 	testImplementation project(':transports:tcp')
-	testImplementation project(':transports:relaytransport')
+	testImplementation project(':transports:relay')
 
-	//testImplementation project(':transports:jadex-platform-extension-websockettransport')
-	// required for test suite (why?)
-	//testImplementation project(':kernels:jadex-kernel-component')
+	//testImplementation project(':transports:websocket')
 
 	api 'javax.mail:mail:1.4.5'
 	api 'org.tukaani:xz:1.5'

diff --git a/platform/relay-launch/build.gradle b/platform/relay-launch/build.gradle
@@ -6,7 +6,7 @@ mainClassName = "jadex.relay.launch.Main"
 dependencies
 {
 	api project(':distributions:minimal')
-	api project(':transports:relaytransport')
-	api project(':transports:websockettransport')
+	api project(':transports:relay')
+	api project(':transports:websocket')
 }
 
diff --git a/platform/standalone-launch/build.gradle b/platform/standalone-launch/build.gradle
@@ -24,8 +24,8 @@ dependencies
 										   ':environments:envsupport-opengl',
 //										   ':platform:maven',
 										   ':environments:envsupport-jmonkey',' :platform:webservice',
-										   ':transports:relaytransport',
-										   ':transports:websockettransport',
+										   ':transports:relay',
+										   ':transports:websocket',
 										   ':platform:webservice',
 										   ':platform:webservice-nano',
 										   ':platform:webservice-websocket'

diff --git a/settings.gradle b/settings.gradle
@@ -31,7 +31,7 @@ projectblacklist.add(':platform:relay-standalone')
 projectblacklist.add(':platform:relay-web')
 
 // Do not include until it can be fixed.
-projectblacklist.add(':transports:udptransport')
+projectblacklist.add(':transports:udp')
 
 // No longer supporting this
 projectblacklist.add(':distributions:pro')

diff --git a/test/integration/build.gradle b/test/integration/build.gradle
@@ -29,8 +29,8 @@ dependencies
 										   ':platform:webservice-desktop-grizzly',
 
 										   ':transports:intravm',
-										   ':transports:websockettransport',
-										   ':transports:relaytransport',
+										   ':transports:websocket',
+										   ':transports:relay',
 										   ])
 
 	launcharts.retainAll(gradle.ext.includeartifacts)

diff --git a/transports/relaytransport/build.gradle → transports/relay/build.gradle b/transports/relaytransport/build.gradle → transports/relay/build.gradle
diff --git a/...ssage/relaytransport/IRoutingService.java → ...ssage/relaytransport/IRoutingService.java b/...ssage/relaytransport/IRoutingService.java → ...ssage/relaytransport/IRoutingService.java
diff --git a/...ansport/RelayMessageComponentFeature.java → ...ansport/RelayMessageComponentFeature.java b/...ansport/RelayMessageComponentFeature.java → ...ansport/RelayMessageComponentFeature.java
diff --git a/...e/relaytransport/RelayTransportAgent.java → ...e/relaytransport/RelayTransportAgent.java b/...e/relaytransport/RelayTransportAgent.java → ...e/relaytransport/RelayTransportAgent.java
diff --git a/transports/udptransport/.gitignore → transports/udp/.gitignore b/transports/udptransport/.gitignore → transports/udp/.gitignore
diff --git a/transports/udptransport/build.gradle → transports/udp/build.gradle b/transports/udptransport/build.gradle → transports/udp/build.gradle
diff --git a/...pmtp/DaemonThreadPoolServiceExecutor.java → ...pmtp/DaemonThreadPoolServiceExecutor.java b/...pmtp/DaemonThreadPoolServiceExecutor.java → ...pmtp/DaemonThreadPoolServiceExecutor.java
diff --git a/...transport/udpmtp/HolepunchServerConf.java → ...transport/udpmtp/HolepunchServerConf.java b/...transport/udpmtp/HolepunchServerConf.java → ...transport/udpmtp/HolepunchServerConf.java
diff --git a/.../message/transport/udpmtp/RemoteHost.java → .../message/transport/udpmtp/RemoteHost.java b/.../message/transport/udpmtp/RemoteHost.java → .../message/transport/udpmtp/RemoteHost.java
diff --git a/...nsport/udpmtp/SHolepunchServerClient.java → ...nsport/udpmtp/SHolepunchServerClient.java b/...nsport/udpmtp/SHolepunchServerClient.java → ...nsport/udpmtp/SHolepunchServerClient.java
diff --git a/...essage/transport/udpmtp/UdpTransport.java → ...essage/transport/udpmtp/UdpTransport.java b/...essage/transport/udpmtp/UdpTransport.java → ...essage/transport/udpmtp/UdpTransport.java
diff --git a/...udpmtp/holepunching/AbstractSolution.java → ...udpmtp/holepunching/AbstractSolution.java b/...udpmtp/holepunching/AbstractSolution.java → ...udpmtp/holepunching/AbstractSolution.java
diff --git a/.../udpmtp/holepunching/AddressSolution.java → .../udpmtp/holepunching/AddressSolution.java b/.../udpmtp/holepunching/AddressSolution.java → .../udpmtp/holepunching/AddressSolution.java
diff --git a/...dpmtp/holepunching/IFirewallSolution.java → ...dpmtp/holepunching/IFirewallSolution.java b/...dpmtp/holepunching/IFirewallSolution.java → ...dpmtp/holepunching/IFirewallSolution.java
diff --git a/...sport/udpmtp/holepunching/NoSolution.java → ...sport/udpmtp/holepunching/NoSolution.java b/...sport/udpmtp/holepunching/NoSolution.java → ...sport/udpmtp/holepunching/NoSolution.java
diff --git a/...ort/udpmtp/holepunching/PortSolution.java → ...ort/udpmtp/holepunching/PortSolution.java b/...ort/udpmtp/holepunching/PortSolution.java → ...ort/udpmtp/holepunching/PortSolution.java
diff --git a/transports/websockettransport/build.gradle → transports/websocket/build.gradle b/transports/websockettransport/build.gradle → transports/websocket/build.gradle
diff --git a/...sockettransport/AWebsocketConnection.java → ...sockettransport/AWebsocketConnection.java b/...sockettransport/AWebsocketConnection.java → ...sockettransport/AWebsocketConnection.java
diff --git a/...sockettransport/IWebSocketConnection.java → ...sockettransport/IWebSocketConnection.java b/...sockettransport/IWebSocketConnection.java → ...sockettransport/IWebSocketConnection.java
diff --git a/...ttransport/WebSocketConnectionClient.java → ...ttransport/WebSocketConnectionClient.java b/...ttransport/WebSocketConnectionClient.java → ...ttransport/WebSocketConnectionClient.java
diff --git a/...ttransport/WebSocketConnectionServer.java → ...ttransport/WebSocketConnectionServer.java b/...ttransport/WebSocketConnectionServer.java → ...ttransport/WebSocketConnectionServer.java
diff --git a/...e/websockettransport/WebSocketServer.java → ...e/websockettransport/WebSocketServer.java b/...e/websockettransport/WebSocketServer.java → ...e/websockettransport/WebSocketServer.java
diff --git a/...ebsockettransport/WebSocketTransport.java → ...ebsockettransport/WebSocketTransport.java b/...ebsockettransport/WebSocketTransport.java → ...ebsockettransport/WebSocketTransport.java
diff --git a/...kettransport/WebSocketTransportAgent.java → ...kettransport/WebSocketTransportAgent.java b/...kettransport/WebSocketTransportAgent.java → ...kettransport/WebSocketTransportAgent.java