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

svn commit: r910654 - in /incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm: pom.xml src/main/resources/META-INF/persistence.xml

Author: jbohn
Date: Tue Feb 16 19:24:07 2010
New Revision: 910654

URL: http://svn.apache.org/viewvc?rev=910654&view=rev
Log:
ARIES-144 eliminate duplicate persistence.xml and use the one in entities

Removed:
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/src/main/resources/META-INF/persistence.xml
Modified:
    incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml

Modified: incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml?rev=910654&r1=910653&r2=910654&view=diff
==============================================================================
--- incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml (original)
+++ incubator/aries/trunk/ariestrader-sample/modules/ariestrader-persist-jpa-cm/pom.xml Tue Feb 16 19:24:07 2010
@@ -78,7 +78,6 @@
                     <instructions>
                         <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${pom.version}</Bundle-Version>
-                        <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>
                         <Export-Package>
                             <!--org.apache.aries.samples.ariestrader.persist.jpa;version="${pom.version}"-->
                         </Export-Package>
@@ -87,7 +86,11 @@
                             org.apache.aries.samples.ariestrader.beans,
                             org.apache.aries.samples.ariestrader.persistence.api,
                             org.apache.aries.samples.ariestrader.util,
-                            javax.persistence;version="[1.0.0,2.1.0)"
+                            javax.persistence;version="[1.0.0,2.1.0)",
+                            javax.persistence.criteria;version="[1.0.0,2.1.0)";resolution:="optional",
+                            javax.persistence.metamodel;version="[1.0.0,2.1.0)";resolution:="optional",
+                            javax.persistence.spi;version="[1.0.0,2.1.0)";resolution:="optional",
+                            net.sf.cglib.proxy;resolution:="optional"
                         </Import-Package>
                         <Private-Package>
                             org.apache.aries.samples.ariestrader.persist.jpa