[webbeans-commits] Webbeans SVN: r2043 - in ri/tags/1.0.0.BETA1/impl: src/main/java/org/jboss/webbeans/util and 3 other directories.

Author: pete.muir(a)jboss.org Date: 2009-03-16 10:50:01 -0400 (Mon, 16 Mar 2009) New Revision: 2043 Removed: ri/tags/1.0.0.BETA1/impl/src/main/java/org/jboss/webbeans/util/xml/ ri/tags/1.0.0.BETA1/impl/src/test/java/com/mydomain/myapp/ ri/tags/1.0.0.BETA1/impl/src/test/java/org/jboss/webbeans/test/unit/xml/XmlParserImplTest.java Modified: ri/tags/1.0.0.BETA1/impl/pom.xml ri/tags/1.0.0.BETA1/impl/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml Log: Revert r2042 Modified: ri/tags/1.0.0.BETA1/impl/pom.xml =================================================================== --- ri/tags/1.0.0.BETA1/impl/pom.xml 2009-03-16 14:18:43 UTC (rev 2042) +++ ri/tags/1.0.0.BETA1/impl/pom.xml 2009-03-16 14:50:01 UTC (rev 2043) @@ -82,12 +82,6 @@ <groupId>javassist</groupId> <artifactId>javassist</artifactId> </dependency> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> <dependency> <groupId>log4j</groupId> Deleted: ri/tags/1.0.0.BETA1/impl/src/test/java/org/jboss/webbeans/test/unit/xml/XmlParserImplTest.java =================================================================== --- ri/tags/1.0.0.BETA1/impl/src/test/java/org/jboss/webbeans/test/unit/xml/XmlParserImplTest.java 2009-03-16 14:18:43 UTC (rev 2042) +++ ri/tags/1.0.0.BETA1/impl/src/test/java/org/jboss/webbeans/test/unit/xml/XmlParserImplTest.java 2009-03-16 14:50:01 UTC (rev 2043) @@ -1,56 +0,0 @@ -package org.jboss.webbeans.test.unit.xml; - -import java.lang.reflect.AnnotatedElement; -import java.net.URL; -import java.util.HashSet; -import java.util.Set; - -import org.jboss.webbeans.test.unit.AbstractTest; -import org.jboss.webbeans.util.xml.XmlParserImpl; -//import org.jboss.webbeans.tck.impl.SpecAssertion; -import org.testng.annotations.Test; - -import com.mydomain.myapp.Order; - -public class XmlParserImplTest extends AbstractTest -{ - @Test - public void testParse() - { - Set<URL> xmls = new HashSet<URL>(); - Iterable<URL> urls = getResources("user-defined-beans.xml"); - - for (URL url : urls) - xmls.add(url); - - XmlParserImpl parser = new XmlParserImpl(); - Set<AnnotatedElement> aSet = parser.parse(xmls); - - assert aSet.size() == 1; - for(AnnotatedElement aElement : aSet){ - assert aElement.equals(Order.class); - } - } -} - -/* -<Beans xmlns="urn:java:ee" xmlns:myapp="urn:java:com.mydomain.myapp" -xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml"> -<Deploy> - <Standard /> - <Production /> - <test:AnotherDeploymentType /> -</Deploy> -<myapp:Order> - <ConversationScoped /> - <myapp:PaymentProcessor> - <myapp:Asynchronous /> - </myapp:PaymentProcessor> - <myapp:User /> -</myapp:Order> -<myapp:Login> - <ConversationScoped /> - <BindingType /> -</myapp:Login> -</Beans> -*/ Modified: ri/tags/1.0.0.BETA1/impl/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml =================================================================== --- ri/tags/1.0.0.BETA1/impl/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml 2009-03-16 14:18:43 UTC (rev 2042) +++ ri/tags/1.0.0.BETA1/impl/src/test/resources/org/jboss/webbeans/test/unit/xml/user-defined-beans.xml 2009-03-16 14:50:01 UTC (rev 2043) @@ -1,19 +1,8 @@ -<Beans xmlns="urn:java:ee" xmlns:myapp="urn:java:com.mydomain.myapp" - xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml"> - <Deploy> - <Standard /> - <Production /> - <test:AnotherDeploymentType /> - </Deploy> - <myapp:Order> - <ConversationScoped /> - <myapp:PaymentProcessor> - <myapp:Asynchronous /> - </myapp:PaymentProcessor> - <myapp:User /> - </myapp:Order> - <myapp:Login> - <ConversationScoped /> - <BindingType /> - </myapp:Login> -</Beans> \ No newline at end of file +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.webbeans.test.unit.xml"> + <Deploy> + <Standard /> + <Production /> + <test:AnotherDeploymentType /> + </Deploy> +</Beans>