Update Theia.Cloud to Theia Cloud

* rename org.eclipse.theia.cloud.* to org.eclipse.theiacloud

Contributed on behalf of STMicroelectronics

.github/workflows/ci-maven-common.yml

@@ -21,4 +21,4 @@ jobs:
       packages: write
     uses: ./.github/workflows/reusable-maven.yml
     with:
-      path_to_package: common/org.eclipse.theia.cloud.common/
+      path_to_package: common/org.eclipse.theiacloud.common/

.github/workflows/ci-maven-operator.yml

@@ -6,13 +6,13 @@ on:
       - main
     paths:
       - "java/common/**"
-      - "java/operator/org.eclipse.theia.cloud.operator/**"
+      - "java/operator/org.eclipse.theiacloud.operator/**"
   pull_request:
     branches:
       - main
     paths:
       - "java/common/**"
-      - "java/operator/org.eclipse.theia.cloud.operator/**"
+      - "java/operator/org.eclipse.theiacloud.operator/**"
   release:
     types:
       - published
@@ -23,5 +23,5 @@ jobs:
       packages: write
     uses: ./.github/workflows/reusable-maven.yml
     with:
-      path_to_package: operator/org.eclipse.theia.cloud.operator/
-      dependencies: common/maven-conf/,common/org.eclipse.theia.cloud.common/
+      path_to_package: operator/org.eclipse.theiacloud.operator/
+      dependencies: common/maven-conf/,common/org.eclipse.theiacloud.common/

.github/workflows/ci-maven-service.yml

@@ -5,13 +5,13 @@ on:
       - main
     paths:
       - "java/common/**"
-      - "java/service/org.eclipse.theia.cloud.service/**"
+      - "java/service/org.eclipse.theiacloud.service/**"
   pull_request:
     branches:
       - main
     paths:
       - "java/common/**"
-      - "java/service/org.eclipse.theia.cloud.service/**"
+      - "java/service/org.eclipse.theiacloud.service/**"
   release:
     types:
       - published
@@ -22,5 +22,5 @@ jobs:
       packages: write
     uses: ./.github/workflows/reusable-maven.yml
     with:
-      path_to_package: service/org.eclipse.theia.cloud.service/
-      dependencies: common/maven-conf/,common/org.eclipse.theia.cloud.common/
+      path_to_package: service/org.eclipse.theiacloud.service/
+      dependencies: common/maven-conf/,common/org.eclipse.theiacloud.common/

dockerfiles/conversion-webhook/Dockerfile

@@ -5,14 +5,14 @@ COPY java/common ./common
 COPY java/conversion ./conversion
 RUN cd /conversion/common/maven-conf && \
     mvn clean install --no-transfer-progress && \
-    cd /conversion/common/org.eclipse.theia.cloud.common && \
+    cd /conversion/common/org.eclipse.theiacloud.common && \
     mvn clean install --no-transfer-progress&& \
-    cd /conversion/conversion/org.eclipse.theia.cloud.conversion && \
+    cd /conversion/conversion/org.eclipse.theiacloud.conversion && \
     mvn clean package -Dmaven.test.skip=true -Dquarkus.package.type=uber-jar --no-transfer-progress
 
 FROM eclipse-temurin:17-jre-alpine
 WORKDIR /conversion
-COPY --from=builder /conversion/conversion/org.eclipse.theia.cloud.conversion/target/conversion-webhook-0.11.0-SNAPSHOT-runner.jar .
+COPY --from=builder /conversion/conversion/org.eclipse.theiacloud.conversion/target/conversion-webhook-0.11.0-SNAPSHOT-runner.jar .
 
 ENTRYPOINT java -jar ./conversion-webhook-0.11.0-SNAPSHOT-runner.jar
 CMD [ "" ]

dockerfiles/operator/Dockerfile

@@ -5,19 +5,19 @@ COPY java/common ./common
 COPY java/operator ./operator
 RUN cd /operator/common/maven-conf && \
     mvn clean install --no-transfer-progress && \
-    cd /operator/common/org.eclipse.theia.cloud.common && \
+    cd /operator/common/org.eclipse.theiacloud.common && \
     mvn clean install --no-transfer-progress && \
-    cd /operator/operator/org.eclipse.theia.cloud.operator && \
+    cd /operator/operator/org.eclipse.theiacloud.operator && \
     mvn clean install --no-transfer-progress && \
-    cd /operator/operator/org.eclipse.theia.cloud.defaultoperator && \
+    cd /operator/operator/org.eclipse.theiacloud.defaultoperator && \
     mvn clean verify --no-transfer-progress
 
 FROM eclipse-temurin:17-jre-alpine
 RUN mkdir /templates
 WORKDIR /log-config
-COPY java/operator/org.eclipse.theia.cloud.defaultoperator/log4j2.xml .
+COPY java/operator/org.eclipse.theiacloud.defaultoperator/log4j2.xml .
 WORKDIR /operator
-COPY --from=builder /operator/operator/org.eclipse.theia.cloud.defaultoperator/target/defaultoperator-0.11.0-SNAPSHOT-jar-with-dependencies.jar .
+COPY --from=builder /operator/operator/org.eclipse.theiacloud.defaultoperator/target/defaultoperator-0.11.0-SNAPSHOT-jar-with-dependencies.jar .
 # to get more debug information from the kubernetes client itself, add -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG below
 ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./defaultoperator-0.11.0-SNAPSHOT-jar-with-dependencies.jar" ]
 CMD [ "" ]

dockerfiles/operator/Dockerfile.withcache

@@ -6,19 +6,19 @@ COPY java/operator ./operator
 RUN --mount=type=cache,target=/root/.m2 \
     cd /operator/common/maven-conf && \
     mvn clean install && \
-    cd /operator/common/org.eclipse.theia.cloud.common && \
+    cd /operator/common/org.eclipse.theiacloud.common && \
     mvn clean install && \
-    cd /operator/operator/org.eclipse.theia.cloud.operator && \
+    cd /operator/operator/org.eclipse.theiacloud.operator && \
     mvn clean install && \
-    cd /operator/operator/org.eclipse.theia.cloud.defaultoperator && \
+    cd /operator/operator/org.eclipse.theiacloud.defaultoperator && \
     mvn clean verify
 
 FROM eclipse-temurin:17-jre-alpine
 RUN mkdir /templates
 WORKDIR /log-config
-COPY java/operator/org.eclipse.theia.cloud.defaultoperator/log4j2.xml .
+COPY java/operator/org.eclipse.theiacloud.defaultoperator/log4j2.xml .
 WORKDIR /operator
-COPY --from=builder /operator/operator/org.eclipse.theia.cloud.defaultoperator/target/defaultoperator-0.11.0-SNAPSHOT-jar-with-dependencies.jar .
+COPY --from=builder /operator/operator/org.eclipse.theiacloud.defaultoperator/target/defaultoperator-0.11.0-SNAPSHOT-jar-with-dependencies.jar .
 # to get more debug information from the kubernetes client itself, add -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG below
 ENTRYPOINT [ "java", "-Dlog4j2.configurationFile=/log-config/log4j2.xml", "-jar", "./defaultoperator-0.11.0-SNAPSHOT-jar-with-dependencies.jar" ]
 CMD [ "" ]

dockerfiles/service/Dockerfile

@@ -5,14 +5,14 @@ COPY java/common ./common
 COPY java/service ./service
 RUN cd /service/common/maven-conf && \
     mvn clean install --no-transfer-progress && \
-    cd /service/common/org.eclipse.theia.cloud.common && \
+    cd /service/common/org.eclipse.theiacloud.common && \
     mvn clean install --no-transfer-progress&& \
-    cd /service/service/org.eclipse.theia.cloud.service && \
+    cd /service/service/org.eclipse.theiacloud.service && \
     mvn clean package -Dmaven.test.skip=true -Dquarkus.package.type=uber-jar --no-transfer-progress
 
 FROM eclipse-temurin:17-jre-alpine
 WORKDIR /service
-COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.11.0-SNAPSHOT-runner.jar .
+COPY --from=builder /service/service/org.eclipse.theiacloud.service/target/service-0.11.0-SNAPSHOT-runner.jar .
 ENV APPID default-app-id
 ENV SERVICE_PORT 8081
 
@@ -23,9 +23,9 @@ ENV KEYCLOAK_SERVERURL https://keycloak.url/auth/realms/TheiaCloud
 ENV KEYCLOAK_CLIENTID theia-cloud
 ENV KEYCLOAK_CLIENTSECRET publicbutoauth2proxywantsasecret
 
-ENTRYPOINT java -Dtheia.cloud.app.id=${APPID} \
+ENTRYPOINT java -Dtheiacloud.app.id=${APPID} \
     -Dquarkus.http.port=${SERVICE_PORT} \
-    -Dtheia.cloud.use.keycloak=${KEYCLOAK_ENABLE} \
+    -Dtheiacloud.use.keycloak=${KEYCLOAK_ENABLE} \
     -Dquarkus.oidc.auth-server-url=${KEYCLOAK_SERVERURL} \
     -Dquarkus.oidc.client-id=${KEYCLOAK_CLIENTID} \
     -Dquarkus.oidc.credentials.secret=${KEYCLOAK_CLIENTSECRET} \

dockerfiles/service/Dockerfile.withcache

@@ -6,14 +6,14 @@ COPY java/service ./service
 RUN --mount=type=cache,target=/root/.m2 \
     cd /service/common/maven-conf && \
     mvn clean install && \
-    cd /service/common/org.eclipse.theia.cloud.common && \
+    cd /service/common/org.eclipse.theiacloud.common && \
     mvn clean install && \
-    cd /service/service/org.eclipse.theia.cloud.service && \
+    cd /service/service/org.eclipse.theiacloud.service && \
     mvn clean package -Dmaven.test.skip=true -Dquarkus.package.type=uber-jar
 
 FROM eclipse-temurin:17-jre-alpine
 WORKDIR /service
-COPY --from=builder /service/service/org.eclipse.theia.cloud.service/target/service-0.11.0-SNAPSHOT-runner.jar .
+COPY --from=builder /service/service/org.eclipse.theiacloud.service/target/service-0.11.0-SNAPSHOT-runner.jar .
 ENV APPID default-app-id
 ENV SERVICE_PORT 8081
 
@@ -24,9 +24,9 @@ ENV KEYCLOAK_SERVERURL https://keycloak.url/auth/realms/TheiaCloud
 ENV KEYCLOAK_CLIENTID theia-cloud
 ENV KEYCLOAK_CLIENTSECRET publicbutoauth2proxywantsasecret
 
-ENTRYPOINT java -Dtheia.cloud.app.id=${APPID} \
+ENTRYPOINT java -Dtheiacloud.app.id=${APPID} \
     -Dquarkus.http.port=${SERVICE_PORT} \
-    -Dtheia.cloud.use.keycloak=${KEYCLOAK_ENABLE} \
+    -Dtheiacloud.use.keycloak=${KEYCLOAK_ENABLE} \
     -Dquarkus.oidc.auth-server-url=${KEYCLOAK_SERVERURL} \
     -Dquarkus.oidc.client-id=${KEYCLOAK_CLIENTID} \
     -Dquarkus.oidc.credentials.secret=${KEYCLOAK_CLIENTSECRET} \

documentation/Architecture.md

@@ -7,7 +7,7 @@ The Theia Cloud Operator listens for changes to custom resources inside the clus
 ## Operator Java Overview
 
 The Java operator is created via a dependency injection module.
-We provide a library (`org.eclipse.theia.cloud.operator`), as well as a default implementation (`org.eclipse.theia.cloud.defaultoperator`) for the operator.
+We provide a library (`org.eclipse.theiacloud.operator`), as well as a default implementation (`org.eclipse.theiacloud.defaultoperator`) for the operator.
 The library can be used to create an operator customized to your use cases.
 The default implementation is a production-ready operator that handles most use cases on most cloud providers out of the box and is used in our demos.
 If customization is needed, it also serves as an example of how to utilize the operator library.

documentation/platforms/Minikube.md

@@ -48,7 +48,7 @@ Thus, the custom hostname could not be resolved in the cluster and, thus, the op
 - Operator log contains messages stating the session pod is not available. Log messages can look like this:
 
 ```bash
-ERROR org.eclipse.theia.cloud.operator.handler.impl.AddedHandlerUtil - [16695cf8-1e88-4ca9-93b2-483ebb89e5e4] ws.myhostname.io/e91be8be-0ed3-4c81-8a7b-b3d03bad6fd2/ is NOT available yet.
+ERROR org.eclipse.theiacloud.operator.handler.impl.AddedHandlerUtil - [16695cf8-1e88-4ca9-93b2-483ebb89e5e4] ws.myhostname.io/e91be8be-0ed3-4c81-8a7b-b3d03bad6fd2/ is NOT available yet.
 ```
 
 - Session URL is never set to the Session custom resource

java/common/maven-conf/pom.xml

@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.theia.cloud</groupId>
+	<groupId>org.eclipse.theiacloud</groupId>
 	<artifactId>conf</artifactId>
 	<version>0.11.0-SNAPSHOT</version>
 	<packaging>pom</packaging>

java/common/org.eclipse.theia.cloud.common/.classpath → java/common/org.eclipse.theiacloud.common/.classpath

@@ -47,18 +47,21 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+	<classpathentry kind="src" path="target/generated-sources/annotations">
 		<attributes>
 			<attribute name="optional" value="true"/>
-			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="ignore_optional_problems" value="true"/>
 			<attribute name="m2e-apt" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/annotations">
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
 		<attributes>
 			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

java/common/org.eclipse.theia.cloud.common/pom.xml → java/common/org.eclipse.theiacloud.common/pom.xml

@@ -9,7 +9,7 @@
 	<description>Common components of Theia Cloud</description>
 
 	<parent>
-		<groupId>org.eclipse.theia.cloud</groupId>
+		<groupId>org.eclipse.theiacloud</groupId>
 		<artifactId>conf</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
 		<relativePath>../../common/maven-conf/</relativePath>

java/common/org.eclipse.theiacloud.common/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource

@@ -0,0 +1,9 @@
+org.eclipse.theiacloud.common.k8s.resource.appdefinition.AppDefinition
+org.eclipse.theiacloud.common.k8s.resource.appdefinition.v1beta9.AppDefinitionV1beta9
+org.eclipse.theiacloud.common.k8s.resource.appdefinition.v1beta8.AppDefinitionV1beta8
+org.eclipse.theiacloud.common.k8s.resource.session.Session
+org.eclipse.theiacloud.common.k8s.resource.session.v1beta7.SessionV1beta7
+org.eclipse.theiacloud.common.k8s.resource.session.v1beta6.SessionV1beta6
+org.eclipse.theiacloud.common.k8s.resource.workspace.Workspace
+org.eclipse.theiacloud.common.k8s.resource.workspace.v1beta4.WorkspaceV1beta4
+org.eclipse.theiacloud.common.k8s.resource.workspace.v1beta3.WorkspaceV1beta3

java/common/org.eclipse.theiacloud.common/src/main/resources/META-INF/services/io.fabric8.kubernetes.client.extension.ExtensionAdapter

@@ -0,0 +1 @@
+org.eclipse.theiacloud.common.util.TheiaCloudExtensionAdapter

java/service/org.eclipse.theia.cloud.service/.settings/org.eclipse.jdt.apt.core.prefs → java/conversion/org.eclipse.theiacloud.conversion/.settings/org.eclipse.jdt.apt.core.prefs

