Return-Path: Delivered-To: apmail-incubator-aries-commits-archive@minotaur.apache.org Received: (qmail 71814 invoked from network); 25 Feb 2010 18:07:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Feb 2010 18:07:51 -0000 Received: (qmail 4187 invoked by uid 500); 25 Feb 2010 18:07:51 -0000 Delivered-To: apmail-incubator-aries-commits-archive@incubator.apache.org Received: (qmail 4117 invoked by uid 500); 25 Feb 2010 18:07:51 -0000 Mailing-List: contact aries-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: aries-dev@incubator.apache.org Delivered-To: mailing list aries-commits@incubator.apache.org Received: (qmail 4109 invoked by uid 99); 25 Feb 2010 18:07:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 18:07:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 18:07:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 02220238888F; Thu, 25 Feb 2010 18:07:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r916383 - in /incubator/aries/trunk/jpa/jpa-blueprint-aries: pom.xml src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java Date: Thu, 25 Feb 2010 18:07:27 -0000 To: aries-commits@incubator.apache.org From: timothyjward@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100225180728.02220238888F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: timothyjward Date: Thu Feb 25 18:07:27 2010 New Revision: 916383 URL: http://svn.apache.org/viewvc?rev=916383&view=rev Log: ARIES-202 : Separate the JPA blueprint integration from managed persistence contexts Modified: incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java Modified: incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml?rev=916383&r1=916382&r2=916383&view=diff ============================================================================== --- incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml (original) +++ incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml Thu Feb 25 18:07:27 2010 @@ -80,6 +80,12 @@ org.apache.aries.testsupport.unit test + + org.slf4j + slf4j-simple + 1.5.6 + test + @@ -92,9 +98,9 @@ - org/apache/aries/jpa/container/context/namespace + org/apache/aries/jpa/blueprint/namespace false - ${basedir}/src/main/resources/org/apache/aries/jpa/container/context/namespace + ${basedir}/src/main/resources/org/apache/aries/jpa/blueprint/namespace *.xsd Modified: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java?rev=916383&r1=916382&r2=916383&view=diff ============================================================================== --- incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java (original) +++ incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java Thu Feb 25 18:07:27 2010 @@ -69,7 +69,7 @@ public class NSHandler implements NamespaceHandler { /** Logger */ private static final Logger _logger = LoggerFactory - .getLogger("org.apache.aries.jpa.container.context"); + .getLogger("org.apache.aries.jpa.blueprint.aries"); /** The JPA namespace */ public static final String NS_URI = "http://aries.apache.org/xmlns/jpa/v1.0.0"; @@ -214,7 +214,11 @@ } public URL getSchemaLocation(String namespace) { - return getClass().getResource("jpa.xsd"); + if(NS_URI.equals(namespace)) + return getClass().getResource( + "/org/apache/aries/jpa/blueprint/namespace/jpa.xsd"); + else + return null; } public Metadata parse(Element element, ParserContext context) { Modified: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java?rev=916383&r1=916382&r2=916383&view=diff ============================================================================== --- incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java (original) +++ incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java Thu Feb 25 18:07:27 2010 @@ -19,6 +19,8 @@ package org.apache.aries.jpa.blueprint.aries.test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.util.ArrayList; @@ -79,6 +81,7 @@ sut = new NSHandler(); manager = Skeleton.newMock(PersistenceContextProvider.class); sut.setManager(manager); + sut.contextAvailable(null); clientBundle = Skeleton.newMock(Bundle.class); @@ -207,6 +210,30 @@ } @Test + public void testContextNoPersistenceContextProvider() { + + sut.contextUnavailable(null); + Element e = getTestElement("context"); + BeanMetadata bean = + (BeanMetadata) sut.decorate(e, Skeleton.newMock(BeanMetadata.class), parserCtx); + BeanMetadata innerBean = (BeanMetadata) ((BeanProperty) bean.getProperties().get(0)).getValue(); + + assertEquals("createEntityManager", innerBean.getFactoryMethod()); + assertEquals("internalClose", innerBean.getDestroyMethod()); + + assertEquals(1, registeredComponents.size()); + ReferenceMetadata reference = (ReferenceMetadata) registeredComponents.get(0); + + assertEquals(EntityManagerFactory.class.getName(), reference.getInterface()); + assertEquals("(&(org.apache.aries.jpa.proxy.factory=*)(osgi.unit.name=myUnit))", reference.getFilter()); + + Map props = new HashMap(); + props.put(PersistenceContextProvider.PERSISTENCE_CONTEXT_TYPE, PersistenceContextType.TRANSACTION); + Skeleton.getSkeleton(manager).assertNotCalled( + new MethodCall(PersistenceContextProvider.class, "registerContext", String.class, Bundle.class, Map.class)); + } + + @Test public void testContextWithProps() { Element e = getTestElement("contextWithProps"); BeanMetadata bean = @@ -258,4 +285,11 @@ return null; } + + @Test + public void testgetSchemaLocation() + { + assertNotNull("No schema found", sut.getSchemaLocation(NSHandler.NS_URI)); + assertNull("No schema expected", sut.getSchemaLocation("http://maven.apache.org/POM/4.0.0")); + } }