This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kameleon.git
The following commit(s) were added to refs/heads/main by this push:
new 6048557 #28: Remove CDI
6048557 is described below
commit 604855732a7ee1df798677d05e69608059e05bfd
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Sep 21 14:59:55 2022 +0200
#28: Remove CDI
---
src/main/resources/META-INF/resources/app.js | 1 -
.../META-INF/resources/templates/main-template.js | 3 --
src/main/resources/kameleon.json | 34 ----------------------
.../camel/kameleon/ConfigurationResourceTest.java | 5 ++--
4 files changed, 2 insertions(+), 41 deletions(-)
diff --git a/src/main/resources/META-INF/resources/app.js
b/src/main/resources/META-INF/resources/app.js
index f6097cd..be3b0da 100644
--- a/src/main/resources/META-INF/resources/app.js
+++ b/src/main/resources/META-INF/resources/app.js
@@ -28,7 +28,6 @@ const router = new VueRouter({
{ path: '/', redirect: "/standalone" },
{ path: '/standalone', component: Classic, props: { type: 'standalone',
title: 'Standalone' } },
{ path: '/spring', component: Classic, props: { type: 'spring', title:
'Spring' } },
- { path: '/cdi', component: Classic, props: { type: 'cdi', title: 'CDI' } },
{ path: '/quarkus', component: Classic, props: { type: 'quarkus', title:
'Quarkus'} },
{ path: '/kamelet', component: Classic, props: { type: 'kamelet', title:
'Kamelet'} }
]
diff --git a/src/main/resources/META-INF/resources/templates/main-template.js
b/src/main/resources/META-INF/resources/templates/main-template.js
index f33081f..c1be81d 100644
--- a/src/main/resources/META-INF/resources/templates/main-template.js
+++ b/src/main/resources/META-INF/resources/templates/main-template.js
@@ -33,9 +33,6 @@ const MainTemplate = `
<li class="pf-c-nav__item">
<router-link to="/spring" v-bind:class="[$route.path ===
'/spring' ? 'pf-m-current' : '', 'pf-c-nav__link']">Spring Boot</router-link>
</li>
- <li class="pf-c-nav__item">
- <router-link to="/cdi" v-bind:class="[$route.path ===
'/cdi' ? 'pf-m-current' : '', 'pf-c-nav__link']">CDI</router-link>
- </li>
<li class="pf-c-nav__item">
<router-link to="/quarkus" v-bind:class="[$route.path
=== '/quarkus' ? 'pf-m-current' : '', 'pf-c-nav__link']">Quarkus</router-link>
</li>
diff --git a/src/main/resources/kameleon.json b/src/main/resources/kameleon.json
index 7c1c155..a715ad4 100644
--- a/src/main/resources/kameleon.json
+++ b/src/main/resources/kameleon.json
@@ -68,40 +68,6 @@
}
]
},
- {
- "name": "cdi",
- "pageTitle": "Camel CDI",
- "componentListTitle": "Camel components",
- "versions": [
- {
- "name": "3.18.2",
- "suffix": "LTS",
- "javaVersions": ["11", "17"],
- "defaultJava": "11",
- "runtimeVersion": "",
- "archetypeGroupId": "org.apache.camel.archetypes",
- "archetypeArtifactId": "camel-archetype-cdi"
- },
- {
- "name": "3.14.4",
- "suffix": "LTS",
- "javaVersions": ["11", "1.8"],
- "defaultJava": "11",
- "runtimeVersion": "",
- "archetypeGroupId": "org.apache.camel.archetypes",
- "archetypeArtifactId": "camel-archetype-cdi"
- },
- {
- "name": "2.25.4",
- "suffix": "Legacy",
- "javaVersions": ["1.8"],
- "defaultJava": "1.8",
- "runtimeVersion": "",
- "archetypeGroupId": "org.apache.camel.archetypes",
- "archetypeArtifactId": "camel-archetype-cdi"
- }
- ]
- },
{
"name": "quarkus",
"pageTitle": "Camel Quarkus",
diff --git
a/src/test/java/org/apache/camel/kameleon/ConfigurationResourceTest.java
b/src/test/java/org/apache/camel/kameleon/ConfigurationResourceTest.java
index 9ceac8e..07a0902 100644
--- a/src/test/java/org/apache/camel/kameleon/ConfigurationResourceTest.java
+++ b/src/test/java/org/apache/camel/kameleon/ConfigurationResourceTest.java
@@ -49,11 +49,10 @@ public class ConfigurationResourceTest {
.then()
.statusCode(200)
.contentType(ContentType.JSON)
- .body("types.size()", is(5))
+ .body("types.size()", is(4))
.body("types[0].name", equalTo("standalone"))
.body("types[1].name", equalTo("spring"))
- .body("types[2].name", equalTo("cdi"))
- .body("types[3].name", equalTo("quarkus"));
+ .body("types[2].name", equalTo("quarkus"));
}
}
