diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml index f6a91efba4d..502d58be864 100644 --- a/assemblies/features/base/pom.xml +++ b/assemblies/features/base/pom.xml @@ -54,9 +54,9 @@ jakarta.xml.bind-api - javax.annotation - javax.annotation-api - ${javax.annotation.version} + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.version} org.apache.servicemix.specs @@ -192,8 +192,8 @@ target/classes/resources/lib/jdk9plus - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api target/classes/resources/lib/jdk9plus diff --git a/assemblies/features/enterprise/pom.xml b/assemblies/features/enterprise/pom.xml index f7148a96d17..5ff00a0b820 100644 --- a/assemblies/features/enterprise/pom.xml +++ b/assemblies/features/enterprise/pom.xml @@ -72,26 +72,6 @@ org.apache.aries.util provided - - org.apache.aries.jpa - org.apache.aries.jpa.api - provided - - - org.apache.aries.jpa - org.apache.aries.jpa.blueprint.aries - provided - - - org.apache.aries.jpa - org.apache.aries.jpa.container - provided - - - org.apache.aries.jpa - org.apache.aries.jpa.container.context - provided - @@ -191,8 +171,8 @@ - org.hibernate - hibernate-osgi + org.hibernate.orm + hibernate-core ${hibernate.version} diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml index e7cf5b65601..1ab96e71196 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -20,21 +20,18 @@ - - mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax.jdbc.version}/xml/features - mvn:org.ops4j.pax.jms/pax-jms-features/${pax.jms.version}/xml/features mvn:org.ops4j.pax.transx/pax-transx-features/${pax.transx.version}/xml/features mvn:org.apache.karaf.features/standard/${project.version}/xml/features - mvn:org.apache.aries.jpa/jpa-features/${aries.jpa.version}/xml/features mvn:org.apache.openjpa/openjpa-features/${openjpa.version}/xml/features - - mvn:javax.interceptor/javax.interceptor-api/1.2.2 - mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.2 - mvn:jakarta.el/jakarta.el-api/3.0.3 - mvn:javax.enterprise/cdi-api/1.2 - mvn:javax.transaction/javax.transaction-api/1.2 + + mvn:jakarta.interceptor/jakarta.interceptor-api/2.2.0 + mvn:jakarta.inject/jakarta.inject-api/2.0.1 + mvn:jakarta.el/jakarta.el-api/5.0.1 + mvn:jakarta.enterprise/jakarta.enterprise.lang-model/4.1.0 + mvn:jakarta.enterprise/jakarta.enterprise.cdi-api/4.1.0 + mvn:jakarta.transaction/jakarta.transaction-api/2.0.1 pax-transx-tm-api @@ -67,7 +64,7 @@ org.apache.geronimo.tm.howl.maxLogFiles = 2 org.apache.geronimo.tm.howl.maxBlocksPerFile = 512 org.apache.geronimo.tm.howl.bufferSize = 4 - transaction-api + transaction-api pax-transx-tm-geronimo transaction-manager;provider:=geronimo @@ -100,7 +97,7 @@ com.arjuna.ats.arjuna.objectstore.objectStoreDir=${karaf.data}/narayana com.arjuna.ats.arjuna.objectstore.communicationStore.objectStoreDir=${karaf.data}/narayana com.arjuna.ats.arjuna.hornetqjournal.storeDir=${karaf.data}/narayana/hornetq - transaction-api + transaction-api pax-transx-tm-narayana transaction-manager;provider:=narayana @@ -131,7 +128,7 @@ com.arjuna.ats.arjuna.hornetqjournal.storeDir=${karaf.data}/narayana/hornetq com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos - transaction-api + transaction-api pax-transx-tm-atomikos transaction-manager;provider:=atomikos @@ -163,37 +160,43 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos - - pax-url-wrap + wrap transaction-api aries-blueprint - mvn:org.jboss.logging/jboss-logging/3.3.2.Final - wrap:mvn:antlr/antlr/2.7.7 - mvn:javax.persistence/javax.persistence-api/2.2 - mvn:org.javassist/javassist/3.27.0-GA - mvn:net.bytebuddy/byte-buddy/1.12.9 - mvn:org.jboss.spec.javax.transaction/jboss-transaction-api_1.2_spec/1.1.1.Final - mvn:org.jboss/jandex/2.4.2.Final + jackson + mvn:org.jboss.logging/jboss-logging/3.5.0.Final + mvn:org.antlr/antlr4-runtime/4.13.0 + mvn:jakarta.persistence/jakarta.persistence-api/3.2.0 + mvn:net.bytebuddy/byte-buddy/1.18.0 + mvn:jakarta.transaction/jakarta.transaction-api/2.0.1 + mvn:io.smallrye/jandex/3.2.0 mvn:com.fasterxml/classmate/1.5.1 - wrap:mvn:org.dom4j/dom4j/2.1.4 - mvn:org.hibernate.common/hibernate-commons-annotations/5.1.2.Final - mvn:org.hibernate/hibernate-core/${hibernate.version} - mvn:javax.interceptor/javax.interceptor-api/1.2.2 - mvn:org.hibernate/hibernate-osgi/${hibernate.version} + mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version} + mvn:org.codehaus.woodstox/stax2-api/4.2.2 + mvn:com.fasterxml.woodstox/woodstox-core/7.1.0 + mvn:jakarta.json/jakarta.json-api/2.1.3 + mvn:org.eclipse.parsson/parsson/1.1.7 + mvn:jakarta.json.bind/jakarta.json.bind-api/3.0.1 + mvn:org.eclipse/yasson/3.0.4 + wrap:mvn:org.hibernate.models/hibernate-models/1.1.0 + wrap:mvn:org.hibernate.orm/hibernate-core/${hibernate.version}$overwrite=merge&Import-Package=oracle.jdbc.*;resolution:=optional,oracle.sql.*;resolution:=optional,org.postgresql.*;resolution:=optional,tools.jackson.*;resolution:=optional,* + mvn:jakarta.interceptor/jakarta.interceptor-api/2.2.0 + mvn:jakarta.validation/jakarta.validation-api/3.1.0 + mvn:jakarta.xml.bind/jakarta.xml.bind-api/4.0.2 + mvn:jakarta.activation/jakarta.activation-api/2.1.3 - osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.hibernate.jpa.HibernatePersistenceProvider + osgi.service;objectClass=jakarta.persistence.spi.PersistenceProvider;effective:=active;jakarta.persistence.provider=org.hibernate.jpa.HibernatePersistenceProvider hibernate - mvn:org.jboss/jandex/2.2.3.Final - mvn:org.hibernate/hibernate-envers/${hibernate.version} + mvn:org.hibernate.orm/hibernate-envers/${hibernate.version} mvn:org.hibernate.validator/hibernate-validator/${hibernate.validator.version} - mvn:jakarta.validation/jakarta.validation-api/3.0.0 + mvn:jakarta.validation/jakarta.validation-api/3.1.0 mvn:org.jboss.logging/jboss-logging/3.4.1.Final mvn:com.fasterxml/classmate/1.5.1 mvn:jakarta.el/jakarta.el-api/4.0.0 @@ -207,7 +210,7 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos hibernate-validator mvn:javax.money/money-api/1.0.1 mvn:org.javamoney/moneta/1.1 - mvn:javax.annotation/javax.annotation-api/1.3.2 + mvn:jakarta.annotation/jakarta.annotation-api/2.1.1 hibernate-validator @@ -221,17 +224,14 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
Eclipselink persistence engine.
- jpa - mvn:org.eclipse.persistence/javax.persistence/2.2.0 + mvn:jakarta.persistence/jakarta.persistence-api/3.1.0 transaction mvn:org.eclipse.persistence/org.eclipse.persistence.jpa/${eclipselink.version} mvn:org.eclipse.persistence/org.eclipse.persistence.core/${eclipselink.version} mvn:org.eclipse.persistence/org.eclipse.persistence.asm/9.7.0 - mvn:org.eclipse.persistence/org.eclipse.persistence.antlr/${eclipselink.version} mvn:org.eclipse.persistence/org.eclipse.persistence.jpa.jpql/${eclipselink.version} - mvn:org.apache.aries.jpa/org.apache.aries.jpa.eclipselink.adapter/${aries.jpa.version} - osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.eclipse.persistence.jpa.PersistenceProvider + osgi.service;objectClass=jakarta.persistence.spi.PersistenceProvider;effective:=active;jakarta.persistence.provider=org.eclipse.persistence.jpa.PersistenceProvider @@ -258,14 +258,8 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
JMS support providing service, commands, and MBean.
- pax-jms-pool - pax-jms-config - pax-jms-pool-transx transaction - mvn:javax.jms/javax.jms-api/2.0.1 - mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version} - mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version} - mvn:org.apache.commons/commons-pool2/${commons-pool2.version} + mvn:jakarta.jms/jakarta.jms-api/3.1.0 mvn:org.apache.karaf.jms/org.apache.karaf.jms.core/${project.version} diff --git a/assemblies/features/integration/src/main/feature/feature.xml b/assemblies/features/integration/src/main/feature/feature.xml index d0a06c36a74..5b9defa4f61 100644 --- a/assemblies/features/integration/src/main/feature/feature.xml +++ b/assemblies/features/integration/src/main/feature/feature.xml @@ -24,10 +24,8 @@ mvn:org.apache.karaf.features/enterprise/${project.version}/xml/features mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax.jdbc.version}/xml/features - mvn:org.ops4j.pax.jms/pax-jms-features/${pax.jms.version}/xml/features mvn:org.ops4j.pax.transx/pax-transx-features/${pax.transx.version}/xml/features mvn:org.apache.karaf.features/standard/${project.version}/xml/features - mvn:org.apache.aries.jpa/jpa-features/${aries.jpa.version}/xml/features mvn:org.apache.openjpa/openjpa-features/${openjpa.version}/xml/features mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features diff --git a/assemblies/features/specs/src/main/feature/feature.xml b/assemblies/features/specs/src/main/feature/feature.xml index 845af441f4c..0957682e20c 100644 --- a/assemblies/features/specs/src/main/feature/feature.xml +++ b/assemblies/features/specs/src/main/feature/feature.xml @@ -146,25 +146,6 @@ mvn:org.apache.felix/org.apache.felix.converter/${felix.converter.version} - - - spifly - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.annotation-api-1.3/1.3_3 - mvn:org.apache.xbean/xbean-bundleutils/4.17 - mvn:org.apache.xbean/xbean-asm8-shaded/4.17 - mvn:org.apache.xbean/xbean-finder-shaded/4.17 - mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.2 - mvn:org.apache.geronimo.specs/geronimo-interceptor_1.2_spec/1.2 - mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/1.1 - mvn:org.apache.geronimo.specs/geronimo-jcdi_2.0_spec/1.2 - mvn:org.osgi/org.osgi.service.cdi/1.0.1 - mvn:org.apache.openwebbeans/openwebbeans-spi/2.0.17 - mvn:org.apache.openwebbeans/openwebbeans-impl/2.0.17 - mvn:org.apache.aries.cdi/org.apache.aries.cdi.spi/1.1.3 - mvn:org.apache.aries.cdi/org.apache.aries.cdi.owb/1.1.3 - mvn:org.apache.aries.cdi/org.apache.aries.cdi.extension.spi/1.1.3 - mvn:org.apache.aries.cdi/org.apache.aries.cdi.extender/1.1.3 - diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml index 4bf0cb29dc6..ac72911d077 100644 --- a/assemblies/features/spring/src/main/feature/feature.xml +++ b/assemblies/features/spring/src/main/feature/feature.xml @@ -64,7 +64,7 @@ spring - mvn:javax.websocket/javax.websocket-api/1.1 + mvn:jakarta.websocket/jakarta.websocket-api/2.1.1 mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6 mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring61.version} @@ -94,7 +94,7 @@ - mvn:javax.websocket/javax.websocket-api/1.1 + mvn:jakarta.websocket/jakarta.websocket-api/2.1.1 spring-web mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring61.version} @@ -107,7 +107,7 @@ spring-jdbc spring-tx spring-web - mvn:javax.annotation/javax.annotation-api/${javax.annotation.version} + mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation.version} mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version} mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml index b2dfb8f1688..6e45ac866f8 100644 --- a/assemblies/features/standard/pom.xml +++ b/assemblies/features/standard/pom.xml @@ -36,7 +36,7 @@ ${basedir}/../../../../etc/appended-resources - 1.3 + 2.1.1 1.1 diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index 9e086f7948a..3f233fb932b 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -102,7 +102,6 @@ wicket=mvn:org.ops4j.pax.wicket/features/RELEASE/xml/features hawtio=mvn:io.hawt/hawtio-karaf/RELEASE/xml/features pax-jdbc=mvn:org.ops4j.pax.jdbc/pax-jdbc-features/RELEASE/xml/features -pax-jms=mvn:org.ops4j.pax.jms/pax-jms-features/RELEASE/xml/features pax-jpa=mvn:org.ops4j.pax.jpa/pax-jpa-features/RELEASE/xml/features pax-transx=mvn:org.ops4j.pax.transx/pax-transx-features/RELEASE/xml/features pax-keycloak=mvn:org.ops4j.pax.keycloak/pax-keycloak-features/RELEASE/xml/features @@ -111,10 +110,8 @@ pax-wicket=mvn:org.ops4j.pax.wicket/pax-wicket-features/RELEASE/xml/features ecf=https://download.eclipse.org/rt/ecf/RELEASE/site.p2/karaf-features.xml decanter=mvn:org.apache.karaf.decanter/apache-karaf-decanter/RELEASE/xml/features eclipsesource-jaxrs=mvn:com.eclipsesource.jaxrs/features/RELEASE/xml/features -aries-cdi=mvn:org.apache.aries.cdi/aries-cdi-feature/RELEASE/xml/features -aries-jpa=mvn:org.apache.aries.jpa/jpa-features/RELEASE/xml/features aries-rsa=mvn:org.apache.aries.rsa/rsa-features/RELEASE/xml/features -hibernate=mvn:org.hibernate/hibernate-osgi/RELEASE/xml/karaf +hibernate=mvn:org.apache.karaf.features/enterprise/RELEASE/xml/features ignite=mvn:org.apache.ignite/ignite-osgi-karaf/RELEASE/xml/features openjpa=mvn:org.apache.openjpa/openjpa-features/RELEASE/xml/features artemis=mvn:org.apache.activemq/artemis-features/RELEASE/xml/features diff --git a/bom/pom.xml b/bom/pom.xml index a460fd29ba2..fe935b9ffcf 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -228,9 +228,9 @@ - javax.mail - mail - ${javax.mail.version} + com.sun.mail + jakarta.mail + ${jakarta.mail.version} @@ -1056,26 +1056,6 @@ ${aries.transaction.manager.version} - - org.apache.aries.jpa - org.apache.aries.jpa.api - ${aries.jpa.version} - - - org.apache.aries.jpa - org.apache.aries.jpa.blueprint.aries - ${aries.jpa.blueprint.aries.version} - - - org.apache.aries.jpa - org.apache.aries.jpa.container - ${aries.jpa.version} - - - org.apache.aries.jpa - org.apache.aries.jpa.container.context - ${aries.jpa.container.context.version} - org.apache.aries.subsystem @@ -1149,11 +1129,6 @@ pax-web-extender-whiteboard ${pax.web.version} - - org.ops4j.pax.jms - pax-jms-api - ${pax.jms.version} - org.apache.xbean xbean-bundleutils @@ -1236,9 +1211,9 @@ ${junit.version} - org.apache.geronimo.specs - geronimo-atinject_1.0_spec - 1.2 + jakarta.inject + jakarta.inject-api + 2.0.1 diff --git a/examples/karaf-cdi-example/README.md b/examples/karaf-cdi-example/README.md deleted file mode 100644 index a93da91f4e2..00000000000 --- a/examples/karaf-cdi-example/README.md +++ /dev/null @@ -1,69 +0,0 @@ - -# Apache Karaf CDI Example - -## Abstract - -It's possible to use CDI in your applications, including sharing bean between bundles using the Karaf service registry. - -In addition of supporting the regular CDI annotations (`@ApplicationScoped`, `@Inject`, etc), Karaf CDI also supports -couple of new OSGi CDI annotations: `@Service` and `@Reference`. - -In this example, we are using Aries CDI and OpenWebBeans as CDI container. - -## Artifacts - -* `karaf-cdi-example-api` provides API (interface) shared between provider and consumer bundles. It allows a decoupling between interface and bean implementation. -* `karaf-cdi-example-provider` provides an application scope bean and using the `@Service` annotation to register the bean in the Karaf service registry (can be used in another bundle). -* `karaf-cdi-example-consumer` creates another bean and inject the provider bean from the registry (thanks to the `@Reference` annotation). -* `karaf-cdi-example-features` provides a Karaf features XML to easily install the example application. - -##Build - -Simply use: - -``` -mvn clean install -``` - -##Feature and Deployment - -On a running Karaf instance, you register the CDI example features repository with: - -``` -karaf@root()> feature:repo-add mvn:org.apache.karaf.examples/karaf-cdi-example-features/LATEST/xml -``` - -Then you can install the `karaf-cdi-example-provider` feature: - -``` -karaf@root()> feature:install karaf-cdi-example-provider -``` - -Then, you can install the `karaf-cdi-example-consumer` feature: - -``` -karaf@root()> feature:install karaf-cdi-example-consumer -``` - -When you install the consumer feature, you will see: - -``` -Hello world -``` diff --git a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml deleted file mode 100644 index 650bf41969a..00000000000 --- a/examples/karaf-cdi-example/karaf-cdi-example-api/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.karaf.examples - karaf-cdi-example - 4.5.0-SNAPSHOT - ../pom.xml - - - karaf-cdi-example-api - Apache Karaf :: Examples :: CDI :: API - bundle - - - - - org.apache.felix - maven-bundle-plugin - - - - - \ No newline at end of file diff --git a/examples/karaf-cdi-example/karaf-cdi-example-api/src/main/java/org/apache/karaf/examples/cdi/api/MyService.java b/examples/karaf-cdi-example/karaf-cdi-example-api/src/main/java/org/apache/karaf/examples/cdi/api/MyService.java deleted file mode 100644 index 50f9bdb29b4..00000000000 --- a/examples/karaf-cdi-example/karaf-cdi-example-api/src/main/java/org/apache/karaf/examples/cdi/api/MyService.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.cdi.api; - -public interface MyService { - - String greeting(String message); - -} diff --git a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml deleted file mode 100644 index 93e7afda019..00000000000 --- a/examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.karaf.examples - karaf-cdi-example - 4.5.0-SNAPSHOT - ../pom.xml - - - karaf-cdi-example-consumer - Apache Karaf :: Examples :: CDI :: Consumer - bundle - - - - org.apache.karaf.examples - karaf-cdi-example-api - ${project.version} - - - org.osgi - org.osgi.service.cdi - 1.0.1 - - - org.apache.geronimo.specs - geronimo-atinject_1.0_spec - 1.2 - - - jakarta.enterprise - jakarta.enterprise.cdi-api - 2.0.2 - - - - - - - org.apache.felix - maven-bundle-plugin - - - <_cdiannotations>*;discover=annotated - - - - - - - diff --git a/examples/karaf-cdi-example/karaf-cdi-example-consumer/src/main/java/org/apache/karaf/examples/cdi/consumer/MyConsumerBean.java b/examples/karaf-cdi-example/karaf-cdi-example-consumer/src/main/java/org/apache/karaf/examples/cdi/consumer/MyConsumerBean.java deleted file mode 100644 index 09483eed8dd..00000000000 --- a/examples/karaf-cdi-example/karaf-cdi-example-consumer/src/main/java/org/apache/karaf/examples/cdi/consumer/MyConsumerBean.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.cdi.consumer; - -import org.apache.karaf.examples.cdi.api.MyService; -import org.osgi.service.cdi.annotations.Reference; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Initialized; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - -@ApplicationScoped -public class MyConsumerBean { - - @Reference - @Inject - private MyService service; - - public void onStart(@Observes @Initialized(ApplicationScoped.class) Object start) { - System.out.println(service.greeting("world")); - } - -} diff --git a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml deleted file mode 100644 index 1edab45dde9..00000000000 --- a/examples/karaf-cdi-example/karaf-cdi-example-features/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.karaf.examples - karaf-cdi-example - 4.5.0-SNAPSHOT - ../pom.xml - - - karaf-cdi-example-features - pom - Apache Karaf :: Examples :: CDI :: Features - - - - - src/main/feature - true - ${project.build.directory}/feature - - - - - org.apache.maven.plugins - maven-resources-plugin - - - - resources - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - target/feature/feature.xml - xml - - - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-cdi-example/karaf-cdi-example-features/src/main/feature/feature.xml b/examples/karaf-cdi-example/karaf-cdi-example-features/src/main/feature/feature.xml deleted file mode 100644 index 00305c155f7..00000000000 --- a/examples/karaf-cdi-example/karaf-cdi-example-features/src/main/feature/feature.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - mvn:org.apache.aries.cdi/aries-cdi-feature/1.1.3/xml/features - - - osgi-cdi-owb - mvn:org.apache.karaf.examples/karaf-cdi-example-api/${project.version} - mvn:org.apache.karaf.examples/karaf-cdi-example-provider/${project.version} - - - - karaf-cdi-example-provider - mvn:org.apache.karaf.examples/karaf-cdi-example-consumer/${project.version} - - - diff --git a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml b/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml deleted file mode 100644 index badf49b1e68..00000000000 --- a/examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.karaf.examples - karaf-cdi-example - 4.5.0-SNAPSHOT - ../pom.xml - - - karaf-cdi-example-provider - Apache Karaf :: Examples :: CDI :: Provider - bundle - - - - org.apache.karaf.examples - karaf-cdi-example-api - ${project.version} - - - org.osgi - org.osgi.service.cdi - 1.0.1 - - - org.apache.geronimo.specs - geronimo-atinject_1.0_spec - 1.2 - - - jakarta.enterprise - jakarta.enterprise.cdi-api - 2.0.2 - - - - - - - org.apache.felix - maven-bundle-plugin - - - <_cdiannotations>*;discover=annotated - - - - - - - diff --git a/examples/karaf-cdi-example/karaf-cdi-example-provider/src/main/java/org/apache/karaf/examples/cdi/provider/MyServiceBean.java b/examples/karaf-cdi-example/karaf-cdi-example-provider/src/main/java/org/apache/karaf/examples/cdi/provider/MyServiceBean.java deleted file mode 100644 index f404dc57584..00000000000 --- a/examples/karaf-cdi-example/karaf-cdi-example-provider/src/main/java/org/apache/karaf/examples/cdi/provider/MyServiceBean.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.cdi.provider; - -import org.apache.karaf.examples.cdi.api.MyService; -import org.osgi.service.cdi.annotations.Service; - -import javax.enterprise.context.ApplicationScoped; - -@Service -@ApplicationScoped -public class MyServiceBean implements MyService { - - @Override - public String greeting(String message) { - return "Hello " + message; - } - -} diff --git a/examples/karaf-cdi-example/pom.xml b/examples/karaf-cdi-example/pom.xml deleted file mode 100644 index 104b7b441b3..00000000000 --- a/examples/karaf-cdi-example/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.karaf.examples - apache-karaf-examples - 4.5.0-SNAPSHOT - ../pom.xml - - - karaf-cdi-example - Apache Karaf :: Examples :: CDI - pom - - - karaf-cdi-example-api - karaf-cdi-example-provider - karaf-cdi-example-consumer - karaf-cdi-example-features - - - \ No newline at end of file diff --git a/examples/karaf-itest-example/pom.xml b/examples/karaf-itest-example/pom.xml index 584c8bc92f7..de554a8e0b9 100644 --- a/examples/karaf-itest-example/pom.xml +++ b/examples/karaf-itest-example/pom.xml @@ -53,9 +53,9 @@ test - javax.annotation - javax.annotation-api - ${javax.annotation.version} + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation.version} @@ -91,9 +91,9 @@ test - org.apache.geronimo.specs - geronimo-atinject_1.0_spec - 1.2 + jakarta.inject + jakarta.inject-api + 2.0.1 test diff --git a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml index 0968e37fe86..5ba51e169aa 100644 --- a/examples/karaf-jms-example/karaf-jms-example-command/pom.xml +++ b/examples/karaf-jms-example/karaf-jms-example-command/pom.xml @@ -46,8 +46,9 @@ - org.apache.geronimo.specs - geronimo-jms_1.1_spec + jakarta.jms + jakarta.jms-api + 3.1.0 org.apache.karaf.shell @@ -71,7 +72,7 @@ org.apache.karaf.shell*;version="[4,5)", - javax.jms*;version="[1,3)", + jakarta.jms*;version="[3,4)", * diff --git a/examples/karaf-jms-example/karaf-jms-example-command/src/main/java/org/apache/karaf/examples/jms/command/ConsumeCommand.java b/examples/karaf-jms-example/karaf-jms-example-command/src/main/java/org/apache/karaf/examples/jms/command/ConsumeCommand.java index 12052d7c520..8a6ad69795c 100644 --- a/examples/karaf-jms-example/karaf-jms-example-command/src/main/java/org/apache/karaf/examples/jms/command/ConsumeCommand.java +++ b/examples/karaf-jms-example/karaf-jms-example-command/src/main/java/org/apache/karaf/examples/jms/command/ConsumeCommand.java @@ -19,12 +19,12 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.MessageConsumer; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.Destination; +import jakarta.jms.MessageConsumer; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; @Service @Command(scope = "example", name = "consume", description = "Consume a message from a JMS queue") diff --git a/examples/karaf-jms-example/karaf-jms-example-command/src/main/java/org/apache/karaf/examples/jms/command/SendCommand.java b/examples/karaf-jms-example/karaf-jms-example-command/src/main/java/org/apache/karaf/examples/jms/command/SendCommand.java index d3e7318cf74..0af8148495e 100644 --- a/examples/karaf-jms-example/karaf-jms-example-command/src/main/java/org/apache/karaf/examples/jms/command/SendCommand.java +++ b/examples/karaf-jms-example/karaf-jms-example-command/src/main/java/org/apache/karaf/examples/jms/command/SendCommand.java @@ -19,12 +19,12 @@ import org.apache.karaf.shell.api.action.lifecycle.Reference; import org.apache.karaf.shell.api.action.lifecycle.Service; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.TextMessage; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.Destination; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; +import jakarta.jms.TextMessage; @Service @Command(scope = "example", name = "send", description = "Send a message to a JMS queue") diff --git a/examples/karaf-jms-example/karaf-jms-example-features/src/main/feature/feature.xml b/examples/karaf-jms-example/karaf-jms-example-features/src/main/feature/feature.xml index fa82caf09fb..4a46ecf797f 100644 --- a/examples/karaf-jms-example/karaf-jms-example-features/src/main/feature/feature.xml +++ b/examples/karaf-jms-example/karaf-jms-example-features/src/main/feature/feature.xml @@ -30,12 +30,10 @@ activemq-client jms - pax-jms-activemq - + name=test osgi.jndi.service.name=jms/test password=karaf - pool=transx type=activemq url=tcp://localhost:61616 user=karaf diff --git a/examples/karaf-jpa-example/README.md b/examples/karaf-jpa-example/README.md deleted file mode 100644 index fae143695e4..00000000000 --- a/examples/karaf-jpa-example/README.md +++ /dev/null @@ -1,110 +0,0 @@ - -# Apache Karaf JPA Example - -## Abstract - -This example shows how to use JPA with an entity. The entity manager is used in the persistence implementation. - -It implements a `BookingService` similar using a database for the storage, with a JPA entity. - -This example uses blueprint and declarative service to deal with JPA entity manager. - -The "command" bundle uses the `BookingService`. - -## Artifacts - -* **karaf-jpa-example-provider** module contain: - * **karaf-jpa-example-api** is a bundle providing the `Booking` entity used in the `BookingService`. As a best practice, this bundle should use a common bundle containing -the `BookingService` interface, and then wrapping `Booking` POJO as a `JpaBooking` entity for instance. For convenience and reduce the number of -example artifacts, we gather interface and implementation in the same bundle (again, it's bad). - * **karaf-jpa-example-provider-blueprint** contain bundles providing EclipseLink and Hibernate implementation using blueprint. - * **karaf-jpa-example-provider-ds** contain bundles providing EclipseLink and Hibernate implementation using declarative service. -* **karaf-jpa-example-command** provides shell command to manipulate the `BookingService`. It use declarative service to retreive one instance of a `BookingService`. -If you want to use several service provider, you have to stop the actual service and install the new one. -* **karaf-jpa-example-features** provides a Karaf features repository used for the deployment. - -## Build - -The build uses Apache Maven. Simply use: - -``` -mvn clean install -``` - -## Feature and Deployment - -On a running Karaf instance, register the features repository using: - -``` -karaf@root()> feature:repo-add mvn:org.apache.karaf.examples/karaf-jpa-example-features/LATEST/xml -``` - -Then, you can install the datasource feature: - -``` -karaf@root()> feature:install karaf-jpa-example-datasource -``` - -Then, you can install the service command feature (commands booking:xxx will not be available until you have installed -a provider): - -``` -karaf@root()> feature:install karaf-jpa-example-command -``` - -And install the service provider you want to use (for example EclipseLink using declarative service): - -``` -karaf@root()> feature:install karaf-jpa-example-provider-ds-eclipselink -``` - -## Usage - -Once you have installed the feature, you can see new commands available in the Apache Karaf shell. - -`booking:add` command adds a new booking in the booking service. For instance: - -``` -karaf@root()> booking:add Doe AF520 -``` - -`booking:list` command lists the current bookings: - -``` -karaf@root()> booking:list -ID │ Flight │ Customer -────────┼────────┼───────── -1 │ AF520 │ Doe -``` - -`booking:get` command get the booking with id: - -``` -karaf@root()> booking:get 1 -ID │ Flight │ Customer -────────┼────────┼───────── -1 │ AF520 │ Doe -``` - -`booking:remove` command removes a booking from the booking service: - -``` -karaf@root()> booking:remove 1 -``` \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml deleted file mode 100644 index 763bc88e05d..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-command/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.karaf.examples - karaf-jpa-example - 4.5.0-SNAPSHOT - ../pom.xml - - - karaf-jpa-example-command - Apache Karaf :: Examples :: JPA :: Command - bundle - - - - - org.apache.karaf - karaf-bom - ${project.version} - pom - import - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider-api - ${project.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.core - - - - - - - org.apache.karaf.tooling - karaf-services-maven-plugin - - - org.apache.felix - maven-bundle-plugin - - - - org.apache.karaf.examples.jpa.command, - org.apache.karaf.examples.jpa.completers - - - org.apache.karaf.examples.jpa, - org.apache.karaf.shell*;version="[4,5)", - * - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/AddCommand.java b/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/AddCommand.java deleted file mode 100644 index 99805d8857b..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/AddCommand.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.command; - -import org.apache.karaf.examples.jpa.BookingService; -import org.apache.karaf.shell.api.action.Action; -import org.apache.karaf.shell.api.action.Argument; -import org.apache.karaf.shell.api.action.Command; -import org.apache.karaf.shell.api.action.lifecycle.Reference; -import org.apache.karaf.shell.api.action.lifecycle.Service; - -@Service -@Command(scope = "booking", name = "add", description = "Add a booking") -public class AddCommand implements Action { - - @Reference - private BookingService bookingService; - - @Argument(index = 0, name = "customer", description = "Booking customer", required = true, multiValued = false) - String customer; - - @Argument(index = 1, name = "flight", description = "Booking flight", required = true, multiValued = false) - String flight; - - @Override - public Object execute() throws Exception { - bookingService.add(flight, customer); - return null; - } - -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/GetCommand.java b/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/GetCommand.java deleted file mode 100644 index 5115e56b1b4..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/GetCommand.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.command; - -import org.apache.karaf.examples.jpa.Booking; -import org.apache.karaf.examples.jpa.BookingService; -import org.apache.karaf.examples.jpa.completers.BookingIdCompleter; -import org.apache.karaf.shell.api.action.Action; -import org.apache.karaf.shell.api.action.Argument; -import org.apache.karaf.shell.api.action.Command; -import org.apache.karaf.shell.api.action.Completion; -import org.apache.karaf.shell.api.action.lifecycle.Reference; -import org.apache.karaf.shell.api.action.lifecycle.Service; -import org.apache.karaf.shell.support.table.ShellTable; - -@Service -@Command(scope = "booking", name = "get", description = "Get the booking by id") -public class GetCommand implements Action { - - @Reference - private BookingService bookingService; - - @Argument(index = 0, name = "id", description = "Id of booking to retreive", required = true, multiValued = false) - @Completion(BookingIdCompleter.class) - Long id; - - @Override - public Object execute() throws Exception { - ShellTable table = new ShellTable(); - table.column("ID"); - table.column("Flight"); - table.column("Customer"); - Booking booking = bookingService.get(id); - table.addRow().addContent(booking.getId(), booking.getFlight(), booking.getCustomer()); - table.print(System.out); - return null; - } - -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/ListCommand.java b/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/ListCommand.java deleted file mode 100644 index 012e72083b7..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/ListCommand.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.command; - -import org.apache.karaf.examples.jpa.Booking; -import org.apache.karaf.examples.jpa.BookingService; -import org.apache.karaf.shell.api.action.Action; -import org.apache.karaf.shell.api.action.Command; -import org.apache.karaf.shell.api.action.lifecycle.Reference; -import org.apache.karaf.shell.api.action.lifecycle.Service; -import org.apache.karaf.shell.support.table.ShellTable; - -@Service -@Command(scope = "booking", name = "list", description = "List the current bookings") -public class ListCommand implements Action { - - @Reference - private BookingService bookingService; - - @Override - public Object execute() throws Exception { - ShellTable table = new ShellTable(); - table.column("ID"); - table.column("Flight"); - table.column("Customer"); - for (Booking booking : bookingService.list()) { - table.addRow().addContent(booking.getId(), booking.getFlight(), booking.getCustomer()); - } - table.print(System.out); - return null; - } - -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/RemoveCommand.java b/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/RemoveCommand.java deleted file mode 100644 index 4a1cce6cc65..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/command/RemoveCommand.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.command; - -import org.apache.karaf.examples.jpa.BookingService; -import org.apache.karaf.examples.jpa.completers.BookingIdCompleter; -import org.apache.karaf.shell.api.action.Action; -import org.apache.karaf.shell.api.action.Argument; -import org.apache.karaf.shell.api.action.Command; -import org.apache.karaf.shell.api.action.Completion; -import org.apache.karaf.shell.api.action.lifecycle.Reference; -import org.apache.karaf.shell.api.action.lifecycle.Service; - -import java.util.List; - -@Service -@Command(scope = "booking", name = "remove", description = "Remove an existing bookings") -public class RemoveCommand implements Action { - - @Reference - private BookingService bookingService; - - @Argument(index = 0, name = "ids", description = "List of bookings to remove", required = true, multiValued = true) - @Completion(BookingIdCompleter.class) - List ids; - - @Override - public Object execute() throws Exception { - for (Long id : ids) { - bookingService.remove(id); - } - return null; - } - -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/completers/BookingIdCompleter.java b/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/completers/BookingIdCompleter.java deleted file mode 100644 index 8c1e4d2802b..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-command/src/main/java/org/apache/karaf/examples/jpa/completers/BookingIdCompleter.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.completers; - -import org.apache.karaf.examples.jpa.Booking; -import org.apache.karaf.examples.jpa.BookingService; -import org.apache.karaf.shell.api.action.lifecycle.Reference; -import org.apache.karaf.shell.api.action.lifecycle.Service; -import org.apache.karaf.shell.api.console.CommandLine; -import org.apache.karaf.shell.api.console.Completer; -import org.apache.karaf.shell.api.console.Session; -import org.apache.karaf.shell.support.completers.StringsCompleter; - -import java.util.List; - -@Service -public class BookingIdCompleter implements Completer { - - @Reference - private BookingService bookingService; - - @Override - public int complete(Session session, CommandLine commandLine, List candidates) { - StringsCompleter delegate = new StringsCompleter(); - for (Booking booking : bookingService.list()) { - delegate.getStrings().add(String.valueOf(booking.getId())); - } - return delegate.complete(session, commandLine, candidates); - } - -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml deleted file mode 100644 index 9e156219e39..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-features/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.karaf.examples - karaf-jpa-example - 4.5.0-SNAPSHOT - ../pom.xml - - - karaf-jpa-example-features - Apache Karaf :: Examples :: JPA :: Features - pom - - - - - - src/main/feature - true - ${project.build.directory}/feature - - - - - org.apache.maven.plugins - maven-resources-plugin - - - - resources - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - target/feature/feature.xml - xml - - - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-features/src/main/feature/feature.xml b/examples/karaf-jpa-example/karaf-jpa-example-features/src/main/feature/feature.xml deleted file mode 100644 index 6330ab20ecb..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-features/src/main/feature/feature.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - osgi.jdbc.driver.class=org.h2.Driver - databaseName=./booking - dataSourceName=booking - - - osgi.service;objectClass=javax.sql.DataSource;effective:=active;osgi.jndi.service.name=booking - - - - - transaction - jndi - pax-jdbc-config - pax-jdbc-h2 - pax-jdbc-pool-dbcp2 - jdbc - aries-blueprint - jpa - eclipselink - hibernate - openjpa - mvn:org.apache.karaf.examples/karaf-jpa-example-provider-api/${project.version} - - - - - karaf-jpa-example-common - mvn:org.apache.karaf.examples/karaf-jpa-example-provider-blueprint-hibernate/${project.version} - - - karaf-jpa-example-common - mvn:org.apache.karaf.examples/karaf-jpa-example-provider-blueprint-eclipselink/${project.version} - - - - - - scr - karaf-jpa-example-common - mvn:org.apache.karaf.examples/karaf-jpa-example-provider-ds-hibernate/${project.version} - - - scr - karaf-jpa-example-common - mvn:org.apache.karaf.examples/karaf-jpa-example-provider-ds-eclipselink/${project.version} - - - - - karaf-jpa-example-common - mvn:org.apache.karaf.examples/karaf-jpa-example-command/${project.version} - - - diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml deleted file mode 100644 index 10cf6171663..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider - 4.5.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - karaf-jpa-example-provider-api - Apache Karaf :: Examples :: JPA :: Provider :: API - bundle - - - - org.eclipse.persistence - javax.persistence - 2.2.1 - - - - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.karaf.examples.jpa - - javax.persistence;version="[2,3)", - org.hibernate.proxy, - javassist.util.proxy, - * - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/src/main/java/org/apache/karaf/examples/jpa/Booking.java b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/src/main/java/org/apache/karaf/examples/jpa/Booking.java deleted file mode 100644 index 21fd5df9c93..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/src/main/java/org/apache/karaf/examples/jpa/Booking.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * A regular JPA entity, using JPA annotations. - */ -@Entity -public class Booking { - - @Id - @GeneratedValue - private Long id; - - private String customer; - private String flight; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getCustomer() { - return customer; - } - - public void setCustomer(String customer) { - this.customer = customer; - } - - public String getFlight() { - return flight; - } - - public void setFlight(String flight) { - this.flight = flight; - } -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/src/main/java/org/apache/karaf/examples/jpa/BookingService.java b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/src/main/java/org/apache/karaf/examples/jpa/BookingService.java deleted file mode 100644 index fd2a8aff017..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-api/src/main/java/org/apache/karaf/examples/jpa/BookingService.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa; - -import java.util.List; - -/** - * Simple interface describing the booking service. - */ -public interface BookingService { - - List list(); - - Booking get(Long id); - - void add(Booking booking); - - void add(String flight, String customer); - - void remove(Long id); - -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml deleted file mode 100644 index df12ad8fef8..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider-blueprint - 4.5.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - karaf-jpa-example-provider-blueprint-eclipselink - Apache Karaf :: Examples :: JPA :: Provider :: Blueprint :: EclipseLink - bundle - - - - org.apache.karaf.examples - karaf-jpa-example-provider-api - ${project.version} - - - org.eclipse.persistence - javax.persistence - 2.2.1 - - - javax.transaction - javax.transaction-api - 1.3 - - - javax.interceptor - javax.interceptor-api - 1.2.2 - - - - - - - org.apache.felix - maven-bundle-plugin - - - META-INF/persistence.xml - - javax.persistence;version="[2,3)", - javax.transaction;version="[1,2)", - * - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/eclipselink/BookingServiceImpl.java b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/eclipselink/BookingServiceImpl.java deleted file mode 100644 index 72393accaae..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/eclipselink/BookingServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.provider.blueprint.eclipselink; - -import org.apache.karaf.examples.jpa.Booking; -import org.apache.karaf.examples.jpa.BookingService; - -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.transaction.Transactional; -import java.util.List; - -/** - * Implementation of the booking service using the JPA entity manager service (provided by Karaf). - */ -@Transactional -public class BookingServiceImpl implements BookingService { - - @PersistenceContext(unitName = "booking-eclipselink") - private EntityManager entityManager; - - public void setEntityManager(EntityManager entityManager) { - this.entityManager = entityManager; - } - - @Transactional(Transactional.TxType.REQUIRES_NEW) - @Override - public void add(Booking booking) { - entityManager.persist(booking); - } - - @Transactional(Transactional.TxType.REQUIRES_NEW) - @Override - public void add(String flight, String customer) { - Booking booking = new Booking(); - booking.setCustomer(customer); - booking.setFlight(flight); - entityManager.persist(booking); - } - - @Transactional(Transactional.TxType.SUPPORTS) - @Override - public List list() { - TypedQuery query = entityManager.createQuery("SELECT b FROM Booking b", Booking.class); - return query.getResultList(); - } - - @Transactional(Transactional.TxType.SUPPORTS) - @Override - public Booking get(Long id) { - TypedQuery query = entityManager.createQuery("SELECT b FROM Booking b WHERE b.id=:id", Booking.class); - query.setParameter("id", id); - Booking booking = null; - try { - booking = query.getSingleResult(); - } catch (NoResultException e) { - // nothing to do - } - return booking; - } - - @Transactional(Transactional.TxType.REQUIRES_NEW) - @Override - public void remove(Long id) { - Booking booking = get(id); - entityManager.remove(booking); - } -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/resources/META-INF/persistence.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 4eb0686dd76..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - org.eclipse.persistence.jpa.PersistenceProvider - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - org.apache.karaf.examples.jpa.Booking - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index da0dfcf398e..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-eclipselink/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml deleted file mode 100644 index 38fd61d5cae..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider-blueprint - 4.5.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - karaf-jpa-example-provider-blueprint-hibernate - Apache Karaf :: Examples :: JPA :: Provider :: Blueprint :: Hibernate - bundle - - - - org.apache.karaf.examples - karaf-jpa-example-provider-api - ${project.version} - - - org.eclipse.persistence - javax.persistence - 2.2.1 - - - javax.transaction - javax.transaction-api - 1.3 - - - javax.interceptor - javax.interceptor-api - 1.2.2 - - - - - - - org.apache.felix - maven-bundle-plugin - - - META-INF/persistence.xml - - javax.persistence;version="[2,3)", - javax.transaction;version="[1,2)", - * - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/hibernate/BookingServiceImpl.java b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/hibernate/BookingServiceImpl.java deleted file mode 100644 index 6c1f6b300e0..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/hibernate/BookingServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.provider.blueprint.hibernate; - -import org.apache.karaf.examples.jpa.Booking; -import org.apache.karaf.examples.jpa.BookingService; - -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.transaction.Transactional; -import java.util.List; - -/** - * Implementation of the booking service using the JPA entity manager service (provided by Karaf). - */ -@Transactional -public class BookingServiceImpl implements BookingService { - - @PersistenceContext(unitName = "booking-hibernate") - private EntityManager entityManager; - - public void setEntityManager(EntityManager entityManager) { - this.entityManager = entityManager; - } - - @Transactional(Transactional.TxType.REQUIRES_NEW) - @Override - public void add(Booking booking) { - entityManager.persist(booking); - } - - @Transactional(Transactional.TxType.REQUIRES_NEW) - @Override - public void add(String flight, String customer) { - Booking booking = new Booking(); - booking.setCustomer(customer); - booking.setFlight(flight); - entityManager.persist(booking); - } - - @Transactional(Transactional.TxType.SUPPORTS) - @Override - public List list() { - TypedQuery query = entityManager.createQuery("SELECT b FROM Booking b", Booking.class); - return query.getResultList(); - } - - @Transactional(Transactional.TxType.SUPPORTS) - @Override - public Booking get(Long id) { - TypedQuery query = entityManager.createQuery("SELECT b FROM Booking b WHERE b.id=:id", Booking.class); - query.setParameter("id", id); - Booking booking = null; - try { - booking = query.getSingleResult(); - } catch (NoResultException e) { - // nothing to do - } - return booking; - } - - @Transactional(Transactional.TxType.REQUIRES_NEW) - @Override - public void remove(Long id) { - Booking booking = get(id); - entityManager.remove(booking); - } -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/resources/META-INF/persistence.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 71afd701d6e..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - org.hibernate.jpa.HibernatePersistenceProvider - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - org.apache.karaf.examples.jpa.Booking - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index d367dac2adb..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-hibernate/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml deleted file mode 100644 index 6202d120b0d..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider-blueprint - 4.5.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - karaf-jpa-example-provider-blueprint-openjpa - Apache Karaf :: Examples :: JPA :: Provider :: Blueprint :: OpenJPA - bundle - - - - org.apache.karaf.examples - karaf-jpa-example-provider-api - ${project.version} - - - org.eclipse.persistence - javax.persistence - 2.2.1 - - - javax.transaction - javax.transaction-api - 1.3 - - - javax.interceptor - javax.interceptor-api - 1.2.2 - - - - - - - org.apache.felix - maven-bundle-plugin - - - META-INF/persistence.xml - - javax.persistence;version="[2,3)", - javax.transaction;version="[1,2)", - * - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/openjpa/BookingServiceImpl.java b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/openjpa/BookingServiceImpl.java deleted file mode 100644 index e0e7a5c0610..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/blueprint/openjpa/BookingServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.provider.blueprint.openjpa; - -import org.apache.karaf.examples.jpa.Booking; -import org.apache.karaf.examples.jpa.BookingService; - -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.transaction.Transactional; -import java.util.List; - -/** - * Implementation of the booking service using the JPA entity manager service (provided by Karaf). - */ -@Transactional -public class BookingServiceImpl implements BookingService { - - @PersistenceContext(unitName = "booking-openjpa") - private EntityManager entityManager; - - public void setEntityManager(EntityManager entityManager) { - this.entityManager = entityManager; - } - - @Transactional(Transactional.TxType.REQUIRES_NEW) - @Override - public void add(Booking booking) { - entityManager.persist(booking); - } - - @Transactional(Transactional.TxType.REQUIRES_NEW) - @Override - public void add(String flight, String customer) { - Booking booking = new Booking(); - booking.setCustomer(customer); - booking.setFlight(flight); - entityManager.persist(booking); - } - - @Transactional(Transactional.TxType.SUPPORTS) - @Override - public List list() { - TypedQuery query = entityManager.createQuery("SELECT b FROM Booking b", Booking.class); - return query.getResultList(); - } - - @Transactional(Transactional.TxType.SUPPORTS) - @Override - public Booking get(Long id) { - TypedQuery query = entityManager.createQuery("SELECT b FROM Booking b WHERE b.id=:id", Booking.class); - query.setParameter("id", id); - Booking booking = null; - try { - booking = query.getSingleResult(); - } catch (NoResultException e) { - // nothing to do - } - return booking; - } - - @Transactional(Transactional.TxType.REQUIRES_NEW) - @Override - public void remove(Long id) { - Booking booking = get(id); - entityManager.remove(booking); - } -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/resources/META-INF/persistence.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index b701c373906..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - org.apache.openjpa.persistence.PersistenceProviderImpl - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - org.apache.karaf.examples.jpa.Booking - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index f41056ceaec..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/karaf-jpa-example-provider-blueprint-openjpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml deleted file mode 100644 index 05aaa347657..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-blueprint/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider - 4.5.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - karaf-jpa-example-provider-blueprint - Apache Karaf :: Examples :: JPA :: Provider :: Blueprint - pom - - - karaf-jpa-example-provider-blueprint-eclipselink - karaf-jpa-example-provider-blueprint-hibernate - karaf-jpa-example-provider-blueprint-openjpa - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml deleted file mode 100644 index 6aef43f74f1..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider-ds - 4.5.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - karaf-jpa-example-provider-ds-eclipselink - Apache Karaf :: Examples :: JPA :: Provider :: Declarative Service :: EclipseLink - bundle - - - - - org.apache.karaf - karaf-bom - ${project.version} - pom - import - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider-api - ${project.version} - - - org.eclipse.persistence - javax.persistence - 2.2.1 - - - javax.transaction - javax.transaction-api - 1.3 - - - javax.interceptor - javax.interceptor-api - 1.2.2 - - - org.osgi - osgi.core - provided - - - org.osgi - org.osgi.service.component.annotations - provided - - - org.apache.aries.jpa - org.apache.aries.jpa.api - - - - - - - org.apache.felix - maven-bundle-plugin - - - META-INF/persistence.xml - - javax.persistence;version="[2,3)", - * - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/src/main/java/org/apache/karaf/examples/jpa/provider/ds/eclipselink/BookingServiceImpl.java b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/src/main/java/org/apache/karaf/examples/jpa/provider/ds/eclipselink/BookingServiceImpl.java deleted file mode 100644 index 7f1882c7ba1..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/src/main/java/org/apache/karaf/examples/jpa/provider/ds/eclipselink/BookingServiceImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.provider.ds.eclipselink; - -import org.apache.aries.jpa.template.JpaTemplate; -import org.apache.aries.jpa.template.TransactionType; -import org.apache.karaf.examples.jpa.Booking; -import org.apache.karaf.examples.jpa.BookingService; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Reference; - -import java.util.List; - -/** - * Implementation of the booking service using the JPA entity manager service (provided by Karaf). - */ -@Component(service = BookingService.class, immediate = true) -public class BookingServiceImpl implements BookingService { - - @Reference(target = "(osgi.unit.name=booking-eclipselink)") - private JpaTemplate jpaTemplate; - - @Override - public void add(Booking booking) { - jpaTemplate.tx(TransactionType.RequiresNew, entityManager -> { - entityManager.persist(booking); - entityManager.flush(); - }); - } - - @Override - public void add(String flight, String customer) { - Booking booking = new Booking(); - booking.setCustomer(customer); - booking.setFlight(flight); - jpaTemplate.tx(TransactionType.RequiresNew, entityManager -> { - entityManager.persist(booking); - entityManager.flush(); - }); - } - - @Override - public List list() { - return jpaTemplate.txExpr(TransactionType.Supports, - entityManager -> entityManager.createQuery("SELECT b FROM Booking b", Booking.class).getResultList()); - } - - @Override - public Booking get(Long id) { - return jpaTemplate.txExpr(TransactionType.Supports, - entityManager -> entityManager.find(Booking.class, id)); - } - - @Override - public void remove(Long id) { - jpaTemplate.tx(TransactionType.RequiresNew, entityManager -> { - Booking booking = entityManager.find(Booking.class, id); - if (booking != null) { - entityManager.remove(booking); - } - }); - } -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/src/main/resources/META-INF/persistence.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 4eb0686dd76..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-eclipselink/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - org.eclipse.persistence.jpa.PersistenceProvider - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - org.apache.karaf.examples.jpa.Booking - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml deleted file mode 100644 index 45255571cc1..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider-ds - 4.5.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - karaf-jpa-example-provider-ds-hibernate - Apache Karaf :: Examples :: JPA :: Provider :: Declarative Service :: Hibernate - bundle - - - - - org.apache.karaf - karaf-bom - ${project.version} - pom - import - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider-api - ${project.version} - - - org.eclipse.persistence - javax.persistence - 2.2.1 - - - javax.transaction - javax.transaction-api - 1.3 - - - javax.interceptor - javax.interceptor-api - 1.2.2 - - - org.osgi - osgi.core - provided - - - org.osgi - org.osgi.service.component.annotations - provided - - - org.apache.aries.jpa - org.apache.aries.jpa.api - - - - - - - org.apache.felix - maven-bundle-plugin - - - META-INF/persistence.xml - - javax.persistence;version="[2,3)", - * - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/src/main/java/org/apache/karaf/examples/jpa/provider/ds/hibernate/BookingServiceImpl.java b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/src/main/java/org/apache/karaf/examples/jpa/provider/ds/hibernate/BookingServiceImpl.java deleted file mode 100644 index f1be9b8f486..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/src/main/java/org/apache/karaf/examples/jpa/provider/ds/hibernate/BookingServiceImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.provider.ds.hibernate; - -import org.apache.aries.jpa.template.JpaTemplate; -import org.apache.aries.jpa.template.TransactionType; -import org.apache.karaf.examples.jpa.Booking; -import org.apache.karaf.examples.jpa.BookingService; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Reference; - -import java.util.List; - -/** - * Implementation of the booking service using the JPA entity manager service (provided by Karaf). - */ -@Component(service = BookingService.class, immediate = true) -public class BookingServiceImpl implements BookingService { - - @Reference(target = "(osgi.unit.name=booking-hibernate)") - private JpaTemplate jpaTemplate; - - @Override - public void add(Booking booking) { - jpaTemplate.tx(TransactionType.RequiresNew, entityManager -> { - entityManager.persist(booking); - entityManager.flush(); - }); - } - - @Override - public void add(String flight, String customer) { - Booking booking = new Booking(); - booking.setCustomer(customer); - booking.setFlight(flight); - jpaTemplate.tx(TransactionType.RequiresNew, entityManager -> { - entityManager.persist(booking); - entityManager.flush(); - }); - } - - @Override - public List list() { - return jpaTemplate.txExpr(TransactionType.Supports, - entityManager -> entityManager.createQuery("SELECT b FROM Booking b", Booking.class).getResultList()); - } - - @Override - public Booking get(Long id) { - return jpaTemplate.txExpr(TransactionType.Supports, - entityManager -> entityManager.find(Booking.class, id)); - } - - @Override - public void remove(Long id) { - jpaTemplate.tx(TransactionType.RequiresNew, entityManager -> { - Booking booking = entityManager.find(Booking.class, id); - if (booking != null) { - entityManager.remove(booking); - } - }); - } -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/src/main/resources/META-INF/persistence.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 71afd701d6e..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-hibernate/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - org.hibernate.jpa.HibernatePersistenceProvider - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - org.apache.karaf.examples.jpa.Booking - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml deleted file mode 100644 index 9d84327d1b5..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider-ds - 4.5.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - karaf-jpa-example-provider-ds-openjpa - Apache Karaf :: Examples :: JPA :: Provider :: Declarative Service :: OpenJPA - bundle - - - - - org.apache.karaf - karaf-bom - ${project.version} - pom - import - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider-api - ${project.version} - - - org.eclipse.persistence - javax.persistence - 2.2.1 - - - javax.transaction - javax.transaction-api - 1.3 - - - javax.interceptor - javax.interceptor-api - 1.2.2 - - - org.osgi - osgi.core - provided - - - org.osgi - org.osgi.service.component.annotations - provided - - - org.apache.aries.jpa - org.apache.aries.jpa.api - - - - - - - org.apache.felix - maven-bundle-plugin - - - META-INF/persistence.xml - - javax.persistence;version="[2,3)", - * - - - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/ds/openjpa/BookingServiceImpl.java b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/ds/openjpa/BookingServiceImpl.java deleted file mode 100644 index 35a74a70571..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/java/org/apache/karaf/examples/jpa/provider/ds/openjpa/BookingServiceImpl.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.karaf.examples.jpa.provider.ds.openjpa; - -import org.apache.aries.jpa.template.JpaTemplate; -import org.apache.aries.jpa.template.TransactionType; -import org.apache.karaf.examples.jpa.Booking; -import org.apache.karaf.examples.jpa.BookingService; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Reference; - -import java.util.List; - -/** - * Implementation of the booking service using the JPA entity manager service (provided by Karaf). - */ -@Component(service = BookingService.class, immediate = true) -public class BookingServiceImpl implements BookingService { - - @Reference(target = "(osgi.unit.name=booking-openjpa)") - private JpaTemplate jpaTemplate; - - @Override - public void add(Booking booking) { - jpaTemplate.tx(TransactionType.RequiresNew, entityManager -> { - entityManager.persist(booking); - entityManager.flush(); - }); - } - - @Override - public void add(String flight, String customer) { - Booking booking = new Booking(); - booking.setCustomer(customer); - booking.setFlight(flight); - jpaTemplate.tx(TransactionType.RequiresNew, entityManager -> { - entityManager.persist(booking); - entityManager.flush(); - }); - } - - @Override - public List list() { - return jpaTemplate.txExpr(TransactionType.Supports, - entityManager -> entityManager.createQuery("SELECT b FROM Booking b", Booking.class).getResultList()); - } - - @Override - public Booking get(Long id) { - return jpaTemplate.txExpr(TransactionType.Supports, - entityManager -> entityManager.find(Booking.class, id)); - } - - @Override - public void remove(Long id) { - jpaTemplate.tx(TransactionType.RequiresNew, entityManager -> { - Booking booking = entityManager.find(Booking.class, id); - if (booking != null) { - entityManager.remove(booking); - } - }); - } -} diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/resources/META-INF/persistence.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index b701c373906..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/karaf-jpa-example-provider-ds-openjpa/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - org.apache.openjpa.persistence.PersistenceProviderImpl - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=booking) - org.apache.karaf.examples.jpa.Booking - - - - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml deleted file mode 100644 index d91ba9557da..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/karaf-jpa-example-provider-ds/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - org.apache.karaf.examples - karaf-jpa-example-provider - 4.5.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - karaf-jpa-example-provider-ds - Apache Karaf :: Examples :: JPA :: Provider :: Declarative Service - pom - - - karaf-jpa-example-provider-ds-eclipselink - karaf-jpa-example-provider-ds-hibernate - karaf-jpa-example-provider-ds-openjpa - - - \ No newline at end of file diff --git a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml b/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml deleted file mode 100644 index 28d59a40a6f..00000000000 --- a/examples/karaf-jpa-example/karaf-jpa-example-provider/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.karaf.examples - karaf-jpa-example - 4.5.0-SNAPSHOT - ../pom.xml - - - karaf-jpa-example-provider - Apache Karaf :: Examples :: JPA :: Provider - pom - - - karaf-jpa-example-provider-api - karaf-jpa-example-provider-ds - karaf-jpa-example-provider-blueprint - - - diff --git a/examples/karaf-jpa-example/pom.xml b/examples/karaf-jpa-example/pom.xml deleted file mode 100644 index 18173b316d5..00000000000 --- a/examples/karaf-jpa-example/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.karaf.examples - apache-karaf-examples - 4.5.0-SNAPSHOT - ../pom.xml - - - karaf-jpa-example - Apache Karaf :: Examples :: JPA - pom - - - karaf-jpa-example-provider - karaf-jpa-example-command - karaf-jpa-example-features - - - \ No newline at end of file diff --git a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml index b7b756d829f..3b32d62461e 100644 --- a/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-blueprint/pom.xml @@ -34,9 +34,9 @@ - javax.ws.rs - javax.ws.rs-api - 2.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 org.apache.karaf.examples diff --git a/examples/karaf-rest-example/karaf-rest-example-blueprint/src/main/java/org/apache/karaf/examples/rest/blueprint/BookingServiceRest.java b/examples/karaf-rest-example/karaf-rest-example-blueprint/src/main/java/org/apache/karaf/examples/rest/blueprint/BookingServiceRest.java index ad3f557a7f9..3ca1048d781 100644 --- a/examples/karaf-rest-example/karaf-rest-example-blueprint/src/main/java/org/apache/karaf/examples/rest/blueprint/BookingServiceRest.java +++ b/examples/karaf-rest-example/karaf-rest-example-blueprint/src/main/java/org/apache/karaf/examples/rest/blueprint/BookingServiceRest.java @@ -20,14 +20,14 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.apache.karaf.examples.rest.api.Booking; import org.apache.karaf.examples.rest.api.BookingService; diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml index 87f1d44c0a1..a3a93af091e 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/pom.xml @@ -39,9 +39,9 @@ - javax.ws.rs - javax.ws.rs-api - 2.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 org.apache.karaf.examples @@ -51,13 +51,18 @@ org.apache.cxf cxf-rt-rs-client - ${cxf.version} + 4.1.2 - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider ${jackson.version} + + jakarta.activation + jakarta.activation-api + 2.1.3 + org.apache.karaf.shell org.apache.karaf.shell.core @@ -77,7 +82,6 @@ org.apache.karaf.shell*;version="[4,5)", - javax.activation;version="[1.1,2)", * diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java index c0934521932..a9db15a0eb9 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/AddBookingCommand.java @@ -16,7 +16,7 @@ */ package org.apache.karaf.examples.rest.client.cxf; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.karaf.examples.rest.api.Booking; import org.apache.karaf.shell.api.action.Action; @@ -25,7 +25,7 @@ import org.apache.karaf.shell.api.action.Option; import org.apache.karaf.shell.api.action.lifecycle.Service; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.util.ArrayList; import java.util.List; diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListAllBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListAllBookingCommand.java index e32c4575162..e6e2698b180 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListAllBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListAllBookingCommand.java @@ -23,7 +23,7 @@ import java.util.LinkedList; import java.util.List; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.karaf.examples.rest.api.Booking; diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListBookingCommand.java index aa45b0809d3..919f6225be0 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-cxf/src/main/java/org/apache/karaf/examples/rest/client/cxf/ListBookingCommand.java @@ -16,7 +16,7 @@ */ package org.apache.karaf.examples.rest.client.cxf; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.karaf.examples.rest.api.Booking; import org.apache.karaf.shell.api.action.Action; @@ -24,7 +24,7 @@ import org.apache.karaf.shell.api.action.Option; import org.apache.karaf.shell.api.action.lifecycle.Service; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.util.ArrayList; import java.util.List; diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml index 0b8ca713ed2..33c53240e7e 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/pom.xml @@ -46,9 +46,9 @@ - javax.ws.rs - javax.ws.rs-api - 2.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 com.fasterxml.jackson.jaxrs diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/AddBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/AddBookingCommand.java index dad17bba219..6655cd9bbeb 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/AddBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/AddBookingCommand.java @@ -24,10 +24,10 @@ import org.apache.karaf.shell.api.action.Option; import org.apache.karaf.shell.api.action.lifecycle.Service; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; @Service @Command(scope = "booking", name = "add", description = "Add booking") diff --git a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/ListBookingCommand.java b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/ListBookingCommand.java index 8b6898c0151..9f01880033b 100644 --- a/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/ListBookingCommand.java +++ b/examples/karaf-rest-example/karaf-rest-example-client/karaf-rest-example-client-jersey/src/main/java/org/apache/karaf/examples/rest/client/jersey/ListBookingCommand.java @@ -23,11 +23,11 @@ import org.apache.karaf.shell.api.action.Option; import org.apache.karaf.shell.api.action.lifecycle.Service; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.GenericType; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.GenericType; +import jakarta.ws.rs.core.MediaType; import java.util.List; diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml index 1811c945c1b..88038514173 100644 --- a/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-scr/pom.xml @@ -58,7 +58,12 @@ org.apache.cxf cxf-rt-frontend-jaxrs - ${cxf.version} + 4.1.2 + + + jakarta.activation + jakarta.activation-api + 2.1.3 org.apache.karaf.examples @@ -66,8 +71,8 @@ ${project.version} - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider ${jackson.version} diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/BookingServiceRest.java b/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/BookingServiceRest.java index 29d09f2f58c..533d410800c 100644 --- a/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/BookingServiceRest.java +++ b/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/BookingServiceRest.java @@ -21,8 +21,8 @@ import org.apache.karaf.examples.rest.api.Booking; import org.apache.karaf.examples.rest.api.BookingService; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import java.io.ByteArrayInputStream; import java.util.ArrayList; diff --git a/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/RestService.java b/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/RestService.java index f51cbe393a4..ec28c88fcb3 100644 --- a/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/RestService.java +++ b/examples/karaf-rest-example/karaf-rest-example-scr/src/main/java/org/apache/karaf/examples/rest/scr/RestService.java @@ -16,7 +16,7 @@ */ package org.apache.karaf.examples.rest.scr; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; diff --git a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml index 7cb079dfa3d..2e601c2dcdc 100644 --- a/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml +++ b/examples/karaf-rest-example/karaf-rest-example-whiteboard/pom.xml @@ -40,9 +40,9 @@ provided - javax.ws.rs - javax.ws.rs-api - 2.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 provided diff --git a/examples/karaf-rest-example/karaf-rest-example-whiteboard/src/main/java/org/apache/karaf/examples/rest/whiteboard/BookingServiceRest.java b/examples/karaf-rest-example/karaf-rest-example-whiteboard/src/main/java/org/apache/karaf/examples/rest/whiteboard/BookingServiceRest.java index af274e75e32..a792a4c80a3 100644 --- a/examples/karaf-rest-example/karaf-rest-example-whiteboard/src/main/java/org/apache/karaf/examples/rest/whiteboard/BookingServiceRest.java +++ b/examples/karaf-rest-example/karaf-rest-example-whiteboard/src/main/java/org/apache/karaf/examples/rest/whiteboard/BookingServiceRest.java @@ -20,14 +20,14 @@ import org.apache.karaf.examples.rest.api.BookingService; import org.osgi.service.component.annotations.Component; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import java.util.Collection; import java.util.HashMap; import java.util.Map; diff --git a/examples/pom.xml b/examples/pom.xml index 927d08c204e..ca726c4ae89 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -38,7 +38,6 @@ karaf-branding-example karaf-bundle-example karaf-camel-example - karaf-cdi-example karaf-command-example karaf-config-example karaf-deployer-example @@ -53,7 +52,6 @@ karaf-jdbc-example karaf-jms-example - karaf-jpa-example karaf-itest-example karaf-maven-example karaf-mbean-example diff --git a/features/core/src/test/resources/org/apache/karaf/features/internal/service/f02.xml b/features/core/src/test/resources/org/apache/karaf/features/internal/service/f02.xml index d8bc9e93300..3f17407218a 100644 --- a/features/core/src/test/resources/org/apache/karaf/features/internal/service/f02.xml +++ b/features/core/src/test/resources/org/apache/karaf/features/internal/service/f02.xml @@ -86,7 +86,7 @@ jetty - mvn:javax.mail/mail/1.4.3 + mvn:com.sun.mail/jakarta.mail/1.6.7 mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 mvn:org.eclipse.jetty/jetty-webapp/7.2.2.v20101205 mvn:org.eclipse.jetty/jetty-jndi/7.2.2.v20101205 diff --git a/features/core/src/test/resources/org/apache/karaf/features/internal/service/org.apache.karaf.features.xml b/features/core/src/test/resources/org/apache/karaf/features/internal/service/org.apache.karaf.features.xml index 1aca6faace8..4e62a9b00b1 100644 --- a/features/core/src/test/resources/org/apache/karaf/features/internal/service/org.apache.karaf.features.xml +++ b/features/core/src/test/resources/org/apache/karaf/features/internal/service/org.apache.karaf.features.xml @@ -58,7 +58,7 @@ - +