[jboss-cvs] JBossAS SVN: r66110 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun Oct 14 12:04:41 EDT 2007


Author: scott.stark at jboss.org
Date: 2007-10-14 12:04:41 -0400 (Sun, 14 Oct 2007)
New Revision: 66110

Added:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar20_testVersion.xml
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar2xMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar3xMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EJBMetaDataTestSuite.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml
Log:
Move version to base EjbJarMetaData class so legacy deployments have a version based on dtd, and make the version type string

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar2xMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar2xMetaData.java	2007-10-14 15:53:37 UTC (rev 66109)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar2xMetaData.java	2007-10-14 16:04:41 UTC (rev 66110)
@@ -21,8 +21,6 @@
 */
 package org.jboss.metadata.ejb.spec;
 
-import java.math.BigDecimal;
-
 import javax.xml.bind.annotation.XmlAttribute;
 
 /**
@@ -36,8 +34,6 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = 809339942454480150L;
 
-   /** The version */
-   private BigDecimal version;
    
    /**
     * Create a new EjbJarMetaData.
@@ -54,26 +50,14 @@
    }
 
    /**
-    * Get the version.
+    * Override to get the version from the root element version attribute.
     * 
-    * @return the version.
-    */
-   public BigDecimal getVersion()
-   {
-      return version;
-   }
-
-   /**
-    * Set the version.
-    * 
     * @param version the version.
     * @throws IllegalArgumentException for a null version
     */
    @XmlAttribute
-   public void setVersion(BigDecimal version)
+   public void setVersion(String version)
    {
-      if (version == null)
-         throw new IllegalArgumentException("Null version");
-      this.version = version;
+      super.setVersion(version);
    }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar3xMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar3xMetaData.java	2007-10-14 15:53:37 UTC (rev 66109)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJar3xMetaData.java	2007-10-14 16:04:41 UTC (rev 66110)
@@ -34,9 +34,6 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = 272246605720472113L;
 
-   /** The version */
-   private String version;
-   
    /** Metadata complete */
    private boolean metadataComplete;
    
@@ -58,30 +55,6 @@
    }
 
    /**
-    * Get the version.
-    * 
-    * @return the version.
-    */
-   public String getVersion()
-   {
-      return version;
-   }
-
-   /**
-    * Set the version.
-    * 
-    * @param version the version.
-    * @throws IllegalArgumentException for a null version
-    */
-   @XmlAttribute
-   public void setVersion(String version)
-   {
-      if (version == null)
-         throw new IllegalArgumentException("Null version");
-      this.version = version;
-   }
-
-   /**
     * Get the metadataComplete.
     * 
     * @return the metadataComplete.
@@ -124,4 +97,16 @@
          throw new IllegalArgumentException("Null interceptors");
       this.interceptors = interceptors;
    }
+
+   /**
+    * Override to get the version from the root element version attribute.
+    * 
+    * @param version the version.
+    * @throws IllegalArgumentException for a null version
+    */
+   @XmlAttribute
+   public void setVersion(String version)
+   {
+      super.setVersion(version);
+   }
 }

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java	2007-10-14 15:53:37 UTC (rev 66109)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java	2007-10-14 16:04:41 UTC (rev 66110)
@@ -21,6 +21,8 @@
 */
 package org.jboss.metadata.ejb.spec;
 
+import java.math.BigDecimal;
+
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
@@ -38,6 +40,9 @@
 
    private String dtdPublicId;
    private String dtdSystemId;
+   /** The version */
+   private String version;
+
    /** The ejb client jar */
    private String ejbClientJar;
 
@@ -69,7 +74,16 @@
    {
       this.dtdPublicId = publicId;
       this.dtdSystemId = systemId;
+      // Set version of legacy non-xsd descriptors from publicId
+      if(publicId != null)
+      {
+         if(publicId.contains("2.0"))
+            setVersion("2.0");
+         if(publicId.contains("1.1"))
+            setVersion("1.1");
+      }
    }
