aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1703378 - in /aries/trunk/jpa/itests: ./ jpa-container-itest-karaf/ jpa-container-itest-karaf/src/ jpa-container-itest-karaf/src/test/ jpa-container-itest-karaf/src/test/java/ jpa-container-itest-karaf/src/test/java/org/ jpa-container-ites...
Date Wed, 16 Sep 2015 10:07:14 GMT
Author: cschneider
Date: Wed Sep 16 10:07:14 2015
New Revision: 1703378

URL: http://svn.apache.org/r1703378
Log:
[ARIES-1406] Add karaf itests

Added:
    aries/trunk/jpa/itests/jpa-container-itest-karaf/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/LICENSE
    aries/trunk/jpa/itests/jpa-container-itest-karaf/NOTICE
    aries/trunk/jpa/itests/jpa-container-itest-karaf/pom.xml
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/AbstractJPAItest.java
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/BlueprintTest.java
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/DSTest.java
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/resources/
    aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/resources/persistence.xml
Modified:
    aries/trunk/jpa/itests/pom.xml

Added: aries/trunk/jpa/itests/jpa-container-itest-karaf/LICENSE
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest-karaf/LICENSE?rev=1703378&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest-karaf/LICENSE (added)
+++ aries/trunk/jpa/itests/jpa-container-itest-karaf/LICENSE Wed Sep 16 10:07:14 2015
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Added: aries/trunk/jpa/itests/jpa-container-itest-karaf/NOTICE
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest-karaf/NOTICE?rev=1703378&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest-karaf/NOTICE (added)
+++ aries/trunk/jpa/itests/jpa-container-itest-karaf/NOTICE Wed Sep 16 10:07:14 2015
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2011 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Added: aries/trunk/jpa/itests/jpa-container-itest-karaf/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest-karaf/pom.xml?rev=1703378&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest-karaf/pom.xml (added)
+++ aries/trunk/jpa/itests/jpa-container-itest-karaf/pom.xml Wed Sep 16 10:07:14 2015
@@ -0,0 +1,176 @@
+<?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.jpa.itest</groupId>
+        <artifactId>org.apache.aries.jpa.itest.parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <groupId>org.apache.aries.jpa</groupId>
+    <artifactId>org.apache.aries.jpa.container.itest.karaf</artifactId>
+    <name>Apache Aries JPA iTests on Karaf</name>
+    
+    <properties>
+        <baseline.skip>true</baseline.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>test</scope>
+        </dependency>  
+
+        <!-- Test bundles -->
+        <dependency>
+            <groupId>org.apache.aries.jpa.example</groupId>
+            <artifactId>org.apache.aries.jpa.example.tasklist.model</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jpa.example</groupId>
+            <artifactId>org.apache.aries.jpa.example.tasklist.ds</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jpa.example</groupId>
+            <artifactId>org.apache.aries.jpa.example.tasklist.blueprint</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>enterprise</artifactId>
+            <version>4.0.1</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>jpa-features</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>test</scope>
+        </dependency>
+        
+        <!-- pax exam -->
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-container-karaf</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit4</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-link-mvn</artifactId>
+            <version>${exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <version>${url.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <id>generate-depends-file</id>
+                        <goals>
+                            <goal>generate-depends-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkCount>1</forkCount>
+                    <reuseForks>false</reuseForks>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>ci-build-profile</id>
+            <activation>
+                <property>
+                    <name>maven.repo.local</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <forkCount>1</forkCount>
+                            <reuseForks>false</reuseForks>
+                            <!--
+                                when the local repo location has been specified, we need
to pass
+                                on this information to PAX mvn url
+                            -->
+                            <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${maven.repo.local}</argLine>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

Added: aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/AbstractJPAItest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/AbstractJPAItest.java?rev=1703378&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/AbstractJPAItest.java
(added)
+++ aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/AbstractJPAItest.java
Wed Sep 16 10:07:14 2015
@@ -0,0 +1,194 @@
+/*  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.aries.jpa.itest.karaf;
+
+import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureSecurity;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import javax.inject.Inject;
+
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
+import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
+import org.ops4j.pax.exam.options.UrlReference;
+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.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+import org.osgi.service.jdbc.DataSourceFactory;
+import org.osgi.util.tracker.ServiceTracker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public abstract class AbstractJPAItest {
+    private static Logger LOG = LoggerFactory.getLogger(AbstractJPAItest.class);
+
+    /*
+     *  The @Inject annotations below currently do not work as the transaction-api/1.2 feature
installs an atinject bundle that 
+     *  confuses pax exam. As a workaround the services are set below in the @Before method
+     */
+    
+    @Inject
+    BundleContext bundleContext;
+    
+    @Inject
+    ConfigurationAdmin configAdmin;
+    
+    private static Configuration config;
+    
+    /**
+     * Helps to diagnose bundles that are not resolved as it will throw a detailed exception
+     * 
+     * @throws BundleException
+     */
+    public void resolveBundles() throws BundleException {
+        Bundle[] bundles = bundleContext.getBundles();
+        for (Bundle bundle : bundles) {
+            if (bundle.getState() == Bundle.INSTALLED) {
+                System.out.println("Found non resolved bundle " + bundle.getBundleId() +
":"
+                    + bundle.getSymbolicName() + ":" + bundle.getVersion());
+                bundle.start();
+            }
+        }
+    }
+
+    public Bundle getBundleByName(String symbolicName) {
+        for (Bundle b : bundleContext.getBundles()) {
+            if (b.getSymbolicName().equals(symbolicName)) {
+                return b;
+            }
+        }
+        return null;
+    }
+    
+    public <T> T getService(Class<T> type, String filter) {
+        return getService(type, filter, 10000);
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public <T> T getService(Class<T> type, String filter, int timeout) {
+        ServiceTracker tracker = null;
+        try {
+            String objClassFilter = "(" + Constants.OBJECTCLASS + "=" + type.getName() +
")";
+            String flt = filter != null ? "(&" + objClassFilter + sanitizeFilter(filter)
+ ")" : objClassFilter;
+            Filter osgiFilter = FrameworkUtil.createFilter(flt);
+            tracker = new ServiceTracker(bundleContext, osgiFilter, null);
+            tracker.open();
+
+            Object svc = type.cast(tracker.waitForService(timeout));
+            if (svc == null) {
+                throw new IllegalStateException("Gave up waiting for service " + flt);
+            }
+            return type.cast(svc);
+        } catch (InvalidSyntaxException e) {
+            throw new IllegalArgumentException("Invalid filter", e);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        } finally {
+            //tracker.close();
+        }
+    }
+
+    public String sanitizeFilter(String filter) {
+        return filter.startsWith("(") ? filter : "(" + filter + ")";
+    }
+
+    protected Option baseOptions() {
+        String localRepo = System.getProperty("maven.repo.local");
+
+        if (localRepo == null) {
+            localRepo = System.getProperty("org.ops4j.pax.url.mvn.localRepository");
+        }
+        MavenArtifactUrlReference karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").version("4.0.1").type("tar.gz");
+        UrlReference enterpriseFeatureUrl = maven().groupId("org.apache.karaf.features").artifactId("enterprise").versionAsInProject().type("xml").classifier("features");
+        UrlReference jpaFeatureUrl = maven().groupId("org.apache.aries.jpa").artifactId("jpa-features").versionAsInProject().type("xml").classifier("features");
+        UrlReference paxJdbcFeatureUrl = maven().groupId("org.ops4j.pax.jdbc").artifactId("pax-jdbc-features").version("0.7.0").type("xml").classifier("features");
+        return CoreOptions.composite(
+            //KarafDistributionOption.debugConfiguration("8000", true),
+            karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new
File("target/exam")).useDeployFolder(false),
+            configureSecurity().disableKarafMBeanServerBuilder(),
+            keepRuntimeFolder(),
+            logLevel(LogLevel.INFO),
+            when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository="
+ localRepo)),
+            features(paxJdbcFeatureUrl, "pax-jdbc-config", "pax-jdbc-h2", "pax-jdbc-pool-dbcp2"),
+            features(enterpriseFeatureUrl, "transaction", "http-whiteboard", "hibernate/4.3.6.Final",
"scr"),
+            features(jpaFeatureUrl, "jpa/2.2.0-SNAPSHOT"),
+            mavenBundle("org.apache.aries.jpa.example", "org.apache.aries.jpa.example.tasklist.model").versionAsInProject()
+//            replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", getConfigFile("/etc/org.ops4j.pax.logging.cfg")),
+        );
+
+    }
+
+    @Before
+    public void createConfigs() throws Exception {
+        if (config == null) {
+            bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+            configAdmin = getService(ConfigurationAdmin.class, null);
+            createConfigForLogging();
+            createConfigForDS();
+
+        }
+    }
+
+    private void createConfigForDS() throws IOException {
+        config = configAdmin.createFactoryConfiguration("org.ops4j.datasource", null);
+        Dictionary<String, String> props = new Hashtable<String, String>();
+        props.put(DataSourceFactory.OSGI_JDBC_DRIVER_NAME, "H2-pool-xa");
+        props.put(DataSourceFactory.JDBC_DATABASE_NAME, "tasklist;create=true");
+        props.put(DataSourceFactory.JDBC_DATASOURCE_NAME, "tasklist");
+        config.update(props);
+        LOG.info("Created DataSource config tasklist");
+    }
+    
+    private void createConfigForLogging() throws IOException {
+        Configuration logConfig = configAdmin.getConfiguration("org.ops4j.pax.logging", null);
+        Dictionary<String, String> props = new Hashtable<String, String>();
+        props.put("log4j.rootLogger", "INFO, stdout");
+        props.put("log4j.logger.org.apache.aries.transaction", "DEBUG");
+        props.put("log4j.logger.org.apache.aries.transaction.parsing", "DEBUG");
+        props.put("log4j.logger.org.apache.aries.jpa.blueprint.impl", "DEBUG");
+        props.put("log4j.appender.stdout", "org.apache.log4j.ConsoleAppender");
+        props.put("log4j.appender.stdout.layout", "org.apache.log4j.PatternLayout");
+        props.put("log4j.appender.stdout.layout.ConversionPattern", "%d{ISO8601} | %-5.5p
| %-16.16t | %c | %m%n");
+        logConfig.update(props);
+    }
+
+}

