[jboss-cvs] JBossAS SVN: r76581 - in trunk/testsuite: src/main/org/jboss/test/deployers/valuefactory and 7 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Aug 1 11:17:24 EDT 2008


Author: bstansberry at jboss.com
Date: 2008-08-01 11:17:22 -0400 (Fri, 01 Aug 2008)
New Revision: 76581

Added:
   trunk/testsuite/src/main/org/jboss/test/jmx/test/ValueFactoryInjectionUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/
   trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean1.java
   trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean1MBean.java
   trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean2.java
   trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean2MBean.java
   trunk/testsuite/src/resources/jmx/valuefactory/
   trunk/testsuite/src/resources/jmx/valuefactory/jboss-beans.xml
   trunk/testsuite/src/resources/jmx/valuefactory/valuefactory-service.xml
Removed:
   trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean1.java
   trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean1MBean.java
   trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean2.java
   trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean2MBean.java
   trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/test/ValueFactoryInjectionUnitTestCase.java
   trunk/testsuite/src/resources/deployers/valuefactory/jboss-beans.xml
   trunk/testsuite/src/resources/deployers/valuefactory/valuefactory-service.xml
Modified:
   trunk/testsuite/imports/sections/deployers.xml
   trunk/testsuite/imports/sections/jmx.xml
Log:
[JBAS-5822] Move the tests to the right package

Modified: trunk/testsuite/imports/sections/deployers.xml
===================================================================
--- trunk/testsuite/imports/sections/deployers.xml	2008-08-01 14:56:36 UTC (rev 76580)
+++ trunk/testsuite/imports/sections/deployers.xml	2008-08-01 15:17:22 UTC (rev 76581)
@@ -174,19 +174,6 @@
       <copy todir="${build.lib}/unpacked-mbean1-not.asar">
          <fileset dir="${build.lib}/unpacked-mbean1.sar"/>
       </copy>
-   	
-   	  <!-- JBAS-5822 -->
-    <jar destfile="${build.lib}/testdeployers-valuefactory.sar">
-        <metainf dir="${build.resources}/deployers/valuefactory">
-           <include name="jboss-beans.xml"/>
-        </metainf>
-       <fileset dir="${build.resources}/deployers/valuefactory">
-          <include name="*-service.xml"/>
-       </fileset>
-       <fileset dir="${build.classes}">
-          <include name="org/jboss/test/deployers/valuefactory/**"/>
-       </fileset>
-    </jar>
       
       <!-- EAR -->
       <jar destfile="${build.lib}/testdeployers-ear1.ear">

Modified: trunk/testsuite/imports/sections/jmx.xml
===================================================================
--- trunk/testsuite/imports/sections/jmx.xml	2008-08-01 14:56:36 UTC (rev 76580)
+++ trunk/testsuite/imports/sections/jmx.xml	2008-08-01 15:17:22 UTC (rev 76581)
@@ -779,5 +779,19 @@
             <include name="org/jboss/test/jmx/annotated/**"/>
          </fileset>
       </jar>
+
+   	
+   	  <!-- JBAS-5822 -->
+      <jar destfile="${build.lib}/testjmx-valuefactory.sar">
+        <metainf dir="${build.resources}/jmx/valuefactory">
+           <include name="jboss-beans.xml"/>
+        </metainf>
+       <fileset dir="${build.resources}/jmx/valuefactory">
+          <include name="*-service.xml"/>
+       </fileset>
+       <fileset dir="${build.classes}">
+          <include name="org/jboss/test/jmx/valuefactory/**"/>
+       </fileset>
+    </jar>
    </target>
 </project>

Deleted: trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean1.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean1.java	2008-08-01 14:56:36 UTC (rev 76580)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean1.java	2008-08-01 15:17:22 UTC (rev 76581)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.deployers.valuefactory;
-
-/**
- * A MBean1.
- * 
- * @author Brian Stansberry
- * @version $Revision$
- */
-public class MBean1 implements MBean1MBean
-{
-   public int add(int a, Integer b)
-   {
-      int result = a;
-      if (b != null)
-         result += b.intValue();
-      
-      return result;
-   }
-   
-   public Integer noReturn()
-   {
-      return null;
-   }
-}

