You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/01/15 02:20:53 UTC
cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound ConnectionManagerDeployment.java
djencks 2004/01/14 17:20:53
Modified: modules/core/src/java/org/apache/geronimo/connector/deployment
ManagedConnectionFactoryHelper.java
modules/core/src/java/org/apache/geronimo/connector/outbound
ConnectionManagerDeployment.java
Log:
Fix a couple bugs preventing deployment
Revision Changes Path
1.4 +4 -3 incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/deployment/ManagedConnectionFactoryHelper.java
Index: ManagedConnectionFactoryHelper.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/deployment/ManagedConnectionFactoryHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ManagedConnectionFactoryHelper.java 14 Jan 2004 08:29:38 -0000 1.3
+++ ManagedConnectionFactoryHelper.java 15 Jan 2004 01:20:53 -0000 1.4
@@ -69,6 +69,7 @@
import org.apache.geronimo.kernel.service.GeronimoMBeanInfo;
import org.apache.geronimo.kernel.service.GeronimoMBeanTarget;
import org.apache.geronimo.kernel.service.GeronimoOperationInfo;
+import org.apache.geronimo.kernel.service.GeronimoParameterInfo;
import org.apache.geronimo.naming.ger.GerContextManager;
/**
@@ -321,9 +322,9 @@
mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ConnectionInterface", true, true, "Interface implemented by the Connection", TARGET_NAME));
mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ConnectionImplClass", true, true, "Class of the Connection", TARGET_NAME));
mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("ManagedConnectionFactoryClass", true, true, "Class of the ManagedConnectionFactory", TARGET_NAME));
- mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("GlobalJNDIName", true, true, "Optional name to bind ConnectionFactory under in ger: context"));
+ mbeanInfo.addAttributeInfo(new GeronimoAttributeInfo("GlobalJNDIName", true, true, "Optional name to bind ConnectionFactory under in ger: context", TARGET_NAME));
- mbeanInfo.addOperationInfo(new GeronimoOperationInfo("getConnectionFactory", null, GeronimoOperationInfo.INFO, "Retrieve the ConnectionFactory we deployed", TARGET_NAME));
+ mbeanInfo.addOperationInfo(new GeronimoOperationInfo("getConnectionFactory", new GeronimoParameterInfo[]{}, GeronimoOperationInfo.INFO, "Retrieve the ConnectionFactory we deployed", TARGET_NAME));
if (resourceAdapterName != null) {
mbeanInfo.addEndpoint(new GeronimoMBeanEndpoint("ResourceAdapterHelper", ResourceAdapterHelper.class.getName(), resourceAdapterName, true, TARGET_NAME));
1.10 +1 -2 incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java
Index: ConnectionManagerDeployment.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/outbound/ConnectionManagerDeployment.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConnectionManagerDeployment.java 14 Jan 2004 08:29:38 -0000 1.9
+++ ConnectionManagerDeployment.java 15 Jan 2004 01:20:53 -0000 1.10
@@ -349,7 +349,6 @@
mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UseLocalTransactions", true, true, "Use local rather than xa transactions"));
mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UseTransactionCaching", true, true, "Always use the same connection in a transaction"));
mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("UseSubject", true, true, "Select pool using SecurityDomain supplied subject"));
- mBeanInfo.addAttributeInfo(new GeronimoAttributeInfo("GlobalJNDIName", true, true, "Optional name to bind ConnectionFactory under in ger: context"));
mBeanInfo.addOperationInfo(new GeronimoOperationInfo("getStack"));