Author: dain
Date: Wed Sep 19 17:09:38 2007
New Revision: 577481

URL: http://svn.apache.org/viewvc?rev=577481&view=rev
Log:
Merging 575836 from trunk
Added jaxb objects to process ra.xml file

Added:
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationSpec.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ActivationSpec.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/AdminObject.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AdminObject.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthenticationMechanism.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/AuthenticationMechanism.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConfigProperty.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConfigProperty.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectionDefinition.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ConnectionDefinition.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/Connector.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/InboundResource.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/InboundResource.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/License.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/License.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageAdapter.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageAdapter.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageListener.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageListener.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/OutboundResourceAdapter.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/RequiredConfigProperty.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/RequiredConfigProperty.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceAdapter.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityPermission.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/SecurityPermission.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/TransactionSupportType.java
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TransactionSupportType.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/test/resources/connector-example.xml
      - copied unchanged from r575836, 
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/connector-example.xml
Modified:
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
    
openejb/branches/3.0-beta-1/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java

Modified: 
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java?rev=577481&r1=577480&r2=577481&view=diff
==============================================================================
--- 
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
 (original)
+++ 
openejb/branches/3.0-beta-1/container/openejb-jee/src/main/java/org/apache/openejb/jee/ObjectFactory.java
 Wed Sep 19 17:09:38 2007
@@ -48,6 +48,7 @@
     private final static QName _EjbRelationTypeDescription_QNAME = new 
QName("http://java.sun.com/xml/ns/javaee";, "description");
     private final static QName _WebResourceCollectionTypeHttpMethod_QNAME = 
new QName("http://java.sun.com/xml/ns/javaee";, "http-method");
     private final static QName _WebApp_QNAME = new 
QName("http://java.sun.com/xml/ns/javaee";, "web-app");
+    private final static QName _Connector_QNAME = new 
QName("http://java.sun.com/xml/ns/j2ee";, "connector");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of 
schema derived classes for package: org.apache.openejb.jee2
@@ -106,4 +107,12 @@
         return new JAXBElement<WebApp>(_WebApp_QNAME, WebApp.class, null, 
value);
     }
 
+    /**
+     * Create an instance of [EMAIL PROTECTED] JAXBElement [EMAIL PROTECTED] 
<[EMAIL PROTECTED] Connector [EMAIL PROTECTED] >}}
+     *
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/j2ee";, name = 
"connector")
+    public JAXBElement<Connector> createConnector(Connector value) {
+        return new JAXBElement<Connector>(_Connector_QNAME, Connector.class, 
null, value);
+    }
 }

Modified: 
openejb/branches/3.0-beta-1/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java?rev=577481&r1=577480&r2=577481&view=diff
==============================================================================
--- 
openejb/branches/3.0-beta-1/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
 (original)
+++ 
openejb/branches/3.0-beta-1/container/openejb-jee/src/test/java/org/apache/openejb/jee/JeeTest.java
 Wed Sep 19 17:09:38 2007
@@ -55,6 +55,10 @@
         marshalAndUnmarshal(WebApp.class, "web-example.xml");
     }
 
+    public void testRar() throws Exception {
+        marshalAndUnmarshal(Connector.class, "connector-example.xml");
+    }
+
     private <T> void marshalAndUnmarshal(Class<T> type, String xmlFileName) 
throws JAXBException, IOException {
         JAXBContext ctx = JAXBContext.newInstance(type);
         Unmarshaller unmarshaller = ctx.createUnmarshaller();


Reply via email to