+
    /**
     * Get the DTD public id if one was seen
     * @return the value of the web.xml dtd public id
@@ -90,6 +104,29 @@
    }
 
    /**
+    * Get the version.
+    * 
+    * @return the version.
+    */
+   public String getVersion()
+   {
+      return version;
+   }
+
+   /**
+    * Set the version.
+    * 
+    * @param version the version.
+    * @throws IllegalArgumentException for a null version
+    */
+   public void setVersion(String version)
+   {
+      if (version == null)
+         throw new IllegalArgumentException("Null version");
+      this.version = version;
+   }
+
+   /**
     * Whether this is ejb1.x
     * 
     * @return true when ejb1.x

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EJBMetaDataTestSuite.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EJBMetaDataTestSuite.java	2007-10-14 15:53:37 UTC (rev 66109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EJBMetaDataTestSuite.java	2007-10-14 16:04:41 UTC (rev 66110)
@@ -44,6 +44,7 @@
 
       suite.addTest(EjbJar3xUnitTestCase.suite());
       suite.addTest(EjbJar21UnitTestCase.suite());
+      suite.addTest(EjbJar20UnitTestCase.suite());
       suite.addTest(EjbJar3xEverythingUnitTestCase.suite());
       suite.addTest(EjbJar21EverythingUnitTestCase.suite());
       suite.addTest(JBoss50UnitTestCase.suite());

Added: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java	                        (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java	2007-10-14 16:04:41 UTC (rev 66110)
@@ -0,0 +1,78 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.ejb;
+
+import junit.framework.Test;
+
+import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar20MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar2xMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * 2.0 ejb-jar.xml tests.
+ * 
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class EjbJar20UnitTestCase extends AbstractJavaEEMetaDataTest
+{
+   public static Test suite()
+   {
+      return suite(EjbJar20UnitTestCase.class);
+   }
+   
+   public static SchemaBindingResolver initResolver()
+   {
+      DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+      resolver.addClassBindingForLocation("ejb-jar_2_0.dtd", EjbJar20MetaData.class);
+      return resolver;
+   }
+
+   public EjbJar20UnitTestCase(String name)
+   {
+      super(name);
+   }
+   
+   protected EjbJar2xMetaData unmarshal() throws Exception
+   {
+      return unmarshal(EjbJar20MetaData.class);
+   }
+
+   public void testVersion() throws Exception
+   {
+      EjbJar2xMetaData result = unmarshal();
+      assertEquals("2.0", result.getVersion());
+      assertFalse(result.isEJB1x());
+      assertTrue(result.isEJB2x());
+      assertFalse(result.isEJB21());
+      assertFalse(result.isEJB3x());
+
+      ApplicationMetaData old = new ApplicationMetaData(result);
+      assertFalse(old.isEJB1x());
+      assertTrue(old.isEJB2x());
+      assertFalse(old.isEJB21());
+      assertFalse(old.isEJB3x());
+   }
+}


Property changes on: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar20UnitTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java	2007-10-14 15:53:37 UTC (rev 66109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java	2007-10-14 16:04:41 UTC (rev 66110)
@@ -21,8 +21,6 @@
 */
 package org.jboss.test.metadata.ejb;
 
-import java.math.BigDecimal;
-
 import junit.framework.Test;
 
 import org.jboss.metadata.ApplicationMetaData;
@@ -117,7 +115,7 @@
    
    private void assertVersion(EjbJar2xMetaData ejbJar2xMetaData)
    {
-      assertEquals(new BigDecimal("2.1"), ejbJar2xMetaData.getVersion());
+      assertEquals("2.1", ejbJar2xMetaData.getVersion());
       assertFalse(ejbJar2xMetaData.isEJB1x());
       assertTrue(ejbJar2xMetaData.isEJB2x());
       assertTrue(ejbJar2xMetaData.isEJB21());

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java	2007-10-14 15:53:37 UTC (rev 66109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21UnitTestCase.java	2007-10-14 16:04:41 UTC (rev 66110)
@@ -21,8 +21,6 @@
 */
 package org.jboss.test.metadata.ejb;
 
-import java.math.BigDecimal;
-import java.security.Principal;
 import java.util.Set;
 
 import junit.framework.Test;
@@ -72,7 +70,7 @@
    public void testVersion() throws Exception
    {
       EjbJar2xMetaData result = unmarshal();
-      assertEquals(new BigDecimal("2.1"), result.getVersion());
+      assertEquals("2.1", result.getVersion());
       assertFalse(result.isEJB1x());
       assertTrue(result.isEJB2x());
       assertTrue(result.isEJB21());

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java	2007-10-14 15:53:37 UTC (rev 66109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJarJBossMergeEverythingUnitTestCase.java	2007-10-14 16:04:41 UTC (rev 66110)
@@ -29,12 +29,9 @@
 import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
 import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
 import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
 import org.jboss.test.metadata.ejb.AbstractEJBEverythingTest;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-import org.jboss.xb.builder.JBossXBBuilder;
-import org.w3c.dom.ls.LSInput;
 
 /**
  * 
@@ -51,44 +48,11 @@
 
    public static SchemaBindingResolver initResolver()
    {
-      return new SchemaBindingResolver()
-      {
-         public String getBaseURI()
-         {
-            return null;
-         }
-
-         public SchemaBinding resolve(String nsUri, String baseURI, String schemaLocation)
-         {
-            SchemaBinding schema;
-            if(JavaEEMetaDataConstants.JAVAEE_NS.equals(nsUri))
-            {
-               schema = JBossXBBuilder.build(EjbJar30MetaData.class);
-            }
-            else if(JavaEEMetaDataConstants.J2EE_NS.equals(nsUri))
-            {
-               schema = JBossXBBuilder.build(EjbJar21MetaData.class);
-            }
-            else if(JavaEEMetaDataConstants.JBOSS_NS.equals(nsUri))
-            {
-               schema = JBossXBBuilder.build(JBoss50MetaData.class);
-            }
-            else
-            {
-               throw new IllegalStateException("Unexpected namespace: " + nsUri);
-            }
-            return schema;
-         }
-
-         public LSInput resolveAsLSInput(String nsUri, String baseUri, String schemaLocation)
-         {
-            return null;
-         }
-
-         public void setBaseURI(String baseURI)
-         {
-         }
-      };
+      DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+      resolver.addClassBindingForLocation("ejb-jar_2_1.xsd", EjbJar21MetaData.class);
+      resolver.addClassBindingForLocation("ejb-jar_3_0.xsd", EjbJar30MetaData.class);
+      resolver.addClassBindingForLocation("jboss_5_0.xsd", JBoss50MetaData.class);
+      return resolver;
    }
    
    public EjbJarJBossMergeEverythingUnitTestCase(String name)

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java	2007-10-14 15:53:37 UTC (rev 66109)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java	2007-10-14 16:04:41 UTC (rev 66110)
@@ -372,7 +372,7 @@
          EnvEntryMetaData envEntry = envEntries.next();
          String pref = prefix + "EnvEntry" + count;
          assertEquals(pref + "Name", envEntry.getName());
-         assertEquals(pref + "Type", envEntry.getType());
+         assertEquals("java.lang.String", envEntry.getType());
          assertEquals(pref + "Value", envEntry.getValue());
          ++count;
       }

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar20_testVersion.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar20_testVersion.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar20_testVersion.xml	2007-10-14 16:04:41 UTC (rev 66110)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ejb-jar PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+   "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+   
+<ejb-jar id="ejb-jar_2_0">
+    <description>Basic version tests</description>
+    <enterprise-beans>
+        <session id="session0">
+            <ejb-name>session0-name</ejb-name>
+            <ejb-class>session0.class</ejb-class>
+            <session-type>Stateless</session-type>
+            <transaction-type>Container</transaction-type>
+        </session>
+    </enterprise-beans>
+</ejb-jar>       
\ No newline at end of file


Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar20_testVersion.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml	2007-10-14 15:53:37 UTC (rev 66109)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml	2007-10-14 16:04:41 UTC (rev 66110)
@@ -247,7 +247,7 @@
             <description xml:lang="fr">fr-session2EnvEntry1-desc</description>
             <description xml:lang="de">de-session2EnvEntry1-desc</description>
             <env-entry-name>session2EnvEntry1Name</env-entry-name>
-            <env-entry-type>session2EnvEntry1Type</env-entry-type>
+            <env-entry-type>java.lang.String</env-entry-type>
             <env-entry-value>session2EnvEntry1Value</env-entry-value>
          </env-entry>
          <env-entry id="session2EnvEntry2-id">
@@ -255,7 +255,7 @@
             <description xml:lang="fr">fr-session2EnvEntry2-desc</description>
             <description xml:lang="de">de-session2EnvEntry2-desc</description>
             <env-entry-name>session2EnvEntry2Name</env-entry-name>
-            <env-entry-type>session2EnvEntry2Type</env-entry-type>
+            <env-entry-type>java.lang.String</env-entry-type>
             <env-entry-value>session2EnvEntry2Value</env-entry-value>
          </env-entry>
          <ejb-ref id="session2EjbRef1-id">
@@ -460,7 +460,7 @@
             <description xml:lang="fr">fr-entity1EnvEntry1-desc</description>
             <description xml:lang="de">de-entity1EnvEntry1-desc</description>
             <env-entry-name>entity1EnvEntry1Name</env-entry-name>
-            <env-entry-type>entity1EnvEntry1Type</env-entry-type>
+            <env-entry-type>java.lang.String</env-entry-type>
             <env-entry-value>entity1EnvEntry1Value</env-entry-value>
          </env-entry>
          <env-entry id="entity1EnvEntry2-id">
@@ -468,7 +468,7 @@
             <description xml:lang="fr">fr-entity1EnvEntry2-desc</description>
             <description xml:lang="de">de-entity1EnvEntry2-desc</description>
             <env-entry-name>entity1EnvEntry2Name</env-entry-name>
-            <env-entry-type>entity1EnvEntry2Type</env-entry-type>
+            <env-entry-type>java.lang.String</env-entry-type>
             <env-entry-value>entity1EnvEntry2Value</env-entry-value>
          </env-entry>
          <ejb-ref id="entity1EjbRef1-id">
@@ -673,7 +673,7 @@
             <description xml:lang="fr">fr-entity2EnvEntry1-desc</description>
             <description xml:lang="de">de-entity2EnvEntry1-desc</description>
             <env-entry-name>entity2EnvEntry1Name</env-entry-name>
-            <env-entry-type>entity2EnvEntry1Type</env-entry-type>
+            <env-entry-type>java.lang.String</env-entry-type>
             <env-entry-value>entity2EnvEntry1Value</env-entry-value>
          </env-entry>
          <env-entry id="entity2EnvEntry2-id">
@@ -681,7 +681,7 @@
             <description xml:lang="fr">fr-entity2EnvEntry2-desc</description>
             <description xml:lang="de">de-entity2EnvEntry2-desc</description>
             <env-entry-name>entity2EnvEntry2Name</env-entry-name>
-            <env-entry-type>entity2EnvEntry2Type</env-entry-type>
+            <env-entry-type>java.lang.String</env-entry-type>
             <env-entry-value>entity2EnvEntry2Value</env-entry-value>
          </env-entry>
          <ejb-ref id="entity2EjbRef1-id">
@@ -911,7 +911,7 @@
             <description xml:lang="fr">fr-mdb1EnvEntry1-desc</description>
             <description xml:lang="de">de-mdb1EnvEntry1-desc</description>
             <env-entry-name>mdb1EnvEntry1Name</env-entry-name>
-            <env-entry-type>mdb1EnvEntry1Type</env-entry-type>
+            <env-entry-type>java.lang.String</env-entry-type>
             <env-entry-value>mdb1EnvEntry1Value</env-entry-value>
          </env-entry>
          <env-entry id="mdb1EnvEntry2-id">
@@ -919,7 +919,7 @@
             <description xml:lang="fr">fr-mdb1EnvEntry2-desc</description>
             <description xml:lang="de">de-mdb1EnvEntry2-desc</description>
             <env-entry-name>mdb1EnvEntry2Name</env-entry-name>
-            <env-entry-type>mdb1EnvEntry2Type</env-entry-type>
+            <env-entry-type>java.lang.String</env-entry-type>
             <env-entry-value>mdb1EnvEntry2Value</env-entry-value>
          </env-entry>
          <ejb-ref id="mdb1EjbRef1-id">
@@ -1084,7 +1084,7 @@
             <description xml:lang="fr">fr-mdb2EnvEntry1-desc</description>
             <description xml:lang="de">de-mdb2EnvEntry1-desc</description>
             <env-entry-name>mdb2EnvEntry1Name</env-entry-name>
-            <env-entry-type>mdb2EnvEntry1Type</env-entry-type>
+            <env-entry-type>java.lang.String</env-entry-type>
             <env-entry-value>mdb2EnvEntry1Value</env-entry-value>
          </env-entry>
          <env-entry id="mdb2EnvEntry2-id">
@@ -1092,7 +1092,7 @@
             <description xml:lang="fr">fr-mdb2EnvEntry2-desc</description>
             <description xml:lang="de">de-mdb2EnvEntry2-desc</description>
             <env-entry-name>mdb2EnvEntry2Name</env-entry-name>
-            <env-entry-type>mdb2EnvEntry2Type</env-entry-type>
+            <env-entry-type>java.lang.String</env-entry-type>
             <env-entry-value>mdb2EnvEntry2Value</env-entry-value>
          </env-entry>
          <ejb-ref id="mdb2EjbRef1-id">




More information about the jboss-cvs-commits mailing list