This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2177-stop-using-aries-application-in-samples in repository https://gitbox.apache.org/repos/asf/aries.git
commit 0ba31fac3cdb00ac785186555e31fa7623e9bdd1 Author: Dominik Przybysz <[email protected]> AuthorDate: Fri Apr 18 23:27:31 2025 +0200 ARIES-2177: Remove eba usage from samples/blog --- samples/blog/blog-assembly/pom.xml | 318 --------------------- .../filtered-resources/configuration/config.ini | 222 -------------- .../blog-assembly/src/main/resources/blogDB.sql | 33 --- samples/blog/blog-itests/pom.xml | 67 ----- .../blog/itests/AbstractBlogIntegrationTest.java | 308 +++++++++----------- ...pleWithEbaTest.java => JdbcBlogSampleTest.java} | 28 +- ...mpleWithEbaTest.java => JpaBlogSampleTest.java} | 30 +- ...WithEbaTest.java => QuiesceBlogSampleTest.java} | 36 +-- samples/blog/blog-jdbc-eba/pom.xml | 77 ----- samples/blog/blog-jpa-eba/pom.xml | 77 ----- samples/blog/pom.xml | 15 - 11 files changed, 182 insertions(+), 1029 deletions(-) diff --git a/samples/blog/blog-assembly/pom.xml b/samples/blog/blog-assembly/pom.xml deleted file mode 100644 index b2a5708e0..000000000 --- a/samples/blog/blog-assembly/pom.xml +++ /dev/null @@ -1,318 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>blog</artifactId> - <version>1.0.1-SNAPSHOT</version> - </parent> - - <artifactId>org.apache.aries.samples.blog.assembly</artifactId> - <name>Apache Aries blog sample assembly</name> - <packaging>pom</packaging> - - <properties> - <cm.version>3.2.0-v20070116</cm.version> - <services.version>3.1.200-v20070605</services.version> - </properties> - - <dependencies> - - <!-- Base (JDBC) platform dependencies --> - - <dependency> - <groupId>org.eclipse.tycho</groupId> - <artifactId>org.eclipse.osgi</artifactId> - </dependency> - - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>cm</artifactId> - <version>${cm.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.osgi</groupId> - <artifactId>services</artifactId> - <version>${services.version}</version> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-api</artifactId> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-log4j2</artifactId> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-extender-war</artifactId> - </dependency> - <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-jetty-bundle</artifactId> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-jsp</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.fileinstall</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.bundlerepository</artifactId> - </dependency> - - <!-- Additional (JPA persistence layer) platform dependencies --> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.geronimo.components</groupId> - <artifactId>geronimo-transaction</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.serp</artifactId> - </dependency> - - - <!-- Base (JDBC) Aries dependencies --> - - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.proxy</groupId> - <artifactId>org.apache.aries.proxy</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>org.apache.aries.jndi</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.install</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.management</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.runtime</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.utils</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.default.local.platform</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.modeller</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.deployment.management</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.resolver.obr</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.resolver.noop</artifactId> - </dependency> - - <!-- Additional (JPA persistence layer) Aries dependencies --> - - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.api</artifactId> - </dependency> - - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-commons</artifactId> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-tree</artifactId> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-analysis</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.container</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>org.apache.aries.jpa.container.context</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.transaction</groupId> - <artifactId>org.apache.aries.transaction.manager</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.transaction</groupId> - <artifactId>org.apache.aries.transaction.blueprint</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries.transaction</groupId> - <artifactId>org.apache.aries.transaction.wrappers</artifactId> - </dependency> - - <!-- Blog sample datasource --> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.datasource</artifactId> - </dependency> - - </dependencies> - - <build> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}</outputDirectory> - </configuration> - <executions> - <execution> - <id>filter</id> - <phase>generate-resources</phase> - <goals> - <goal>resources</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <excludeTransitive>true</excludeTransitive> - <outputDirectory>${project.build.directory}</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini b/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini deleted file mode 100644 index 607b0ef7f..000000000 --- a/samples/blog/blog-assembly/src/main/filtered-resources/configuration/config.ini +++ /dev/null @@ -1,222 +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. - -osgi.bundles=\ -cm-${cm.version}@start,\ -services-${services.version}.jar@start,\ -asm-${asm.version}.jar@start,\ -asm-commons-${asm.version}.jar@start,\ -asm-tree-${asm.version}.jar@start,\ -asm-analysis-${asm.version}.jar@start,\ -pax-logging-api-${pax-logging.version}.jar@start,\ -pax-logging-log4j2-${pax-logging.version}.jar@start,\ -derby-${derby.version}.jar@start,\ -pax-web-jetty-bundle-${pax-web.version}.jar@start,\ -pax-web-extender-war-${pax-web.version}.jar@start,\ -pax-web-jsp-${pax-web.version}.jar@start,\ -org.apache.aries.jndi-${org.apache.aries.jndi.version}.jar@start,\ -org.apache.aries.util-${org.apache.aries.util.version}.jar@start,\ -org.apache.aries.blueprint-${org.apache.aries.blueprint.version}.jar@start,\ -org.apache.aries.proxy-${org.apache.aries.proxy.version}.jar@start,\ -org.apache.aries.application.install-${org.apache.aries.application.install.version}.jar@start,\ -org.apache.aries.application.management-${org.apache.aries.application.management.version}.jar@start,\ -org.apache.aries.application.api-${org.apache.aries.application.api.version}.jar@start,\ -org.apache.aries.application.utils-${org.apache.aries.application.utils.version}.jar@start,\ -org.apache.aries.application.deployment.management-${org.apache.aries.application.deployment.management.version}.jar@start,\ -org.apache.aries.application.modeller-${org.apache.aries.application.modeller.version}.jar@start,\ -org.apache.aries.application.resolver.obr-${org.apache.aries.application.resolver.obr.version}.jar@start,\ -org.apache.aries.application.resolver.noop-${org.apache.aries.application.resolver.noop.version}.jar@start,\ -org.apache.aries.application.default.local.platform-${org.apache.aries.application.default.local.platform.version}.jar@start,\ -org.apache.aries.application.runtime-${org.apache.aries.application.runtime.version}.jar@start,\ -org.apache.felix.fileinstall-${org.apache.felix.fileinstall.version}.jar@start,\ -org.apache.felix.bundlerepository-${org.apache.felix.bundlerepository.version}.jar@start,\ -commons-collections-${commons-collections.version}.jar@start,\ -commons-lang-${commons-lang.version}.jar@start,\ -commons-pool-${commons-pool.version}.jar@start,\ -geronimo-j2ee-connector_1.5_spec-${geronimo-j2ee-connector_1.5_spec.version}.jar@start,\ -geronimo-jpa_2.0_spec-${geronimo-jpa_2.0_spec.version}.jar@start,\ -geronimo-jta_1.1_spec-${geronimo-jta_1.1_spec.version}.jar@start,\ -geronimo-transaction-${geronimo-transaction.version}.jar@start,\ -geronimo-servlet_2.5_spec-${geronimo-servlet_2.5_spec.version}.jar@start,\ -openjpa-${openjpa.version}.jar@start,\ -org.apache.aries.jpa.api-${org.apache.aries.jpa.api.version}.jar@start,\ -org.apache.aries.jpa.blueprint.aries-${org.apache.aries.jpa.blueprint.aries.version}.jar@start,\ -org.apache.aries.jpa.container-${org.apache.aries.jpa.container.version}.jar@start,\ -org.apache.aries.jpa.container.context-${org.apache.aries.jpa.container.context.version}.jar@start,\ -org.apache.aries.transaction.blueprint-${org.apache.aries.transaction.blueprint.version}.jar@start,\ -org.apache.aries.transaction.manager-${org.apache.aries.transaction.manager.version}.jar@start,\ -org.apache.servicemix.bundles.serp-${org.apache.servicemix.bundles.serp.version}.jar@start,\ -org.apache.aries.samples.blog.datasource-${project.version}.jar@start,\ -org.apache.aries.transaction.wrappers-${org.apache.aries.transaction.wrappers.version}.jar@start -eclipse.ignoreApp=true -org.ops4j.pax.logging.DefaultServiceLog.level=INFO -org.osgi.framework.system.packages=\ -javax.accessibility,\ -javax.activation,\ -javax.activity,\ -javax.annotation,\ -javax.annotation.processing,\ -javax.crypto,\ -javax.crypto.interfaces,\ -javax.crypto.spec,\ -javax.imageio,\ -javax.imageio.event,\ -javax.imageio.metadata,\ -javax.imageio.plugins.bmp,\ -javax.imageio.plugins.jpeg,\ -javax.imageio.spi,\ -javax.imageio.stream,\ -javax.jms,\ -javax.jws,\ -javax.jws.soap,\ -javax.lang.model,\ -javax.lang.model.element,\ -javax.lang.model.type,\ -javax.lang.model.util,\ -javax.management,\ -javax.management.loading,\ -javax.management.modelmbean,\ -javax.management.monitor,\ -javax.management.openmbean,\ -javax.management.relation,\ -javax.management.remote,\ -javax.management.remote.rmi,\ -javax.management.timer,\ -javax.naming,\ -javax.naming.directory,\ -javax.naming.event,\ -javax.naming.ldap,\ -javax.naming.spi,\ -javax.net,\ -javax.net.ssl,\ -javax.print,\ -javax.print.attribute,\ -javax.print.attribute.standard,\ -javax.print.event,javax.rmi,\ -javax.rmi.CORBA,\ -javax.rmi.ssl,\ -javax.script,\ -javax.security.auth,\ -javax.security.auth.callback,\ -javax.security.auth.kerberos,\ -javax.security.auth.login,\ -javax.security.auth.spi,\ -javax.security.auth.x500,\ -javax.security.cert,\ -javax.security.sasl,\ -javax.sound.midi,\ -javax.sound.midi.spi,javax.sound.sampled,\ -javax.sound.sampled.spi,\ -javax.sql,\ -javax.sql.rowset,\ -javax.sql.rowset.serial,\ -javax.sql.rowset.spi,\ -javax.swing,\ -javax.swing.border,\ -javax.swing.colorchooser,\ -javax.swing.event,\ -javax.swing.filechooser,\ -javax.swing.plaf,\ -javax.swing.plaf.basic,\ -javax.swing.plaf.metal,\ -javax.swing.plaf.multi,\ -javax.swing.plaf.synth,\ -javax.swing.table,\ -javax.swing.text,\ -javax.swing.text.html,\ -javax.swing.text.html.parser,\ -javax.swing.text.rtf,\ -javax.swing.tree,\ -javax.swing.undo,\ -javax.tools,\ -javax.xml,\ -javax.xml.bind,\ -javax.xml.bind.annotation,\ -javax.xml.bind.annotation.adapters,\ -javax.xml.bind.attachment,\ -javax.xml.bind.helpers,\ -javax.xml.bind.util,\ -javax.xml.crypto,\ -javax.xml.crypto.dom,\ -javax.xml.crypto.dsig,\ -javax.xml.crypto.dsig.dom,\ -javax.xml.crypto.dsig.keyinfo,\ -javax.xml.crypto.dsig.spec,\ -javax.xml.datatype,\ -javax.xml.namespace,\ -javax.xml.parsers,\ -javax.xml.soap,\ -javax.xml.stream,\ -javax.xml.stream.events,\ -javax.xml.stream.util,\ -javax.xml.transform,\ -javax.xml.transform.dom,\ -javax.xml.transform.sax,\ -javax.xml.transform.stax,\ -javax.xml.transform.stream,\ -javax.xml.validation,\ -javax.xml.ws,\ -javax.xml.ws.handler,\ -javax.xml.ws.handler.soap,\ -javax.xml.ws.http,\ -javax.xml.ws.soap,\ -javax.xml.ws.spi,\ -javax.xml.xpath,\ -org.ietf.jgss,\ -org.omg.CORBA,\ -org.omg.CORBA.DynAnyPackage,\ -org.omg.CORBA.ORBPackage,\ -org.omg.CORBA.TypeCodePackage,\ -org.omg.CORBA.portable,\ -org.omg.CORBA_2_3,\ -org.omg.CORBA_2_3.portable,\ -org.omg.CosNaming,\ -org.omg.CosNaming.NamingContextExtPackage,\ -org.omg.CosNaming.NamingContextPackage,\ -org.omg.Dynamic,org.omg.DynamicAny,\ -org.omg.DynamicAny.DynAnyFactoryPackage,\ -org.omg.DynamicAny.DynAnyPackage,\ -org.omg.IOP,\ -org.omg.IOP.CodecFactoryPackage,\ -org.omg.IOP.CodecPackage,\ -org.omg.Messaging,\ -org.omg.PortableInterceptor,\ -org.omg.PortableInterceptor.ORBInitInfoPackage,\ -org.omg.PortableServer,\ -org.omg.PortableServer.CurrentPackage,\ -org.omg.PortableServer.POAManagerPackage,\ -org.omg.PortableServer.POAPackage,\ -org.omg.PortableServer.ServantLocatorPackage,\ -org.omg.PortableServer.portable,\ -org.omg.SendingContext,\ -org.omg.stub.java.rmi,\ -org.w3c.dom,\ -org.w3c.dom.bootstrap,\ -org.w3c.dom.css,\ -org.w3c.dom.events,\ -org.w3c.dom.html,\ -org.w3c.dom.ls,\ -org.w3c.dom.ranges,\ -org.w3c.dom.stylesheets,\ -org.w3c.dom.traversal,\ -org.w3c.dom.views,\ -org.xml.sax,\ -org.xml.sax.ext,\ -org.xml.sax.helpers,\ -javax.transaction;partial=true;mandatory:=partial,\ -javax.transaction.xa;partial=true;mandatory:=partial - diff --git a/samples/blog/blog-assembly/src/main/resources/blogDB.sql b/samples/blog/blog-assembly/src/main/resources/blogDB.sql deleted file mode 100644 index 50a214bd1..000000000 --- a/samples/blog/blog-assembly/src/main/resources/blogDB.sql +++ /dev/null @@ -1,33 +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. - */ -connect 'jdbc:derby:blogDB/;create=true'; -CREATE TABLE AUTHOR (email VARCHAR(255) NOT NULL, bio VARCHAR(255), displayName VARCHAR(255), dob TIMESTAMP, name VARCHAR(255), PRIMARY KEY (email)); -CREATE TABLE AUTHOR_BLOGENTRY (AUTHOR_EMAIL VARCHAR(255), POSTS_ID BIGINT); -CREATE TABLE BLOGENTRY (id BIGINT NOT NULL, blogText VARCHAR(10000), publishDate TIMESTAMP, title VARCHAR(255), updatedDate TIMESTAMP, AUTHOR_EMAIL VARCHAR(255), PRIMARY KEY (id)); -CREATE TABLE COMMENT (id BIGINT NOT NULL, comment VARCHAR(255), creationDate TIMESTAMP, AUTHOR_EMAIL VARCHAR(255), BLOGENTRY_ID BIGINT); -CREATE TABLE OPENJPA_SEQUENCE_TABLE (ID SMALLINT NOT NULL, SEQUENCE_VALUE BIGINT, PRIMARY KEY (ID)); -CREATE INDEX I_THR_TRY_AUTHOR_EMAIL ON AUTHOR_BLOGENTRY (AUTHOR_EMAIL); -CREATE INDEX I_THR_TRY_ELEMENT ON AUTHOR_BLOGENTRY (POSTS_ID); -CREATE INDEX I_BLGNTRY_AUTHOR ON BLOGENTRY (AUTHOR_EMAIL); -DELETE FROM AUTHOR; -DELETE FROM AUTHOR_BLOGENTRY; -DELETE FROM BLOGENTRY; -DELETE FROM COMMENT; -DELETE FROM OPENJPA_SEQUENCE_TABLE; -exit; diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml index a8dc01a49..3b74cd45e 100644 --- a/samples/blog/blog-itests/pom.xml +++ b/samples/blog/blog-itests/pom.xml @@ -132,20 +132,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.jdbc.eba</artifactId> - <scope>test</scope> - <type>eba</type> - </dependency> - - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.jpa.eba</artifactId> - <scope>test</scope> - <type>eba</type> - </dependency> - <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.cglib</artifactId> @@ -299,53 +285,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.install</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.deployment.management</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.management</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.modeller</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.runtime</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.utils</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.default.local.platform</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.bundlerepository</artifactId> @@ -405,12 +344,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>org.apache.aries.application.resolver.obr</artifactId> - <scope>test</scope> - </dependency> - <!-- pax exam --> <dependency> <groupId>org.slf4j</groupId> diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java index 0b5c11bc7..e965bfe01 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java @@ -40,208 +40,160 @@ import javax.inject.Inject; import javax.sql.XADataSource; import javax.transaction.TransactionManager; -import org.apache.aries.application.management.AriesApplication; -import org.apache.aries.application.management.AriesApplicationContext; -import org.apache.aries.application.management.AriesApplicationManager; import org.apache.aries.samples.blog.api.BloggingService; import org.apache.aries.samples.blog.api.persistence.BlogPersistenceService; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.options.MavenArtifactUrlReference; import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; import org.ops4j.pax.exam.spi.reactors.PerClass; import org.osgi.framework.Bundle; -import org.osgi.framework.ServiceReference; +import org.osgi.framework.BundleContext; @RunWith(PaxExam.class) @ExamReactorStrategy(PerClass.class) public abstract class AbstractBlogIntegrationTest extends org.apache.aries.itest.AbstractIntegrationTest { - private static final int CONNECTION_TIMEOUT = 30000; - public static final long DEFAULT_TIMEOUT = 60000; - - @Inject - AriesApplicationManager manager; - - protected AriesApplicationContext installEba(MavenArtifactUrlReference eba) throws Exception { - AriesApplication app = manager.createApplication(new URL(eba.getURL())); - AriesApplicationContext ctx = manager.install(app); - ctx.start(); - return ctx; - } - - protected Bundle assertBundleStarted(String symName) { - Bundle bundle = context().getBundleByName(symName); - assertNotNull("Bundle " + symName + " not found", bundle); - assertEquals(Bundle.ACTIVE, bundle.getState()); - return bundle; - } - - protected void assertActive(Bundle bundle) { - assertTrue("Bundle " + bundle.getSymbolicName() + " should be ACTIVE but is in state " + bundle.getState(), bundle.getState() == Bundle.ACTIVE); - } - - protected void assertResolved(Bundle bundle) { - assertTrue("Bundle " + bundle.getSymbolicName() + " should be ACTIVE but is in state " + bundle.getState(), bundle.getState() == Bundle.RESOLVED); - } - - @SuppressWarnings("rawtypes") - protected void listBundleServices(Bundle b) { - ServiceReference []srb = b.getRegisteredServices(); - for(ServiceReference sr:srb){ - System.out.println(b.getSymbolicName() + " SERVICE: "+sr); - } - } - - @SuppressWarnings("rawtypes") - protected Boolean isServiceRegistered(Bundle b) { - ServiceReference []srb = b.getRegisteredServices(); - if(srb == null) { - return false; - } - return true; - } - - protected void checkBlogWebAccess() throws IOException, InterruptedException { - Thread.sleep(1000); - HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog";); - String response = getHTTPResponse(conn); - - /* Uncomment for additional debug */ + @Inject + protected BundleContext context; + + private static final int CONNECTION_TIMEOUT = 30000; + + protected Bundle assertBundleStarted(String symName) { + Bundle bundle = context().getBundleByName(symName); + assertNotNull("Bundle " + symName + " not found", bundle); + assertEquals(Bundle.ACTIVE, bundle.getState()); + return bundle; + } + + protected void assertActive(Bundle bundle) { + assertEquals("Bundle " + bundle.getSymbolicName() + " should be ACTIVE but is in state " + bundle.getState(), Bundle.ACTIVE, bundle.getState()); + } + + protected void assertResolved(Bundle bundle) { + assertEquals("Bundle " + bundle.getSymbolicName() + " should be ACTIVE but is in state " + bundle.getState(), Bundle.RESOLVED, bundle.getState()); + } + + protected void checkBlogWebAccess() throws IOException, InterruptedException { + Thread.sleep(1000); + HttpURLConnection conn = makeConnection("http://localhost:8080/blog/ViewBlog";); + String response = getHTTPResponse(conn); + + /* Uncomment for additional debug */ /* System.out.println("ZZZZZ " + response); System.out.println("ZZZZZ " + conn.getResponseCode()); System.out.println("ZZZZZ " + HttpURLConnection.HTTP_OK); */ - assertEquals(HttpURLConnection.HTTP_OK, - conn.getResponseCode()); - - assertTrue("The response did not contain the expected content", response.contains("Blog home")); - } - - public static String getHTTPResponse(HttpURLConnection conn) throws IOException - { - StringBuilder response = new StringBuilder(); - BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream(), - "ISO-8859-1")); - try { - for (String s = reader.readLine(); s != null; s = reader.readLine()) { - response.append(s).append("\r\n"); - } - } finally { - reader.close(); - } - - return response.toString(); - } - - public static HttpURLConnection makeConnection(String contextPath) throws IOException - { - URL url = new URL(contextPath); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - - conn.setConnectTimeout(CONNECTION_TIMEOUT); - conn.connect(); - - return conn; - } - - protected Option baseOptions() { - String localRepo = System.getProperty("maven.repo.local"); - - if (localRepo == null) { - localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository"); - } - return composite( - junitBundles(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - mavenBundle("org.ops4j.pax.logging", "pax-logging-log4j2").versionAsInProject(), + assertEquals(HttpURLConnection.HTTP_OK, + conn.getResponseCode()); + + assertTrue("The response did not contain the expected content", response.contains("Blog home")); + } + + public static String getHTTPResponse(HttpURLConnection conn) throws IOException { + StringBuilder response = new StringBuilder(); + BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream(), + "ISO-8859-1")); + try { + for (String s = reader.readLine(); s != null; s = reader.readLine()) { + response.append(s).append("\r\n"); + } + } finally { + reader.close(); + } + + return response.toString(); + } + + public static HttpURLConnection makeConnection(String contextPath) throws IOException { + URL url = new URL(contextPath); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + + conn.setConnectTimeout(CONNECTION_TIMEOUT); + conn.connect(); + + return conn; + } + + protected Option baseOptions() { + String localRepo = System.getProperty("maven.repo.local"); + + if (localRepo == null) { + localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository"); + } + return composite( + junitBundles(), + mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), + mavenBundle("org.ops4j.pax.logging", "pax-logging-log4j2").versionAsInProject(), // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), - // this is how you set the default log level when using pax - // logging (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), - when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)) - ); - } - - @Configuration - public Option[] configuration() { - return options( - baseOptions(), - frameworkProperty("org.osgi.framework.system.packages") - .value("javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbea [...] - // Log - //mavenBundle("org.ops4j.pax.logging", "pax-logging-api").versionAsInProject(), - //mavenBundle("org.ops4j.pax.logging", "pax-logging-log4j2").versionAsInProject(), - // Felix mvn url handler - do we need this? - //mavenBundle("org.ops4j.pax.url", "pax-url-aether").versionAsInProject(), - - mavenBundle("org.eclipse.equinox", "cm").versionAsInProject(), - mavenBundle("org.eclipse.osgi", "services").versionAsInProject(), - - mavenBundle("org.apache.xbean", "xbean-asm5-shaded").versionAsInProject(), - mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(), - mavenBundle("org.apache.xbean", "xbean-bundleutils").versionAsInProject(), - mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle").versionAsInProject(), - mavenBundle("org.ops4j.pax.web", "pax-web-extender-war").versionAsInProject(), - mavenBundle("org.ops4j.pax.web", "pax-web-spi").versionAsInProject(), - mavenBundle("org.ops4j.pax.web", "pax-web-api").versionAsInProject(), - - //mavenBundle("org.ops4j.pax.web", "pax-web-jsp").versionAsInProject(), - mavenBundle("org.apache.derby", "derby").versionAsInProject(), - mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec").versionAsInProject(), - - mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec").versionAsInProject(), - mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec").versionAsInProject(), - mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec").versionAsInProject(), - mavenBundle("org.apache.geronimo.components", "geronimo-transaction").versionAsInProject(), - mavenBundle("org.apache.openjpa", "openjpa").versionAsInProject(), - mavenBundle("commons-lang", "commons-lang").versionAsInProject(), - mavenBundle("commons-collections", "commons-collections").versionAsInProject(), - mavenBundle("commons-pool", "commons-pool").versionAsInProject(), - mavenBundle("commons-dbcp", "commons-dbcp").versionAsInProject(), - mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp").versionAsInProject(), - mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api").versionAsInProject(), - mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager").versionAsInProject(), - mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ).versionAsInProject(), - mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(), - mavenBundle("org.apache.aries", "org.apache.aries.util" ).versionAsInProject(), - mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi" ).versionAsInProject(), - mavenBundle("org.apache.felix", "org.apache.felix.fileinstall" ).versionAsInProject(), - mavenBundle("org.apache.aries.application", "org.apache.aries.application.install" ).versionAsInProject(), - mavenBundle("org.apache.aries.application", "org.apache.aries.application.api" ).versionAsInProject(), - mavenBundle("org.apache.aries.application", "org.apache.aries.application.management" ).versionAsInProject(), - mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime" ).versionAsInProject(), - mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils" ).versionAsInProject(), - mavenBundle("org.apache.aries.application", "org.apache.aries.application.default.local.platform").versionAsInProject(), - mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository").versionAsInProject(), - mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr").versionAsInProject(), - mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller").versionAsInProject(), - mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management").versionAsInProject(), - mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api" ).versionAsInProject(), - mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container" ).versionAsInProject(), - mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.blueprint.aries" ).versionAsInProject(), - mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container.context" ).versionAsInProject(), - mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager" ).versionAsInProject(), - mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint" ).versionAsInProject(), - mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers" ).versionAsInProject(), + systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)) + ); + } + + @Configuration + public Option[] configuration() { + return options( + baseOptions(), + frameworkProperty("org.osgi.framework.system.packages") + .value("javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax. [...] + + mavenBundle("org.eclipse.equinox", "cm").versionAsInProject(), + mavenBundle("org.eclipse.osgi", "services").versionAsInProject(), + + mavenBundle("org.apache.xbean", "xbean-asm5-shaded").versionAsInProject(), + mavenBundle("org.apache.xbean", "xbean-finder-shaded").versionAsInProject(), + mavenBundle("org.apache.xbean", "xbean-bundleutils").versionAsInProject(), + mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle").versionAsInProject(), + mavenBundle("org.ops4j.pax.web", "pax-web-extender-war").versionAsInProject(), + mavenBundle("org.ops4j.pax.web", "pax-web-spi").versionAsInProject(), + mavenBundle("org.ops4j.pax.web", "pax-web-api").versionAsInProject(), + + //mavenBundle("org.ops4j.pax.web", "pax-web-jsp").versionAsInProject(), + mavenBundle("org.apache.derby", "derby").versionAsInProject(), + mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec").versionAsInProject(), + + mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec").versionAsInProject(), + mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec").versionAsInProject(), + mavenBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec").versionAsInProject(), + mavenBundle("org.apache.geronimo.components", "geronimo-transaction").versionAsInProject(), + mavenBundle("org.apache.openjpa", "openjpa").versionAsInProject(), + mavenBundle("commons-lang", "commons-lang").versionAsInProject(), + mavenBundle("commons-collections", "commons-collections").versionAsInProject(), + mavenBundle("commons-pool", "commons-pool").versionAsInProject(), + mavenBundle("commons-dbcp", "commons-dbcp").versionAsInProject(), + mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp").versionAsInProject(), + mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api").versionAsInProject(), + mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager").versionAsInProject(), + mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(), + mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(), + mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(), + mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi").versionAsInProject(), + mavenBundle("org.apache.felix", "org.apache.felix.fileinstall").versionAsInProject(), + mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository").versionAsInProject(), + mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api").versionAsInProject(), + mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container").versionAsInProject(), + mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.blueprint.aries").versionAsInProject(), + mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container.context").versionAsInProject(), + mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager").versionAsInProject(), + mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint").versionAsInProject(), + mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers").versionAsInProject(), mavenBundle("org.ow2.asm", "asm").versionAsInProject(), mavenBundle("org.ow2.asm", "asm-commons").versionAsInProject(), mavenBundle("org.ow2.asm", "asm-tree").versionAsInProject(), mavenBundle("org.ow2.asm", "asm-analysis").versionAsInProject(), - mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.datasource" ).versionAsInProject() - ///vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"), - ); - } - - protected void assertBlogServicesStarted() { - context().getService(BloggingService.class); - context().getService(BlogPersistenceService.class); - context().getService(XADataSource.class); - context().getService(TransactionManager.class); - } + mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.datasource").versionAsInProject() + ); + } + + protected void assertBlogServicesStarted() { + context().getService(BloggingService.class); + context().getService(BlogPersistenceService.class); + context().getService(XADataSource.class); + context().getService(TransactionManager.class); + } } diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleTest.java similarity index 55% rename from samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java rename to samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleTest.java index ef16c155d..d5285a73b 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleTest.java @@ -18,22 +18,24 @@ */ package org.apache.aries.samples.blog.itests; -import static org.ops4j.pax.exam.CoreOptions.maven; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import org.apache.aries.application.management.AriesApplicationContext; import org.junit.Test; -import org.ops4j.pax.exam.options.MavenArtifactUrlReference; +import org.osgi.framework.Bundle; -public class JdbcBlogSampleWithEbaTest extends AbstractBlogIntegrationTest { +public class JdbcBlogSampleTest extends AbstractBlogIntegrationTest { @Test public void test() throws Exception { - MavenArtifactUrlReference eba = maven() - .groupId("org.apache.aries.samples.blog") - .artifactId("org.apache.aries.samples.blog.jdbc.eba") - .versionAsInProject() - .type("eba"); - AriesApplicationContext ctx = installEba(eba); + Bundle bundleApi = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.api").versionAsInProject().getURL()); + Bundle bundleWeb = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.web").versionAsInProject().getURL()); + Bundle bundleBiz = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.biz").versionAsInProject().getURL()); + Bundle bundlePersistenceJdbc = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.persistence.jdbc").versionAsInProject().getURL()); + + bundleApi.start(); + bundlePersistenceJdbc.start(); + bundleBiz.start(); + bundleWeb.start(); /* Check that the Blog Sample bundles are present an started */ assertBundleStarted("org.apache.aries.samples.blog.api"); @@ -44,8 +46,10 @@ public class JdbcBlogSampleWithEbaTest extends AbstractBlogIntegrationTest { assertBlogServicesStarted(); checkBlogWebAccess(); - ctx.stop(); - manager.uninstall(ctx); + bundleWeb.uninstall(); + bundleBiz.uninstall(); + bundlePersistenceJdbc.uninstall(); + bundleApi.uninstall(); } } diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleTest.java similarity index 56% rename from samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java rename to samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleTest.java index 70e8d4d59..f58a6a50b 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleTest.java @@ -18,22 +18,24 @@ */ package org.apache.aries.samples.blog.itests; -import static org.ops4j.pax.exam.CoreOptions.maven; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import org.apache.aries.application.management.AriesApplicationContext; import org.junit.Test; -import org.ops4j.pax.exam.options.MavenArtifactUrlReference; +import org.osgi.framework.Bundle; -public class JpaBlogSampleWithEbaTest extends AbstractBlogIntegrationTest { +public class JpaBlogSampleTest extends AbstractBlogIntegrationTest { @Test public void test() throws Exception { - MavenArtifactUrlReference eba = maven() - .groupId("org.apache.aries.samples.blog") - .artifactId("org.apache.aries.samples.blog.jpa.eba") - .versionAsInProject() - .type("eba"); - AriesApplicationContext ctx = installEba(eba); + Bundle bundleApi = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.api").versionAsInProject().getURL()); + Bundle bundleWeb = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.web").versionAsInProject().getURL()); + Bundle bundleBiz = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.biz").versionAsInProject().getURL()); + Bundle bundlePersistenceJpa = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.persistence.jpa").versionAsInProject().getURL()); + + bundleApi.start(); + bundlePersistenceJpa.start(); + bundleBiz.start(); + bundleWeb.start(); /* Find and check all the blog sample bundles */ assertBundleStarted("org.apache.aries.samples.blog.api"); @@ -45,9 +47,11 @@ public class JpaBlogSampleWithEbaTest extends AbstractBlogIntegrationTest { assertBlogServicesStarted(); checkBlogWebAccess(); - - ctx.stop(); - manager.uninstall(ctx); + + bundleWeb.uninstall(); + bundleBiz.uninstall(); + bundlePersistenceJpa.uninstall(); + bundleApi.uninstall(); } } diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleTest.java similarity index 67% rename from samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java rename to samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleTest.java index 64859ccdf..d6efe6f9d 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleTest.java @@ -18,42 +18,43 @@ */ package org.apache.aries.samples.blog.itests; -import static org.junit.Assert.assertTrue; - import java.util.Arrays; import java.util.Collections; import javax.inject.Inject; -import org.apache.aries.application.management.AriesApplicationContext; import org.apache.aries.quiesce.manager.QuiesceManager; import org.junit.Test; -import org.ops4j.pax.exam.CoreOptions; -import org.ops4j.pax.exam.options.MavenArtifactUrlReference; import org.osgi.framework.Bundle; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; + -public class QuiesceBlogSampleWithEbaTest extends AbstractBlogIntegrationTest { +public class QuiesceBlogSampleTest extends AbstractBlogIntegrationTest { @Inject QuiesceManager quiesceMgr; @Test public void test() throws Exception { resolveBundles(); - MavenArtifactUrlReference eba = CoreOptions.maven() - .groupId("org.apache.aries.samples.blog") - .artifactId("org.apache.aries.samples.blog.jpa.eba") - .versionAsInProject() - .type("eba"); - AriesApplicationContext ctx = installEba(eba); + + Bundle bundleApi = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.api").versionAsInProject().getURL()); + Bundle bundleWeb = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.web").versionAsInProject().getURL()); + Bundle bundleBiz = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.biz").versionAsInProject().getURL()); + Bundle bundlePersistenceJpa = context.installBundle(mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.persistence.jpa").versionAsInProject().getURL()); + + bundleApi.start(); + bundlePersistenceJpa.start(); + bundleBiz.start(); + bundleWeb.start(); /* Find and check all the blog sample bundles */ Bundle bapi = assertBundleStarted("org.apache.aries.samples.blog.api"); Bundle bweb = assertBundleStarted("org.apache.aries.samples.blog.web"); Bundle bbiz = assertBundleStarted("org.apache.aries.samples.blog.biz"); Bundle bper = assertBundleStarted("org.apache.aries.samples.blog.persistence.jpa"); - Bundle bds = assertBundleStarted("org.apache.aries.samples.blog.datasource"); - Bundle txs = assertBundleStarted("org.apache.aries.transaction.manager"); + assertBundleStarted("org.apache.aries.samples.blog.datasource"); + assertBundleStarted("org.apache.aries.transaction.manager"); assertBlogServicesStarted(); checkBlogWebAccess(); @@ -89,9 +90,10 @@ public class QuiesceBlogSampleWithEbaTest extends AbstractBlogIntegrationTest { System.out.println("Checking if blog works again after restart"); checkBlogWebAccess(); - ctx.stop(); - manager.uninstall(ctx); - + bundleWeb.uninstall(); + bundleBiz.uninstall(); + bundlePersistenceJpa.uninstall(); + bundleApi.uninstall(); } } diff --git a/samples/blog/blog-jdbc-eba/pom.xml b/samples/blog/blog-jdbc-eba/pom.xml deleted file mode 100644 index ea0fed7af..000000000 --- a/samples/blog/blog-jdbc-eba/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -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. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>blog</artifactId> - <version>1.0.1-SNAPSHOT</version> - </parent> - - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.jdbc.eba</artifactId> - <name>Apache Aries Blog Sample EBA using JDBC</name> - <description> - This EBA contains the core bundles for the sample Blog application. - It does not include all transitive dependencies, which need to - be provisioned during deployment. It uses JDBC for the persistence layer. - </description> - <packaging>eba</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.web</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.biz</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.persistence.jdbc</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.aries</groupId> - <artifactId>eba-maven-plugin</artifactId> - <version>${eba-maven-plugin.version}</version> - <extensions>true</extensions> - <configuration> - <generateManifest>true</generateManifest> - <instructions> - <Application-SymbolicName>${project.artifactId}</Application-SymbolicName> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/samples/blog/blog-jpa-eba/pom.xml b/samples/blog/blog-jpa-eba/pom.xml deleted file mode 100644 index 4c4d45bb0..000000000 --- a/samples/blog/blog-jpa-eba/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -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. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>blog</artifactId> - <version>1.0.1-SNAPSHOT</version> - </parent> - - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.jpa.eba</artifactId> - <name>Apache Aries Blog Sample EBA using JPA</name> - <description> - This EBA contains the core bundles for the sample Blog application. - It does not include all transitive dependencies, which need to - be provisioned during deployment. It uses JPA for the persistence layer. - </description> - <packaging>eba</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.web</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.biz</artifactId> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.persistence.jpa</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.aries</groupId> - <artifactId>eba-maven-plugin</artifactId> - <version>${eba-maven-plugin.version}</version> - <extensions>true</extensions> - <configuration> - <generateManifest>true</generateManifest> - <instructions> - <Application-SymbolicName>${project.artifactId}</Application-SymbolicName> - </instructions> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/samples/blog/pom.xml b/samples/blog/pom.xml index 42c33e113..60f2b9b4c 100644 --- a/samples/blog/pom.xml +++ b/samples/blog/pom.xml @@ -59,18 +59,6 @@ <artifactId>org.apache.aries.samples.blog.datasource</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.jdbc.eba</artifactId> - <version>${project.version}</version> - <type>eba</type> - </dependency> - <dependency> - <groupId>org.apache.aries.samples.blog</groupId> - <artifactId>org.apache.aries.samples.blog.jpa.eba</artifactId> - <version>${project.version}</version> - <type>eba</type> - </dependency> <dependency> <groupId>org.apache.aries.samples.blog</groupId> <artifactId>org.apache.aries.samples.blog.persistence.jdbc</artifactId> @@ -98,11 +86,8 @@ <modules> <module>blog-api</module> - <module>blog-assembly</module> <module>blog-biz</module> <module>blog-datasource</module> - <module>blog-jdbc-eba</module> - <module>blog-jpa-eba</module> <module>blog-persistence-jdbc</module> <module>blog-persistence-jpa</module> <module>blog-web</module>
