[seam-commits] Seam SVN: r12075 - in modules/xml/trunk: src/main/java/org/jboss/seam/xml/parser and 1 other directories.
Author: swd847
Date: 2010-02-25 20:43:39 -0500 (Thu, 25 Feb 2010)
New Revision: 12075
Modified:
modules/xml/trunk/pom.xml
modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java
Log:
updated to weld 1.0.1
Modified: modules/xml/trunk/pom.xml
===================================================================
--- modules/xml/trunk/pom.xml 2010-02-25 11:42:00 UTC (rev 12074)
+++ modules/xml/trunk/pom.xml 2010-02-26 01:43:39 UTC (rev 12075)
@@ -37,12 +37,12 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>1.0</version>
+ <version>1.0-SP1</version>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-Final</version>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-se</artifactId>
- <version>1.0.0-CR2</version>
+ <version>1.0.1-Final</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java 2010-02-25
11:42:00 UTC (rev 12074)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/SaxNode.java 2010-02-26
01:43:39 UTC (rev 12075)
@@ -33,7 +33,7 @@
public String getInnerText()
{
- if (innerText != null && innerText.isEmpty())
+ if (innerText != null && innerText.length() == 0)
{
return null;
}
Modified: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java
===================================================================
---
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java 2010-02-25
11:42:00 UTC (rev 12074)
+++
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/AbstractXMLTest.java 2010-02-26
01:43:39 UTC (rev 12075)
@@ -9,10 +9,9 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.AnnotationLiteral;
-import org.jboss.weld.environment.se.StartMain;
-import org.jboss.weld.environment.se.events.Shutdown;
+import org.jboss.weld.environment.se.Weld;
+import org.jboss.weld.environment.se.WeldContainer;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -22,6 +21,8 @@
public static String[] ARGS_EMPTY = new String[] {};
protected BeanManager manager;
+
+ Weld weld;
protected abstract String getXmlFileName();
@@ -30,13 +31,15 @@
{
String fileName = getClass().getPackage().getName().replace('.',
'/') + "/" + getXmlFileName();
TestXmlProvider.fileName = fileName;
- manager = new StartMain(ARGS_EMPTY).go();
+ weld = new Weld();
+ WeldContainer container = weld.initialize();
+ manager = container.getBeanManager();
}
@AfterClass
public void teardown()
{
- manager.fireEvent(manager, new ShutdownAnnotation());
+ weld.shutdown();
}
public <T> T getReference(Class<T> clazz, Annotation... bindings)
@@ -54,8 +57,5 @@
return (T) bean.create(manager.createCreationalContext(bean));
}
- protected static class ShutdownAnnotation extends
AnnotationLiteral<org.jboss.weld.environment.se.events.Shutdown> implements
Shutdown
- {
- }
-
+
}