You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/21 17:24:59 UTC
svn commit: r1291894 - in /openejb/trunk/maven-plugins/xbean-xml/src/test: java/org/apache/openejb/xbean/xml/XmlClassesAnnotationFinderHelperTest.java java/org/apache/openejb/xbean/xml/XmlPackageAnnotationFinderTest.java resources/test-package-scan.xml

Author: rmannibucau
Date: Tue Feb 21 16:24:58 2012
New Revision: 1291894

URL: http://svn.apache.org/viewvc?rev=1291894&view=rev
Log:
fixing package test which was the same than the classes test

Modified:
    openejb/trunk/maven-plugins/xbean-xml/src/test/java/org/apache/openejb/xbean/xml/XmlClassesAnnotationFinderHelperTest.java
    openejb/trunk/maven-plugins/xbean-xml/src/test/java/org/apache/openejb/xbean/xml/XmlPackageAnnotationFinderTest.java
    openejb/trunk/maven-plugins/xbean-xml/src/test/resources/test-package-scan.xml

Modified: openejb/trunk/maven-plugins/xbean-xml/src/test/java/org/apache/openejb/xbean/xml/XmlClassesAnnotationFinderHelperTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/xbean-xml/src/test/java/org/apache/openejb/xbean/xml/XmlClassesAnnotationFinderHelperTest.java?rev=1291894&r1=1291893&r2=1291894&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/xbean-xml/src/test/java/org/apache/openejb/xbean/xml/XmlClassesAnnotationFinderHelperTest.java (original)
+++ openejb/trunk/maven-plugins/xbean-xml/src/test/java/org/apache/openejb/xbean/xml/XmlClassesAnnotationFinderHelperTest.java Tue Feb 21 16:24:58 2012
@@ -11,7 +11,7 @@ public class XmlClassesAnnotationFinderH
     @BeforeClass
     public static void initFinder() throws JAXBException {
         final ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        finder = XMLAnnotationFinderHelper.finderFromXml(loader.getResourceAsStream("test-scan.xml"), loader, null, null);
+        finder = XMLAnnotationFinderHelper.finderFromXml(loader.getResourceAsStream("test-scan.xml"), loader, null);
     }
 
     @Override

Modified: openejb/trunk/maven-plugins/xbean-xml/src/test/java/org/apache/openejb/xbean/xml/XmlPackageAnnotationFinderTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/xbean-xml/src/test/java/org/apache/openejb/xbean/xml/XmlPackageAnnotationFinderTest.java?rev=1291894&r1=1291893&r2=1291894&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/xbean-xml/src/test/java/org/apache/openejb/xbean/xml/XmlPackageAnnotationFinderTest.java (original)
+++ openejb/trunk/maven-plugins/xbean-xml/src/test/java/org/apache/openejb/xbean/xml/XmlPackageAnnotationFinderTest.java Tue Feb 21 16:24:58 2012
@@ -4,14 +4,17 @@ import org.apache.xbean.finder.IAnnotati
 import org.junit.BeforeClass;
 
 import javax.xml.bind.JAXBException;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.util.Arrays;
 
 public class XmlPackageAnnotationFinderTest extends AbstractXmlAnnotationFinderTest {
     private static IAnnotationFinder finder;
 
     @BeforeClass
-    public static void initFinder() throws JAXBException {
+    public static void initFinder() throws JAXBException, MalformedURLException {
         final ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        finder = XMLAnnotationFinderHelper.finderFromXml(loader.getResourceAsStream("test-package-scan.xml"), loader, null, null);
+        finder = XMLAnnotationFinderHelper.finderFromXml(loader.getResourceAsStream("test-package-scan.xml"), loader, Arrays.asList(new File("target/test-classes").toURI().toURL()), null);
     }
 
     @Override

Modified: openejb/trunk/maven-plugins/xbean-xml/src/test/resources/test-package-scan.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/maven-plugins/xbean-xml/src/test/resources/test-package-scan.xml?rev=1291894&r1=1291893&r2=1291894&view=diff
==============================================================================
--- openejb/trunk/maven-plugins/xbean-xml/src/test/resources/test-package-scan.xml (original)
+++ openejb/trunk/maven-plugins/xbean-xml/src/test/resources/test-package-scan.xml Tue Feb 21 16:24:58 2012
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <scan>
-  <classes>
-    <class>org.apache.openejb.xbean.xml.bean.MyBean1</class>
-    <class>org.apache.openejb.xbean.xml.bean.MyBean2</class>
-    <class>org.apache.openejb.xbean.xml.bean.MyBean3</class>
-  </classes>
-  <packages/>
+  <packages>
+    <package>org.apache.openejb.xbean.xml.bean</package>
+  </packages>
 </scan>