You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/22 07:45:23 UTC
svn commit: r498546 - in
/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test:
java/org/apache/openejb/jee/oej2/ConversionTest.java
resources/geronimo-openejb-converted.xml
Author: dblevins
Date: Sun Jan 21 22:45:22 2007
New Revision: 498546
URL: http://svn.apache.org/viewvc?view=rev&rev=498546
Log:
Able to convert a few elements
Added:
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
Modified:
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/ConversionTest.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/ConversionTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/ConversionTest.java?view=diff&rev=498546&r1=498545&r2=498546
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/ConversionTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oej2/ConversionTest.java Sun Jan 21 22:45:22 2007
@@ -19,10 +19,11 @@
import junit.framework.TestCase;
import javax.xml.bind.JAXBElement;
-import java.lang.String;
-import java.io.InputStream;
-import java.io.IOException;
+import javax.xml.namespace.QName;
import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
/**
* @version $Rev$ $Date$
@@ -40,9 +41,15 @@
g2.getService().addAll(o2.getService());
g2.getMessageDestination().addAll(o2.getMessageDestination());
+ List<JAXBElement<?>> jndi = g2.getJndiEnvironmentRefsGroup();
for (EnterpriseBean bean : o2.getEnterpriseBeans()) {
+ jndi.addAll(bean.getAbstractNamingEntry());
//
}
+
+ JAXBElement root = new JAXBElement(new QName("http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0","ejb-jar"), GeronimoEjbJarType.class, g2);
+ String result = JaxbUtil.marshal(GeronimoEjbJarType.class, root);
+ assertEquals(readContent(getInputStream("geronimo-openejb-converted.xml")), result);
}
Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml?view=auto&rev=498546
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml Sun Jan 21 22:45:22 2007
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns6:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns5="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns6="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+ <environment>
+ <moduleId>
+ <groupId>String</groupId>
+ <artifactId>String</artifactId>
+ <version>String</version>
+ <type>String</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>String</groupId>
+ <artifactId>String</artifactId>
+ <version>String</version>
+ <type>String</type>
+ <import>classes</import>
+ </dependency>
+ <dependency>
+ <groupId>String</groupId>
+ <artifactId>String</artifactId>
+ <version>String</version>
+ <type>String</type>
+ <import>classes</import>
+ </dependency>
+ </dependencies>
+ <hidden-classes>
+ <filter>String</filter>
+ <filter>String</filter>
+ </hidden-classes>
+ <non-overridable-classes>
+ <filter>String</filter>
+ <filter>String</filter>
+ </non-overridable-classes>
+ <inverse-classloading/>
+ <suppress-default-environment/>
+ </environment>
+ <ns2:persistence-context-ref>
+ <ns2:persistence-context-ref-name>String</ns2:persistence-context-ref-name>
+ <ns2:persistence-unit-name>String</ns2:persistence-unit-name>
+ <ns2:persistence-context-type>transaction-scoped</ns2:persistence-context-type>
+ <ns2:property>
+ <ns2:key>String</ns2:key>
+ <ns2:value>String</ns2:value>
+ </ns2:property>
+ <ns2:property>
+ <ns2:key>String</ns2:key>
+ <ns2:value>String</ns2:value>
+ </ns2:property>
+ </ns2:persistence-context-ref>
+ <ns2:persistence-context-ref>
+ <ns2:persistence-context-ref-name>String</ns2:persistence-context-ref-name>
+ <ns2:persistence-unit-name>String</ns2:persistence-unit-name>
+ <ns2:persistence-context-type>transaction-scoped</ns2:persistence-context-type>
+ <ns2:property>
+ <ns2:key>String</ns2:key>
+ <ns2:value>String</ns2:value>
+ </ns2:property>
+ <ns2:property>
+ <ns2:key>String</ns2:key>
+ <ns2:value>String</ns2:value>
+ </ns2:property>
+ </ns2:persistence-context-ref>
+ <ns2:persistence-context-ref>
+ <ns2:persistence-context-ref-name>String</ns2:persistence-context-ref-name>
+ <ns2:persistence-unit-name>String</ns2:persistence-unit-name>
+ <ns2:persistence-context-type>transaction-scoped</ns2:persistence-context-type>
+ <ns2:property>
+ <ns2:key>String</ns2:key>
+ <ns2:value>String</ns2:value>
+ </ns2:property>
+ <ns2:property>
+ <ns2:key>String</ns2:key>
+ <ns2:value>String</ns2:value>
+ </ns2:property>
+ </ns2:persistence-context-ref>
+ <ns2:persistence-context-ref>
+ <ns2:persistence-context-ref-name>String</ns2:persistence-context-ref-name>
+ <ns2:persistence-unit-name>String</ns2:persistence-unit-name>
+ <ns2:persistence-context-type>transaction-scoped</ns2:persistence-context-type>
+ <ns2:property>
+ <ns2:key>String</ns2:key>
+ <ns2:value>String</ns2:value>
+ </ns2:property>
+ <ns2:property>
+ <ns2:key>String</ns2:key>
+ <ns2:value>String</ns2:value>
+ </ns2:property>
+ </ns2:persistence-context-ref>
+ <ns2:message-destination>
+ <ns2:message-destination-name>String</ns2:message-destination-name>
+ <ns2:pattern>
+ <ns2:groupId>String</ns2:groupId>
+ <ns2:artifactId>String</ns2:artifactId>
+ <ns2:version>String</ns2:version>
+ <ns2:module>String</ns2:module>
+ <ns2:name>String</ns2:name>
+ </ns2:pattern>
+ </ns2:message-destination>
+ <ns2:message-destination>
+ <ns2:message-destination-name>String</ns2:message-destination-name>
+ <ns2:pattern>
+ <ns2:groupId>String</ns2:groupId>
+ <ns2:artifactId>String</ns2:artifactId>
+ <ns2:version>String</ns2:version>
+ <ns2:module>String</ns2:module>
+ <ns2:name>String</ns2:name>
+ </ns2:pattern>
+ </ns2:message-destination>
+ <gbean name="String" class="String">
+ <attribute type="String" name="String">String</attribute>
+ <attribute type="String" name="String">String</attribute>
+ </gbean>
+ <gbean name="String" class="String">
+ <attribute type="String" name="String">String</attribute>
+ <attribute type="String" name="String">String</attribute>
+ </gbean>
+</ns6:ejb-jar>