You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ga...@apache.org on 2010/06/16 02:52:47 UTC

svn commit: r955102 [1/10] - in /incubator/aries/trunk/jpa: ./ jpa-api/ jpa-api/src/main/java/org/apache/aries/jpa/container/ jpa-api/src/main/java/org/apache/aries/jpa/container/context/ jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/ jp...

Author: gawor
Date: Wed Jun 16 00:52:45 2010
New Revision: 955102

URL: http://svn.apache.org/viewvc?rev=955102&view=rev
Log:
set svn properties - no other changes

Modified:
    incubator/aries/trunk/jpa/jpa-api/pom.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfo.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfoFactory.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/PersistenceUnitConstants.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/PersistenceContextProvider.java   (props changed)
    incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/ParsedPersistenceUnit.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptor.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParser.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParserException.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java   (props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/OSGI-INF/blueprint/jpa.xml   (props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/org/apache/aries/jpa/blueprint/namespace/jpa.xsd   (props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java   (props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/resources/jpa.xml   (props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/JPATestBean.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/Car.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/injection.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-blueprint-testbundle/src/main/resources/OSGI-INF/persistence/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-context/pom.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/GlobalPersistenceManager.java   (props changed)
    incubator/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/ManagedPersistenceContextFactory.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/PersistenceContextManager.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManager.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAPersistenceContextRegistry.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-context/src/main/resources/OSGI-INF/blueprint/jpa.xml   (props changed)
    incubator/aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/impl/PersistenceContextManagerTest.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/transaction/impl/JTAPersistenceContextRegistryTest.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-itest/pom.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-testbundle/pom.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/Car.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container-testbundle/src/main/resources/OSGI-INF/persistence/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/pom.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/EntityManagerFactoryManager.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidPersistenceUnitException.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidRangeCombination.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleHelper.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceDescriptorImpl.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/EarlyParserReturn.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/JPAHandler.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/PersistenceDescriptorParserImpl.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/PersistenceUnitImpl.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/SchemaLocatingHandler.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/BundleDelegatingClassLoader.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/ManagedPersistenceUnitInfoFactoryImpl.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/ManagedPersistenceUnitInfoImpl.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/TempBundleDelegatingClassLoader.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/main/resources/OSGI-INF/blueprint/jpa.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/parsing/PersistenceXMLParsingTest.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/util/FakeManagedPersistenceUnitFactory.java   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file1/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file10/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file11/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file12/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file13/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file14/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file15/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file16/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file17/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file18/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file19/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file2/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file20/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file21/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file21/OSGI-INF/found.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file21/OSGI-INF/not-found.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file21/persistence/another.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file22/META-INF/persistence.xml   (props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file3/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file4/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file5/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file6/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file7/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file8/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/jpa-container/src/test/resources/file9/META-INF/persistence.xml   (contents, props changed)
    incubator/aries/trunk/jpa/pom.xml   (contents, props changed)

Modified: incubator/aries/trunk/jpa/jpa-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-api/pom.xml?rev=955102&r1=955101&r2=955102&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-api/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-api/pom.xml Wed Jun 16 00:52:45 2010
@@ -1,75 +1,75 @@
-<?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">
-    <parent>
-        <artifactId>jpa</artifactId>
-        <groupId>org.apache.aries.jpa</groupId>
-        <version>0.2-incubating-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.aries.jpa.api</artifactId>
-    <packaging>bundle</packaging>
-    <name>Aries JPA Container API</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>
-                            javax.persistence;version="[1.0.0,2.1.0)",
-                            javax.persistence.spi;version="[1.0.0,2.1.0)",
-                            org.osgi.framework;version="[1.5.0,2.0.0)",
-                        </Import-Package>
-                        <Export-Package>
-                            org.apache.aries.jpa.container.parsing;version="${pom.version}",
-                            org.apache.aries.jpa.container;version="${pom.version}",
-                            org.apache.aries.jpa.container.context;version="${pom.version}"
-                        </Export-Package>
-                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<?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">
+    <parent>
+        <artifactId>jpa</artifactId>
+        <groupId>org.apache.aries.jpa</groupId>
+        <version>0.2-incubating-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.aries.jpa.api</artifactId>
+    <packaging>bundle</packaging>
+    <name>Aries JPA Container API</name>
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Import-Package>
+                            javax.persistence;version="[1.0.0,2.1.0)",
+                            javax.persistence.spi;version="[1.0.0,2.1.0)",
+                            org.osgi.framework;version="[1.5.0,2.0.0)",
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.aries.jpa.container.parsing;version="${pom.version}",
+                            org.apache.aries.jpa.container;version="${pom.version}",
+                            org.apache.aries.jpa.container.context;version="${pom.version}"
+                        </Export-Package>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: incubator/aries/trunk/jpa/jpa-api/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-api/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-api/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfo.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfo.java?rev=955102&r1=955101&r2=955102&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfo.java (original)
+++ incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfo.java Wed Jun 16 00:52:45 2010
@@ -1,54 +1,54 @@
-/*
- * 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 WARRANTIESOR 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.container;
-
-import java.util.Map;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitInfo;
-
-/**
- * This interface is used to provide the Aries JPA container with
- * the information it needs to create a container {@link EntityManagerFactory}
- * using the {@link PersistenceProvider} service from a JPA provider.
- * Instances of this interface should be obtained from a 
- * {@link ManagedPersistenceUnitInfoFactory}
- */
-public interface ManagedPersistenceUnitInfo {
-
-  /**
-   * Get the {@link PersistenceUnitInfo} object for this persistence unit.
-   * This method should only be called when the backing bundle for the
-   * persistence unit has been resolved. If the bundle later becomes unresolved
-   * then any {@link PersistenceUnitInfo} objects obtained from this object
-   * will be discarded.
-   * 
-   * @return A {@link PersistenceUnitInfo} that can be used to create an {@link EntityManagerFactory}
-   */
-  public PersistenceUnitInfo getPersistenceUnitInfo();
-  
-  /**
-   * Get a {@link Map} of continer properties to pass to the {@link PersistenceProvider}
-   * when creating an {@link EntityManagerFactory}.  
-   * @return A {@link Map} of properties, or null if no properties are needed.
-   */
-  public Map<String, Object> getContainerProperties();
-  
-}
+/*
+ * 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 WARRANTIESOR 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.container;
+
+import java.util.Map;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.spi.PersistenceProvider;
+import javax.persistence.spi.PersistenceUnitInfo;
+
+/**
+ * This interface is used to provide the Aries JPA container with
+ * the information it needs to create a container {@link EntityManagerFactory}
+ * using the {@link PersistenceProvider} service from a JPA provider.
+ * Instances of this interface should be obtained from a 
+ * {@link ManagedPersistenceUnitInfoFactory}
+ */
+public interface ManagedPersistenceUnitInfo {
+
+  /**
+   * Get the {@link PersistenceUnitInfo} object for this persistence unit.
+   * This method should only be called when the backing bundle for the
+   * persistence unit has been resolved. If the bundle later becomes unresolved
+   * then any {@link PersistenceUnitInfo} objects obtained from this object
+   * will be discarded.
+   * 
+   * @return A {@link PersistenceUnitInfo} that can be used to create an {@link EntityManagerFactory}
+   */
+  public PersistenceUnitInfo getPersistenceUnitInfo();
+  
+  /**
+   * Get a {@link Map} of continer properties to pass to the {@link PersistenceProvider}
+   * when creating an {@link EntityManagerFactory}.  
+   * @return A {@link Map} of properties, or null if no properties are needed.
+   */
+  public Map<String, Object> getContainerProperties();
+  
+}

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfo.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfoFactory.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfoFactory.java?rev=955102&r1=955101&r2=955102&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfoFactory.java (original)
+++ incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfoFactory.java Wed Jun 16 00:52:45 2010
@@ -1,117 +1,117 @@
-/*
- * 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 WARRANTIESOR 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.container;
-
-import java.util.Collection;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitInfo;
-
-import org.apache.aries.jpa.container.parsing.ParsedPersistenceUnit;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-/**
- * A Factory for {@link ManagedPersistenceUnitInfo} objects.
- * 
- * This interface marks a plug-point for implementations that wish to extend
- * the Aries JPA Container by providing customized {@link PersistenceUnitInfo}
- * objects.
- *
- * Customized implementations can be provided in two ways:
- * <ul>
- *   <li>
- *     By setting a config property of the "container" bean in in the blueprint for this bundle.
- *   </li>
- *   <li>
- *     By adding a config property to a properties file added to this bundle using a fragment.
- *     The properties file should be named "org.apache.aries.jpa.container.properties" and be
- *     available at the root of the classpath. This properties file name is available as a
- *     constant ARIES_JPA_CONTAINER_PROPERTIES.
- *   </li>
- * </ul>
- * 
- * Note that properties provided through the properties file will override properties supplied
- * through the blueprint container.
- * 
- * The property key to use is "org.apache.aries.jpa.container.ManagedPersistenceUnitInfoFactory"
- * and is accessible using the DEFAULT_PU_INFO_FACTORY_KEY field. The value associated with this
- * key should be the class name of the {@link ManagedPersistenceUnitInfoFactory} implementation
- * that should be used. The provided class name must be loadable by this bundle.
- * 
- * Implementations of this interface <b>must</b> have a no-args constructor and be safe for
- * use by multiple concurrent threads.
- * 
- * No locks will be held by the JPA container or framework when calling methods on this interface.
- */
-public interface ManagedPersistenceUnitInfoFactory {
-  /** 
-   * The config property key that should be used to provide a customized
-   * {@link ManagedPersistenceUnitInfoFactory} to the Aries JPA Container
-   */
-  public static final String DEFAULT_PU_INFO_FACTORY_KEY = "org.apache.aries.jpa.container.ManagedPersistenceUnitInfoFactory";
-  /** 
-   * The name of the config properties file that can be used to configure
-   * the Aries JPA Container 
-   */
-  public static final String ARIES_JPA_CONTAINER_PROPERTIES = "org.apache.aries.jpa.container.properties";
-
-  /**
-   * This method will be called by the Aries JPA container when persistence descriptors have
-   * been located in a persistence bundle.
-   * 
-   * @param containerContext  The {@link BundleContext} for the container bundle. This can be
-   *                          used to get services from the service registry when creating
-   *                          {@link PersistenceUnitInfo} objects.
-   * @param persistenceBundle The {@link Bundle} defining the persistence units. This bundle may
-   *                          be in any state, and so may not have a usable {@link BundleContext}
-   *                          or be able to load classes.
-   * @param providerReference A {@link ServiceReference} for the {@link PersistenceProvider} service
-   *                          that will be used to create {@link EntityManagerFactory} objects from
-   *                          these persistence units.
-   * @param persistenceMetadata A {@link Collection} of {@link ParsedPersistenceUnit} objects containing the
-   *                            metadata from the persistence descriptor.
-   * @return A Collection of {@link ManagedPersistenceUnitInfo} objects that can be used to create {@link EntityManagerFactory} instances
-   */
-  public Collection<ManagedPersistenceUnitInfo> createManagedPersistenceUnitMetadata(BundleContext containerContext, Bundle persistenceBundle, ServiceReference providerReference, Collection<ParsedPersistenceUnit> persistenceMetadata);
-  
-  /**
-   * If no persistence units in a persistence bundle specify a JPA {@link PersistenceProvider} 
-   * implementation class, then the JPA container will call this method to obtain a default
-   * provider to use.
-   * @return A {@link PersistenceProvider} implementation class name, or null if no default is
-   *         specified.
-   */
-  public String getDefaultProviderClassName();
-
-  /**
-   * This method will be called when the persistence bundle is no longer being managed. This may
-   * be because the bundle is being updated, or because the {@link PersistenceProvider} being
-   * used is no longer available.
-   * 
-   * When this method is called implementations should clear up any resources associated with
-   * persistence units defined by the persistence bundle. 
-   * 
-   * @param containerContext  The {@link BundleContext} for the container bundle. 
-   * @param persistenceBundle The persistence bundle that is no longer valid.
-   */
-  public void destroyPersistenceBundle(BundleContext containerContext, Bundle persistenceBundle);
-}
+/*
+ * 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 WARRANTIESOR 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.container;
+
+import java.util.Collection;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.spi.PersistenceProvider;
+import javax.persistence.spi.PersistenceUnitInfo;
+
+import org.apache.aries.jpa.container.parsing.ParsedPersistenceUnit;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * A Factory for {@link ManagedPersistenceUnitInfo} objects.
+ * 
+ * This interface marks a plug-point for implementations that wish to extend
+ * the Aries JPA Container by providing customized {@link PersistenceUnitInfo}
+ * objects.
+ *
+ * Customized implementations can be provided in two ways:
+ * <ul>
+ *   <li>
+ *     By setting a config property of the "container" bean in in the blueprint for this bundle.
+ *   </li>
+ *   <li>
+ *     By adding a config property to a properties file added to this bundle using a fragment.
+ *     The properties file should be named "org.apache.aries.jpa.container.properties" and be
+ *     available at the root of the classpath. This properties file name is available as a
+ *     constant ARIES_JPA_CONTAINER_PROPERTIES.
+ *   </li>
+ * </ul>
+ * 
+ * Note that properties provided through the properties file will override properties supplied
+ * through the blueprint container.
+ * 
+ * The property key to use is "org.apache.aries.jpa.container.ManagedPersistenceUnitInfoFactory"
+ * and is accessible using the DEFAULT_PU_INFO_FACTORY_KEY field. The value associated with this
+ * key should be the class name of the {@link ManagedPersistenceUnitInfoFactory} implementation
+ * that should be used. The provided class name must be loadable by this bundle.
+ * 
+ * Implementations of this interface <b>must</b> have a no-args constructor and be safe for
+ * use by multiple concurrent threads.
+ * 
+ * No locks will be held by the JPA container or framework when calling methods on this interface.
+ */
+public interface ManagedPersistenceUnitInfoFactory {
+  /** 
+   * The config property key that should be used to provide a customized
+   * {@link ManagedPersistenceUnitInfoFactory} to the Aries JPA Container
+   */
+  public static final String DEFAULT_PU_INFO_FACTORY_KEY = "org.apache.aries.jpa.container.ManagedPersistenceUnitInfoFactory";
+  /** 
+   * The name of the config properties file that can be used to configure
+   * the Aries JPA Container 
+   */
+  public static final String ARIES_JPA_CONTAINER_PROPERTIES = "org.apache.aries.jpa.container.properties";
+
+  /**
+   * This method will be called by the Aries JPA container when persistence descriptors have
+   * been located in a persistence bundle.
+   * 
+   * @param containerContext  The {@link BundleContext} for the container bundle. This can be
+   *                          used to get services from the service registry when creating
+   *                          {@link PersistenceUnitInfo} objects.
+   * @param persistenceBundle The {@link Bundle} defining the persistence units. This bundle may
+   *                          be in any state, and so may not have a usable {@link BundleContext}
+   *                          or be able to load classes.
+   * @param providerReference A {@link ServiceReference} for the {@link PersistenceProvider} service
+   *                          that will be used to create {@link EntityManagerFactory} objects from
+   *                          these persistence units.
+   * @param persistenceMetadata A {@link Collection} of {@link ParsedPersistenceUnit} objects containing the
+   *                            metadata from the persistence descriptor.
+   * @return A Collection of {@link ManagedPersistenceUnitInfo} objects that can be used to create {@link EntityManagerFactory} instances
+   */
+  public Collection<ManagedPersistenceUnitInfo> createManagedPersistenceUnitMetadata(BundleContext containerContext, Bundle persistenceBundle, ServiceReference providerReference, Collection<ParsedPersistenceUnit> persistenceMetadata);
+  
+  /**
+   * If no persistence units in a persistence bundle specify a JPA {@link PersistenceProvider} 
+   * implementation class, then the JPA container will call this method to obtain a default
+   * provider to use.
+   * @return A {@link PersistenceProvider} implementation class name, or null if no default is
+   *         specified.
+   */
+  public String getDefaultProviderClassName();
+
+  /**
+   * This method will be called when the persistence bundle is no longer being managed. This may
+   * be because the bundle is being updated, or because the {@link PersistenceProvider} being
+   * used is no longer available.
+   * 
+   * When this method is called implementations should clear up any resources associated with
+   * persistence units defined by the persistence bundle. 
+   * 
+   * @param containerContext  The {@link BundleContext} for the container bundle. 
+   * @param persistenceBundle The persistence bundle that is no longer valid.
+   */
+  public void destroyPersistenceBundle(BundleContext containerContext, Bundle persistenceBundle);
+}

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfoFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfoFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfoFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/PersistenceUnitConstants.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/PersistenceUnitConstants.java?rev=955102&r1=955101&r2=955102&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/PersistenceUnitConstants.java (original)
+++ incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/PersistenceUnitConstants.java Wed Jun 16 00:52:45 2010
@@ -1,39 +1,39 @@
-/*
- * 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 WARRANTIESOR 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.container;
-
-import javax.persistence.spi.PersistenceProvider;
-
-/**
- * Constants used when registering Persistence Units in the service registry
- */
-public interface PersistenceUnitConstants {
-  /** The service property key mapped to the persistence unit name */
-  public static final String OSGI_UNIT_NAME = "osgi.unit.name";
-  /** The version of the persistence bundle as a {@link Version} object*/
-  public static final String OSGI_UNIT_VERSION = "osgi.unit.version";
-  /** The service property key mapped to the {@link PersistenceProvider} implementation class name */
-  public static final String OSGI_UNIT_PROVIDER = "osgi.unit.provider";
-  /** The service property key mapped to a Boolean indicating whether this persistence unit is container managed */ 
-  public static final String CONTAINER_MANAGED_PERSISTENCE_UNIT = "org.apache.aries.jpa.container.managed";
-  /** The service property key mapped to a Boolean indicating whether this persistence unit has the default (empty string) unit name 
-   *  This allows clients to filter for empty string persistence unit names.
-   */
-  public static final String EMPTY_PERSISTENCE_UNIT_NAME = "org.apache.aries.jpa.default.unit.name";
-}
+/*
+ * 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 WARRANTIESOR 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.container;
+
+import javax.persistence.spi.PersistenceProvider;
+
+/**
+ * Constants used when registering Persistence Units in the service registry
+ */
+public interface PersistenceUnitConstants {
+  /** The service property key mapped to the persistence unit name */
+  public static final String OSGI_UNIT_NAME = "osgi.unit.name";
+  /** The version of the persistence bundle as a {@link Version} object*/
+  public static final String OSGI_UNIT_VERSION = "osgi.unit.version";
+  /** The service property key mapped to the {@link PersistenceProvider} implementation class name */
+  public static final String OSGI_UNIT_PROVIDER = "osgi.unit.provider";
+  /** The service property key mapped to a Boolean indicating whether this persistence unit is container managed */ 
+  public static final String CONTAINER_MANAGED_PERSISTENCE_UNIT = "org.apache.aries.jpa.container.managed";
+  /** The service property key mapped to a Boolean indicating whether this persistence unit has the default (empty string) unit name 
+   *  This allows clients to filter for empty string persistence unit names.
+   */
+  public static final String EMPTY_PERSISTENCE_UNIT_NAME = "org.apache.aries.jpa.default.unit.name";
+}

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/PersistenceUnitConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/PersistenceUnitConstants.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/PersistenceUnitConstants.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/PersistenceContextProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/PersistenceContextProvider.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/PersistenceContextProvider.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/ParsedPersistenceUnit.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/ParsedPersistenceUnit.java?rev=955102&r1=955101&r2=955102&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/ParsedPersistenceUnit.java (original)
+++ incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/ParsedPersistenceUnit.java Wed Jun 16 00:52:45 2010
@@ -1,90 +1,90 @@
-/*
- * 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 WARRANTIESOR 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.container.parsing;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.osgi.framework.Bundle;
-
-/**
- * This interface provides access to the information defined by a 
- * persistence unit in a persistence descriptor.
- * 
- * Implementations of this interface will be returned by calls to
- * {@link PersistenceDescriptorParser}.
- */
-public interface ParsedPersistenceUnit {
-  /*
-   * Keys for use in the PersistenceXml Map
-   * Stored values are Strings unless otherwise specified, and all values
-   * other than the schema version and unit name may be null. A null value
-   * indicates that the element/attribute was not present in the xml.
-   */
-  
-  /** The version of the JPA schema being used */
-  public static final String SCHEMA_VERSION = "org.apache.aries.jpa.schema.version";
-  /** The name of the persistence unit */
-  public static final String UNIT_NAME = "org.apache.aries.jpa.unit.name";
-  /** The Transaction type of the persistence unit */
-  public static final String TRANSACTION_TYPE = "org.apache.aries.jpa.transaction.type";
-  /** A {@link List} of {@link String} mapping file names */
-  public static final String MAPPING_FILES = "org.apache.aries.jpa.mapping.files";
-  /** A {@link List} of {@link String} jar file names */
-  public static final String JAR_FILES = "org.apache.aries.jpa.jar.files";
-  /** A {@link List} of {@link String} managed class names */
-  public static final String MANAGED_CLASSES = "org.apache.aries.jpa.managed.classes";
-  /** A {@link Properties} object containing the properties from the persistence unit */
-  public static final String PROPERTIES = "org.apache.aries.jpa.properties";
-  /** The provider class name */
-  public static final String PROVIDER_CLASSNAME = "org.apache.aries.jpa.provider";
-  /** The jta-datasource name */
-  public static final String JTA_DATASOURCE = "org.apache.aries.jpa.jta.datasource";
-  /** The non-jta-datasource name */
-  public static final String NON_JTA_DATASOURCE = "org.apache.aries.jpa.non.jta.datasource";
-  /** A {@link Boolean} indicating whether unlisted classes should be excluded */
-  public static final String EXCLUDE_UNLISTED_CLASSES = "org.apache.aries.jpa.exclude.unlisted";
-  
-  /* JPA 2 extensions */
-  
-  /** The caching type of the persistence unit. This will only be available for JPA2 persistence units. */
-  public static final String SHARED_CACHE_MODE = "org.apache.aries.jpa2.shared.cache.mode";
-  /** The validation mode of the persistence unit. This will only be available for JPA2 persistence units. */
-  public static final String VALIDATION_MODE = "org.apache.aries.jpa2.validation.mode";
-  
-  
-  /* End of Map keys */
-  
-  /** This property is used in the JPA properties to indicate a provider version range */
-  public static final String JPA_PROVIDER_VERSION = "org.apache.aries.jpa.provider.version";
-
-  /**
-   * Return the persistence bundle that defines this persistence unit
-   * @return
-   */
-  public Bundle getDefiningBundle();
-
-  /**
-   * Returns a deep copy of the persistence metadata, modifications to the
-   * returned {@link Map} will not be reflected in future calls. 
-   * @return
-   */
-  public Map<String, Object> getPersistenceXmlMetadata();
-}
+/*
+ * 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 WARRANTIESOR 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.container.parsing;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import org.osgi.framework.Bundle;
+
+/**
+ * This interface provides access to the information defined by a 
+ * persistence unit in a persistence descriptor.
+ * 
+ * Implementations of this interface will be returned by calls to
+ * {@link PersistenceDescriptorParser}.
+ */
+public interface ParsedPersistenceUnit {
+  /*
+   * Keys for use in the PersistenceXml Map
+   * Stored values are Strings unless otherwise specified, and all values
+   * other than the schema version and unit name may be null. A null value
+   * indicates that the element/attribute was not present in the xml.
+   */
+  
+  /** The version of the JPA schema being used */
+  public static final String SCHEMA_VERSION = "org.apache.aries.jpa.schema.version";
+  /** The name of the persistence unit */
+  public static final String UNIT_NAME = "org.apache.aries.jpa.unit.name";
+  /** The Transaction type of the persistence unit */
+  public static final String TRANSACTION_TYPE = "org.apache.aries.jpa.transaction.type";
+  /** A {@link List} of {@link String} mapping file names */
+  public static final String MAPPING_FILES = "org.apache.aries.jpa.mapping.files";
+  /** A {@link List} of {@link String} jar file names */
+  public static final String JAR_FILES = "org.apache.aries.jpa.jar.files";
+  /** A {@link List} of {@link String} managed class names */
+  public static final String MANAGED_CLASSES = "org.apache.aries.jpa.managed.classes";
+  /** A {@link Properties} object containing the properties from the persistence unit */
+  public static final String PROPERTIES = "org.apache.aries.jpa.properties";
+  /** The provider class name */
+  public static final String PROVIDER_CLASSNAME = "org.apache.aries.jpa.provider";
+  /** The jta-datasource name */
+  public static final String JTA_DATASOURCE = "org.apache.aries.jpa.jta.datasource";
+  /** The non-jta-datasource name */
+  public static final String NON_JTA_DATASOURCE = "org.apache.aries.jpa.non.jta.datasource";
+  /** A {@link Boolean} indicating whether unlisted classes should be excluded */
+  public static final String EXCLUDE_UNLISTED_CLASSES = "org.apache.aries.jpa.exclude.unlisted";
+  
+  /* JPA 2 extensions */
+  
+  /** The caching type of the persistence unit. This will only be available for JPA2 persistence units. */
+  public static final String SHARED_CACHE_MODE = "org.apache.aries.jpa2.shared.cache.mode";
+  /** The validation mode of the persistence unit. This will only be available for JPA2 persistence units. */
+  public static final String VALIDATION_MODE = "org.apache.aries.jpa2.validation.mode";
+  
+  
+  /* End of Map keys */
+  
+  /** This property is used in the JPA properties to indicate a provider version range */
+  public static final String JPA_PROVIDER_VERSION = "org.apache.aries.jpa.provider.version";
+
+  /**
+   * Return the persistence bundle that defines this persistence unit
+   * @return
+   */
+  public Bundle getDefiningBundle();
+
+  /**
+   * Returns a deep copy of the persistence metadata, modifications to the
+   * returned {@link Map} will not be reflected in future calls. 
+   * @return
+   */
+  public Map<String, Object> getPersistenceXmlMetadata();
+}

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/ParsedPersistenceUnit.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/ParsedPersistenceUnit.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/ParsedPersistenceUnit.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptor.java?rev=955102&r1=955101&r2=955102&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptor.java (original)
+++ incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptor.java Wed Jun 16 00:52:45 2010
@@ -1,50 +1,50 @@
-/*
- * 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 WARRANTIESOR 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.container.parsing;
-
-import java.io.InputStream;
-
-/**
- * This is a utility interface that is used by the {@link PersistenceDescriptorParser}.
- *
- * This interfaces provides access to a single {@link InputStream} that returns the bytes
- * of the persistence descriptor, and a String denoting the location of the persistence
- * descriptor as present in the persistence bundle's Meta-Persistence header. 
- */
-public interface PersistenceDescriptor {
-
-  /**
-   * Get the location of the persistence descriptor as it appears in the
-   * Meta-Persistence header. The default location should be returned as
-   * "META-INF/persistence.xml".
-   * @return
-   */
-  public String getLocation();
-
-  /**
-   * Get an {@link InputStream} to the persistence descriptor. This method need not return a
-   * new {@link InputStream} each time, and it is undefined for multiple clients to attempt to use
-   * the {@link InputStream} from this {@link PersistenceDescriptor}. It is also undefined for a
-   * client to try to retrieve multiple {@link InputStream} objects from this method.
-   *
-   * @return An {@link InputStream} to the persistence descriptor.
-   */
-  public InputStream getInputStream();
-
+/*
+ * 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 WARRANTIESOR 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.container.parsing;
+
+import java.io.InputStream;
+
+/**
+ * This is a utility interface that is used by the {@link PersistenceDescriptorParser}.
+ *
+ * This interfaces provides access to a single {@link InputStream} that returns the bytes
+ * of the persistence descriptor, and a String denoting the location of the persistence
+ * descriptor as present in the persistence bundle's Meta-Persistence header. 
+ */
+public interface PersistenceDescriptor {
+
+  /**
+   * Get the location of the persistence descriptor as it appears in the
+   * Meta-Persistence header. The default location should be returned as
+   * "META-INF/persistence.xml".
+   * @return
+   */
+  public String getLocation();
+
+  /**
+   * Get an {@link InputStream} to the persistence descriptor. This method need not return a
+   * new {@link InputStream} each time, and it is undefined for multiple clients to attempt to use
+   * the {@link InputStream} from this {@link PersistenceDescriptor}. It is also undefined for a
+   * client to try to retrieve multiple {@link InputStream} objects from this method.
+   *
+   * @return An {@link InputStream} to the persistence descriptor.
+   */
+  public InputStream getInputStream();
+
 }
\ No newline at end of file

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptor.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptor.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParser.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParser.java?rev=955102&r1=955101&r2=955102&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParser.java (original)
+++ incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParser.java Wed Jun 16 00:52:45 2010
@@ -1,43 +1,43 @@
-/**
- * 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.container.parsing;
-
-import java.util.Collection;
-
-import org.osgi.framework.Bundle;
-
-/**
- * A utility service for parsing JPA persistence descriptors 
- */
-public interface PersistenceDescriptorParser {
-
-  /**
-   * Parse the supplied {@link PersistenceDescriptor} 
-   * 
-   * @param b  The bundle that contains the persistence descriptor
-   * @param descriptor The descriptor
-   * 
-   * @return A collection of {@link ParsedPersistenceUnit}
-   * @throws PersistenceDescriptorParserException  if any error occurs in parsing
-   */
-  public abstract Collection<ParsedPersistenceUnit> parse(Bundle b,
-      PersistenceDescriptor descriptor)
-      throws PersistenceDescriptorParserException;
-
+/**
+ * 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.container.parsing;
+
+import java.util.Collection;
+
+import org.osgi.framework.Bundle;
+
+/**
+ * A utility service for parsing JPA persistence descriptors 
+ */
+public interface PersistenceDescriptorParser {
+
+  /**
+   * Parse the supplied {@link PersistenceDescriptor} 
+   * 
+   * @param b  The bundle that contains the persistence descriptor
+   * @param descriptor The descriptor
+   * 
+   * @return A collection of {@link ParsedPersistenceUnit}
+   * @throws PersistenceDescriptorParserException  if any error occurs in parsing
+   */
+  public abstract Collection<ParsedPersistenceUnit> parse(Bundle b,
+      PersistenceDescriptor descriptor)
+      throws PersistenceDescriptorParserException;
+
 }
\ No newline at end of file

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParser.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParser.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParser.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParserException.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParserException.java?rev=955102&r1=955101&r2=955102&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParserException.java (original)
+++ incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParserException.java Wed Jun 16 00:52:45 2010
@@ -1,49 +1,49 @@
-/*
- * 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 WARRANTIESOR 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.container.parsing;
-
-/**
- * This Exception will be thrown when there was an error parsing a PersistenceDescriptor
- * It will use the standard chaining mechanism to wrap the Exception thrown by the parser. 
- */
-public class PersistenceDescriptorParserException extends Exception {
-
-  /**
-   * Construct a PersistenceDescriptorException
-   * @param string 
-   * @param e the exception to wrap
-   */
-  public PersistenceDescriptorParserException(String string, Exception e) {
-    super(string, e);
-  }
-
-  /**
-   * Construct a PersistenceDescriptorException
-   * @param string 
-   */
-  public PersistenceDescriptorParserException(String string) {
-    super(string);
-  }
-  
-  /**
-   * For Serialization
-   */
-  private static final long serialVersionUID = -8960763303021136544L;
-
-}
+/*
+ * 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 WARRANTIESOR 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.container.parsing;
+
+/**
+ * This Exception will be thrown when there was an error parsing a PersistenceDescriptor
+ * It will use the standard chaining mechanism to wrap the Exception thrown by the parser. 
+ */
+public class PersistenceDescriptorParserException extends Exception {
+
+  /**
+   * Construct a PersistenceDescriptorException
+   * @param string 
+   * @param e the exception to wrap
+   */
+  public PersistenceDescriptorParserException(String string, Exception e) {
+    super(string, e);
+  }
+
+  /**
+   * Construct a PersistenceDescriptorException
+   * @param string 
+   */
+  public PersistenceDescriptorParserException(String string) {
+    super(string);
+  }
+  
+  /**
+   * For Serialization
+   */
+  private static final long serialVersionUID = -8960763303021136544L;
+
+}

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParserException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParserException.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParserException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=955102&r1=955101&r2=955102&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml Wed Jun 16 00:52:45 2010
@@ -1,102 +1,102 @@
-<?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">
-    <parent>
-        <artifactId>jpa</artifactId>
-        <groupId>org.apache.aries.jpa</groupId>
-        <version>0.2-incubating-SNAPSHOT</version>
-    </parent>
-    <name>Aries JPA Container blueprint integration for Aries blueprint</name>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.jpa</groupId>
-            <artifactId>org.apache.aries.jpa.api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.testsupport</groupId>
-            <artifactId>org.apache.aries.testsupport.unit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>
-                            javax.persistence;version="[1.0.0,3.0.0)",
-                            org.apache.aries.jpa.container.context;version="[0.1.0,1.1.0)",
-                            org.apache.aries.blueprint;version="[0.1.0,1.1.0)",
-                            *
-                        </Import-Package>
-                        <Export-Service>
-                            org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace=http://aries.apache.org/xmlns/jpa/v1.0.0
-                        </Export-Service>
-                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<?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">
+    <parent>
+        <artifactId>jpa</artifactId>
+        <groupId>org.apache.aries.jpa</groupId>
+        <version>0.2-incubating-SNAPSHOT</version>
+    </parent>
+    <name>Aries JPA Container blueprint integration for Aries blueprint</name>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>org.apache.aries.jpa.api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.testsupport</groupId>
+            <artifactId>org.apache.aries.testsupport.unit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Import-Package>
+                            javax.persistence;version="[1.0.0,3.0.0)",
+                            org.apache.aries.jpa.container.context;version="[0.1.0,1.1.0)",
+                            org.apache.aries.blueprint;version="[0.1.0,1.1.0)",
+                            *
+                        </Import-Package>
+                        <Export-Service>
+                            org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace=http://aries.apache.org/xmlns/jpa/v1.0.0
+                        </Export-Service>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/OSGI-INF/blueprint/jpa.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/OSGI-INF/blueprint/jpa.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/OSGI-INF/blueprint/jpa.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/org/apache/aries/jpa/blueprint/namespace/jpa.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/org/apache/aries/jpa/blueprint/namespace/jpa.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/org/apache/aries/jpa/blueprint/namespace/jpa.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/resources/jpa.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/resources/jpa.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-aries/src/test/resources/jpa.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml?rev=955102&r1=955101&r2=955102&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml Wed Jun 16 00:52:45 2010
@@ -1,62 +1,62 @@
-<?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">
-    <parent>
-        <artifactId>jpa</artifactId>
-        <groupId>org.apache.aries.jpa</groupId>
-        <version>0.2-incubating-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
-    <packaging>bundle</packaging>
-    <name>Test Bundle for Aries JPA Blueprint iTests</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>
-                            javax.persistence;version="[1.0.0,3.0.0)",
-                            *
-                        </Import-Package>
-						<Export-Package>
-                            org.apache.aries.jpa.blueprint.itest*;version="${pom.version}",
-						</Export-Package>
-                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
-                        <Meta-Persistence>OSGI-INF/persistence/persistence.xml</Meta-Persistence>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?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">
+    <parent>
+        <artifactId>jpa</artifactId>
+        <groupId>org.apache.aries.jpa</groupId>
+        <version>0.2-incubating-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
+    <packaging>bundle</packaging>
+    <name>Test Bundle for Aries JPA Blueprint iTests</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Import-Package>
+                            javax.persistence;version="[1.0.0,3.0.0)",
+                            *
+                        </Import-Package>
+						<Export-Package>
+                            org.apache.aries.jpa.blueprint.itest*;version="${pom.version}",
+						</Export-Package>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+                        <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
+                        <Meta-Persistence>OSGI-INF/persistence/persistence.xml</Meta-Persistence>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: incubator/aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml