AS7-5369 Allow direct text value in parameter element.

QStephen · Aug 14, 2012 · 2cd952c · 2cd952c
1 parent 5990d07
commit 2cd952c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/pojo/src/main/java/org/jboss/as/pojo/descriptor/KernelDeploymentXmlDescriptorParser.java b/pojo/src/main/java/org/jboss/as/pojo/descriptor/KernelDeploymentXmlDescriptorParser.java
@@ -22,10 +22,6 @@
 
 package org.jboss.as.pojo.descriptor;
 
-import static org.jboss.as.controller.parsing.ParseUtils.missingRequired;
-import static org.jboss.as.controller.parsing.ParseUtils.unexpectedAttribute;
-import static org.jboss.as.controller.parsing.ParseUtils.unexpectedElement;
-
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -44,6 +40,10 @@
 import org.jboss.staxmapper.XMLElementReader;
 import org.jboss.staxmapper.XMLExtendedStreamReader;
 
+import static org.jboss.as.controller.parsing.ParseUtils.missingRequired;
+import static org.jboss.as.controller.parsing.ParseUtils.unexpectedAttribute;
+import static org.jboss.as.controller.parsing.ParseUtils.unexpectedElement;
+
 /**
  * Parse Microcontainer jboss-beans.xml.
  *
@@ -617,6 +617,11 @@ private ValueConfig parseParameter(final XMLExtendedStreamReader reader) throws
 
         while (reader.hasNext()) {
             switch (reader.next()) {
+                case CHARACTERS:
+                    final StringValueConfig svc = new StringValueConfig();
+                    svc.setValue(reader.getText());
+                    valueConfig = svc;
+                    break;
                 case END_ELEMENT:
                     if (valueConfig == null)
                         throw new XMLStreamException(PojoMessages.MESSAGES.missingValue(), reader.getLocation());

diff --git a/...ration/basic/src/test/java/org/jboss/as/test/integration/pojo/test/simple-jboss-beans.xml b/...ration/basic/src/test/java/org/jboss/as/test/integration/pojo/test/simple-jboss-beans.xml
@@ -51,6 +51,15 @@
         <depends>Blocker</depends>
     </bean>
 
+    <bean name="ParamTextValue" class="org.jboss.as.test.integration.pojo.support.TInjectee">
+        <constructor>
+            <parameter>Wazup, </parameter>
+        </constructor>
+        <install method="sayHello">
+            <parameter><value>POJO subsystem!</value></parameter>
+        </install>
+    </bean>
+
     <bean name="Blocker" class="org.jboss.as.test.integration.pojo.support.TInjectee"/>
 
     <bean name="B2" class="org.jboss.as.test.integration.pojo.support.TBean">