User: cazzius
Date: 02/03/18 00:44:29
Modified: src/main/org/jboss/resource ConnectionFactoryLoader.java
Log:
Use J2EEManagerObject.TYPE, JMSResource.J2EE_TYPE and JDBCDataSource.J2EE_TYPE when
checking if a JSR-77 object exists
Revision Changes Path
1.24 +19 -6 jbosscx/src/main/org/jboss/resource/ConnectionFactoryLoader.java
Index: ConnectionFactoryLoader.java
===================================================================
RCS file:
/cvsroot/jboss/jbosscx/src/main/org/jboss/resource/ConnectionFactoryLoader.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ConnectionFactoryLoader.java 6 Mar 2002 01:07:45 -0000 1.23
+++ ConnectionFactoryLoader.java 18 Mar 2002 08:44:29 -0000 1.24
@@ -50,6 +50,7 @@
import org.jboss.resource.security.PrincipalMapping;
import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.management.j2ee.J2EEManagedObject;
import org.jboss.management.j2ee.JDBCDataSource;
import org.jboss.management.j2ee.JMSResource;
import org.jboss.deployment.DeploymentException;
@@ -68,7 +69,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>David Jencks</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Andreas Schaefer</a>
* @see RARDeployer
- * @version $Revision: 1.23 $ <p>
+ * @version $Revision: 1.24 $ <p>
*
* <b>Revisions:</b>
*
@@ -393,7 +394,10 @@
try {
java.util.Set lNames = getServer().queryNames(
- new ObjectName( "*:type=JDBCDataSource,name=" + jndiName + ",*" ),
+ new ObjectName( "*:" +
+ J2EEManagedObject.TYPE + "=" + JDBCDataSource.J2EE_TYPE
+
+ ",name=" + jndiName +
+ ",*" ),
null
);
if( lNames.iterator().hasNext() ) {
@@ -410,11 +414,14 @@
try {
java.util.Set lNames = getServer().queryNames(
- new ObjectName( "*:type=JMSResource,name=" + jndiName + ",*" ),
+ new ObjectName( "*:" +
+ J2EEManagedObject.TYPE + "=" + JMSResource.J2EE_TYPE +
+ ",name=" + jndiName +
+ ",*" ),
null
);
if( lNames.iterator().hasNext() ) {
- // Destroy JSR-77 JDBCDataSource
+ // Destroy JSR-77 JMSResource
JMSResource.destroy(
getServer(),
jndiName
@@ -795,7 +802,10 @@
{
try {
java.util.Set lNames = getServer().queryNames(
- new ObjectName( "*:type=JDBCDataSource,name=" + jndiName + ",*" ),
+ new ObjectName( "*:" +
+ J2EEManagedObject.TYPE + "=" + JDBCDataSource.J2EE_TYPE
+
+ ",name=" + jndiName +
+ ",*" ),
null
);
if( lNames.iterator().hasNext() ) {
@@ -818,7 +828,10 @@
{
try {
java.util.Set lNames = getServer().queryNames(
- new ObjectName( "*:type=JMSResource,name=" + jndiName + ",*" ),
+ new ObjectName( "*:" +
+ J2EEManagedObject.TYPE + "=" + JMSResource.J2EE_TYPE +
+ ",name=" + jndiName +
+ ",*" ),
null
);
if( lNames.iterator().hasNext() ) {
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