Added: aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/BlueprintTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/BlueprintTest.java?rev=1703378&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/BlueprintTest.java
(added)
+++ aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/BlueprintTest.java
Wed Sep 16 10:07:14 2015
@@ -0,0 +1,71 @@
+/*  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.aries.jpa.itest.karaf;
+
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+
+import java.util.Collection;
+
+import javax.inject.Inject;
+
+import org.apache.aries.jpa.example.tasklist.model.Task;
+import org.apache.aries.jpa.example.tasklist.model.TaskService;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+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.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.BundleException;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class BlueprintTest extends AbstractJPAItest {
+    
+    @Inject
+    TaskService taskService;
+
+    @Before
+    public void initService() {
+        taskService = getService(TaskService.class, null);
+    }
+    
+    @Test
+    public void test() throws BundleException {
+        resolveBundles();
+        Assert.assertEquals(0, taskService.getTasks().size());
+        Task task = new Task();
+        task.setId(1);
+        task.setDescription("My task");
+        taskService.addTask(task);
+        Collection<Task> tasks = taskService.getTasks();
+        Assert.assertEquals(1, tasks.size());
+        Task task1  = tasks.iterator().next();
+        Assert.assertEquals(1, task1.getId().intValue());
+        Assert.assertEquals("My task", task1.getDescription());
+    }
+
+    @Configuration
+    public Option[] configuration() {
+        return new Option[] {
+            baseOptions(), //
+            mavenBundle("org.apache.aries.jpa.example", "org.apache.aries.jpa.example.tasklist.blueprint").versionAsInProject()
+        };
+    }
+}

Added: aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/DSTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/DSTest.java?rev=1703378&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/DSTest.java
(added)
+++ aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/java/org/apache/aries/jpa/itest/karaf/DSTest.java
Wed Sep 16 10:07:14 2015
@@ -0,0 +1,76 @@
+/*  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.aries.jpa.itest.karaf;
+
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+
+import java.util.Collection;
+
+import javax.inject.Inject;
+
+import org.apache.aries.jpa.example.tasklist.model.Task;
+import org.apache.aries.jpa.example.tasklist.model.TaskService;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+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.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.BundleException;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class DSTest extends AbstractJPAItest {
+    
+    @Inject
+    TaskService taskService;
+
+    @Before
+    public void initService() {
+        taskService = getService(TaskService.class, null);
+    }
+    
+    /**
+     * Test currently does not work as data source config is not deployed for unknown reason
+     */
+    @Ignore
+    @Test
+    public void test() throws BundleException {
+        resolveBundles();
+        Assert.assertEquals(0, taskService.getTasks().size());
+        Task task = new Task();
+        task.setId(1);
+        task.setDescription("My task");
+        taskService.addTask(task);
+        Collection<Task> tasks = taskService.getTasks();
+        Assert.assertEquals(1, tasks.size());
+        Task task1  = tasks.iterator().next();
+        Assert.assertEquals(1, task1.getId().intValue());
+        Assert.assertEquals("My task", task1.getDescription());
+    }
+
+    @Configuration
+    public Option[] configuration() {
+        return new Option[] {
+            baseOptions(), //
+            mavenBundle("org.apache.aries.jpa.example", "org.apache.aries.jpa.example.tasklist.ds").versionAsInProject()
+        };
+    }
+}

