Skip to content

Commit fe91721

Browse files
author
Robert Winkler
committed
Updated package names to org.eclipse.thingweb
1 parent 57698f3 commit fe91721

File tree

137 files changed

+529
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+529
-529
lines changed

.github/workflows/gradle.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232

3333
steps:
3434
- uses: actions/checkout@v4
35-
- name: Set up JDK 17
35+
- name: Set up JDK 21
3636
uses: actions/setup-java@v4
3737
with:
38-
java-version: '17'
38+
java-version: '21'
3939
distribution: 'temurin'
4040
- name: Setup Gradle
4141
uses: gradle/actions/setup-gradle@0d30c9111cf47a838eb69c06d13f3f51ab2ed76f # v3.1.0

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ subprojects {
1111
apply(plugin = "maven-publish")
1212
apply(plugin = "org.cadixdev.licenser")
1313

14-
group = "ai.ancf.lmos"
14+
group = "org.eclipse.thingweb"
1515
version = "0.1.3-SNAPSHOT"
1616

1717
license {

kotlin-wot-binding-http/src/main/kotlin/http/HttpClientConfig.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
package http
88

9-
import ai.ancf.lmos.wot.security.SecurityScheme
9+
import org.eclipse.thingweb.security.SecurityScheme
1010

1111
data class HttpClientConfig(
1212
val port: Int?,

kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClient.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.http
7+
package org.eclipse.thingweb.binding.http
88

9-
import ai.ancf.lmos.wot.content.Content
10-
import ai.ancf.lmos.wot.credentials.CredentialsProvider
11-
import ai.ancf.lmos.wot.thing.schema.WoTForm
9+
import org.eclipse.thingweb.content.Content
10+
import org.eclipse.thingweb.credentials.CredentialsProvider
11+
import org.eclipse.thingweb.thing.schema.WoTForm
1212
import ai.anfc.lmos.wot.binding.ProtocolClient
1313
import ai.anfc.lmos.wot.binding.ProtocolClientException
1414
import io.ktor.client.*

kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClientFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.http
7+
package org.eclipse.thingweb.binding.http
88

99
import ai.anfc.lmos.wot.binding.ProtocolClient
1010
import ai.anfc.lmos.wot.binding.ProtocolClientFactory

kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolServer.kt

+13-13
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.http
7+
package org.eclipse.thingweb.binding.http
88

9-
import ai.ancf.lmos.wot.JsonMapper
10-
import ai.ancf.lmos.wot.Servient
11-
import ai.ancf.lmos.wot.content.Content
12-
import ai.ancf.lmos.wot.content.ContentCodecException
13-
import ai.ancf.lmos.wot.content.ContentManager
14-
import ai.ancf.lmos.wot.thing.ExposedThing
15-
import ai.ancf.lmos.wot.thing.ThingDescription
16-
import ai.ancf.lmos.wot.thing.form.Form
17-
import ai.ancf.lmos.wot.thing.form.Operation
18-
import ai.ancf.lmos.wot.thing.schema.ContentListener
19-
import ai.ancf.lmos.wot.thing.schema.InteractionAffordance
20-
import ai.ancf.lmos.wot.thing.schema.WoTExposedThing
9+
import org.eclipse.thingweb.JsonMapper
10+
import org.eclipse.thingweb.Servient
11+
import org.eclipse.thingweb.content.Content
12+
import org.eclipse.thingweb.content.ContentCodecException
13+
import org.eclipse.thingweb.content.ContentManager
14+
import org.eclipse.thingweb.thing.ExposedThing
15+
import org.eclipse.thingweb.thing.ThingDescription
16+
import org.eclipse.thingweb.thing.form.Form
17+
import org.eclipse.thingweb.thing.form.Operation
18+
import org.eclipse.thingweb.thing.schema.ContentListener
19+
import org.eclipse.thingweb.thing.schema.InteractionAffordance
20+
import org.eclipse.thingweb.thing.schema.WoTExposedThing
2121
import ai.anfc.lmos.wot.binding.ProtocolServer
2222
import ai.anfc.lmos.wot.binding.ProtocolServerException
2323
import com.fasterxml.jackson.databind.DeserializationFeature

kotlin-wot-binding-http/src/main/kotlin/http/HttpsProtocolClientFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.http
7+
package org.eclipse.thingweb.binding.http
88

99
/**
1010
* Creates new [HttpProtocolClient] instances that allow consuming Things via HTTPS.

kotlin-wot-binding-http/src/main/kotlin/http/routes/AbstractRoute.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.http.routes
7+
package org.eclipse.thingweb.binding.http.routes
88

9-
import ai.ancf.lmos.wot.binding.http.routes.AbstractRoute
10-
import ai.ancf.lmos.wot.content.ContentManager
11-
import ai.ancf.lmos.wot.content.ContentManager.isSupportedMediaType
9+
import org.eclipse.thingweb.binding.http.routes.AbstractRoute
10+
import org.eclipse.thingweb.content.ContentManager
11+
import org.eclipse.thingweb.content.ContentManager.isSupportedMediaType
1212
import io.ktor.http.*
1313
import io.ktor.server.request.*
1414
import io.ktor.server.routing.*

kotlin-wot-binding-http/src/main/kotlin/http/routes/ThingsRoute.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.http.routes
7+
package org.eclipse.thingweb.binding.http.routes
88

9-
import ai.ancf.lmos.wot.content.Content
10-
import ai.ancf.lmos.wot.content.ContentManager
11-
import ai.ancf.lmos.wot.thing.ExposedThing
9+
import org.eclipse.thingweb.content.Content
10+
import org.eclipse.thingweb.content.ContentManager
11+
import org.eclipse.thingweb.thing.ExposedThing
1212
import io.ktor.http.cio.*
1313
import io.ktor.server.routing.*
1414
import io.ktor.util.reflect.*

kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolClientFactoryTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.http
7+
package org.eclipse.thingweb.binding.http
88

99
import kotlin.test.Test
1010
import kotlin.test.assertEquals

kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolClientTest.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.http
8-
import ai.ancf.lmos.wot.content.Content
9-
import ai.ancf.lmos.wot.security.BasicSecurityScheme
10-
import ai.ancf.lmos.wot.security.BearerSecurityScheme
11-
import ai.ancf.lmos.wot.security.NoSecurityScheme
12-
import ai.ancf.lmos.wot.security.SecurityScheme
13-
import ai.ancf.lmos.wot.thing.form.Form
7+
package org.eclipse.thingweb.binding.http
8+
import org.eclipse.thingweb.content.Content
9+
import org.eclipse.thingweb.security.BasicSecurityScheme
10+
import org.eclipse.thingweb.security.BearerSecurityScheme
11+
import org.eclipse.thingweb.security.NoSecurityScheme
12+
import org.eclipse.thingweb.security.SecurityScheme
13+
import org.eclipse.thingweb.thing.form.Form
1414
import ai.anfc.lmos.wot.binding.ProtocolClientException
1515
import com.github.tomakehurst.wiremock.WireMockServer
1616
import com.marcinziolo.kotlin.wiremock.*

kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolServerTest.kt

+13-13
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.http
8-
9-
import ai.ancf.lmos.wot.Servient
10-
import ai.ancf.lmos.wot.thing.ExposedThing
11-
import ai.ancf.lmos.wot.thing.ThingDescription
12-
import ai.ancf.lmos.wot.thing.exposedThing
13-
import ai.ancf.lmos.wot.thing.form.Operation
14-
import ai.ancf.lmos.wot.thing.form.Operation.READ_PROPERTY
15-
import ai.ancf.lmos.wot.thing.form.Operation.WRITE_PROPERTY
16-
import ai.ancf.lmos.wot.thing.schema.InteractionInput
17-
import ai.ancf.lmos.wot.thing.schema.StringSchema
18-
import ai.ancf.lmos.wot.thing.schema.stringSchema
19-
import ai.ancf.lmos.wot.thing.schema.toInteractionInputValue
7+
package org.eclipse.thingweb.binding.http
8+
9+
import org.eclipse.thingweb.Servient
10+
import org.eclipse.thingweb.thing.ExposedThing
11+
import org.eclipse.thingweb.thing.ThingDescription
12+
import org.eclipse.thingweb.thing.exposedThing
13+
import org.eclipse.thingweb.thing.form.Operation
14+
import org.eclipse.thingweb.thing.form.Operation.READ_PROPERTY
15+
import org.eclipse.thingweb.thing.form.Operation.WRITE_PROPERTY
16+
import org.eclipse.thingweb.thing.schema.InteractionInput
17+
import org.eclipse.thingweb.thing.schema.StringSchema
18+
import org.eclipse.thingweb.thing.schema.stringSchema
19+
import org.eclipse.thingweb.thing.schema.toInteractionInputValue
2020
import ai.anfc.lmos.wot.binding.ProtocolServerException
2121
import com.fasterxml.jackson.databind.DeserializationFeature
2222
import com.fasterxml.jackson.databind.SerializationFeature

kotlin-wot-binding-http/src/test/kotlin/http/HttpsProtocolClientFactoryTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.http
7+
package org.eclipse.thingweb.binding.http
88

99
import kotlin.test.Test
1010
import kotlin.test.assertEquals

kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttClientConfig.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.mqtt
7+
package org.eclipse.thingweb.binding.mqtt
88

99
import java.util.*
1010

kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolClient.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.mqtt
7+
package org.eclipse.thingweb.binding.mqtt
88

9-
import ai.ancf.lmos.wot.content.Content
10-
import ai.ancf.lmos.wot.credentials.CredentialsProvider
11-
import ai.ancf.lmos.wot.thing.schema.WoTForm
9+
import org.eclipse.thingweb.content.Content
10+
import org.eclipse.thingweb.credentials.CredentialsProvider
11+
import org.eclipse.thingweb.thing.schema.WoTForm
1212
import ai.anfc.lmos.wot.binding.ProtocolClient
1313
import ai.anfc.lmos.wot.binding.ProtocolClientException
1414
import com.hivemq.client.mqtt.datatypes.MqttQos

kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolClientFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.mqtt
7+
package org.eclipse.thingweb.binding.mqtt
88

99
import ai.anfc.lmos.wot.binding.ProtocolClient
1010
import ai.anfc.lmos.wot.binding.ProtocolClientFactory

kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolException.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.mqtt
7+
package org.eclipse.thingweb.binding.mqtt
88

99

1010
internal class MqttProtocolException : Exception {

kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolServer.kt

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.mqtt
8-
9-
import ai.ancf.lmos.wot.Servient
10-
import ai.ancf.lmos.wot.content.Content
11-
import ai.ancf.lmos.wot.content.ContentManager
12-
import ai.ancf.lmos.wot.thing.ExposedThing
13-
import ai.ancf.lmos.wot.thing.form.Form
14-
import ai.ancf.lmos.wot.thing.form.Operation
15-
import ai.ancf.lmos.wot.thing.schema.ContentListener
7+
package org.eclipse.thingweb.binding.mqtt
8+
9+
import org.eclipse.thingweb.Servient
10+
import org.eclipse.thingweb.content.Content
11+
import org.eclipse.thingweb.content.ContentManager
12+
import org.eclipse.thingweb.thing.ExposedThing
13+
import org.eclipse.thingweb.thing.form.Form
14+
import org.eclipse.thingweb.thing.form.Operation
15+
import org.eclipse.thingweb.thing.schema.ContentListener
1616
import ai.anfc.lmos.wot.binding.ProtocolServer
1717
import ai.anfc.lmos.wot.binding.ProtocolServerException
1818
import com.hivemq.client.mqtt.datatypes.MqttQos

kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttsProtocolClientFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.mqtt
7+
package org.eclipse.thingweb.binding.mqtt
88

99
import ai.anfc.lmos.wot.binding.ProtocolClient
1010
import ai.anfc.lmos.wot.binding.ProtocolClientFactory

kotlin-wot-binding-mqtt/src/test/kotlin/integration/MqttProtocolClientFactoryTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.mqtt
7+
package org.eclipse.thingweb.binding.mqtt
88

99
import kotlin.test.Test
1010
import kotlin.test.assertEquals

kotlin-wot-binding-mqtt/src/test/kotlin/integration/MqttProtocolClientTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.mqtt
7+
package org.eclipse.thingweb.binding.mqtt
88

9-
import ai.ancf.lmos.wot.content.Content
10-
import ai.ancf.lmos.wot.thing.form.Form
9+
import org.eclipse.thingweb.content.Content
10+
import org.eclipse.thingweb.thing.form.Form
1111
import app.cash.turbine.test
1212
import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient
1313
import com.hivemq.client.mqtt.mqtt5.Mqtt5Client

kotlin-wot-binding-mqtt/src/test/kotlin/integration/MqttProtocolServerTest.kt

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.mqtt
8-
9-
import ai.ancf.lmos.wot.JsonMapper
10-
import ai.ancf.lmos.wot.Servient
11-
import ai.ancf.lmos.wot.content.Content
12-
import ai.ancf.lmos.wot.content.ContentManager
13-
import ai.ancf.lmos.wot.thing.ExposedThing
14-
import ai.ancf.lmos.wot.thing.exposedThing
15-
import ai.ancf.lmos.wot.thing.form.Form
16-
import ai.ancf.lmos.wot.thing.schema.StringSchema
17-
import ai.ancf.lmos.wot.thing.schema.stringSchema
18-
import ai.ancf.lmos.wot.thing.schema.toInteractionInputValue
7+
package org.eclipse.thingweb.binding.mqtt
8+
9+
import org.eclipse.thingweb.JsonMapper
10+
import org.eclipse.thingweb.Servient
11+
import org.eclipse.thingweb.content.Content
12+
import org.eclipse.thingweb.content.ContentManager
13+
import org.eclipse.thingweb.thing.ExposedThing
14+
import org.eclipse.thingweb.thing.exposedThing
15+
import org.eclipse.thingweb.thing.form.Form
16+
import org.eclipse.thingweb.thing.schema.StringSchema
17+
import org.eclipse.thingweb.thing.schema.stringSchema
18+
import org.eclipse.thingweb.thing.schema.toInteractionInputValue
1919
import ai.anfc.lmos.wot.binding.ProtocolClient
2020
import app.cash.turbine.test
2121
import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient

kotlin-wot-binding-mqtt/src/test/resources/logback.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
<appender-ref ref="STDOUT"/>
99
</root>
1010
<logger name="io.netty" level="WARN"/>
11-
<logger name="ai.ancf.lmos.wot.binding.mqtt" level="DEBUG"/>
11+
<logger name="org.eclipse.thingweb.binding.mqtt" level="DEBUG"/>
1212
</configuration>

kotlin-wot-binding-websocket/src/main/kotlin/websocket/HttpClientConfig.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.websocket
7+
package org.eclipse.thingweb.binding.websocket
88

9-
import ai.ancf.lmos.wot.security.SecurityScheme
9+
import org.eclipse.thingweb.security.SecurityScheme
1010

1111
data class HttpClientConfig(
1212
val port: Int?,

kotlin-wot-binding-websocket/src/main/kotlin/websocket/Messages.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.websocket
7+
package org.eclipse.thingweb.binding.websocket
88

99
import com.fasterxml.jackson.annotation.*
1010
import com.fasterxml.jackson.databind.JsonNode

kotlin-wot-binding-websocket/src/main/kotlin/websocket/SecureWebSocketProtocolClientFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.websocket
7+
package org.eclipse.thingweb.binding.websocket
88

99
/**
1010
* Creates new [WebSocketProtocolClient] instances that allow consuming Things via WSS.

kotlin-wot-binding-websocket/src/main/kotlin/websocket/WebSocketProtocolClient.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package ai.ancf.lmos.wot.binding.websocket
7+
package org.eclipse.thingweb.binding.websocket
88

9-
import ai.ancf.lmos.wot.JsonMapper
10-
import ai.ancf.lmos.wot.content.Content
11-
import ai.ancf.lmos.wot.content.ContentManager
12-
import ai.ancf.lmos.wot.credentials.CredentialsProvider
13-
import ai.ancf.lmos.wot.thing.schema.WoTForm
9+
import org.eclipse.thingweb.JsonMapper
10+
import org.eclipse.thingweb.content.Content
11+
import org.eclipse.thingweb.content.ContentManager
12+
import org.eclipse.thingweb.credentials.CredentialsProvider
13+
import org.eclipse.thingweb.thing.schema.WoTForm
1414
import ai.anfc.lmos.wot.binding.ProtocolClient
1515
import ai.anfc.lmos.wot.binding.ProtocolClientException
1616
import ai.anfc.lmos.wot.binding.Resource

0 commit comments

Comments
 (0)