[jboss-cvs] JBossAS SVN: r66932 - trunk/server/src/main/org/jboss/ejb/plugins/inflow.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2007-11-09 13:08:44 -0500 (Fri, 09 Nov 2007)
New Revision: 66932

Modified:
   trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossMessageEndpointFactory.java
Log:
[JBAS-4959] - Parse the activation-config-properties in the proxy factory config

Modified: trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossMessageEndpointFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossMessageEndpointFactory.java	2007-11-09 17:49:40 UTC (rev 66931)
+++ trunk/server/src/main/org/jboss/ejb/plugins/inflow/JBossMessageEndpointFactory.java	2007-11-09 18:08:44 UTC (rev 66932)
@@ -52,6 +52,7 @@
 import org.jboss.mx.util.JMXExceptionDecoder;
 import org.jboss.proxy.GenericProxyFactory;
 import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.util.Strings;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -383,17 +384,17 @@
          Iterator<Element> iterator = MetaData.getChildrenByTagName(activationConfig, "activation-config-property");
          while (iterator.hasNext())
          {
-            Element resourceRef = iterator.next();
+            Element xml = iterator.next();
             org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData md = new org.jboss.metadata.ejb.spec.ActivationConfigPropertyMetaData();
             ActivationConfigPropertyMetaData metaData = new ActivationConfigPropertyMetaData(md);
-            try
-            {
-               metaData.importXml(resourceRef);
-            }
-            catch(Exception e)
-            {
-               throw new DeploymentException(e);
-            }
+            String name = MetaData.getElementContent(MetaData.getUniqueChild(xml, "activation-config-property-name"));
+            String value = MetaData.getElementContent(MetaData.getUniqueChild(xml, "activation-config-property-value"));
+            if (name == null || name.trim().length() == 0)
+               throw new DeploymentException("activation-config-property doesn't have a name");
+            if (Strings.isValidJavaIdentifier(name) == false)
+               throw new DeploymentException("activation-config-property '" + name + "' is not a valid java identifier");
+            md.setName(name);
+            md.setValue(value);
             if (properties.containsKey(metaData.getName()) == false)
                properties.put(metaData.getName(), metaData);
          }
@@ -427,7 +428,7 @@
          }
       }
    }   
-   
+
    /**
     * Create the activation spec
     *