You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2006/04/07 04:37:03 UTC
svn commit: r392163 - in /geronimo/branches/1.1/modules:
connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java
Author: ammulder
Date: Thu Apr 6 19:37:01 2006
New Revision: 392163
URL: http://svn.apache.org/viewcvs?rev=392163&view=rev
Log:
Fix a reference problem
Modified:
geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java
Modified: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=392163&r1=392162&r2=392163&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Thu Apr 6 19:37:01 2006
@@ -86,6 +86,8 @@
import org.apache.geronimo.xbeans.j2ee.MessagelistenerType;
import org.apache.geronimo.xbeans.j2ee.ResourceadapterType;
import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
+import org.apache.geronimo.management.geronimo.JCAResourceAdapter;
+import org.apache.geronimo.management.JCAConnectionFactory;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -344,8 +346,8 @@
}
GBeanData jcaResourceData = new GBeanData(jcaResourcejsr77Name, JCAResourceImplGBean.GBEAN_INFO);
- jcaResourceData.setReferencePattern("ConnectionFactories", new AbstractNameQuery(resourceAdapterModuleName.getArtifact(), Collections.EMPTY_MAP));
- jcaResourceData.setReferencePattern("ResourceAdapters", new AbstractNameQuery(resourceAdapterModuleName.getArtifact(), Collections.EMPTY_MAP));
+ jcaResourceData.setReferencePattern("ConnectionFactories", new AbstractNameQuery(resourceAdapterModuleName.getArtifact(), Collections.EMPTY_MAP, JCAConnectionFactory.class.getName()));
+ jcaResourceData.setReferencePattern("ResourceAdapters", new AbstractNameQuery(resourceAdapterModuleName.getArtifact(), Collections.EMPTY_MAP, JCAResourceAdapter.class.getName()));
try {
earContext.addGBean(jcaResourceData);
} catch (GBeanAlreadyExistsException e) {
Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java?rev=392163&r1=392162&r2=392163&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java (original)
+++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java Thu Apr 6 19:37:01 2006
@@ -18,6 +18,7 @@
import org.apache.geronimo.management.geronimo.JCAResource;
import org.apache.geronimo.management.geronimo.JCAResourceAdapter;
+import org.apache.geronimo.management.JCAConnectionFactory;
import org.apache.geronimo.connector.outbound.JCAConnectionFactoryImpl;
import java.util.Collection;
@@ -25,7 +26,7 @@
import java.util.Iterator;
/**
- * @version $Rev: 386505 $ $Date$
+ * @version $Rev$ $Date$
*/
public class JCAResourceImpl implements JCAResource {
private final String objectName;
@@ -42,7 +43,7 @@
public String[] getConnectionFactories() {
ArrayList temp = new ArrayList();
for (Iterator iterator = connectionFactories.iterator(); iterator.hasNext();) {
- JCAConnectionFactoryImpl jcaConnectionFactory = (JCAConnectionFactoryImpl) iterator.next();
+ JCAConnectionFactory jcaConnectionFactory = (JCAConnectionFactory) iterator.next();
temp.add(jcaConnectionFactory.getObjectName());
}
return (String[])temp.toArray(new String[temp.size()]);