Author: timothyjward
Date: Thu Jan 7 11:27:21 2010
New Revision: 896849
URL: http://svn.apache.org/viewvc?rev=896849&view=rev
Log:
ARIES-80: Deliver a persistence descriptor parser.
Modified:
incubator/aries/trunk/jpa/jpa-container/pom.xml
incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/parsing/PersistenceXMLParsingTest.java
incubator/aries/trunk/jpa/pom.xml
incubator/aries/trunk/pom.xml
Modified: incubator/aries/trunk/jpa/jpa-container/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container/pom.xml?rev=896849&r1=896848&r2=896849&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-container/pom.xml Thu Jan 7 11:27:21 2010
@@ -33,4 +33,26 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${pom.groupId}.container</Bundle-SymbolicName>
+ <Export-Package>
+
org.apache.aries.jpa.container.parsing;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>
\ No newline at end of file
Modified:
incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/parsing/PersistenceXMLParsingTest.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/parsing/PersistenceXMLParsingTest.java?rev=896849&r1=896848&r2=896849&view=diff
==============================================================================
---
incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/parsing/PersistenceXMLParsingTest.java
(original)
+++
incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/parsing/PersistenceXMLParsingTest.java
Thu Jan 7 11:27:21 2010
@@ -26,7 +26,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
@@ -52,8 +51,8 @@
{
InputStream is = null;
try {
- String location = "src/test/resources/file1/META-INF/persistence.xml";
- is = new FileInputStream(location);
+ String location = "file1/META-INF/persistence.xml";
+ is = getClass().getClassLoader().getResourceAsStream(location);
PersistenceDescriptor descriptor = new
PersistenceDescriptorImpl(location, is);
Bundle b = Skeleton.newMock(Bundle.class);
@@ -202,8 +201,8 @@
InputStream is = null;
try {
- String location = "src/test/resources/file2/META-INF/persistence.xml";
- is = new FileInputStream(location);
+ String location = "file2/META-INF/persistence.xml";
+ is = getClass().getClassLoader().getResourceAsStream(location);
PersistenceDescriptor descriptor = new
PersistenceDescriptorImpl(location, is);
Bundle b = Skeleton.newMock(Bundle.class);
@@ -222,8 +221,8 @@
InputStream is = null;
try {
- String location = "src/test/resources/file3/META-INF/persistence.xml";
- is = new FileInputStream(location);
+ String location = "file3/META-INF/persistence.xml";
+ is = getClass().getClassLoader().getResourceAsStream(location);
PersistenceDescriptor descriptor = new
PersistenceDescriptorImpl(location, is);
Bundle b = Skeleton.newMock(Bundle.class);
Modified: incubator/aries/trunk/jpa/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/pom.xml?rev=896849&r1=896848&r2=896849&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/pom.xml (original)
+++ incubator/aries/trunk/jpa/pom.xml Thu Jan 7 11:27:21 2010
@@ -11,7 +11,7 @@
<name>Aries JPA Component</name>
<version>1.0.0-incubating-SNAPSHOT</version>
<modules>
- <!-- <module>jpa-container</module> -->
+ <module>jpa-container</module>
</modules>
<dependencyManagement>
<dependencies>
Modified: incubator/aries/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/pom.xml?rev=896849&r1=896848&r2=896849&view=diff
==============================================================================
--- incubator/aries/trunk/pom.xml (original)
+++ incubator/aries/trunk/pom.xml Thu Jan 7 11:27:21 2010
@@ -44,6 +44,7 @@
<module>transaction</module>
<module>application</module>
<module>jmx</module>
+ <module>jpa</module>
</modules>
</project>
