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/29 09:43:24 UTC
svn commit: r1295011 - in /openejb/trunk/openejb: ./ container/openejb-jee/
container/openejb-jee/src/main/java/org/apache/openejb/jee/
container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/
container/openejb-jee/src/test/java/org/apache/ope...
Author: rmannibucau
Date: Wed Feb 29 08:43:23 2012
New Revision: 1295011
URL: http://svn.apache.org/viewvc?rev=1295011&view=rev
Log:
OPENEJB-1787 jaxb 2.2
Modified:
openejb/trunk/openejb/container/openejb-jee/pom.xml
openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java
openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java
openejb/trunk/openejb/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java
openejb/trunk/openejb/pom.xml
Modified: openejb/trunk/openejb/container/openejb-jee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee/pom.xml?rev=1295011&r1=1295010&r2=1295011&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jee/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-jee/pom.xml Wed Feb 29 08:43:23 2012
@@ -107,10 +107,10 @@
<artifactId>javaee-api</artifactId>
<scope>provided</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.sun.xml.bind</groupId>-->
- <!--<artifactId>jaxb-impl</artifactId>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java?rev=1295011&r1=1295010&r2=1295011&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java (original)
+++ openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbJar.java Wed Feb 29 08:43:23 2012
@@ -22,17 +22,17 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.Map;
-import java.util.LinkedHashMap;
import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
/**
* ejb-jar_3_1.xsd
@@ -79,7 +79,6 @@ import java.util.Collection;
"ejbClientJar"
})
public class EjbJar implements NamedModule {
-
@XmlElement(name = "module-name")
protected String moduleName;
@XmlTransient
Modified: openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java?rev=1295011&r1=1295010&r2=1295011&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java (original)
+++ openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SecurityType.java Wed Feb 29 08:43:23 2012
@@ -16,12 +16,11 @@
*/
package org.apache.openejb.jee.oejb2;
-import java.util.List;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import java.util.List;
/**
* @version $Rev$ $Date$
Modified: openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java?rev=1295011&r1=1295010&r2=1295011&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java (original)
+++ openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java Wed Feb 29 08:43:23 2012
@@ -16,12 +16,14 @@
*/
@javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter(value=javax.xml.bind.annotation.adapters.CollapsedStringAdapter.class,type=String.class)
@javax.xml.bind.annotation.XmlSchema(
- namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
- xmlns = {
+ namespace = "http://openejb.apache.org/xml/ns/openejb-jar-2.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
+ xmlns = {
@javax.xml.bind.annotation.XmlNs(prefix = "o", namespaceURI = "http://openejb.apache.org/xml/ns/openejb-jar-2.2"),
@javax.xml.bind.annotation.XmlNs(prefix = "sys", namespaceURI = "http://geronimo.apache.org/xml/ns/deployment-1.2"),
@javax.xml.bind.annotation.XmlNs(prefix = "pkgen", namespaceURI = "http://openejb.apache.org/xml/ns/pkgen-2.1"),
@javax.xml.bind.annotation.XmlNs(prefix = "naming", namespaceURI = "http://geronimo.apache.org/xml/ns/naming-1.2"),
- @javax.xml.bind.annotation.XmlNs(prefix = "app", namespaceURI = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2")
- }
-) package org.apache.openejb.jee.oejb2;
+ @javax.xml.bind.annotation.XmlNs(prefix = "app", namespaceURI = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2"),
+ @javax.xml.bind.annotation.XmlNs(prefix = "secu", namespaceURI = "http://geronimo.apache.org/xml/ns/security-2.0")
+ }
+)
+package org.apache.openejb.jee.oejb2;
Modified: openejb/trunk/openejb/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java?rev=1295011&r1=1295010&r2=1295011&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java (original)
+++ openejb/trunk/openejb/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java Wed Feb 29 08:43:23 2012
@@ -17,18 +17,18 @@
package org.apache.openejb.jee.oejb2;
import junit.framework.TestCase;
-import junit.framework.AssertionFailedError;
+import org.custommonkey.xmlunit.DetailedDiff;
+import org.custommonkey.xmlunit.Diff;
+import org.custommonkey.xmlunit.Difference;
+import org.custommonkey.xmlunit.DifferenceListener;
+import org.w3c.dom.Node;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-
-import org.custommonkey.xmlunit.Diff;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.custommonkey.xmlunit.DetailedDiff;
-
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* @version $Rev$ $Date$
@@ -68,7 +68,23 @@ public class ConversionTest extends Test
String expected = readContent(getInputStream("geronimo-openejb-converted.xml"));
Diff myDiff = new DetailedDiff(new Diff(expected, result));
- assertTrue("Files are not similar " + myDiff, myDiff.similar());
+ final AtomicInteger differenceNumber = new AtomicInteger(0); // just to get an int wrapper for the test
+ myDiff.overrideDifferenceListener(new DifferenceListener() {
+ @Override
+ public int differenceFound(Difference difference) {
+ if (!difference.isRecoverable()) {
+ differenceNumber.incrementAndGet();
+ System.err.println(">>> " + difference.toString());
+ }
+ return 0;
+ }
+
+ @Override
+ public void skippedComparison(Node node, Node node1) {
+ // no-op
+ }
+ });
+ assertTrue("Files are not similar", myDiff.similar());
}
private <T> void unmarshalAndMarshal(Class<T> type, java.lang.String xmlFileName, java.lang.String expectedFile) throws Exception {
Modified: openejb/trunk/openejb/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1295011&r1=1295010&r2=1295011&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Wed Feb 29 08:43:23 2012
@@ -1099,7 +1099,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.13</version>
+ <version>2.2.5</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
@@ -1122,7 +1122,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>2.1.13</version>
+ <version>2.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>