diff --git a/docs/serving/samples/hello-world/helloworld-java/.dockerignore b/docs/serving/samples/hello-world/helloworld-java-spring/.dockerignore similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/.dockerignore rename to docs/serving/samples/hello-world/helloworld-java-spring/.dockerignore diff --git a/docs/serving/samples/hello-world/helloworld-java/.gitignore b/docs/serving/samples/hello-world/helloworld-java-spring/.gitignore similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/.gitignore rename to docs/serving/samples/hello-world/helloworld-java-spring/.gitignore diff --git a/docs/serving/samples/hello-world/helloworld-java/.mvn/wrapper/maven-wrapper.jar b/docs/serving/samples/hello-world/helloworld-java-spring/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/.mvn/wrapper/maven-wrapper.jar rename to docs/serving/samples/hello-world/helloworld-java-spring/.mvn/wrapper/maven-wrapper.jar diff --git a/docs/serving/samples/hello-world/helloworld-java/.mvn/wrapper/maven-wrapper.properties b/docs/serving/samples/hello-world/helloworld-java-spring/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/.mvn/wrapper/maven-wrapper.properties rename to docs/serving/samples/hello-world/helloworld-java-spring/.mvn/wrapper/maven-wrapper.properties diff --git a/docs/serving/samples/hello-world/helloworld-java/Dockerfile b/docs/serving/samples/hello-world/helloworld-java-spring/Dockerfile similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/Dockerfile rename to docs/serving/samples/hello-world/helloworld-java-spring/Dockerfile diff --git a/docs/serving/samples/hello-world/helloworld-java/README.md b/docs/serving/samples/hello-world/helloworld-java-spring/README.md similarity index 94% rename from docs/serving/samples/hello-world/helloworld-java/README.md rename to docs/serving/samples/hello-world/helloworld-java-spring/README.md index 6f43b20c1..bbc275135 100644 --- a/docs/serving/samples/hello-world/helloworld-java/README.md +++ b/docs/serving/samples/hello-world/helloworld-java-spring/README.md @@ -118,7 +118,7 @@ recreate the source files from this folder. apiVersion: serving.knative.dev/v1alpha1 kind: Service metadata: - name: helloworld-java + name: helloworld-java-spring namespace: default spec: runLatest: @@ -126,7 +126,7 @@ recreate the source files from this folder. revisionTemplate: spec: container: - image: docker.io/{username}/helloworld-java + image: docker.io/{username}/helloworld-java-spring env: - name: TARGET value: "Spring Boot Sample v1" @@ -143,10 +143,10 @@ folder) you're ready to build and deploy the sample app. ```shell # Build the container on your local machine - docker build -t {username}/helloworld-java . + docker build -t {username}/helloworld-java-spring . # Push the container to docker registry - docker push {username}/helloworld-java + docker push {username}/helloworld-java-spring ``` 1. After the build has completed and the container is pushed to docker hub, you @@ -196,14 +196,14 @@ folder) you're ready to build and deploy the sample app. 1. To find the URL for your service, use ```shell - kubectl get ksvc helloworld-java \ + kubectl get ksvc helloworld-java-spring \ --output=custom-columns=NAME:.metadata.name,DOMAIN:.status.domain - NAME DOMAIN - helloworld-java helloworld-java.default.example.com + NAME DOMAIN + helloworld-java-spring helloworld-java-spring.default.example.com # Or simply: - export DOMAIN_NAME=$(kubectl get ksvc helloworld-java \ + export DOMAIN_NAME=$(kubectl get ksvc helloworld-java-spring \ --output jsonpath={.status.domain} ``` diff --git a/docs/serving/samples/hello-world/helloworld-java/_index.md b/docs/serving/samples/hello-world/helloworld-java-spring/_index.md similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/_index.md rename to docs/serving/samples/hello-world/helloworld-java-spring/_index.md diff --git a/docs/serving/samples/hello-world/helloworld-java/helloworld.zip b/docs/serving/samples/hello-world/helloworld-java-spring/helloworld.zip similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/helloworld.zip rename to docs/serving/samples/hello-world/helloworld-java-spring/helloworld.zip diff --git a/docs/serving/samples/hello-world/helloworld-java/mvnw b/docs/serving/samples/hello-world/helloworld-java-spring/mvnw similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/mvnw rename to docs/serving/samples/hello-world/helloworld-java-spring/mvnw diff --git a/docs/serving/samples/hello-world/helloworld-java/mvnw.cmd b/docs/serving/samples/hello-world/helloworld-java-spring/mvnw.cmd similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/mvnw.cmd rename to docs/serving/samples/hello-world/helloworld-java-spring/mvnw.cmd diff --git a/docs/serving/samples/hello-world/helloworld-java/pom.xml b/docs/serving/samples/hello-world/helloworld-java-spring/pom.xml similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/pom.xml rename to docs/serving/samples/hello-world/helloworld-java-spring/pom.xml diff --git a/docs/serving/samples/hello-world/helloworld-java/service.yaml b/docs/serving/samples/hello-world/helloworld-java-spring/service.yaml similarity index 74% rename from docs/serving/samples/hello-world/helloworld-java/service.yaml rename to docs/serving/samples/hello-world/helloworld-java-spring/service.yaml index b4a0958b9..3f7ac1834 100644 --- a/docs/serving/samples/hello-world/helloworld-java/service.yaml +++ b/docs/serving/samples/hello-world/helloworld-java-spring/service.yaml @@ -1,7 +1,7 @@ apiVersion: serving.knative.dev/v1alpha1 kind: Service metadata: - name: helloworld-java + name: helloworld-java-spring namespace: default spec: runLatest: @@ -9,7 +9,7 @@ spec: revisionTemplate: spec: container: - image: docker.io/{username}/helloworld-java + image: docker.io/{username}/helloworld-java-spring env: - name: TARGET value: "Spring Boot Sample v1" diff --git a/docs/serving/samples/hello-world/helloworld-java/src/main/java/com/example/helloworld/HelloworldApplication.java b/docs/serving/samples/hello-world/helloworld-java-spring/src/main/java/com/example/helloworld/HelloworldApplication.java similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/src/main/java/com/example/helloworld/HelloworldApplication.java rename to docs/serving/samples/hello-world/helloworld-java-spring/src/main/java/com/example/helloworld/HelloworldApplication.java diff --git a/docs/serving/samples/hello-world/helloworld-java/src/main/resources/application.properties b/docs/serving/samples/hello-world/helloworld-java-spring/src/main/resources/application.properties similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/src/main/resources/application.properties rename to docs/serving/samples/hello-world/helloworld-java-spring/src/main/resources/application.properties diff --git a/docs/serving/samples/hello-world/helloworld-java/src/test/java/com/example/helloworld/HelloworldApplicationTests.java b/docs/serving/samples/hello-world/helloworld-java-spring/src/test/java/com/example/helloworld/HelloworldApplicationTests.java similarity index 100% rename from docs/serving/samples/hello-world/helloworld-java/src/test/java/com/example/helloworld/HelloworldApplicationTests.java rename to docs/serving/samples/hello-world/helloworld-java-spring/src/test/java/com/example/helloworld/HelloworldApplicationTests.java diff --git a/test/sampleapp/config.yaml b/test/sampleapp/config.yaml index d62c1356a..fdbf6be3b 100644 --- a/test/sampleapp/config.yaml +++ b/test/sampleapp/config.yaml @@ -1,11 +1,11 @@ languages: - - language: "java" + - language: "java-spring" expectedOutput: "Hello Spring Boot Sample v1!" preCommands: - exec: "curl" args: "https://start.spring.io/starter.zip -d dependencies=web -d name=helloworld -d artifactId=helloworld -o helloworld.zip" - exec: "unzip" - args: "helloworld.zip -d helloworld-java_tmp" + args: "helloworld.zip -d helloworld-java-spring_tmp" - exec: "rm" args: "helloworld.zip" copies: