[jboss-cvs] JBossAS SVN: r60259 - branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun Feb 4 06:33:29 EST 2007


Author: wolfc
Date: 2007-02-04 06:33:28 -0500 (Sun, 04 Feb 2007)
New Revision: 60259

Added:
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/BaseEjbRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbLocalRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvEntry.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/InjectionTarget.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/JndiRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Listener.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestination.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestinationRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/NameValuePair.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceContextRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PortInfo.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Ref.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceEnvRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/RunAs.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRole.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ServiceRef.java
Removed:
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/BaseEjbRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbLocalRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvEntry.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/InjectionTarget.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/JndiRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Listener.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestination.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestinationRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/NameValuePair.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceContextRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Ref.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceEnvRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/RunAs.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRole.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java
   branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/WebServiceRef.java
Log:
Merged JBoss_5_EJB3_RC10 again.

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/BaseEjbRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/BaseEjbRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/BaseEjbRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 46506 $
- */
-public class BaseEjbRef extends Ref
-{
-   protected String ejbRefName;
-   protected String ejbRefType;
-   private String ejbLink;
-   protected String mappedName;
-
-   public String getMappedName()
-   {
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public String getEjbRefName()
-   {
-      return ejbRefName;
-   }
-
-   public void setEjbRefName(String ejbRefName)
-   {
-      this.ejbRefName = ejbRefName;
-   }
-
-   public String getEjbRefType()
-   {
-      return ejbRefType;
-   }
-
-   public void setEjbRefType(String ejbRefType)
-   {
-      this.ejbRefType = ejbRefType;
-   }
-
-   public String getEjbLink()
-   {
-      return ejbLink;
-   }
-
-   public void setEjbLink(String ejbLink)
-   {
-      this.ejbLink = ejbLink;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/BaseEjbRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/BaseEjbRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/BaseEjbRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/BaseEjbRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class BaseEjbRef extends Ref
+{
+   protected String ejbRefName;
+   protected String ejbRefType;
+   private String ejbLink;
+   protected String mappedName;
+
+   public String getMappedName()
+   {
+      return mappedName;
+   }
+
+   public void setMappedName(String mappedName)
+   {
+      this.mappedName = mappedName;
+   }
+
+   public String getEjbRefName()
+   {
+      return ejbRefName;
+   }
+
+   public void setEjbRefName(String ejbRefName)
+   {
+      this.ejbRefName = ejbRefName;
+   }
+
+   public String getEjbRefType()
+   {
+      return ejbRefType;
+   }
+
+   public void setEjbRefType(String ejbRefType)
+   {
+      this.ejbRefType = ejbRefType;
+   }
+
+   public String getEjbLink()
+   {
+      return ejbLink;
+   }
+
+   public void setEjbLink(String ejbLink)
+   {
+      this.ejbLink = ejbLink;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/BaseEjbRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,583 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-
-import org.jboss.logging.Logger;
-import org.jboss.metamodel.descriptor.EjbLocalRef;
-import org.jboss.metamodel.descriptor.EjbRef;
-import org.jboss.metamodel.descriptor.EnvEntry;
-import org.jboss.metamodel.descriptor.InjectionTarget;
-import org.jboss.metamodel.descriptor.MessageDestinationRef;
-import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.metamodel.descriptor.SecurityRole;
-import org.xml.sax.Attributes;
-
-import javax.persistence.PersistenceContextType;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 56531 $</tt>
- */
-public abstract class DDObjectFactory implements ObjectModelFactory
-{
-   private static final Logger log = Logger
-   .getLogger(DDObjectFactory.class);
-
-   public Object newChild(PersistenceUnitRef ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      return newRefChild(ref, localName);
-   }
-
-   public Object newChild(PersistenceContextRef ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      return newRefChild(ref, localName);
-   }
-
-   public Object newChild(EnvEntry ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      return newRefChild(ref, localName);
-   }
-
-   public Object newChild(EjbRef ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      return newRefChild(ref, localName);
-   }
-
-   public Object newChild(EjbLocalRef ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      return newRefChild(ref, localName);
-   }
-
-   public Object newChild(ResourceRef ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      return newRefChild(ref, localName);
-   }
-
-   public Object newChild(ResourceEnvRef ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      return newRefChild(ref, localName);
-   }
-
-   public Object newChild(MessageDestinationRef ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      return newRefChild(ref, localName);
-   }
-
-   public Object newChild(WebServiceRef ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      return newRefChild(ref, localName);
-   }
-
-   public Object newChild(JndiRef ref,
-                          UnmarshallingContext navigator, String namespaceURI, String localName,
-                          Attributes attrs)
-   {
-      return newRefChild(ref, localName);
-   }
-
-   public void addChild(PersistenceUnitRef parent, InjectionTarget target,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(target);
-   }
-
-   public void addChild(PersistenceContextRef parent, InjectionTarget target,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(target);
-   }
-
-   public void addChild(EnvEntry parent, InjectionTarget target,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(target);
-   }
-
-   public void addChild(EjbRef parent, InjectionTarget target,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(target);
-   }
-
-   public void addChild(EjbLocalRef parent, InjectionTarget target,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(target);
-   }
-
-   public void addChild(ResourceRef parent, InjectionTarget target,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(target);
-   }
-
-   public void addChild(ResourceEnvRef parent, InjectionTarget target,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(target);
-   }
-
-   public void addChild(MessageDestinationRef parent, InjectionTarget target,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(target);
-   }
-
-   public void addChild(WebServiceRef parent, InjectionTarget target,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(target);
-   }
-
-   public void addChild(JndiRef parent, InjectionTarget target,
-                        UnmarshallingContext navigator, String namespaceURI, String localName)
-   {
-      parent.setInjectionTarget(target);
-   }
-
-   public void setValue(EjbLocalRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-ref-name"))
-      {
-         ref.setEjbRefName(getValue(localName, value));
-      }
-      else if (localName.equals("ejb-ref-type"))
-      {
-         ref.setEjbRefType(getValue(localName, value));
-      }
-      else if (localName.equals("local-home"))
-      {
-         ref.setLocalHome(getValue(localName, value));
-      }
-      else if (localName.equals("local"))
-      {
-         ref.setLocal(getValue(localName, value));
-      }
-      else if (localName.equals("ejb-link"))
-      {
-         ref.setEjbLink(getValue(localName, value));
-      }
-      else if (localName.equals("mapped-name") || localName.equals("local-jndi-name") || localName.equals("jndi-name"))
-      {
-         ref.setMappedName(getValue(localName, value));
-      }
-      else if (localName.equals("ignore-dependency"))
-      {
-         ref.setIgnoreDependency(true);
-      }
-   }
-
-   public void setValue(EjbRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("ejb-ref-name"))
-      {
-         ref.setEjbRefName(getValue(localName, value));
-      }
-      else if (localName.equals("ejb-ref-type"))
-      {
-         ref.setEjbRefType(getValue(localName, value));
-      }
-      else if (localName.equals("home"))
-      {
-         ref.setHome(getValue(localName, value));
-      }
-      else if (localName.equals("remote"))
-      {
-         ref.setRemote(getValue(localName, value));
-      }
-      else if (localName.equals("ejb-link"))
-      {
-         ref.setEjbLink(getValue(localName, value));
-      }
-      else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
-      {
-         ref.setMappedName(getValue(localName, value));
-      }
-      else if (localName.equals("ignore-dependency"))
-      {
-         ref.setIgnoreDependency(true);
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(InjectionTarget target, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("injection-target-class"))
-      {
-         target.setTargetClass(getValue(localName, value));
-      }
-      else if (localName.equals("injection-target-name"))
-      {
-         target.setTargetName(getValue(localName, value));
-      }
-   }
-
-   /**
-    * Called when a child element with simple content is read for DD.
-    */
-   public void setValue(MessageDestinationRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("description"))
-      {
-         ref.setDescription(getValue(localName, value));
-      }
-      else if (localName.equals("message-destination-ref-name"))
-      {
-         ref.setMessageDestinationRefName(getValue(localName, value));
-      }
-      else if (localName.equals("message-destination-type"))
-      {
-         ref.setMessageDestinationType(getValue(localName, value));
-      }
-      else if (localName.equals("message-destination-usage"))
-      {
-         ref.setMessageDestinationUsage(getValue(localName, value));
-      }
-      else if (localName.equals("message-destination-link"))
-      {
-         ref.setMessageDestinationLink(getValue(localName, value));
-      }
-      else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
-      {
-         ref.setMappedName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(EnvEntry entry, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("description"))
-      {
-         entry.setDescription(getValue(localName, value));
-      }
-      else if (localName.equals("env-entry-name"))
-      {
-         entry.setEnvEntryName(getValue(localName, value));
-      }
-      else if (localName.equals("env-entry-type"))
-      {
-         entry.setEnvEntryType(getValue(localName, value));
-      }
-      else if (localName.equals("env-entry-value"))
-      {
-         entry.setEnvEntryValue(getValue(localName, value));
-      }
-   }
-
-   public void setValue(ResourceEnvRef envRef, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("res-ref-name")
-              || localName.equals("resource-env-ref-name"))
-      {
-         envRef.setResRefName(getValue(localName, value));
-      }
-      else if (localName.equals("res-type")
-              || localName.equals("resource-env-ref-type"))
-      {
-         envRef.setResType(getValue(localName, value));
-      }
-      else if (localName.equals("res-auth"))
-      {
-         envRef.setResAuth(getValue(localName, value));
-      }
-      else if (localName.equals("res-sharing-scope"))
-      {
-         envRef.setResSharingScope(getValue(localName, value));
-      }
-      else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
-      {
-         envRef.setMappedName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(ResourceRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("res-ref-name")
-              || localName.equals("resource-env-ref-name"))
-      {
-         ref.setResRefName(getValue(localName, value));
-      }
-      else if (localName.equals("res-type")
-              || localName.equals("resource-env-ref-type"))
-      {
-         ref.setResType(getValue(localName, value));
-      }
-      else if (localName.equals("res-auth"))
-      {
-         ref.setResAuth(getValue(localName, value));
-      }
-      else if (localName.equals("res-sharing-scope"))
-      {
-         ref.setResSharingScope(getValue(localName, value));
-      }
-      else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
-      {
-         ref.setMappedName(getValue(localName, value));
-         ref.setJndiName(getValue(localName, value));
-      }
-      else if (localName.equals("res-url"))
-      {
-         ref.setResUrl(getValue(localName, value));
-      }
-      else if (localName.equals("resource-name"))
-      {
-         ref.setResourceName(getValue(localName, value));
-         ref.setMappedName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(WebServiceRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("service-ref-name"))
-      {
-         ref.setServiceRefName(getValue(localName, value));
-      }
-      else if (localName.equals("service-res-type"))
-      {
-         ref.setResType(getValue(localName, value));
-      }
-      else if (localName.equals("service-interface"))
-      {
-         ref.setServiceInterface(getValue(localName, value));
-      }
-      else if (localName.equals("wsdl-file"))
-      {
-         ref.setWsdlFile(getValue(localName, value));
-      }
-      else if (localName.equals("jaxrpc-mapping-file"))
-      {
-         ref.setJaxRpcMappingFile(getValue(localName, value));
-      }
-      else if (localName.equals("mapped-name"))
-      {
-         ref.setMappedName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(SecurityRole role, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("role-name"))
-      {
-         role.setRoleName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(JndiRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("mapped-name"))
-      {
-         ref.setMappedName(getValue(localName, value));
-      }
-      else if (localName.equals("jndi-ref-name"))
-      {
-         ref.setJndiRefName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(RunAs runAs, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("role-name"))
-      {
-         runAs.setRoleName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(SecurityRoleRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("role-name"))
-      {
-         ref.setRoleName(getValue(localName, value));
-      }
-      else if (localName.equals("role-link"))
-      {
-         ref.setRoleLink(getValue(localName, value));
-      }
-   }
-
-   public void setValue(Listener listener, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("listener-class"))
-      {
-         listener.setListenerClass(getValue(localName, value));
-      }
-   }
-
-   public void setValue(MessageDestination destination, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("message-destination-name"))
-      {
-         destination.setMessageDestinationName(getValue(localName, value));
-      }
-      else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
-      {
-         destination.setMappedName(getValue(localName, value));
-      }
-   }
-
-   public void setValue(PersistenceUnitRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("persistence-unit-ref-name"))
-      {
-         ref.setRefName(getValue(localName, value));
-      }
-      else if (localName.equals("persistence-unit-name"))
-      {
-         ref.setUnitName(getValue(localName, value));
-      }
-      else
-      {
-         throw new RuntimeException("INVALID element<" + localName + "> in <persistence-unit-ref>");
-      }
-   }
-
-   protected Object newEnvRefGroupChild(String localName)
-   {
-      Object child = null;
-
-      if (localName.equals("ejb-local-ref"))
-      {
-         child = new EjbLocalRef();
-      }
-      else if (localName.equals("ejb-ref"))
-      {
-         child = new EjbRef();
-      }
-      else if (localName.equals("resource-ref"))
-      {
-         child = new ResourceRef();
-      }
-      else if (localName.equals("resource-env-ref"))
-      {
-         child = new ResourceEnvRef();
-      }
-      else if (localName.equals("env-entry"))
-      {
-         child = new EnvEntry();
-      }
-      else if (localName.equals("message-destination-ref"))
-      {
-         child = new MessageDestinationRef();
-      }
-      else if (localName.equals("service-ref"))
-      {
-         child = new WebServiceRef();
-      }
-      else if (localName.equals("jndi-ref"))
-      {
-         child = new JndiRef();
-      }
-      else if (localName.equals("persistence-unit-ref"))
-      {
-         child = new PersistenceUnitRef();
-      }
-      else if (localName.equals("persistence-context-ref"))
-      {
-         child = new PersistenceContextRef();
-      }
-
-      return child;
-   }
-
-   protected Object newRefChild(Ref ref, String localName)
-   {
-      Object child = null;
-
-      if (localName.equals("ignore-dependency"))
-      {
-         ref.setIgnoreDependency(true);
-      }
-      else if (localName.equals("injection-target"))
-      {
-         InjectionTarget target = new InjectionTarget();
-         child = target;
-      }
-
-      return child;
-   }
-
-   public void setValue(PersistenceContextRef ref, UnmarshallingContext navigator,
-                        String namespaceURI, String localName, String value)
-   {
-      if (localName.equals("persistence-context-ref-name"))
-      {
-         ref.setRefName(getValue(localName, value));
-      }
-      else if (localName.equals("persistence-unit-name"))
-      {
-         ref.setUnitName(getValue(localName, value));
-      }
-      else if(localName.equals("persistence-context-type"))
-      {
-         if (value.toLowerCase().equals("transaction"))
-         {
-            ref.setPersistenceContextType(PersistenceContextType.TRANSACTION);
-         }
-         else
-         {
-            ref.setPersistenceContextType(PersistenceContextType.EXTENDED);
-         }
-      }
-   }
-   
-   protected String getValue(String name, String value)
-   {
-      return value;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,587 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import javax.persistence.PersistenceContextType;
+import javax.xml.namespace.QName;
+
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.UnmarshallingContext;
+import org.xml.sax.Attributes;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @author Thomas.Diesler at jboss.com
+ * @version <tt>$Revision$</tt>
+ */
+public abstract class DDObjectFactory implements ObjectModelFactory
+{
+   public Object newChild(PersistenceUnitRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return newRefChild(ref, localName);
+   }
+
+   public Object newChild(PersistenceContextRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return newRefChild(ref, localName);
+   }
+
+   public Object newChild(EnvEntry ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return newRefChild(ref, localName);
+   }
+
+   public Object newChild(EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return newRefChild(ref, localName);
+   }
+
+   public Object newChild(EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return newRefChild(ref, localName);
+   }
+
+   public Object newChild(ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return newRefChild(ref, localName);
+   }
+
+   public Object newChild(ResourceEnvRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return newRefChild(ref, localName);
+   }
+
+   public Object newChild(MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return newRefChild(ref, localName);
+   }
+
+   public Object newChild(ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return newServiceRefChild(ref, localName);
+   }
+
+   public Object newChild(JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      return newRefChild(ref, localName);
+   }
+
+   public void addChild(PersistenceUnitRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(target);
+   }
+
+   public void addChild(PersistenceContextRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(target);
+   }
+
+   public void addChild(EnvEntry parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(target);
+   }
+
+   public void addChild(EjbRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(target);
+   }
+
+   public void addChild(EjbLocalRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(target);
+   }
+
+   public void addChild(ResourceRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(target);
+   }
+
+   public void addChild(ResourceEnvRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(target);
+   }
+
+   public void addChild(MessageDestinationRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(target);
+   }
+
+   public void addChild(ServiceRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(target);
+   }
+
+   public void addChild(JndiRef parent, InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.setInjectionTarget(target);
+   }
+
+   public void setValue(EjbLocalRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("ejb-ref-name"))
+      {
+         ref.setEjbRefName(getValue(localName, value));
+      }
+      else if (localName.equals("ejb-ref-type"))
+      {
+         ref.setEjbRefType(getValue(localName, value));
+      }
+      else if (localName.equals("local-home"))
+      {
+         ref.setLocalHome(getValue(localName, value));
+      }
+      else if (localName.equals("local"))
+      {
+         ref.setLocal(getValue(localName, value));
+      }
+      else if (localName.equals("ejb-link"))
+      {
+         ref.setEjbLink(getValue(localName, value));
+      }
+      else if (localName.equals("mapped-name") || localName.equals("local-jndi-name") || localName.equals("jndi-name"))
+      {
+         ref.setMappedName(getValue(localName, value));
+      }
+      else if (localName.equals("ignore-dependency"))
+      {
+         ref.setIgnoreDependency(true);
+      }
+   }
+
+   public void setValue(EjbRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("ejb-ref-name"))
+      {
+         ref.setEjbRefName(getValue(localName, value));
+      }
+      else if (localName.equals("ejb-ref-type"))
+      {
+         ref.setEjbRefType(getValue(localName, value));
+      }
+      else if (localName.equals("home"))
+      {
+         ref.setHome(getValue(localName, value));
+      }
+      else if (localName.equals("remote"))
+      {
+         ref.setRemote(getValue(localName, value));
+      }
+      else if (localName.equals("ejb-link"))
+      {
+         ref.setEjbLink(getValue(localName, value));
+      }
+      else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
+      {
+         ref.setMappedName(getValue(localName, value));
+      }
+      else if (localName.equals("ignore-dependency"))
+      {
+         ref.setIgnoreDependency(true);
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(InjectionTarget target, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("injection-target-class"))
+      {
+         target.setTargetClass(getValue(localName, value));
+      }
+      else if (localName.equals("injection-target-name"))
+      {
+         target.setTargetName(getValue(localName, value));
+      }
+   }
+
+   /**
+    * Called when a child element with simple content is read for DD.
+    */
+   public void setValue(MessageDestinationRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("description"))
+      {
+         ref.setDescription(getValue(localName, value));
+      }
+      else if (localName.equals("message-destination-ref-name"))
+      {
+         ref.setMessageDestinationRefName(getValue(localName, value));
+      }
+      else if (localName.equals("message-destination-type"))
+      {
+         ref.setMessageDestinationType(getValue(localName, value));
+      }
+      else if (localName.equals("message-destination-usage"))
+      {
+         ref.setMessageDestinationUsage(getValue(localName, value));
+      }
+      else if (localName.equals("message-destination-link"))
+      {
+         ref.setMessageDestinationLink(getValue(localName, value));
+      }
+      else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
+      {
+         ref.setMappedName(getValue(localName, value));
+      }
+   }
+
+   public void setValue(EnvEntry entry, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("description"))
+      {
+         entry.setDescription(getValue(localName, value));
+      }
+      else if (localName.equals("env-entry-name"))
+      {
+         entry.setEnvEntryName(getValue(localName, value));
+      }
+      else if (localName.equals("env-entry-type"))
+      {
+         entry.setEnvEntryType(getValue(localName, value));
+      }
+      else if (localName.equals("env-entry-value"))
+      {
+         entry.setEnvEntryValue(getValue(localName, value));
+      }
+   }
+
+   public void setValue(ResourceEnvRef envRef, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("res-ref-name") || localName.equals("resource-env-ref-name"))
+      {
+         envRef.setResRefName(getValue(localName, value));
+      }
+      else if (localName.equals("res-type") || localName.equals("resource-env-ref-type"))
+      {
+         envRef.setResType(getValue(localName, value));
+      }
+      else if (localName.equals("res-auth"))
+      {
+         envRef.setResAuth(getValue(localName, value));
+      }
+      else if (localName.equals("res-sharing-scope"))
+      {
+         envRef.setResSharingScope(getValue(localName, value));
+      }
+      else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
+      {
+         envRef.setMappedName(getValue(localName, value));
+      }
+   }
+
+   public void setValue(ResourceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("res-ref-name") || localName.equals("resource-env-ref-name"))
+      {
+         ref.setResRefName(getValue(localName, value));
+      }
+      else if (localName.equals("res-type") || localName.equals("resource-env-ref-type"))
+      {
+         ref.setResType(getValue(localName, value));
+      }
+      else if (localName.equals("res-auth"))
+      {
+         ref.setResAuth(getValue(localName, value));
+      }
+      else if (localName.equals("res-sharing-scope"))
+      {
+         ref.setResSharingScope(getValue(localName, value));
+      }
+      else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
+      {
+         ref.setMappedName(getValue(localName, value));
+         ref.setJndiName(getValue(localName, value));
+      }
+      else if (localName.equals("res-url"))
+      {
+         ref.setResUrl(getValue(localName, value));
+      }
+      else if (localName.equals("resource-name"))
+      {
+         ref.setResourceName(getValue(localName, value));
+         ref.setMappedName(getValue(localName, value));
+      }
+   }
+
+   public void setValue(ServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("service-ref-name"))
+      {
+         ref.setServiceRefName(value);
+      }
+      else if (localName.equals("service-class-name"))
+      {
+         ref.setServiceClassName(value);
+      }
+      else if (localName.equals("service-qname"))
+      {
+         ref.setServiceQName(QName.valueOf(value));
+      }
+      else if (localName.equals("config-name"))
+      {
+         ref.setConfigName(value);
+      }
+      else if (localName.equals("config-file"))
+      {
+         ref.setConfigFile(value);
+      }
+      else if (localName.equals("handler-chain"))
+      {
+         ref.setHandlerChain(value);
+      }
+      else if (localName.equals("wsdl-override"))
+      {
+         ref.setWsdlOverride(value);
+      }
+   }
+
+   private Object newServiceRefChild(ServiceRef ref, String localName)
+   {
+      Object child = newRefChild(ref, localName);
+
+      if (localName.equals("port-info"))
+         child = new PortInfo(ref);
+
+      return child;
+   }
+
+   public void addChild(ServiceRef parent, PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.getPortInfos().add(portInfo);
+   }
+
+   public void setValue(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("service-endpoint-interface"))
+      {
+         portInfo.setServiceEndpointInterface(value);
+      }
+      else if (localName.equals("port-qname"))
+      {
+         portInfo.setPortQName(QName.valueOf(value));
+      }
+      else if (localName.equals("config-name"))
+      {
+         portInfo.setConfigName(value);
+      }
+      else if (localName.equals("config-file"))
+      {
+         portInfo.setConfigFile(value);
+      }
+   }
+
+   public Object newChild(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+   {
+      Object child = null;
+      if (localName.equals("stub-property"))
+         child = new NameValuePair();
+
+      return child;
+   }
+
+   public void addChild(PortInfo parent, NameValuePair stubProp, UnmarshallingContext navigator, String namespaceURI, String localName)
+   {
+      parent.getStubProperties().add(stubProp);
+   }
+
+   public void setValue(NameValuePair nvPair, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("name"))
+      {
+         nvPair.setName(value);
+      }
+      else if (localName.equals("value"))
+      {
+         nvPair.setValue(value);
+      }
+   }
+
+   public void setValue(SecurityRole role, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("role-name"))
+      {
+         role.setRoleName(getValue(localName, value));
+      }
+   }
+
+   public void setValue(JndiRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("mapped-name"))
+      {
+         ref.setMappedName(getValue(localName, value));
+      }
+      else if (localName.equals("jndi-ref-name"))
+      {
+         ref.setJndiRefName(getValue(localName, value));
+      }
+   }
+
+   public void setValue(RunAs runAs, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("role-name"))
+      {
+         runAs.setRoleName(getValue(localName, value));
+      }
+   }
+
+   public void setValue(SecurityRoleRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("role-name"))
+      {
+         ref.setRoleName(getValue(localName, value));
+      }
+      else if (localName.equals("role-link"))
+      {
+         ref.setRoleLink(getValue(localName, value));
+      }
+   }
+
+   public void setValue(Listener listener, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("listener-class"))
+      {
+         listener.setListenerClass(getValue(localName, value));
+      }
+   }
+
+   public void setValue(MessageDestination destination, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("message-destination-name"))
+      {
+         destination.setMessageDestinationName(getValue(localName, value));
+      }
+      else if (localName.equals("mapped-name") || localName.equals("jndi-name"))
+      {
+         destination.setMappedName(getValue(localName, value));
+      }
+   }
+
+   public void setValue(PersistenceUnitRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("persistence-unit-ref-name"))
+      {
+         ref.setRefName(getValue(localName, value));
+      }
+      else if (localName.equals("persistence-unit-name"))
+      {
+         ref.setUnitName(getValue(localName, value));
+      }
+      else
+      {
+         throw new RuntimeException("INVALID element<" + localName + "> in <persistence-unit-ref>");
+      }
+   }
+
+   protected Object newEnvRefGroupChild(String localName)
+   {
+      Object child = null;
+
+      if (localName.equals("ejb-local-ref"))
+      {
+         child = new EjbLocalRef();
+      }
+      else if (localName.equals("ejb-ref"))
+      {
+         child = new EjbRef();
+      }
+      else if (localName.equals("resource-ref"))
+      {
+         child = new ResourceRef();
+      }
+      else if (localName.equals("resource-env-ref"))
+      {
+         child = new ResourceEnvRef();
+      }
+      else if (localName.equals("env-entry"))
+      {
+         child = new EnvEntry();
+      }
+      else if (localName.equals("message-destination-ref"))
+      {
+         child = new MessageDestinationRef();
+      }
+      else if (localName.equals("service-ref"))
+      {
+         child = new ServiceRef();
+      }
+      else if (localName.equals("jndi-ref"))
+      {
+         child = new JndiRef();
+      }
+      else if (localName.equals("persistence-unit-ref"))
+      {
+         child = new PersistenceUnitRef();
+      }
+      else if (localName.equals("persistence-context-ref"))
+      {
+         child = new PersistenceContextRef();
+      }
+
+      return child;
+   }
+
+   protected Object newRefChild(Ref ref, String localName)
+   {
+      Object child = null;
+
+      if (localName.equals("ignore-dependency"))
+      {
+         ref.setIgnoreDependency(true);
+      }
+      else if (localName.equals("injection-target"))
+      {
+         InjectionTarget target = new InjectionTarget();
+         child = target;
+      }
+
+      return child;
+   }
+
+   public void setValue(PersistenceContextRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("persistence-context-ref-name"))
+      {
+         ref.setRefName(getValue(localName, value));
+      }
+      else if (localName.equals("persistence-unit-name"))
+      {
+         ref.setUnitName(getValue(localName, value));
+      }
+      else if (localName.equals("persistence-context-type"))
+      {
+         if (value.toLowerCase().equals("transaction"))
+         {
+            ref.setPersistenceContextType(PersistenceContextType.TRANSACTION);
+         }
+         else
+         {
+            ref.setPersistenceContextType(PersistenceContextType.EXTENDED);
+         }
+      }
+   }
+
+   protected String getValue(String name, String value)
+   {
+      return value;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbLocalRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbLocalRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbLocalRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-/**
- * Represents an ejb-local-ref element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 46506 $</tt>
- */
-public class EjbLocalRef extends BaseEjbRef
-{
-   private String localHome;
-
-   private String local;
-
-   public String getLocalHome()
-   {
-      return localHome;
-   }
-
-   public void setLocalHome(String localHome)
-   {
-      this.localHome = localHome;
-   }
-
-   public String getLocal()
-   {
-      return local;
-   }
-
-   public void setLocal(String local)
-   {
-      this.local = local;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbRefName=").append(ejbRefName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbLocalRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/EjbLocalRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbLocalRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbLocalRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+/**
+ * Represents an ejb-local-ref element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class EjbLocalRef extends BaseEjbRef
+{
+   private String localHome;
+
+   private String local;
+
+   public String getLocalHome()
+   {
+      return localHome;
+   }
+
+   public void setLocalHome(String localHome)
+   {
+      this.localHome = localHome;
+   }
+
+   public String getLocal()
+   {
+      return local;
+   }
+
+   public void setLocal(String local)
+   {
+      this.local = local;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("ejbRefName=").append(ejbRefName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbLocalRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-/**
- * Represents an ejb-ref element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 46506 $</tt>
- */
-public class EjbRef extends BaseEjbRef
-{
-
-   private String home;
-   
-   private String remote;
-
-   public String getHome()
-   {
-      return home;
-   }
-
-   public void setHome(String home)
-   {
-      this.home = home;
-   }
-
-   public String getRemote()
-   {
-      return remote;
-   }
-
-   public void setRemote(String remote)
-   {
-      this.remote = remote;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("ejbRefName=").append(ejbRefName);
-      sb.append(", ejbRefType=").append(ejbRefType);
-      sb.append(", remote=").append(remote);
-      sb.append(", jndiName=").append(mappedName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/EjbRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+/**
+ * Represents an ejb-ref element of the ejb-jar.xml deployment descriptor for
+ * the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class EjbRef extends BaseEjbRef
+{
+
+   private String home;
+   
+   private String remote;
+
+   public String getHome()
+   {
+      return home;
+   }
+
+   public void setHome(String home)
+   {
+      this.home = home;
+   }
+
+   public String getRemote()
+   {
+      return remote;
+   }
+
+   public void setRemote(String remote)
+   {
+      this.remote = remote;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("ejbRefName=").append(ejbRefName);
+      sb.append(", ejbRefType=").append(ejbRefType);
+      sb.append(", remote=").append(remote);
+      sb.append(", jndiName=").append(mappedName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EjbRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvEntry.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvEntry.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvEntry.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-/**
- * Represents an env-entry element of the ejb-jar.xml deployment descriptor for
- * the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45240 $</tt>
- */
-public class EnvEntry extends Ref
-{
-   private String description;
-
-   private String envEntryName;
-
-   private String envEntryType;
-
-   private String envEntryValue;
-
-   public String getDescription()
-   {
-      return description;
-   }
-
-   public void setDescription(String description)
-   {
-      this.description = description;
-   }
-
-   public String getEnvEntryName()
-   {
-      return envEntryName;
-   }
-
-   public void setEnvEntryName(String envEntryName)
-   {
-      this.envEntryName = envEntryName;
-   }
-
-   public String getEnvEntryType()
-   {
-      return envEntryType;
-   }
-
-   public void setEnvEntryType(String envEntryType)
-   {
-      this.envEntryType = envEntryType;
-   }
-
-   public String getEnvEntryValue()
-   {
-      return envEntryValue;
-   }
-
-   public void setEnvEntryValue(String envEntryValue)
-   {
-      this.envEntryValue = envEntryValue;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("envEntryName=").append(envEntryName);
-      sb.append(",envEntryType=").append(envEntryType);
-      sb.append(",envEntryValue=").append(envEntryValue);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvEntry.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/EnvEntry.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvEntry.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvEntry.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+/**
+ * Represents an env-entry element of the ejb-jar.xml deployment descriptor for
+ * the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class EnvEntry extends Ref
+{
+   private String description;
+
+   private String envEntryName;
+
+   private String envEntryType;
+
+   private String envEntryValue;
+
+   public String getDescription()
+   {
+      return description;
+   }
+
+   public void setDescription(String description)
+   {
+      this.description = description;
+   }
+
+   public String getEnvEntryName()
+   {
+      return envEntryName;
+   }
+
+   public void setEnvEntryName(String envEntryName)
+   {
+      this.envEntryName = envEntryName;
+   }
+
+   public String getEnvEntryType()
+   {
+      return envEntryType;
+   }
+
+   public void setEnvEntryType(String envEntryType)
+   {
+      this.envEntryType = envEntryType;
+   }
+
+   public String getEnvEntryValue()
+   {
+      return envEntryValue;
+   }
+
+   public void setEnvEntryValue(String envEntryValue)
+   {
+      this.envEntryValue = envEntryValue;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("envEntryName=").append(envEntryName);
+      sb.append(",envEntryType=").append(envEntryType);
+      sb.append(",envEntryValue=").append(envEntryValue);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvEntry.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,249 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import java.util.HashMap;
-import java.util.Collection;
-import java.util.List;
-import java.util.ArrayList;
-
-import org.jboss.logging.Logger;
-
-import org.jboss.metamodel.descriptor.EjbLocalRef;
-import org.jboss.metamodel.descriptor.EjbRef;
-import org.jboss.metamodel.descriptor.EnvEntry;
-import org.jboss.metamodel.descriptor.JndiRef;
-import org.jboss.metamodel.descriptor.MessageDestinationRef;
-import org.jboss.metamodel.descriptor.ResourceEnvRef;
-import org.jboss.metamodel.descriptor.ResourceRef;
-import org.jboss.metamodel.descriptor.WebServiceRef;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 56237 $</tt>
- */
-public abstract class EnvironmentRefGroup
-{
-   private static final Logger log = Logger.getLogger(EnvironmentRefGroup.class);
-
-   protected HashMap<String, EjbLocalRef> ejbLocalRefs = new HashMap<String, EjbLocalRef>();
-   protected HashMap<String, EjbRef> ejbRefs = new HashMap<String, EjbRef>();
-   protected HashMap<String, EnvEntry> envEntries = new HashMap<String, EnvEntry>();
-   protected HashMap<String, ResourceEnvRef> resourceEnvRefs = new HashMap<String, ResourceEnvRef>();
-   protected HashMap<String, ResourceRef> resourceRefs = new HashMap<String, ResourceRef>();
-   protected HashMap<String, MessageDestinationRef> messageDestinationRefs = new HashMap<String, MessageDestinationRef>();
-   /** An index of MessageDestinationRef keyed by message-destination-link values */
-   protected HashMap<String, MessageDestinationRef> messageDestinationRefsByLink = new HashMap<String, MessageDestinationRef>();
-   protected HashMap<String, WebServiceRef> webServiceRefs = new HashMap<String, WebServiceRef>();
-   protected HashMap<String, JndiRef> jndiRefs = new HashMap<String, JndiRef>();
-   protected List<PersistenceContextRef> persistenceContextRefs = new ArrayList<PersistenceContextRef>();
-   protected List<PersistenceUnitRef> persistenceUnitRefs = new ArrayList<PersistenceUnitRef>();
-
-   public Collection<MessageDestinationRef> getMessageDestinationRefs()
-   {
-      return messageDestinationRefs.values();
-   }
-
-   public void addMessageDestinationRef(MessageDestinationRef ref)
-   {
-      log.debug("addMessageDestinationRef, "+ref);
-      messageDestinationRefs.put(ref.getMessageDestinationRefName(), ref);
-      String link = ref.getMessageDestinationLink();
-      if( link != null )
-      {
-         messageDestinationRefsByLink.put(link, ref);
-      }
-   }
-
-   public Collection<EjbLocalRef> getEjbLocalRefs()
-   {
-      return ejbLocalRefs.values();
-   }
-
-   public void addEjbLocalRef(EjbLocalRef ref)
-   {
-      ejbLocalRefs.put(ref.getEjbRefName(), ref);
-   }
-
-   public Collection<EjbRef> getEjbRefs()
-   {
-      return ejbRefs.values();
-   }
-
-   public void addEjbRef(EjbRef ref)
-   {
-      ejbRefs.put(ref.getEjbRefName(), ref);
-   }
-  
-   public Collection<EnvEntry> getEnvEntries()
-   {
-      return envEntries.values();
-   }
-
-   public void addEnvEntry(EnvEntry entry)
-   {
-      envEntries.put(entry.getEnvEntryName(), entry);
-   }
-
-   public Collection<ResourceEnvRef> getResourceEnvRefs()
-   {
-      return resourceEnvRefs.values();
-   }
-
-   public void addResourceEnvRef(ResourceEnvRef envRef)
-   {
-      resourceEnvRefs.put(envRef.getResRefName(), envRef);
-   }
-   
-   public Collection<ResourceRef> getResourceRefs()
-   {
-      return resourceRefs.values();
-   }
-
-   public void addResourceRef(ResourceRef ref)
-   {
-      resourceRefs.put(ref.getResRefName(), ref);
-   }
-   
-   public Collection<JndiRef> getJndiRefs()
-   {
-      return jndiRefs.values();
-   }
-
-   public void addJndiRef(JndiRef ref)
-   {
-      jndiRefs.put(ref.getJndiRefName(), ref);
-   }
-   
-   public Collection<WebServiceRef> getWebServiceRefs()
-   {
-      return webServiceRefs.values();
-   }
-
-   public void addWebServiceRef(WebServiceRef ref)
-   {
-      webServiceRefs.put(ref.getServiceRefName(), ref);
-   }
-   
-   public void updateEjbRef(EjbRef updatedRef)
-   {
-      EjbRef ref = (EjbRef)ejbRefs.get(updatedRef.getEjbRefName());
-      if (ref != null)
-      {
-         ref.setMappedName(updatedRef.getMappedName());
-         ref.setIgnoreDependency(updatedRef.isIgnoreDependency());
-      }
-      else
-      {
-         ejbRefs.put(updatedRef.getEjbRefName(), updatedRef);
-      }
-   }
-
-   public void updateEjbLocalRef(EjbLocalRef updatedRef)
-   {
-      EjbLocalRef ref = (EjbLocalRef)ejbLocalRefs.get(updatedRef.getEjbRefName());
-      if (ref != null)
-      {
-         ref.setMappedName(updatedRef.getMappedName());
-         ref.setIgnoreDependency(updatedRef.isIgnoreDependency());
-      }
-      else
-      {
-         ejbLocalRefs.put(updatedRef.getEjbRefName(), updatedRef);
-      }
-   }
-   
-   public void updateResourceRef(ResourceRef updatedRef)
-   {
-      ResourceRef ref = (ResourceRef)resourceRefs.get(updatedRef.getResRefName());
-      if (ref != null)
-      {
-         ref.setMappedName(updatedRef.getMappedName());
-         ref.setResUrl(updatedRef.getResUrl());
-         ref.setResourceName(updatedRef.getResourceName());
-      }
-      else
-      {
-         resourceRefs.put(updatedRef.getResRefName(), updatedRef);
-      }
-   }
-   
-   public void updateResourceEnvRef(ResourceEnvRef updatedRef)
-   {
-      ResourceEnvRef ref = (ResourceEnvRef)resourceEnvRefs.get(updatedRef.getResRefName());
-      if (ref != null)
-      {
-         ref.setMappedName(updatedRef.getMappedName());
-      }
-      else
-      {
-         resourceEnvRefs.put(updatedRef.getResRefName(), updatedRef);
-      }
-   }
-   
-   public void updateMessageDestinationRef(MessageDestinationRef updatedRef)
-   {
-      log.debug("updateMessageDestinationRef, "+updatedRef);
-      MessageDestinationRef ref = (MessageDestinationRef)messageDestinationRefs.get(updatedRef.getMessageDestinationRefName());
-      if (ref != null)
-      {
-         ref.setMappedName(updatedRef.getMappedName());
-      }
-      else
-      {
-         messageDestinationRefs.put(updatedRef.getMessageDestinationRefName(), updatedRef);
-         ref = updatedRef;
-      }
-   }
- 
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      return sb.toString();
-   }
-
-   public List<PersistenceContextRef> getPersistenceContextRefs()
-   {
-      return persistenceContextRefs;
-   }
-
-   public List<PersistenceUnitRef> getPersistenceUnitRefs()
-   {
-      return persistenceUnitRefs;
-   }
-
-   public void addPersistenceContextRef(PersistenceContextRef ref)
-   {
-      persistenceContextRefs.add(ref);
-   }
-
-   public void addPersistenceUnitRef(PersistenceUnitRef ref)
-   {
-      persistenceUnitRefs.add(ref);
-   }
-
-   public MessageDestinationRef getMessageDestinationRefForLink(String link)
-   {
-      MessageDestinationRef ref = messageDestinationRefsByLink.get(link);
-      return ref;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,249 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.jboss.logging.Logger;
+
+import org.jboss.metamodel.descriptor.EjbLocalRef;
+import org.jboss.metamodel.descriptor.EjbRef;
+import org.jboss.metamodel.descriptor.EnvEntry;
+import org.jboss.metamodel.descriptor.JndiRef;
+import org.jboss.metamodel.descriptor.MessageDestinationRef;
+import org.jboss.metamodel.descriptor.ResourceEnvRef;
+import org.jboss.metamodel.descriptor.ResourceRef;
+import org.jboss.metamodel.descriptor.ServiceRef;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public abstract class EnvironmentRefGroup
+{
+   private static final Logger log = Logger.getLogger(EnvironmentRefGroup.class);
+
+   protected HashMap<String, EjbLocalRef> ejbLocalRefs = new HashMap<String, EjbLocalRef>();
+   protected HashMap<String, EjbRef> ejbRefs = new HashMap<String, EjbRef>();
+   protected HashMap<String, EnvEntry> envEntries = new HashMap<String, EnvEntry>();
+   protected HashMap<String, ResourceEnvRef> resourceEnvRefs = new HashMap<String, ResourceEnvRef>();
+   protected HashMap<String, ResourceRef> resourceRefs = new HashMap<String, ResourceRef>();
+   protected HashMap<String, MessageDestinationRef> messageDestinationRefs = new HashMap<String, MessageDestinationRef>();
+   /** An index of MessageDestinationRef keyed by message-destination-link values */
+   protected HashMap<String, MessageDestinationRef> messageDestinationRefsByLink = new HashMap<String, MessageDestinationRef>();
+   protected HashMap<String, ServiceRef> serviceRefs = new HashMap<String, ServiceRef>();
+   protected HashMap<String, JndiRef> jndiRefs = new HashMap<String, JndiRef>();
+   protected List<PersistenceContextRef> persistenceContextRefs = new ArrayList<PersistenceContextRef>();
+   protected List<PersistenceUnitRef> persistenceUnitRefs = new ArrayList<PersistenceUnitRef>();
+
+   public Collection<MessageDestinationRef> getMessageDestinationRefs()
+   {
+      return messageDestinationRefs.values();
+   }
+
+   public void addMessageDestinationRef(MessageDestinationRef ref)
+   {
+      log.debug("addMessageDestinationRef, "+ref);
+      messageDestinationRefs.put(ref.getMessageDestinationRefName(), ref);
+      String link = ref.getMessageDestinationLink();
+      if( link != null )
+      {
+         messageDestinationRefsByLink.put(link, ref);
+      }
+   }
+
+   public Collection<EjbLocalRef> getEjbLocalRefs()
+   {
+      return ejbLocalRefs.values();
+   }
+
+   public void addEjbLocalRef(EjbLocalRef ref)
+   {
+      ejbLocalRefs.put(ref.getEjbRefName(), ref);
+   }
+
+   public Collection<EjbRef> getEjbRefs()
+   {
+      return ejbRefs.values();
+   }
+
+   public void addEjbRef(EjbRef ref)
+   {
+      ejbRefs.put(ref.getEjbRefName(), ref);
+   }
+  
+   public Collection<EnvEntry> getEnvEntries()
+   {
+      return envEntries.values();
+   }
+
+   public void addEnvEntry(EnvEntry entry)
+   {
+      envEntries.put(entry.getEnvEntryName(), entry);
+   }
+
+   public Collection<ResourceEnvRef> getResourceEnvRefs()
+   {
+      return resourceEnvRefs.values();
+   }
+
+   public void addResourceEnvRef(ResourceEnvRef envRef)
+   {
+      resourceEnvRefs.put(envRef.getResRefName(), envRef);
+   }
+   
+   public Collection<ResourceRef> getResourceRefs()
+   {
+      return resourceRefs.values();
+   }
+
+   public void addResourceRef(ResourceRef ref)
+   {
+      resourceRefs.put(ref.getResRefName(), ref);
+   }
+   
+   public Collection<JndiRef> getJndiRefs()
+   {
+      return jndiRefs.values();
+   }
+
+   public void addJndiRef(JndiRef ref)
+   {
+      jndiRefs.put(ref.getJndiRefName(), ref);
+   }
+   
+   public Collection<ServiceRef> getServiceRefs()
+   {
+      return serviceRefs.values();
+   }
+
+   public void addServiceRef(ServiceRef ref)
+   {
+      serviceRefs.put(ref.getServiceRefName(), ref);
+   }
+   
+   public void updateEjbRef(EjbRef updatedRef)
+   {
+      EjbRef ref = (EjbRef)ejbRefs.get(updatedRef.getEjbRefName());
+      if (ref != null)
+      {
+         ref.setMappedName(updatedRef.getMappedName());
+         ref.setIgnoreDependency(updatedRef.isIgnoreDependency());
+      }
+      else
+      {
+         ejbRefs.put(updatedRef.getEjbRefName(), updatedRef);
+      }
+   }
+
+   public void updateEjbLocalRef(EjbLocalRef updatedRef)
+   {
+      EjbLocalRef ref = (EjbLocalRef)ejbLocalRefs.get(updatedRef.getEjbRefName());
+      if (ref != null)
+      {
+         ref.setMappedName(updatedRef.getMappedName());
+         ref.setIgnoreDependency(updatedRef.isIgnoreDependency());
+      }
+      else
+      {
+         ejbLocalRefs.put(updatedRef.getEjbRefName(), updatedRef);
+      }
+   }
+   
+   public void updateResourceRef(ResourceRef updatedRef)
+   {
+      ResourceRef ref = (ResourceRef)resourceRefs.get(updatedRef.getResRefName());
+      if (ref != null)
+      {
+         ref.setMappedName(updatedRef.getMappedName());
+         ref.setResUrl(updatedRef.getResUrl());
+         ref.setResourceName(updatedRef.getResourceName());
+      }
+      else
+      {
+         resourceRefs.put(updatedRef.getResRefName(), updatedRef);
+      }
+   }
+   
+   public void updateResourceEnvRef(ResourceEnvRef updatedRef)
+   {
+      ResourceEnvRef ref = (ResourceEnvRef)resourceEnvRefs.get(updatedRef.getResRefName());
+      if (ref != null)
+      {
+         ref.setMappedName(updatedRef.getMappedName());
+      }
+      else
+      {
+         resourceEnvRefs.put(updatedRef.getResRefName(), updatedRef);
+      }
+   }
+   
+   public void updateMessageDestinationRef(MessageDestinationRef updatedRef)
+   {
+      log.debug("updateMessageDestinationRef, "+updatedRef);
+      MessageDestinationRef ref = (MessageDestinationRef)messageDestinationRefs.get(updatedRef.getMessageDestinationRefName());
+      if (ref != null)
+      {
+         ref.setMappedName(updatedRef.getMappedName());
+      }
+      else
+      {
+         messageDestinationRefs.put(updatedRef.getMessageDestinationRefName(), updatedRef);
+         ref = updatedRef;
+      }
+   }
+ 
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      return sb.toString();
+   }
+
+   public List<PersistenceContextRef> getPersistenceContextRefs()
+   {
+      return persistenceContextRefs;
+   }
+
+   public List<PersistenceUnitRef> getPersistenceUnitRefs()
+   {
+      return persistenceUnitRefs;
+   }
+
+   public void addPersistenceContextRef(PersistenceContextRef ref)
+   {
+      persistenceContextRefs.add(ref);
+   }
+
+   public void addPersistenceUnitRef(PersistenceUnitRef ref)
+   {
+      persistenceUnitRefs.add(ref);
+   }
+
+   public MessageDestinationRef getMessageDestinationRefForLink(String link)
+   {
+      MessageDestinationRef ref = messageDestinationRefsByLink.get(link);
+      return ref;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/EnvironmentRefGroup.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/InjectionTarget.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/InjectionTarget.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/InjectionTarget.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 45240 $
- */
-public class InjectionTarget
-{
-   private String targetClass;
-   private String targetName;
-
-   public String getTargetClass()
-   {
-      return targetClass;
-   }
-
-   public void setTargetClass(String targetClass)
-   {
-      this.targetClass = targetClass;
-   }
-
-   public String getTargetName()
-   {
-      return targetName;
-   }
-
-   public void setTargetName(String targetName)
-   {
-      this.targetName = targetName;
-   }
-   
-   public String toString()
-   {
-      StringBuffer buffer = new StringBuffer(100);
-      buffer.append("[InjectionTarget:targetClass=" + targetClass);
-      buffer.append(", targetName=" + targetName);
-      buffer.append("]");
-      
-      return buffer.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/InjectionTarget.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/InjectionTarget.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/InjectionTarget.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/InjectionTarget.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class InjectionTarget
+{
+   private String targetClass;
+   private String targetName;
+
+   public String getTargetClass()
+   {
+      return targetClass;
+   }
+
+   public void setTargetClass(String targetClass)
+   {
+      this.targetClass = targetClass;
+   }
+
+   public String getTargetName()
+   {
+      return targetName;
+   }
+
+   public void setTargetName(String targetName)
+   {
+      this.targetName = targetName;
+   }
+   
+   public String toString()
+   {
+      StringBuffer buffer = new StringBuffer(100);
+      buffer.append("[InjectionTarget:targetClass=" + targetClass);
+      buffer.append(", targetName=" + targetName);
+      buffer.append("]");
+      
+      return buffer.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/InjectionTarget.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/JndiRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/JndiRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/JndiRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.logging.Logger;
-
-import org.jboss.metamodel.descriptor.InjectionTarget;
-
-/**
- * Represents a <jndi-ref> element of the jboss.xml deployment descriptor
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45249 $</tt>
- */
-public class JndiRef extends Ref
-{
-   private static final Logger log = Logger.getLogger(JndiRef.class);
-   
-   private String jndiRefName;
-   
-   private String mappedName;
-   
-   public String getJndiRefName()
-   {
-      return jndiRefName;
-   }
-
-   public void setJndiRefName(String jndiRefName)
-   {
-      this.jndiRefName = jndiRefName;
-   }
-
-   public String getMappedName()
-   {
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[" + this.getClass().getName() + ": ");
-      sb.append("mappedName=").append(mappedName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/JndiRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/JndiRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/JndiRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/JndiRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import org.jboss.logging.Logger;
+
+import org.jboss.metamodel.descriptor.InjectionTarget;
+
+/**
+ * Represents a <jndi-ref> element of the jboss.xml deployment descriptor
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class JndiRef extends Ref
+{
+   private static final Logger log = Logger.getLogger(JndiRef.class);
+   
+   private String jndiRefName;
+   
+   private String mappedName;
+   
+   public String getJndiRefName()
+   {
+      return jndiRefName;
+   }
+
+   public void setJndiRefName(String jndiRefName)
+   {
+      this.jndiRefName = jndiRefName;
+   }
+
+   public String getMappedName()
+   {
+      return mappedName;
+   }
+
+   public void setMappedName(String mappedName)
+   {
+      this.mappedName = mappedName;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[" + this.getClass().getName() + ": ");
+      sb.append("mappedName=").append(mappedName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/JndiRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Listener.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Listener.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Listener.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a <listener> element of the deployment descriptor
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45409 $</tt>
- */
-public class Listener
-{
-   private static final Logger log = Logger.getLogger(Listener.class);
-   
-   protected String clazz;
-   
-   public String getListenerClass()
-   {
-      return clazz;
-   }
-   
-   public void setListenerClass(String clazz)
-   {
-      this.clazz = clazz;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Listener.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/Listener.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Listener.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Listener.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Represents a <listener> element of the deployment descriptor
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class Listener
+{
+   private static final Logger log = Logger.getLogger(Listener.class);
+   
+   protected String clazz;
+   
+   public String getListenerClass()
+   {
+      return clazz;
+   }
+   
+   public void setListenerClass(String clazz)
+   {
+      this.clazz = clazz;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Listener.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestination.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestination.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestination.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.logging.Logger;
-
-
-/**
- * Represents a <message-destination> element of the web.xml deployment descriptor for the
- * 2.5 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45409 $</tt>
- */
-public class MessageDestination
-{
-   private static final Logger log = Logger.getLogger(MessageDestination.class);
-
-   private String messageDestinationName;
-
-   private String mappedName;
-
-   public String getMappedName()
-   {     
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-   
-   public String getMessageDestinationName()
-   {
-      return messageDestinationName;
-   }
-
-   public void setMessageDestinationName(String messageDestinationName)
-   {
-      this.messageDestinationName = messageDestinationName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("messageDestinationRefName=").append(messageDestinationName);
-      sb.append(", mappedName=").append(mappedName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestination.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/MessageDestination.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestination.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestination.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import org.jboss.logging.Logger;
+
+
+/**
+ * Represents a <message-destination> element of the web.xml deployment descriptor for the
+ * 2.5 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class MessageDestination
+{
+   private static final Logger log = Logger.getLogger(MessageDestination.class);
+
+   private String messageDestinationName;
+
+   private String mappedName;
+
+   public String getMappedName()
+   {     
+      return mappedName;
+   }
+
+   public void setMappedName(String mappedName)
+   {
+      this.mappedName = mappedName;
+   }
+   
+   public String getMessageDestinationName()
+   {
+      return messageDestinationName;
+   }
+
+   public void setMessageDestinationName(String messageDestinationName)
+   {
+      this.messageDestinationName = messageDestinationName;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("messageDestinationRefName=").append(messageDestinationName);
+      sb.append(", mappedName=").append(mappedName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestination.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestinationRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestinationRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestinationRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,145 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.logging.Logger;
-
-
-/**
- * Represents a <message-destination-ref> element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 56237 $</tt>
- */
-public class MessageDestinationRef extends Ref
-{
-   private static final Logger log = Logger.getLogger(MessageDestinationRef.class);
-   
-   private String description;
-
-   private String messageDestinationRefName;
-
-   private String messageDestinationType;
-
-   private String messageDestinationUsage;
-
-   private String messageDestinationLink;
-
-   private String mappedName;
-   
-   private String jndiName;
-   
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public String getMappedName()
-   {     
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public String getDescription()
-   {
-      return description;
-   }
-
-   public void setDescription(String description)
-   {
-      this.description = description;
-   }
-
-   public String getMessageDestinationRefName()
-   {
-      return messageDestinationRefName;
-   }
-
-   public void setMessageDestinationRefName(String messageDestinationRefName)
-   {
-      this.messageDestinationRefName = messageDestinationRefName;
-   }
-
-   public String getMessageDestinationType()
-   {
-      return messageDestinationType;
-   }
-
-   public void setMessageDestinationType(String messageDestinationType)
-   {
-      this.messageDestinationType = messageDestinationType;
-   }
-
-   public String getMessageDestinationUsage()
-   {
-      return messageDestinationUsage;
-   }
-
-   public void setMessageDestinationUsage(String messageDestinationUsage)
-   {
-      this.messageDestinationUsage = messageDestinationUsage;
-   }
-
-   public String getMessageDestinationLink()
-   {
-      return messageDestinationLink;
-   }
-
-   public void setMessageDestinationLink(String messageDestinationLink)
-   {
-      this.messageDestinationLink = messageDestinationLink;
-   }
-   
-   public void merge(MessageDestinationRef ref)
-   {
-      if (ref.getJndiName() != null)
-      {
-         this.setJndiName(ref.getJndiName());
-         
-         setMappedName(ref.getJndiName());
-      }
-   }
-
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("messageDestinationRefName=").append(messageDestinationRefName);
-      sb.append(", messageDestinationType=").append(messageDestinationType);
-      sb.append(", messageDestinationLink=").append(messageDestinationLink);
-      sb.append(", messageDestinationUsage=").append(messageDestinationUsage);
-      sb.append(", mappedName=").append(mappedName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestinationRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/MessageDestinationRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestinationRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestinationRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,145 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import org.jboss.logging.Logger;
+
+
+/**
+ * Represents a <message-destination-ref> element of the ejb-jar.xml deployment descriptor for the
+ * 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class MessageDestinationRef extends Ref
+{
+   private static final Logger log = Logger.getLogger(MessageDestinationRef.class);
+   
+   private String description;
+
+   private String messageDestinationRefName;
+
+   private String messageDestinationType;
+
+   private String messageDestinationUsage;
+
+   private String messageDestinationLink;
+
+   private String mappedName;
+   
+   private String jndiName;
+   
+   public String getJndiName()
+   {
+      return jndiName;
+   }
+
+   public void setJndiName(String jndiName)
+   {
+      this.jndiName = jndiName;
+   }
+
+   public String getMappedName()
+   {     
+      return mappedName;
+   }
+
+   public void setMappedName(String mappedName)
+   {
+      this.mappedName = mappedName;
+   }
+
+   public String getDescription()
+   {
+      return description;
+   }
+
+   public void setDescription(String description)
+   {
+      this.description = description;
+   }
+
+   public String getMessageDestinationRefName()
+   {
+      return messageDestinationRefName;
+   }
+
+   public void setMessageDestinationRefName(String messageDestinationRefName)
+   {
+      this.messageDestinationRefName = messageDestinationRefName;
+   }
+
+   public String getMessageDestinationType()
+   {
+      return messageDestinationType;
+   }
+
+   public void setMessageDestinationType(String messageDestinationType)
+   {
+      this.messageDestinationType = messageDestinationType;
+   }
+
+   public String getMessageDestinationUsage()
+   {
+      return messageDestinationUsage;
+   }
+
+   public void setMessageDestinationUsage(String messageDestinationUsage)
+   {
+      this.messageDestinationUsage = messageDestinationUsage;
+   }
+
+   public String getMessageDestinationLink()
+   {
+      return messageDestinationLink;
+   }
+
+   public void setMessageDestinationLink(String messageDestinationLink)
+   {
+      this.messageDestinationLink = messageDestinationLink;
+   }
+   
+   public void merge(MessageDestinationRef ref)
+   {
+      if (ref.getJndiName() != null)
+      {
+         this.setJndiName(ref.getJndiName());
+         
+         setMappedName(ref.getJndiName());
+      }
+   }
+
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("messageDestinationRefName=").append(messageDestinationRefName);
+      sb.append(", messageDestinationType=").append(messageDestinationType);
+      sb.append(", messageDestinationLink=").append(messageDestinationLink);
+      sb.append(", messageDestinationUsage=").append(messageDestinationUsage);
+      sb.append(", mappedName=").append(mappedName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/MessageDestinationRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/NameValuePair.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/NameValuePair.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/NameValuePair.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45409 $</tt>
- */
-public class NameValuePair
-{
-   private static final Logger log = Logger.getLogger(NameValuePair.class);
-
-   private String name;
-   private String value;
-
-   public String getName()
-   {
-      return name;
-   }
-
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-   
-   public String getValue()
-   {
-      return value;
-   }
-
-   public void setValue(String value)
-   {
-      this.value = value;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append('[');
-      sb.append("name=").append(name);
-      sb.append(", value=").append(value);
-      sb.append(']');
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/NameValuePair.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/NameValuePair.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/NameValuePair.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/NameValuePair.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class NameValuePair
+{
+   private static final Logger log = Logger.getLogger(NameValuePair.class);
+
+   private String name;
+   private String value;
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+   
+   public String getValue()
+   {
+      return value;
+   }
+
+   public void setValue(String value)
+   {
+      this.value = value;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append('[');
+      sb.append("name=").append(name);
+      sb.append(", value=").append(value);
+      sb.append(']');
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/NameValuePair.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceContextRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceContextRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceContextRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import javax.persistence.PersistenceContextType;
-
-import org.jboss.metamodel.descriptor.Ref;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 46506 $
- */
-public class PersistenceContextRef extends Ref
-{
-   private String refName;
-   private String unitName;
-   private PersistenceContextType persistenceContextType;
-
-   public String getRefName()
-   {
-      return refName;
-   }
-
-   public void setRefName(String refName)
-   {
-      this.refName = refName;
-   }
-
-   public String getUnitName()
-   {
-      return unitName;
-   }
-
-   public void setUnitName(String unitName)
-   {
-      this.unitName = unitName;
-   }
-
-   public PersistenceContextType getPersistenceContextType()
-   {
-      return persistenceContextType;
-   }
-
-   public void setPersistenceContextType(PersistenceContextType persistenceContextType)
-   {
-      this.persistenceContextType = persistenceContextType;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceContextRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/PersistenceContextRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceContextRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceContextRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import javax.persistence.PersistenceContextType;
+
+import org.jboss.metamodel.descriptor.Ref;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class PersistenceContextRef extends Ref
+{
+   private String refName;
+   private String unitName;
+   private PersistenceContextType persistenceContextType;
+
+   public String getRefName()
+   {
+      return refName;
+   }
+
+   public void setRefName(String refName)
+   {
+      this.refName = refName;
+   }
+
+   public String getUnitName()
+   {
+      return unitName;
+   }
+
+   public void setUnitName(String unitName)
+   {
+      this.unitName = unitName;
+   }
+
+   public PersistenceContextType getPersistenceContextType()
+   {
+      return persistenceContextType;
+   }
+
+   public void setPersistenceContextType(PersistenceContextType persistenceContextType)
+   {
+      this.persistenceContextType = persistenceContextType;
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceContextRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.metamodel.descriptor.Ref;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 45712 $
- */
-public class PersistenceUnitRef extends Ref
-{
-   private String refName;
-   private String unitName;
-
-   public String getRefName()
-   {
-      return refName;
-   }
-
-   public void setRefName(String refName)
-   {
-      this.refName = refName;
-   }
-
-   public String getUnitName()
-   {
-      return unitName;
-   }
-
-   public void setUnitName(String unitName)
-   {
-      this.unitName = unitName;
-   }
-   
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[" + this.getClass().getName() + ": ");
-      sb.append("refName=").append(refName);
-      sb.append(", unitName=").append(unitName);
-      sb.append(", unitName=").append(unitName);
-      sb.append(", " + super.toString());
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import org.jboss.metamodel.descriptor.Ref;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+public class PersistenceUnitRef extends Ref
+{
+   private String refName;
+   private String unitName;
+
+   public String getRefName()
+   {
+      return refName;
+   }
+
+   public void setRefName(String refName)
+   {
+      this.refName = refName;
+   }
+
+   public String getUnitName()
+   {
+      return unitName;
+   }
+
+   public void setUnitName(String unitName)
+   {
+      this.unitName = unitName;
+   }
+   
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[" + this.getClass().getName() + ": ");
+      sb.append("refName=").append(refName);
+      sb.append(", unitName=").append(unitName);
+      sb.append(", unitName=").append(unitName);
+      sb.append(", " + super.toString());
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PortInfo.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PortInfo.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PortInfo.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+// $Id$
+
+/**
+ * Represents a <port-info> element in <service-ref>
+ *
+ * @author Thomas.Diesler at jboss.com
+ */
+public class PortInfo
+{
+   private ServiceRef serviceRef;
+   private String serviceEndpointInterface;
+   private QName portQName;
+   private String configName;
+   private String configFile;
+   private List<NameValuePair> stubProperties = new ArrayList<NameValuePair>();
+
+   public PortInfo(ServiceRef serviceRef)
+   {
+      this.serviceRef = serviceRef;
+   }
+   
+   public ServiceRef getServiceRef()
+   {
+      return serviceRef;
+   }
+
+   public QName getPortQName()
+   {
+      return portQName;
+   }
+
+   public void setPortQName(QName portName)
+   {
+      this.portQName = portName;
+   }
+
+   public String getServiceEndpointInterface()
+   {
+      return serviceEndpointInterface;
+   }
+
+   public void setServiceEndpointInterface(String serviceEndpointInterface)
+   {
+      this.serviceEndpointInterface = serviceEndpointInterface;
+   }
+
+   public String getConfigFile()
+   {
+      return configFile;
+   }
+
+   public void setConfigFile(String configFile)
+   {
+      this.configFile = configFile;
+   }
+
+   public String getConfigName()
+   {
+      return configName;
+   }
+
+   public void setConfigName(String configName)
+   {
+      this.configName = configName;
+   }
+
+   public List<NameValuePair> getStubProperties()
+   {
+      return stubProperties;
+   }
+
+   public String toXMLFragment()
+   {
+      StringBuilder xml = new StringBuilder("<port-info>");
+
+      if (serviceEndpointInterface != null)
+         xml.append("<service-endpoint-interface>" + serviceEndpointInterface + "</service-endpoint-interface>");
+
+      if (portQName != null)
+         xml.append("<port-qname>" + portQName + "</port-qname>");
+
+      if (configName != null)
+         xml.append("<config-name>" + configName + "</config-name>");
+      if (configFile != null)
+         xml.append("<config-file>" + configFile + "</config-file>");
+      
+      for (NameValuePair nvp : stubProperties)
+      {
+         xml.append("<stub-property>");
+         xml.append("<name>" + nvp.getName() + "</name>");
+         xml.append("<value>" + nvp.getValue() + "</value>");
+         xml.append("</stub-property>");
+      }
+
+      xml.append("</port-info>");
+
+      return xml.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/PortInfo.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Ref.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Ref.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Ref.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-/**
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45790 $</tt>
- */
-public abstract class Ref
-{
-   protected InjectionTarget injectionTarget;
-   private boolean ignoreDependency;
-
-   public InjectionTarget getInjectionTarget()
-   {
-      return injectionTarget;
-   }
-
-   public void setInjectionTarget(InjectionTarget injectionTarget)
-   {
-      this.injectionTarget = injectionTarget;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append(", injectionTarget=").append(injectionTarget);
-      sb.append("]");
-      return sb.toString();
-   }
-
-   public boolean isIgnoreDependency()
-   {
-      return ignoreDependency;
-   }
-
-   public void setIgnoreDependency(boolean ignoreDependency)
-   {
-      this.ignoreDependency = ignoreDependency;
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Ref.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/Ref.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Ref.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Ref.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+/**
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public abstract class Ref
+{
+   protected InjectionTarget injectionTarget;
+   private boolean ignoreDependency;
+
+   public InjectionTarget getInjectionTarget()
+   {
+      return injectionTarget;
+   }
+
+   public void setInjectionTarget(InjectionTarget injectionTarget)
+   {
+      this.injectionTarget = injectionTarget;
+   }
+
+   public boolean isIgnoreDependency()
+   {
+      return ignoreDependency;
+   }
+
+   public void setIgnoreDependency(boolean ignoreDependency)
+   {
+      this.ignoreDependency = ignoreDependency;
+   }
+   
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append(", injectionTarget=").append(injectionTarget);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/Ref.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceEnvRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceEnvRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceEnvRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,167 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a <resource-env-ref> element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45240 $</tt>
- */
-public class ResourceEnvRef extends Ref
-{
-   private static final Logger log = Logger.getLogger(ResourceEnvRef.class);
-   
-   private String resRefName;
-
-   private String resType;
-
-   private String resAuth;
-
-   private String resSharingScope;
-
-   private String mappedName;
-   
-   private String jndiName;
-   
-   private String resourceName;
-   
-   public String getResourceName()
-   {
-      return resourceName;
-   }
-
-   public void setResourceName(String resourceName)
-   {
-      this.resourceName = resourceName;
-   }
-   
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-      this.mappedName = jndiName;
-   }
-
-   public String getMappedName()
-   {
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public String getResRefName()
-   {
-      return resRefName;
-   }
-
-   public void setResRefName(String resRefName)
-   {
-      this.resRefName = resRefName;
-   }
-
-   public String getResType()
-   {
-      return resType;
-   }
-
-   public void setResType(String resType)
-   {
-      this.resType = resType;
-   }
-
-   public String getResAuth()
-   {
-      return resAuth;
-   }
-
-   public void setResAuth(String resAuth)
-   {
-      this.resAuth = resAuth;
-   }
-
-   public String getAuthorizationType()
-   {
-      return resAuth;
-   }
-
-   public String getResSharingScope()
-   {
-      return resSharingScope;
-   }
-
-   public void setResSharingScope(String resSharingScope)
-   {
-      this.resSharingScope = resSharingScope;
-   }
-
-   public boolean isShareable()
-   {
-      if (resSharingScope == null || resSharingScope.equals("Shareable"))
-         return true;
-      else
-         return false;
-   }
-   
-   public void merge(ResourceEnvRef ref)
-   {
-      if (ref.getJndiName() != null)
-      {
-         this.setJndiName(ref.getJndiName());
-         
-         setMappedName(ref.getJndiName());
-      }
-      
-      if (ref.getResourceName() != null)
-      {
-         this.setResourceName(ref.getResourceName());
-         
-         String mappedName = ref.getResourceName();
-         if (mappedName.startsWith("java:"))
-            this.setMappedName(ref.getResourceName());
-         else
-            this.setMappedName("java:" + ref.getResourceName());
-      }
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[ResourceEnvRef:");
-      sb.append("resRefName=").append(resRefName);
-      sb.append(",resType=").append(resType);
-      sb.append(",jndiName=").append(jndiName);
-      sb.append(",mappedName=").append(mappedName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceEnvRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/ResourceEnvRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceEnvRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceEnvRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,167 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Represents a <resource-env-ref> element of the ejb-jar.xml deployment descriptor for the
+ * 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ResourceEnvRef extends Ref
+{
+   private static final Logger log = Logger.getLogger(ResourceEnvRef.class);
+   
+   private String resRefName;
+
+   private String resType;
+
+   private String resAuth;
+
+   private String resSharingScope;
+
+   private String mappedName;
+   
+   private String jndiName;
+   
+   private String resourceName;
+   
+   public String getResourceName()
+   {
+      return resourceName;
+   }
+
+   public void setResourceName(String resourceName)
+   {
+      this.resourceName = resourceName;
+   }
+   
+   public String getJndiName()
+   {
+      return jndiName;
+   }
+
+   public void setJndiName(String jndiName)
+   {
+      this.jndiName = jndiName;
+      this.mappedName = jndiName;
+   }
+
+   public String getMappedName()
+   {
+      return mappedName;
+   }
+
+   public void setMappedName(String mappedName)
+   {
+      this.mappedName = mappedName;
+   }
+
+   public String getResRefName()
+   {
+      return resRefName;
+   }
+
+   public void setResRefName(String resRefName)
+   {
+      this.resRefName = resRefName;
+   }
+
+   public String getResType()
+   {
+      return resType;
+   }
+
+   public void setResType(String resType)
+   {
+      this.resType = resType;
+   }
+
+   public String getResAuth()
+   {
+      return resAuth;
+   }
+
+   public void setResAuth(String resAuth)
+   {
+      this.resAuth = resAuth;
+   }
+
+   public String getAuthorizationType()
+   {
+      return resAuth;
+   }
+
+   public String getResSharingScope()
+   {
+      return resSharingScope;
+   }
+
+   public void setResSharingScope(String resSharingScope)
+   {
+      this.resSharingScope = resSharingScope;
+   }
+
+   public boolean isShareable()
+   {
+      if (resSharingScope == null || resSharingScope.equals("Shareable"))
+         return true;
+      else
+         return false;
+   }
+   
+   public void merge(ResourceEnvRef ref)
+   {
+      if (ref.getJndiName() != null)
+      {
+         this.setJndiName(ref.getJndiName());
+         
+         setMappedName(ref.getJndiName());
+      }
+      
+      if (ref.getResourceName() != null)
+      {
+         this.setResourceName(ref.getResourceName());
+         
+         String mappedName = ref.getResourceName();
+         if (mappedName.startsWith("java:"))
+            this.setMappedName(ref.getResourceName());
+         else
+            this.setMappedName("java:" + ref.getResourceName());
+      }
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[ResourceEnvRef:");
+      sb.append("resRefName=").append(resRefName);
+      sb.append(",resType=").append(resType);
+      sb.append(",jndiName=").append(jndiName);
+      sb.append(",mappedName=").append(mappedName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceEnvRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,188 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a <resource-ref> element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45249 $</tt>
- */
-public class ResourceRef extends Ref
-{
-   private static final Logger log = Logger.getLogger(ResourceRef.class);
-   
-   private String resRefName;
-
-   private String resType;
-
-   private String resAuth;
-
-   private String resSharingScope;
-
-   private String mappedName;
-   
-   private String jndiName;
-   
-   private String resourceName;
-   
-   private String resUrl;
-   
-   public String getResUrl()
-   {
-      return resUrl;
-   }
-
-   public void setResUrl(String resUrl)
-   {
-      this.resUrl = resUrl;
-   }
-   
-   public String getResourceName()
-   {
-      return resourceName;
-   }
-
-   public void setResourceName(String resourceName)
-   {
-      this.resourceName = resourceName;
-   }
-   
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public String getMappedName()
-   {
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public String getResRefName()
-   {
-      return resRefName;
-   }
-
-   public void setResRefName(String resRefName)
-   {
-      this.resRefName = resRefName;
-   }
-
-   public String getResType()
-   {
-      return resType;
-   }
-
-   public void setResType(String resType)
-   {
-      this.resType = resType;
-   }
-
-   public String getResAuth()
-   {
-      return resAuth;
-   }
-
-   public void setResAuth(String resAuth)
-   {
-      this.resAuth = resAuth;
-   }
-
-   public String getAuthorizationType()
-   {
-      return resAuth;
- /*     if (resAuth == null || resAuth.equals("Container"))
-         return AuthenticationType.CONTAINER;
-      else
-         return AuthenticationType.APPLICATION;*/
-   }
-
-   public String getResSharingScope()
-   {
-      return resSharingScope;
-   }
-
-   public void setResSharingScope(String resSharingScope)
-   {
-      this.resSharingScope = resSharingScope;
-   }
-
-   public boolean isShareable()
-   {
-      if (resSharingScope == null || resSharingScope.equals("Shareable"))
-         return true;
-      else
-         return false;
-   }
-   
-   public void merge(ResourceRef ref)
-   {
-      if (ref.getJndiName() != null)
-      {
-         this.setJndiName(ref.getJndiName());
-         
-         String mappedName = ref.getJndiName();
-         if (mappedName.startsWith("java:"))
-            this.setMappedName(ref.getJndiName());
-         else
-            this.setMappedName("java:" + ref.getJndiName());
-      }
-      
-      if (ref.getResourceName() != null)
-      {
-         this.setResourceName(ref.getResourceName());
-         
-         String mappedName = ref.getResourceName();
-         if (mappedName.startsWith("java:"))
-            this.setMappedName(ref.getResourceName());
-         else
-            this.setMappedName("java:" + ref.getResourceName());
-      }
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[" + this.getClass().getName() + ": ");
-      sb.append("resRefName=").append(resRefName);
-      sb.append(", jndiName=").append(jndiName);
-      sb.append(", resourceName=").append(resourceName);
-      sb.append(", resType=").append(resType);
-      sb.append(", mappedName=").append(mappedName);
-      sb.append(", injectionTarget=").append(injectionTarget);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/ResourceRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,188 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Represents a <resource-ref> element of the ejb-jar.xml deployment descriptor for the
+ * 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class ResourceRef extends Ref
+{
+   private static final Logger log = Logger.getLogger(ResourceRef.class);
+   
+   private String resRefName;
+
+   private String resType;
+
+   private String resAuth;
+
+   private String resSharingScope;
+
+   private String mappedName;
+   
+   private String jndiName;
+   
+   private String resourceName;
+   
+   private String resUrl;
+   
+   public String getResUrl()
+   {
+      return resUrl;
+   }
+
+   public void setResUrl(String resUrl)
+   {
+      this.resUrl = resUrl;
+   }
+   
+   public String getResourceName()
+   {
+      return resourceName;
+   }
+
+   public void setResourceName(String resourceName)
+   {
+      this.resourceName = resourceName;
+   }
+   
+   public String getJndiName()
+   {
+      return jndiName;
+   }
+
+   public void setJndiName(String jndiName)
+   {
+      this.jndiName = jndiName;
+   }
+
+   public String getMappedName()
+   {
+      return mappedName;
+   }
+
+   public void setMappedName(String mappedName)
+   {
+      this.mappedName = mappedName;
+   }
+
+   public String getResRefName()
+   {
+      return resRefName;
+   }
+
+   public void setResRefName(String resRefName)
+   {
+      this.resRefName = resRefName;
+   }
+
+   public String getResType()
+   {
+      return resType;
+   }
+
+   public void setResType(String resType)
+   {
+      this.resType = resType;
+   }
+
+   public String getResAuth()
+   {
+      return resAuth;
+   }
+
+   public void setResAuth(String resAuth)
+   {
+      this.resAuth = resAuth;
+   }
+
+   public String getAuthorizationType()
+   {
+      return resAuth;
+ /*     if (resAuth == null || resAuth.equals("Container"))
+         return AuthenticationType.CONTAINER;
+      else
+         return AuthenticationType.APPLICATION;*/
+   }
+
+   public String getResSharingScope()
+   {
+      return resSharingScope;
+   }
+
+   public void setResSharingScope(String resSharingScope)
+   {
+      this.resSharingScope = resSharingScope;
+   }
+
+   public boolean isShareable()
+   {
+      if (resSharingScope == null || resSharingScope.equals("Shareable"))
+         return true;
+      else
+         return false;
+   }
+   
+   public void merge(ResourceRef ref)
+   {
+      if (ref.getJndiName() != null)
+      {
+         this.setJndiName(ref.getJndiName());
+         
+         String mappedName = ref.getJndiName();
+         if (mappedName.startsWith("java:"))
+            this.setMappedName(ref.getJndiName());
+         else
+            this.setMappedName("java:" + ref.getJndiName());
+      }
+      
+      if (ref.getResourceName() != null)
+      {
+         this.setResourceName(ref.getResourceName());
+         
+         String mappedName = ref.getResourceName();
+         if (mappedName.startsWith("java:"))
+            this.setMappedName(ref.getResourceName());
+         else
+            this.setMappedName("java:" + ref.getResourceName());
+      }
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[" + this.getClass().getName() + ": ");
+      sb.append("resRefName=").append(resRefName);
+      sb.append(", jndiName=").append(jndiName);
+      sb.append(", resourceName=").append(resourceName);
+      sb.append(", resType=").append(resType);
+      sb.append(", mappedName=").append(mappedName);
+      sb.append(", injectionTarget=").append(injectionTarget);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ResourceRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/RunAs.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/RunAs.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/RunAs.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.logging.Logger;
-
-/**
- * Represents a <run-as> element
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45409 $</tt>
- */
-public class RunAs
-{
-   private static final Logger log = Logger.getLogger(RunAs.class);
-   
-   private String roleName;
-    
-   public String getRoleName()
-   {
-      return roleName;
-   }
-
-   public void setRoleName(String roleName)
-   {
-      this.roleName = roleName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[" + this.getClass().getName() + ": ");
-      sb.append("roleName=").append(roleName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/RunAs.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/RunAs.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/RunAs.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/RunAs.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Represents a <run-as> element
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class RunAs
+{
+   private static final Logger log = Logger.getLogger(RunAs.class);
+   
+   private String roleName;
+    
+   public String getRoleName()
+   {
+      return roleName;
+   }
+
+   public void setRoleName(String roleName)
+   {
+      this.roleName = roleName;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[" + this.getClass().getName() + ": ");
+      sb.append("roleName=").append(roleName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/RunAs.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRole.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRole.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRole.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-
-/**
- * Represents an security-role element of the ejb-jar.xml deployment descriptor
- * for the 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45417 $</tt>
- */
-public class SecurityRole
-{
-   private String roleName = null;
-
-   public String getRoleName()
-   {
-      return roleName;
-   }
-
-   public void setRoleName(String roleName)
-   {
-      this.roleName = roleName;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("roleName=").append(roleName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRole.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/SecurityRole.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRole.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRole.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+
+/**
+ * Represents an security-role element of the ejb-jar.xml deployment descriptor
+ * for the 1.4 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class SecurityRole
+{
+   private String roleName = null;
+
+   public String getRoleName()
+   {
+      return roleName;
+   }
+
+   public void setRoleName(String roleName)
+   {
+      this.roleName = roleName;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("roleName=").append(roleName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRole.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-
-/**
- * Represents an <security-role-ref> 
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45409 $</tt>
- */
-public class SecurityRoleRef
-{
-   protected String roleName = null;
-   protected String roleLink = null;
-
-   public String getRoleName()
-   {
-      return roleName;
-   }
-
-   public void setRoleName(String roleName)
-   {
-      this.roleName = roleName;
-   }
-   
-   public String getRoleLink()
-   {
-      return roleLink;
-   }
-
-   public void setRoleLink(String roleLink)
-   {
-      this.roleLink = roleLink;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[");
-      sb.append("roleName=").append(roleName);
-      sb.append("]");
-      return sb.toString();
-   }
-}

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+
+/**
+ * Represents an <security-role-ref> 
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @version <tt>$Revision$</tt>
+ */
+public class SecurityRoleRef
+{
+   protected String roleName = null;
+   protected String roleLink = null;
+
+   public String getRoleName()
+   {
+      return roleName;
+   }
+
+   public void setRoleName(String roleName)
+   {
+      this.roleName = roleName;
+   }
+   
+   public String getRoleLink()
+   {
+      return roleLink;
+   }
+
+   public void setRoleLink(String roleLink)
+   {
+      this.roleLink = roleLink;
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("roleName=").append(roleName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/SecurityRoleRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ServiceRef.java (from rev 60258, branches/JBoss_5_EJB3_RC10/server/src/main/org/jboss/metamodel/descriptor/ServiceRef.java)
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ServiceRef.java	                        (rev 0)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ServiceRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -0,0 +1,163 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+// $Id$
+
+/**
+ * Represents a <service-ref> element of the jboss.xml, jboss-web.xml, jboss-client.xml deployment descriptor 
+ * for the 5.0 schema
+ *
+ * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
+ * @author Thomas.Diesler at jboss.com
+ */
+public class ServiceRef extends Ref
+{
+   private String serviceRefName;
+   private String serviceClassName;
+   private QName serviceQName;
+   private String configName;
+   private String configFile;
+   private String handlerChain;
+   private List<PortInfo> portInfos = new ArrayList<PortInfo>();
+   private String wsdlOverride;
+
+   public String getServiceRefName()
+   {
+      return serviceRefName;
+   }
+
+   public void setServiceRefName(String name)
+   {
+      this.serviceRefName = name;
+   }
+
+   public String getServiceClassName()
+   {
+      return serviceClassName;
+   }
+
+   public void setServiceClassName(String serviceClassName)
+   {
+      this.serviceClassName = serviceClassName;
+   }
+
+   public QName getServiceQName()
+   {
+      return serviceQName;
+   }
+
+   public void setServiceQName(QName serviceQName)
+   {
+      this.serviceQName = serviceQName;
+   }
+   
+   public String getConfigFile()
+   {
+      return configFile;
+   }
+
+   public void setConfigFile(String configFile)
+   {
+      this.configFile = configFile;
+   }
+
+   public String getConfigName()
+   {
+      return configName;
+   }
+
+   public void setConfigName(String configName)
+   {
+      this.configName = configName;
+   }
+
+   public String getHandlerChain()
+   {
+      return handlerChain;
+   }
+
+   public void setHandlerChain(String handlerChain)
+   {
+      this.handlerChain = handlerChain;
+   }
+
+   public List<PortInfo> getPortInfos()
+   {
+      return portInfos;
+   }
+
+   public String getWsdlOverride()
+   {
+      return wsdlOverride;
+   }
+
+   public void setWsdlOverride(String wsdlLocation)
+   {
+      this.wsdlOverride = wsdlLocation;
+   }
+
+   public String toXMLFragment() 
+   {
+      StringBuilder xml = new StringBuilder("<service-ref>");
+      
+      xml.append("<service-ref-name>" + serviceRefName + "</service-ref-name>");
+      
+      if (serviceClassName != null)
+         xml.append("<service-class-name>" + serviceClassName + "</service-class-name>");
+      
+      if (serviceQName != null)
+         xml.append("<service-qname>" + serviceQName + "</service-qname>");
+      
+      if (configName != null)
+         xml.append("<config-name>" + configName + "</config-name>");
+      if (configFile != null)
+         xml.append("<config-file>" + configFile + "</config-file>");
+      
+      if (handlerChain != null)
+         xml.append("<handler-chain>" + handlerChain + "</handler-chain>");
+      
+      for (PortInfo portInfo : portInfos)
+         xml.append(portInfo.toXMLFragment());
+      
+      if (wsdlOverride != null)
+         xml.append("<wsdl-override>" + wsdlOverride + "</wsdl-override>");
+      
+      xml.append("</service-ref>");
+
+      return xml.toString();
+   }
+
+   public String toString()
+   {
+      StringBuffer sb = new StringBuffer(100);
+      sb.append("[");
+      sb.append("name=").append(serviceRefName);
+      sb.append("]");
+      return sb.toString();
+   }
+}


Property changes on: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/ServiceRef.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/WebServiceRef.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/WebServiceRef.java	2007-02-04 11:17:20 UTC (rev 60258)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/metamodel/descriptor/WebServiceRef.java	2007-02-04 11:33:28 UTC (rev 60259)
@@ -1,135 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.metamodel.descriptor;
-
-import org.jboss.logging.Logger;
-
-import org.jboss.metamodel.descriptor.Ref;
-
-/**
- * Represents a <resource-ref> element of the ejb-jar.xml deployment descriptor for the
- * 1.4 schema
- *
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- * @version <tt>$Revision: 45249 $</tt>
- */
-public class WebServiceRef extends Ref
-{
-   private static final Logger log = Logger.getLogger(WebServiceRef.class);
-   
-   private String serviceRefName;
-
-   private String resType;
-
-   private String serviceInterface;
-
-   private String wsdlFile;
-
-   private String mappedName;
-   
-   private String jndiName;
-   
-   private String jaxRpcMappingFile;
-   
-   public String getJaxRpcMappingFile()
-   {
-      return jaxRpcMappingFile;
-   }
-
-   public void setJaxRpcMappingFile(String jaxRpcMappingFile)
-   {
-      this.jaxRpcMappingFile = jaxRpcMappingFile;
-   }
-   
-   public String getJndiName()
-   {
-      return jndiName;
-   }
-
-   public void setJndiName(String jndiName)
-   {
-      this.jndiName = jndiName;
-   }
-
-   public String getMappedName()
-   {
-      return mappedName;
-   }
-
-   public void setMappedName(String mappedName)
-   {
-      this.mappedName = mappedName;
-   }
-
-   public String getServiceRefName()
-   {
-      return serviceRefName;
-   }
-
-   public void setServiceRefName(String serviceRefName)
-   {
-      this.serviceRefName = serviceRefName;
-   }
-
-   public String getResType()
-   {
-      return resType;
-   }
-
-   public void setResType(String resType)
-   {
-      this.resType = resType;
-   }
-
-   public String getServiceInterface()
-   {
-      return serviceInterface;
-   }
-
-   public void setServiceInterface(String serviceInterface)
-   {
-      this.serviceInterface = serviceInterface;
-   }
-
-   public String getWsdlFile()
-   {
-      return wsdlFile;
-   }
-
-   public void setWsdlFile(String wsdlFile)
-   {
-      this.wsdlFile = wsdlFile;
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer(100);
-      sb.append("[" + this.getClass().getName() + ": ");
-      sb.append("serviceRefName=").append(serviceRefName);
-      sb.append(", jndiName=").append(jndiName);
-      sb.append(", jaxRpcMappingFile=").append(jaxRpcMappingFile);
-      sb.append(", resType=").append(resType);
-      sb.append(", mappedName=").append(mappedName);
-      sb.append("]");
-      return sb.toString();
-   }
-}




More information about the jboss-cvs-commits mailing list