@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.aptEnabled=false
 org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
 org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations

java/conversion/org.eclipse.theia.cloud.conversion/.settings/org.eclipse.jdt.core.prefs → java/conversion/org.eclipse.theiacloud.conversion/.settings/org.eclipse.jdt.core.prefs

@@ -167,7 +167,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeArgumentsForMethodInvocation=war
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.storeAnnotations=disabled

java/conversion/org.eclipse.theia.cloud.conversion/pom.xml → java/conversion/org.eclipse.theiacloud.conversion/pom.xml

@@ -7,7 +7,7 @@
 	<artifactId>conversion-webhook</artifactId>
 
 	<parent>
-		<groupId>org.eclipse.theia.cloud</groupId>
+		<groupId>org.eclipse.theiacloud</groupId>
 		<artifactId>conf</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
 		<relativePath>../../common/maven-conf/</relativePath>
@@ -43,7 +43,7 @@
 		</dependency>
 		<!-- Theia Cloud -->
 		<dependency>
-			<groupId>org.eclipse.theia.cloud</groupId>
+			<groupId>org.eclipse.theiacloud</groupId>
 			<artifactId>common</artifactId>
 			<version>0.11.0-SNAPSHOT</version>
 		</dependency>

java/operator/org.eclipse.theia.cloud.defaultoperator/log4j2.xml → java/operator/org.eclipse.theiacloud.defaultoperator/log4j2.xml

@@ -7,55 +7,55 @@
 		</Console>
 	</Appenders>
 	<Loggers>
-        <Logger name="org.eclipse.theia.cloud.defaultoperator" level="trace"
+        <Logger name="org.eclipse.theiacloud.defaultoperator" level="trace"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-        <Logger name="org.eclipse.theia.cloud.operator" level="trace"
+        <Logger name="org.eclipse.theiacloud.operator" level="trace"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-		<Logger name="org.eclipse.theia.cloud.operator.bandwidth" level="trace"
+		<Logger name="org.eclipse.theiacloud.operator.bandwidth" level="trace"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-        <Logger name="org.eclipse.theia.cloud.operator.di" level="trace"
+        <Logger name="org.eclipse.theiacloud.operator.di" level="trace"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-        <Logger name="org.eclipse.theia.cloud.operator.handler" level="trace"
+        <Logger name="org.eclipse.theiacloud.operator.handler" level="trace"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-        <Logger name="org.eclipse.theia.cloud.operator.ingress" level="trace"
+        <Logger name="org.eclipse.theiacloud.operator.ingress" level="trace"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-        <Logger name="org.eclipse.theia.cloud.operator.messaging" level="trace"
+        <Logger name="org.eclipse.theiacloud.operator.messaging" level="trace"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-        <Logger name="org.eclipse.theia.cloud.operator.plugins" level="trace"
+        <Logger name="org.eclipse.theiacloud.operator.plugins" level="trace"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-        <Logger name="org.eclipse.theia.cloud.operator.pv" level="trace"
+        <Logger name="org.eclipse.theiacloud.operator.pv" level="trace"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-        <Logger name="org.eclipse.theia.cloud.operator.replacements" level="trace"
+        <Logger name="org.eclipse.theiacloud.operator.replacements" level="trace"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-        <Logger name="org.eclipse.theia.cloud.operator.util.ResourceUtil" level="warn"
+        <Logger name="org.eclipse.theiacloud.operator.util.ResourceUtil" level="warn"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-		<Logger name="org.eclipse.theia.cloud.operator.KillAfterRunnable" level="warn"
+		<Logger name="org.eclipse.theiacloud.operator.KillAfterRunnable" level="warn"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>
-		<Logger name="org.eclipse.theia.cloud.operator.TheiaCloudImpl" level="info"
+		<Logger name="org.eclipse.theiacloud.operator.TheiaCloudImpl" level="info"
 			additivity="false">
 			<AppenderRef ref="Console" />
 		</Logger>