Deleted: trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean1MBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean1MBean.java	2008-08-01 14:56:36 UTC (rev 76580)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean1MBean.java	2008-08-01 15:17:22 UTC (rev 76581)
@@ -1,8 +0,0 @@
-package org.jboss.test.deployers.valuefactory;
-
-public interface MBean1MBean
-{
-
-   int add(int a, Integer b);
-   Integer noReturn();
-}
\ No newline at end of file

Deleted: trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean2.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean2.java	2008-08-01 14:56:36 UTC (rev 76580)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean2.java	2008-08-01 15:17:22 UTC (rev 76581)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.deployers.valuefactory;
-
-/**
- * A MBean2.
- * 
- * @author Brian Stansberry
- * @version $Revision$
- */
-public class MBean2 implements MBean2MBean
-{
-   private int fromMBean;
-   private int fromPojo;
-   private int fromDefault;
-   
-   public int getFromMBean()
-   {
-      return fromMBean;
-   }
-   public void setFromMBean(int fromMBean)
-   {
-      this.fromMBean = fromMBean;
-   }
-   
-   public int getFromPojo()
-   {
-      return fromPojo;
-   }
-   public void setFromPojo(int fromPojo)
-   {
-      this.fromPojo = fromPojo;
-   }
-   
-   public int getFromDefault()
-   {
-      return fromDefault;
-   }
-   public void setFromDefault(int fromDefault)
-   {
-      this.fromDefault = fromDefault;
-   }   
-   
-}

Deleted: trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean2MBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean2MBean.java	2008-08-01 14:56:36 UTC (rev 76580)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean2MBean.java	2008-08-01 15:17:22 UTC (rev 76581)
@@ -1,18 +0,0 @@
-package org.jboss.test.deployers.valuefactory;
-
-public interface MBean2MBean
-{
-
-   public abstract int getFromMBean();
-
-   public abstract void setFromMBean(int fromMBean);
-
-   public abstract int getFromPojo();
-
-   public abstract void setFromPojo(int fromPojo);
-
-   public abstract int getFromDefault();
-
-   public abstract void setFromDefault(int fromDefault);
-
-}
\ No newline at end of file

Deleted: trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/test/ValueFactoryInjectionUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/test/ValueFactoryInjectionUnitTestCase.java	2008-08-01 14:56:36 UTC (rev 76580)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/test/ValueFactoryInjectionUnitTestCase.java	2008-08-01 15:17:22 UTC (rev 76581)
@@ -1,66 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.test.deployers.valuefactory.test;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-
-/**
- * A test that deploys app sars.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 58276 $
- */
-public class ValueFactoryInjectionUnitTestCase extends JBossTestCase
-{
-   private static final String valueFactoryDeployment = "testdeployers-valuefactory.sar";
-   private static final String targetObject = "jboss.test:service=ValueFactoryInjectionTestTarget";
-   
-   public ValueFactoryInjectionUnitTestCase(String test)
-   {
-      super(test);
-   }
-
-   public static Test suite() throws Exception
-   {
-      return getDeploySetup(ValueFactoryInjectionUnitTestCase.class, valueFactoryDeployment);
-   }
-  
-   public void testValueFactoryInjection() throws Exception
-   {      
-      ObjectName oname = new ObjectName(targetObject);
-      MBeanServerConnection adaptor = this.getServer();
-      Integer val = (Integer) adaptor.getAttribute(oname, "FromPojo");
-      assertNotNull(val);
-      assertEquals(3, val.intValue());
-      val = (Integer) adaptor.getAttribute(oname, "FromMBean");
-      assertNotNull(val);
-      assertEquals(7, val.intValue());
-      val = (Integer) adaptor.getAttribute(oname, "FromDefault");
-      assertNotNull(val);
-      assertEquals(5, val.intValue());
-   }
-}

