[jboss-svn-commits] JBL Code SVN: r25619 - in labs/jbosstm/trunk/ArjunaCore/tsmx/sar: resources/META-INF and 1 other directory.

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

Author: mmusgrov
Date: 2009-03-12 11:33:17 -0400 (Thu, 12 Mar 2009)
New Revision: 25619

Added:
   labs/jbosstm/trunk/ArjunaCore/tsmx/sar/resources/META-INF/jboss-beans.xml
Removed:
   labs/jbosstm/trunk/ArjunaCore/tsmx/sar/resources/META-INF/jboss-service.xml
Modified:
   labs/jbosstm/trunk/ArjunaCore/tsmx/sar/build.xml
Log:
Convert the old style service xml file to the new jboss-beans format.

JBTM-511


Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/sar/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/sar/build.xml	2009-03-12 14:41:09 UTC (rev 25618)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/sar/build.xml	2009-03-12 15:33:17 UTC (rev 25619)
@@ -82,7 +82,7 @@
                 <attribute name="Class-Path" value="tsmx-tools.jar tools/tsmx-objectstorebrowser.jar"/>
             </manifest>
             <fileset dir="${resources.dir}">
-                <include name="META-INF/jboss-service.xml"/>
+                <include name="META-INF/jboss-beans.xml"/>
             </fileset>
             <fileset dir="${build.dir}/apps" includes="embedded-tools.jar"/>
             <fileset dir="${jboss.ts.tools}/tools">

Added: labs/jbosstm/trunk/ArjunaCore/tsmx/sar/resources/META-INF/jboss-beans.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/sar/resources/META-INF/jboss-beans.xml	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/sar/resources/META-INF/jboss-beans.xml	2009-03-12 15:33:17 UTC (rev 25619)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  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 in the distribution for a
+  full listing of individual contributors.
+  This copyrighted material is made available to anyone wishing to use,
+  modify, copy, or redistribute it subject to the terms and conditions
+  of the GNU Lesser General Public License, v. 2.1.
+  This program is distributed in the hope that it will be useful, but WITHOUT A
+  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,
+  v.2.1 along with this distribution; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+  MA  02110-1301, USA.
+
+  (C) 2008,
+  @author JBoss Inc.
+-->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+	<bean name="EmbeddedTools" class="org.jboss.jbosstm.tools.mbean.EmbeddedTools">
+		<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=EmbeddedTools", exposedInterface=org.jboss.jbosstm.tools.mbean.EmbeddedTools.class, registerDirectly=true)</annotation>
+	</bean>
+</deployment>

Deleted: labs/jbosstm/trunk/ArjunaCore/tsmx/sar/resources/META-INF/jboss-service.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/sar/resources/META-INF/jboss-service.xml	2009-03-12 14:41:09 UTC (rev 25618)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/sar/resources/META-INF/jboss-service.xml	2009-03-12 15:33:17 UTC (rev 25619)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  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 in the distribution for a
-  full listing of individual contributors.
-  This copyrighted material is made available to anyone wishing to use,
-  modify, copy, or redistribute it subject to the terms and conditions
-  of the GNU Lesser General Public License, v. 2.1.
-  This program is distributed in the hope that it will be useful, but WITHOUT A
-  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,
-  v.2.1 along with this distribution; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  MA  02110-1301, USA.
-
-  (C) 2008,
-  @author JBoss Inc.
--->
-
-<server>
-
-   <mbean name="jboss.tm:service=EmbeddedTools" code="org.jboss.jbosstm.tools.mbean.EmbeddedTools"/>
-
-</server>