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/26 00:23:41 UTC
svn commit: r500051 [2/2] - in /incubator/openejb/trunk/openejb3/container:
openejb-core/src/main/java/org/apache/openejb/alt/config/
openejb-core/src/main/java/org/apache/openejb/alt/config/ejb/
openejb-core/src/test/java/org/apache/openejb/alt/config...
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ResourceLocatorType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ResourceLocatorType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ResourceLocatorType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ResourceLocatorType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ResourceRefType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ResourceRefType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ResourceRefType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ResourceRefType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SequenceTableType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SequenceTableType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SequenceTableType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SequenceTableType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceCompletionType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceCompletionType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceCompletionType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceCompletionType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceModuleType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceModuleType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceModuleType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceModuleType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceRefType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceRefType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceRefType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ServiceRefType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SqlGeneratorType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SqlGeneratorType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SqlGeneratorType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SqlGeneratorType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/TransportGuaranteeType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/TransportGuaranteeType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/TransportGuaranteeType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/TransportGuaranteeType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import javax.xml.bind.annotation.XmlEnum;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceSecurityType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceSecurityType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceSecurityType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/WebServiceSecurityType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/XmlAttributeType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/XmlAttributeType.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/XmlAttributeType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/XmlAttributeType.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/package-info.java Thu Jan 25 15:23:35 2007
@@ -23,4 +23,4 @@
@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.oej2;
+) package org.apache.openejb.jee.oejb2;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/EjbDeployment.java Thu Jan 25 15:23:35 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.alt.config.ejb;
+package org.apache.openejb.jee.oejb3;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java?view=auto&rev=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/JaxbOpenejbJar3.java Thu Jan 25 15:23:35 2007
@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.jee.oejb3;
+
+import org.xml.sax.SAXException;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.Attributes;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.ValidationEventHandler;
+import javax.xml.bind.ValidationEvent;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.SAXParser;
+import javax.xml.transform.sax.SAXSource;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JaxbOpenejbJar3 {
+ private static JAXBContext jaxbContext;
+
+ public static <T>String marshal(Class<T> type, Object object) throws JAXBException {
+ JAXBContext ctx2 = getContext(type);
+ Marshaller marshaller = ctx2.createMarshaller();
+
+ marshaller.setProperty("jaxb.formatted.output", true);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ marshaller.marshal(object, baos);
+
+ return new String(baos.toByteArray());
+ }
+
+ private static <T>JAXBContext getContext(Class<T> type) throws JAXBException {
+ if (jaxbContext == null) {
+ jaxbContext = JAXBContext.newInstance(type);
+ }
+ return jaxbContext;
+ }
+
+ public static <T>Object unmarshal(Class<T> type, InputStream in) throws ParserConfigurationException, SAXException, JAXBException {
+ InputSource inputSource = new InputSource(in);
+
+ SAXParserFactory factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setValidating(false);
+ SAXParser parser = factory.newSAXParser();
+
+ JAXBContext ctx = getContext(type);
+ Unmarshaller unmarshaller = ctx.createUnmarshaller();
+ unmarshaller.setEventHandler(new ValidationEventHandler(){
+ public boolean handleEvent(ValidationEvent validationEvent) {
+ System.out.println(validationEvent);
+ return false;
+ }
+ });
+
+
+ NamespaceFilter xmlFilter = new NamespaceFilter(parser.getXMLReader());
+ xmlFilter.setContentHandler(unmarshaller.getUnmarshallerHandler());
+
+ SAXSource source = new SAXSource(xmlFilter, inputSource);
+
+ return unmarshaller.unmarshal(source);
+ }
+
+ public static class NamespaceFilter extends XMLFilterImpl {
+
+ public NamespaceFilter(XMLReader xmlReader) {
+ super(xmlReader);
+ }
+
+ public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
+ super.startElement(uri, localName, qname, atts);
+ }
+ }
+}
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/MethodParams.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/MethodParams.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/MethodParams.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/MethodParams.java Thu Jan 25 15:23:35 2007
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.openejb.alt.config.ejb;
+package org.apache.openejb.jee.oejb3;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ObjectFactory.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ObjectFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ObjectFactory.java Thu Jan 25 15:23:35 2007
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.openejb.alt.config.ejb;
+package org.apache.openejb.jee.oejb3;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java Thu Jan 25 15:23:35 2007
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.openejb.alt.config.ejb;
+package org.apache.openejb.jee.oejb3;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/Query.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/Query.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/Query.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/Query.java Thu Jan 25 15:23:35 2007
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.openejb.alt.config.ejb;
+package org.apache.openejb.jee.oejb3;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/QueryMethod.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/QueryMethod.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/QueryMethod.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/QueryMethod.java Thu Jan 25 15:23:35 2007
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.openejb.alt.config.ejb;
+package org.apache.openejb.jee.oejb3;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ResourceLink.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ResourceLink.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ResourceLink.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/ResourceLink.java Thu Jan 25 15:23:35 2007
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.openejb.alt.config.ejb;
+package org.apache.openejb.jee.oejb3;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/package-info.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/package-info.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/package-info.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/package-info.java Thu Jan 25 15:23:35 2007
@@ -17,4 +17,4 @@
*/
@javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter(value=javax.xml.bind.annotation.adapters.CollapsedStringAdapter.class,type=String.class)
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.openejb.org/openejb-jar/1.1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.openejb.alt.config.ejb;
+package org.apache.openejb.jee.oejb3;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/Cmp2ConversionTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/Cmp2ConversionTest.java?view=diff&rev=500051&r1=500050&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/Cmp2ConversionTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/Cmp2ConversionTest.java Thu Jan 25 15:23:35 2007
@@ -33,7 +33,7 @@
import javax.xml.bind.ValidationEvent;
import junit.framework.TestCase;
-import org.apache.openejb.jee.oej2.OpenejbJarType;
+import org.apache.openejb.jee.oejb2.OpenejbJarType;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.Relationships;
import org.apache.openejb.jee.EjbRelation;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/JaxbTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/JaxbTest.java?view=diff&rev=500051&r1=500050&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/JaxbTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/JaxbTest.java Thu Jan 25 15:23:35 2007
@@ -17,7 +17,6 @@
package org.apache.openejb.jee.jpa;
import junit.framework.TestCase;
-import org.apache.openejb.jee.oej2.Oej2JaxbUtil;
import java.io.InputStream;
import java.io.IOException;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/OpenEjb2CmpConversion.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/OpenEjb2CmpConversion.java?view=diff&rev=500051&r1=500050&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/OpenEjb2CmpConversion.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/OpenEjb2CmpConversion.java Thu Jan 25 15:23:35 2007
@@ -20,11 +20,11 @@
import java.util.TreeMap;
import java.util.List;
-import org.apache.openejb.jee.oej2.EjbRelationType;
-import org.apache.openejb.jee.oej2.EnterpriseBean;
-import org.apache.openejb.jee.oej2.EntityBeanType;
-import org.apache.openejb.jee.oej2.OpenejbJarType;
-import org.apache.openejb.jee.oej2.EjbRelationshipRoleType;
+import org.apache.openejb.jee.oejb2.EjbRelationType;
+import org.apache.openejb.jee.oejb2.EnterpriseBean;
+import org.apache.openejb.jee.oejb2.EntityBeanType;
+import org.apache.openejb.jee.oejb2.OpenejbJarType;
+import org.apache.openejb.jee.oejb2.EjbRelationshipRoleType;
public class OpenEjb2CmpConversion {
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java Thu Jan 25 15:23:35 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import junit.framework.TestCase;
@@ -23,7 +23,6 @@
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.List;
/**
* @version $Rev$ $Date$
@@ -31,7 +30,7 @@
public class ConversionTest extends TestCase {
public void testConversion() throws Exception {
- JAXBElement element = (JAXBElement) Oej2JaxbUtil.unmarshal(OpenejbJarType.class, getInputStream("openejb-jar-2-full.xml"));
+ JAXBElement element = (JAXBElement) JaxbOpenejbJar2.unmarshal(OpenejbJarType.class, getInputStream("openejb-jar-2-full.xml"));
OpenejbJarType o2 = (OpenejbJarType) element.getValue();
GeronimoEjbJarType g2 = new GeronimoEjbJarType();
@@ -51,16 +50,16 @@
}
JAXBElement root = new JAXBElement(new QName("http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0","ejb-jar"), GeronimoEjbJarType.class, g2);
- String result = Oej2JaxbUtil.marshal(GeronimoEjbJarType.class, root);
+ String result = JaxbOpenejbJar2.marshal(GeronimoEjbJarType.class, root);
assertEquals(readContent(getInputStream("geronimo-openejb-converted.xml")), result);
}
private <T> void unmarshalAndMarshal(Class<T> type, java.lang.String xmlFileName, java.lang.String expectedFile) throws Exception {
- Object object = Oej2JaxbUtil.unmarshal(type, getInputStream(xmlFileName));
+ Object object = JaxbOpenejbJar2.unmarshal(type, getInputStream(xmlFileName));
- java.lang.String actual = Oej2JaxbUtil.marshal(type, object);
+ java.lang.String actual = JaxbOpenejbJar2.marshal(type, object);
if (xmlFileName.equals(expectedFile)) {
String sourceXml = readContent(getInputStream(xmlFileName));
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/OpenejbJarTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/OpenejbJarTest.java?view=diff&rev=500051&r1=500014&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/OpenejbJarTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/OpenejbJarTest.java Thu Jan 25 15:23:35 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.jee.oej2;
+package org.apache.openejb.jee.oejb2;
import junit.framework.TestCase;
@@ -50,9 +50,9 @@
private <T> void unmarshalAndMarshal(Class<T> type, java.lang.String xmlFileName, java.lang.String expectedFile) throws Exception {
- Object object = Oej2JaxbUtil.unmarshal(type, getInputStream(xmlFileName));
+ Object object = JaxbOpenejbJar2.unmarshal(type, getInputStream(xmlFileName));
- String actual = Oej2JaxbUtil.marshal(type, object);
+ String actual = JaxbOpenejbJar2.marshal(type, object);
if (xmlFileName.equals(expectedFile)) {
String sourceXml = readContent(getInputStream(xmlFileName));
Copied: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java (from r500014, incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/alt/config/ejb/OpenejbJarTest.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java?view=diff&rev=500051&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/alt/config/ejb/OpenejbJarTest.java&r1=500014&p2=incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java&r2=500051
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/alt/config/ejb/OpenejbJarTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java Thu Jan 25 15:23:35 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.alt.config.ejb;
+package org.apache.openejb.jee.oejb3;
import junit.framework.TestCase;
Propchange: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb3/OpenejbJarTest.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar.xml (from r500014, incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/openejb-jar.xml)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar.xml?view=diff&rev=500051&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/openejb-jar.xml&r1=500014&p2=incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar.xml&r2=500051
==============================================================================
(empty)
Propchange: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL