tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r513090 - in /incubator/openejb/trunk/openejb3/container/openejb-jee/src: main/java/org/apache/openejb/jee/oejb2/ test/java/org/apache/openejb/jee/oejb2/ test/resources/
Date Thu, 01 Mar 2007 01:33:09 GMT
Author: dblevins
Date: Wed Feb 28 17:33:08 2007
New Revision: 513090

URL: http://svn.apache.org/viewvc?view=rev&rev=513090
Log:
Added tss-link element to geronimo-openejb.xml

Added:
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/RpcBean.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/TssLinkType.java
Modified:
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/oejb2/ConversionTest.java
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
    incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java?view=diff&rev=513090&r1=513089&r2=513090
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
Wed Feb 28 17:33:08 2007
@@ -137,7 +137,7 @@
     "resourceEnvRef",
     "query"
 })
-public class EntityBeanType implements EnterpriseBean {
+public class EntityBeanType implements EnterpriseBean, RpcBean {
 
     @XmlElement(name = "ejb-name", required = true)
     protected String ejbName;

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java?view=diff&rev=513090&r1=513089&r2=513090
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
Wed Feb 28 17:33:08 2007
@@ -51,6 +51,7 @@
     "resourceRef",
     "resourceEnvRef",
     "messageDestination",
+    "tssLink",
     "security",
     "service",
     "persistence"
@@ -87,10 +88,12 @@
     @XmlElement(name = "resource-env-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
     protected List<ResourceEnvRefType> resourceEnvRef;
 
-
     @XmlElement(name = "message-destination", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
     protected List<MessageDestinationType> messageDestination;
 
+    @XmlElement(name = "tss-link")
+    protected List<TssLinkType> tssLink;
+
     @XmlElementRef(name="security", namespace = "http://geronimo.apache.org/xml/ns/j2ee/application-1.2",
type = JAXBElement.class)
     protected JAXBElement<? extends AbstractSecurityType> security;
 
@@ -254,6 +257,13 @@
             messageDestination = new ArrayList<MessageDestinationType>();
         }
         return this.messageDestination;
+    }
+
+    public List<TssLinkType> getTssLink() {
+        if (tssLink == null) {
+            tssLink = new ArrayList<TssLinkType>();
+        }
+        return tssLink;
     }
 
     public JAXBElement<? extends AbstractSecurityType> getSecurity() {

Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/RpcBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/RpcBean.java?view=auto&rev=513090
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/RpcBean.java
(added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/RpcBean.java
Wed Feb 28 17:33:08 2007
@@ -0,0 +1,36 @@
+/**
+ * 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.oejb2;
+
+import java.util.List;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface RpcBean extends EnterpriseBean {
+    List<String> getJndiName();
+
+    List<String> getLocalJndiName();
+
+    String getTssLink();
+
+    void setTssLink(String value);
+
+    PatternType getTss();
+
+    void setTss(PatternType value);
+}

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=513090&r1=513089&r2=513090
==============================================================================
--- 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
Wed Feb 28 17:33:08 2007
@@ -79,7 +79,7 @@
     "webServiceVirtualHost",
     "webServiceSecurity"
 })
-public class SessionBeanType implements EnterpriseBean {
+public class SessionBeanType implements EnterpriseBean, RpcBean {
 
     @XmlElement(name = "ejb-name", required = true)
     protected String ejbName;

Added: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/TssLinkType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/TssLinkType.java?view=auto&rev=513090
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/TssLinkType.java
(added)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/TssLinkType.java
Wed Feb 28 17:33:08 2007
@@ -0,0 +1,77 @@
+/**
+ * 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.oejb2;
+
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlElement;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @version $Rev$ $Date$
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "tss-linkType", namespace = "http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0",
propOrder = {
+    "ejbName",
+    "tssName",
+    "jndiName"
+})
+public class TssLinkType {
+
+    @XmlElement(name = "ejb-name")
+    protected String ejbName;
+
+    @XmlElement(name = "tss-name")
+    protected String tssName;
+
+    @XmlElement(name = "jndi-name")
+    protected List<String> jndiName;
+
+    public TssLinkType() {
+    }
+
+    public TssLinkType(String ejbName, String tssName, List<String> jndiName) {
+        this.ejbName = ejbName;
+        this.tssName = tssName;
+        this.jndiName = jndiName;
+    }
+
+    public String getEjbName() {
+        return ejbName;
+    }
+
+    public void setEjbName(String ejbName) {
+        this.ejbName = ejbName;
+    }
+
+    public String getTssName() {
+        return tssName;
+    }
+
+    public void setTssName(String tssName) {
+        this.tssName = tssName;
+    }
+
+    public List<String> getJndiName() {
+        if (jndiName == null){
+            jndiName = new ArrayList<String>();
+        }
+        return jndiName;
+    }
+}

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=513090&r1=513089&r2=513090
==============================================================================
--- 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
Wed Feb 28 17:33:08 2007
@@ -47,6 +47,13 @@
             g2.getResourceEnvRef().addAll(bean.getResourceEnvRef());
             g2.getResourceRef().addAll(bean.getResourceRef());
             g2.getServiceRef().addAll(bean.getServiceRef());
+
+            if (bean instanceof RpcBean) {
+                RpcBean rpcBean = (RpcBean) bean;
+                if (rpcBean.getTssLink() != null){
+                    g2.getTssLink().add(new TssLinkType(rpcBean.getEjbName(), rpcBean.getTssLink(),
rpcBean.getJndiName()));
+                }
+            }
         }
 
         JAXBElement root = new JAXBElement(new QName("http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0","ejb-jar"),
GeronimoEjbJarType.class, g2);

Modified: 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=diff&rev=513090&r1=513089&r2=513090
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
Wed Feb 28 17:33:08 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns8: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://geronimo.apache.org/xml/ns/security-1.2" xmlns:ns6="http://java.sun.com/xml/ns/persistence"
xmlns:ns7="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<ns4: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/ejb/openejb-2.0"
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-1.2"
xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://openejb.apache.org/xml/ns/pkgen-2.1">
     <environment>
         <moduleId>
             <groupId>String</groupId>
@@ -378,16 +378,28 @@
             <ns2:name>String</ns2:name>
         </ns2:pattern>
     </ns2:message-destination>
-    <ns5:security>
-        <ns5:default-principal xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <ns5:principal xmlns:ns10="http://geronimo.apache.org/xml/ns/deployment-1.2"
xmlns="" class="String" name="String"/>
-            <ns5:named-username-password-credential>
-                <ns5:name>String</ns5:name>
-                <ns5:username>String</ns5:username>
-                <ns5:password>String</ns5:password>
-            </ns5:named-username-password-credential>
-        </ns5:default-principal>
-    </ns5:security>
+    <ns4:tss-link>
+        <ns4:ejb-name>ejbNameString</ns4:ejb-name>
+        <ns4:tss-name>tssLinkString</ns4:tss-name>
+        <ns4:jndi-name>jndiOneString</ns4:jndi-name>
+        <ns4:jndi-name>jndiTwoString</ns4:jndi-name>
+    </ns4:tss-link>
+    <ns4:tss-link>
+        <ns4:ejb-name>String</ns4:ejb-name>
+        <ns4:tss-name>String</ns4:tss-name>
+        <ns4:jndi-name>String</ns4:jndi-name>
+        <ns4:jndi-name>String</ns4:jndi-name>
+    </ns4:tss-link>
+    <ns6:security>
+        <ns6:default-principal xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <ns6:principal xmlns:ns10="http://geronimo.apache.org/xml/ns/deployment-1.2"
xmlns="" class="String" name="String"/>
+            <ns6:named-username-password-credential>
+                <ns6:name>String</ns6:name>
+                <ns6:username>String</ns6:username>
+                <ns6:password>String</ns6:password>
+            </ns6:named-username-password-credential>
+        </ns6:default-principal>
+    </ns6:security>
     <gbean name="String" class="String">
         <attribute type="String" name="String">String</attribute>
         <attribute type="String" name="String">String</attribute>
@@ -396,4 +408,4 @@
         <attribute type="String" name="String">String</attribute>
         <attribute type="String" name="String">String</attribute>
     </gbean>
-</ns8:ejb-jar>
+</ns4:ejb-jar>

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml?view=diff&rev=513090&r1=513089&r2=513090
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
Wed Feb 28 17:33:08 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns8: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://geronimo.apache.org/xml/ns/security-1.2" xmlns:ns6="http://java.sun.com/xml/ns/persistence"
xmlns:ns7="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<ns4: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/ejb/openejb-2.0"
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-1.2"
xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://openejb.apache.org/xml/ns/pkgen-2.1">
     <environment>
         <moduleId>
             <groupId>itests</groupId>
@@ -89,20 +89,20 @@
             <ns2:name>SystemDatasource</ns2:name>
         </ns2:pattern>
     </ns2:resource-ref>
-    <ns6:persistence version="1.0">
-        <ns6:persistence-unit transaction-type="JTA" name="cmp">
-            <ns6:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns6:provider>
-            <ns6:jta-data-source>?name=SystemDatasource</ns6:jta-data-source>
-            <ns6:non-jta-data-source>?name=NoTxDatasource</ns6:non-jta-data-source>
-            <ns6:mapping-file>META-INF/jpa.mapping.xml</ns6:mapping-file>
-            <ns6:class>org.apache.openejb.test.entity.cmp.BasicCmpBean</ns6:class>
-            <ns6:exclude-unlisted-classes>false</ns6:exclude-unlisted-classes>
-        </ns6:persistence-unit>
-        <ns6:persistence-unit transaction-type="JTA" name="openjpa-test-unit">
-            <ns6:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns6:provider>
-            <ns6:jta-data-source>?name=SystemDatasource</ns6:jta-data-source>
-            <ns6:non-jta-data-source>?name=NoTxDatasource</ns6:non-jta-data-source>
-            <ns6:class>org.apache.openejb.test.entity.Customer</ns6:class>
-        </ns6:persistence-unit>
-    </ns6:persistence>
-</ns8:ejb-jar>
+    <ns7:persistence version="1.0">
+        <ns7:persistence-unit transaction-type="JTA" name="cmp">
+            <ns7:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns7:provider>
+            <ns7:jta-data-source>?name=SystemDatasource</ns7:jta-data-source>
+            <ns7:non-jta-data-source>?name=NoTxDatasource</ns7:non-jta-data-source>
+            <ns7:mapping-file>META-INF/jpa.mapping.xml</ns7:mapping-file>
+            <ns7:class>org.apache.openejb.test.entity.cmp.BasicCmpBean</ns7:class>
+            <ns7:exclude-unlisted-classes>false</ns7:exclude-unlisted-classes>
+        </ns7:persistence-unit>
+        <ns7:persistence-unit transaction-type="JTA" name="openjpa-test-unit">
+            <ns7:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns7:provider>
+            <ns7:jta-data-source>?name=SystemDatasource</ns7:jta-data-source>
+            <ns7:non-jta-data-source>?name=NoTxDatasource</ns7:non-jta-data-source>
+            <ns7:class>org.apache.openejb.test.entity.Customer</ns7:class>
+        </ns7:persistence-unit>
+    </ns7:persistence>
+</ns4:ejb-jar>

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml?view=diff&rev=513090&r1=513089&r2=513090
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
Wed Feb 28 17:33:08 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns8: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://geronimo.apache.org/xml/ns/security-1.2" xmlns:ns6="http://java.sun.com/xml/ns/persistence"
xmlns:ns7="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns8="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<ns4: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/ejb/openejb-2.0"
xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-1.2"
xmlns:ns7="http://java.sun.com/xml/ns/persistence" xmlns:ns8="http://openejb.apache.org/xml/ns/pkgen-2.1">
     <environment>
         <moduleId>
             <groupId>String</groupId>
@@ -34,8 +34,8 @@
         <inverse-classloading/>
         <suppress-default-environment/>
     </environment>
-    <ns8:openejb-jar xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-	</ns8:openejb-jar>
+    <ns4:openejb-jar xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+	</ns4:openejb-jar>
     <ns2:persistence-context-ref>
         <ns2:persistence-context-ref-name>String</ns2:persistence-context-ref-name>
         <ns2:persistence-unit-name>String</ns2:persistence-unit-name>
@@ -388,4 +388,4 @@
         <attribute type="String" name="String">String</attribute>
         <attribute type="String" name="String">String</attribute>
     </gbean>
-</ns8:ejb-jar>
+</ns4:ejb-jar>

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml?view=diff&rev=513090&r1=513089&r2=513090
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
Wed Feb 28 17:33:08 2007
@@ -48,13 +48,13 @@
     <ns3:enforce-foreign-key-constraints/>
     <ns3:enterprise-beans>
         <ns3:session id="ID_1">
-            <ns3:ejb-name>String</ns3:ejb-name>
-            <ns3:jndi-name>String</ns3:jndi-name>
-            <ns3:jndi-name>String</ns3:jndi-name>
+            <ns3:ejb-name>ejbNameString</ns3:ejb-name>
+            <ns3:jndi-name>jndiOneString</ns3:jndi-name>
+            <ns3:jndi-name>jndiTwoString</ns3:jndi-name>
             <ns3:local-jndi-name>String</ns3:local-jndi-name>
             <ns3:local-jndi-name>String</ns3:local-jndi-name>
             <ns3:cache-size>0</ns3:cache-size>
-            <ns3:tss-link>String</ns3:tss-link>
+            <ns3:tss-link>tssLinkString</ns3:tss-link>
             <ns2:persistence-context-ref>
                 <ns2:persistence-context-ref-name>String</ns2:persistence-context-ref-name>
                 <ns2:persistence-unit-name>String</ns2:persistence-unit-name>

Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml?view=diff&rev=513090&r1=513089&r2=513090
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
Wed Feb 28 17:33:08 2007
@@ -51,13 +51,13 @@
     <enforce-foreign-key-constraints/>
     <enterprise-beans>
         <session id="ID_1">
-            <ejb-name>String</ejb-name>
-            <jndi-name>String</jndi-name>
-            <jndi-name>String</jndi-name>
+            <ejb-name>ejbNameString</ejb-name>
+            <jndi-name>jndiOneString</jndi-name>
+            <jndi-name>jndiTwoString</jndi-name>
             <local-jndi-name>String</local-jndi-name>
             <local-jndi-name>String</local-jndi-name>
             <cache-size>0</cache-size>
-            <tss-link>String</tss-link>
+            <tss-link>tssLinkString</tss-link>
             <persistence-context-ref>
                 <persistence-context-ref-name>String</persistence-context-ref-name>
                 <persistence-unit-name>String</persistence-unit-name>



Mime
View raw message