Added: aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/resources/persistence.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/resources/persistence.xml?rev=1703378&view=auto
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/resources/persistence.xml (added)
+++ aries/trunk/jpa/itests/jpa-container-itest-karaf/src/test/resources/persistence.xml Wed
Sep 16 10:07:14 2015
@@ -0,0 +1,27 @@
+<?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.
+-->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+   version="1.0">
+	<persistence-unit name="incompleteTestUnit">
+		<description>Persistence unit for testing an incomplete persistence unit</description>
+	</persistence-unit>
+</persistence>
\ No newline at end of file

Modified: aries/trunk/jpa/itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/itests/pom.xml?rev=1703378&r1=1703377&r2=1703378&view=diff
==============================================================================
--- aries/trunk/jpa/itests/pom.xml (original)
+++ aries/trunk/jpa/itests/pom.xml Wed Sep 16 10:07:14 2015
@@ -35,7 +35,7 @@
     
     <properties>
         <paxlogging.version>1.7.3</paxlogging.version>
-        <exam.version>4.5.0</exam.version>
+        <exam.version>4.6.0</exam.version>
         <url.version>1.6.0</url.version>
         <hibernate42.version>4.2.15.Final</hibernate42.version>
         <hibernate43.version>4.2.15.Final</hibernate43.version>
@@ -51,6 +51,7 @@
     <modules>
         <module>jpa-container-blueprint-testbundle</module>
         <module>jpa-container-itest</module>
+        <module>jpa-container-itest-karaf</module>
         <module>jpa-container-testbundle</module>
         <module>jpa-container-testbundle-eclipselink</module>
     </modules>



Mime
View raw message