Copied: trunk/testsuite/src/main/org/jboss/test/jmx/test/ValueFactoryInjectionUnitTestCase.java (from rev 76545, trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/test/ValueFactoryInjectionUnitTestCase.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/ValueFactoryInjectionUnitTestCase.java	                        (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/ValueFactoryInjectionUnitTestCase.java	2008-08-01 15:17:22 UTC (rev 76581)
@@ -0,0 +1,66 @@
+/*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2005, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.test.jmx.test;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+
+/**
+ * A test that deploys app sars.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 58276 $
+ */
+public class ValueFactoryInjectionUnitTestCase extends JBossTestCase
+{
+   private static final String valueFactoryDeployment = "testjmx-valuefactory.sar";
+   private static final String targetObject = "jboss.test:service=ValueFactoryInjectionTestTarget";
+   
+   public ValueFactoryInjectionUnitTestCase(String test)
+   {
+      super(test);
+   }
+
+   public static Test suite() throws Exception
+   {
+      return getDeploySetup(ValueFactoryInjectionUnitTestCase.class, valueFactoryDeployment);
+   }
+  
+   public void testValueFactoryInjection() throws Exception
+   {      
+      ObjectName oname = new ObjectName(targetObject);
+      MBeanServerConnection adaptor = this.getServer();
+      Integer val = (Integer) adaptor.getAttribute(oname, "FromPojo");
+      assertNotNull(val);
+      assertEquals(3, val.intValue());
+      val = (Integer) adaptor.getAttribute(oname, "FromMBean");
+      assertNotNull(val);
+      assertEquals(7, val.intValue());
+      val = (Integer) adaptor.getAttribute(oname, "FromDefault");
+      assertNotNull(val);
+      assertEquals(5, val.intValue());
+   }
+}

Copied: trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean1.java (from rev 76545, trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean1.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean1.java	                        (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean1.java	2008-08-01 15:17:22 UTC (rev 76581)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.test.jmx.valuefactory;
+
+/**
+ * A MBean1.
+ * 
+ * @author Brian Stansberry
+ * @version $Revision$
+ */
+public class MBean1 implements MBean1MBean
+{
+   public int add(int a, Integer b)
+   {
+      int result = a;
+      if (b != null)
+         result += b.intValue();
+      
+      return result;
+   }
+   
+   public Integer noReturn()
+   {
+      return null;
+   }
+}

Copied: trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean1MBean.java (from rev 76545, trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean1MBean.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean1MBean.java	                        (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean1MBean.java	2008-08-01 15:17:22 UTC (rev 76581)
@@ -0,0 +1,8 @@
+package org.jboss.test.jmx.valuefactory;
+
+public interface MBean1MBean
+{
+
+   int add(int a, Integer b);
+   Integer noReturn();
+}
\ No newline at end of file

Copied: trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean2.java (from rev 76545, trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean2.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean2.java	                        (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean2.java	2008-08-01 15:17:22 UTC (rev 76581)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.test.jmx.valuefactory;
+
+/**
+ * A MBean2.
+ * 
+ * @author Brian Stansberry
+ * @version $Revision$
+ */
+public class MBean2 implements MBean2MBean
+{
+   private int fromMBean;
+   private int fromPojo;
+   private int fromDefault;
+   
+   public int getFromMBean()
+   {
+      return fromMBean;
+   }
+   public void setFromMBean(int fromMBean)
+   {
+      this.fromMBean = fromMBean;
+   }
+   
+   public int getFromPojo()
+   {
+      return fromPojo;
+   }
+   public void setFromPojo(int fromPojo)
+   {
+      this.fromPojo = fromPojo;
+   }
+   
+   public int getFromDefault()
+   {
+      return fromDefault;
+   }
+   public void setFromDefault(int fromDefault)
+   {
+      this.fromDefault = fromDefault;
+   }   
+   
+}

Copied: trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean2MBean.java (from rev 76545, trunk/testsuite/src/main/org/jboss/test/deployers/valuefactory/MBean2MBean.java)
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean2MBean.java	                        (rev 0)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/valuefactory/MBean2MBean.java	2008-08-01 15:17:22 UTC (rev 76581)
@@ -0,0 +1,18 @@
+package org.jboss.test.jmx.valuefactory;
+
+public interface MBean2MBean
+{
+
+   public abstract int getFromMBean();
+
+   public abstract void setFromMBean(int fromMBean);
+
+   public abstract int getFromPojo();
+
+   public abstract void setFromPojo(int fromPojo);
+
+   public abstract int getFromDefault();
+
+   public abstract void setFromDefault(int fromDefault);
+
+}
\ No newline at end of file

Deleted: trunk/testsuite/src/resources/deployers/valuefactory/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/valuefactory/jboss-beans.xml	2008-08-01 14:56:36 UTC (rev 76580)
+++ trunk/testsuite/src/resources/deployers/valuefactory/jboss-beans.xml	2008-08-01 15:17:22 UTC (rev 76581)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-	<bean name="ValueFactoryInjectionTestSource" class="org.jboss.test.deployers.valuefactory.MBean1"/>
-</deployment>
\ No newline at end of file

Deleted: trunk/testsuite/src/resources/deployers/valuefactory/valuefactory-service.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/valuefactory/valuefactory-service.xml	2008-08-01 14:56:36 UTC (rev 76580)
+++ trunk/testsuite/src/resources/deployers/valuefactory/valuefactory-service.xml	2008-08-01 15:17:22 UTC (rev 76581)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-
-	<mbean code="org.jboss.test.deployers.valuefactory.MBean1" 
-	       name="jboss.test:service=ValueFactoryInjectionTestSource"/>
-
-	<mbean code="org.jboss.test.deployers.valuefactory.MBean2" 
-	       name="jboss.test:service=ValueFactoryInjectionTestTarget">
-	       
-	   <attribute name="FromPojo">
-	      <value-factory bean="ValueFactoryInjectionTestSource" method="add">
-	         <parameter>1</parameter>
-	         <parameter>2</parameter>
-	      </value-factory>
-	   </attribute>
-	       
-	   <attribute name="FromMBean">
-	      <value-factory bean="jboss.test:service=ValueFactoryInjectionTestSource" method="add">
-	         <parameter class="int">3</parameter>
-	         <parameter class="java.lang.Integer">4</parameter>
-	      </value-factory>
-	   </attribute>
-	       
-	   <attribute name="FromDefault">
-	      <value-factory bean="ValueFactoryInjectionTestSource" method="noReturn" default="5"/>
-	   </attribute>
-	   
-	</mbean>
-	
-</server>
\ No newline at end of file

Copied: trunk/testsuite/src/resources/jmx/valuefactory/jboss-beans.xml (from rev 76545, trunk/testsuite/src/resources/deployers/valuefactory/jboss-beans.xml)
===================================================================
--- trunk/testsuite/src/resources/jmx/valuefactory/jboss-beans.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/jmx/valuefactory/jboss-beans.xml	2008-08-01 15:17:22 UTC (rev 76581)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+	<bean name="ValueFactoryInjectionTestSource" class="org.jboss.test.jmx.valuefactory.MBean1"/>
+</deployment>
\ No newline at end of file

Copied: trunk/testsuite/src/resources/jmx/valuefactory/valuefactory-service.xml (from rev 76545, trunk/testsuite/src/resources/deployers/valuefactory/valuefactory-service.xml)
===================================================================
--- trunk/testsuite/src/resources/jmx/valuefactory/valuefactory-service.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/jmx/valuefactory/valuefactory-service.xml	2008-08-01 15:17:22 UTC (rev 76581)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+
+	<mbean code="org.jboss.test.jmx.valuefactory.MBean1" 
+	       name="jboss.test:service=ValueFactoryInjectionTestSource"/>
+
+	<mbean code="org.jboss.test.jmx.valuefactory.MBean2" 
+	       name="jboss.test:service=ValueFactoryInjectionTestTarget">
+	       
+	   <attribute name="FromPojo">
+	      <value-factory bean="ValueFactoryInjectionTestSource" method="add">
+	         <parameter>1</parameter>
+	         <parameter>2</parameter>
+	      </value-factory>
+	   </attribute>
+	       
+	   <attribute name="FromMBean">
+	      <value-factory bean="jboss.test:service=ValueFactoryInjectionTestSource" method="add">
+	         <parameter class="int">3</parameter>
+	         <parameter class="java.lang.Integer">4</parameter>
+	      </value-factory>
+	   </attribute>
+	       
+	   <attribute name="FromDefault">
+	      <value-factory bean="ValueFactoryInjectionTestSource" method="noReturn" default="5"/>
+	   </attribute>
+	   
+	</mbean>
+	
+</server>
\ No newline at end of file




More information about the jboss-cvs-commits mailing list