djencks 2004/03/09 14:48:26
Modified:
modules/connector/src/test/org/apache/geronimo/connector/deployment
RAR_1_5ConfigBuilderTest.java
modules/connector/src/test/org/apache/geronimo/connector/mock
MockAdminObject.java MockAdminObjectImpl.java
MockManagedConnectionFactory.java
MockResourceAdapter.java
modules/connector/src/test-data/connector_1_5
geronimo-ra.xml ra.xml
Log:
actually test that connector gbeans can be loaded and started
Revision Changes Path
1.4 +10 -1
incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilderTest.java
Index: RAR_1_5ConfigBuilderTest.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RAR_1_5ConfigBuilderTest.java 25 Feb 2004 09:57:12 -0000 1.3
+++ RAR_1_5ConfigBuilderTest.java 9 Mar 2004 22:48:26 -0000 1.4
@@ -27,6 +27,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Iterator;
import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
@@ -88,6 +89,14 @@
RAR_1_5ConfigBuilder configBuilder = new
RAR_1_5ConfigBuilder(kernel, null, new
ObjectName("geronimo.connector:service=ConnectionTracker"));
DeploymentContext context = new MockDeploymentContext(kernel);
configBuilder.addConnectorGBeans(context, connectorDocument,
geronimoConnectorDocument.getConnector(), this.getClass().getClassLoader());
+ for (Iterator iterator = gbeans.entrySet().iterator();
iterator.hasNext();) {
+ Map.Entry entry = (Map.Entry) iterator.next();
+ kernel.loadGBean((ObjectName)entry.getKey(),
(GBeanMBean)entry.getValue());
+ }
+ for (Iterator iterator = gbeans.keySet().iterator();
iterator.hasNext();) {
+ ObjectName name = (ObjectName) iterator.next();
+ kernel.startGBean(name);
+ }
} finally {
kernel.shutdown();
}
1.4 +5 -1
incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/mock/MockAdminObject.java
Index: MockAdminObject.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/mock/MockAdminObject.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockAdminObject.java 9 Mar 2004 20:15:43 -0000 1.3
+++ MockAdminObject.java 9 Mar 2004 22:48:26 -0000 1.4
@@ -27,6 +27,10 @@
* */
public interface MockAdminObject extends Serializable {
+ String getTweedle();
+
+ void setTweedle(String tweedle);
+
MockAdminObject getSomething();
}
1.4 +12 -1
incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java
Index: MockAdminObjectImpl.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/mock/MockAdminObjectImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockAdminObjectImpl.java 9 Mar 2004 20:15:43 -0000 1.3
+++ MockAdminObjectImpl.java 9 Mar 2004 22:48:26 -0000 1.4
@@ -24,6 +24,17 @@
*
* */
public class MockAdminObjectImpl implements MockAdminObject {
+
+ private String tweedle;
+
+ public String getTweedle() {
+ return tweedle;
+ }
+
+ public void setTweedle(String tweedle) {
+ this.tweedle = tweedle;
+ }
+
public MockAdminObject getSomething() {
return this;
}
1.3 +38 -1
incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java
Index: MockManagedConnectionFactory.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/mock/MockManagedConnectionFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockManagedConnectionFactory.java 25 Feb 2004 09:57:12 -0000 1.2
+++ MockManagedConnectionFactory.java 9 Mar 2004 22:48:26 -0000 1.3
@@ -44,6 +44,43 @@
private boolean reauthentication;
+ public String getOutboundStringProperty1() {
+ return outboundStringProperty1;
+ }
+
+ public void setOutboundStringProperty1(String outboundStringProperty1) {
+ this.outboundStringProperty1 = outboundStringProperty1;
+ }
+
+ public String getOutboundStringProperty2() {
+ return outboundStringProperty2;
+ }
+
+ public void setOutboundStringProperty2(String outboundStringProperty2) {
+ this.outboundStringProperty2 = outboundStringProperty2;
+ }
+
+ public String getOutboundStringProperty3() {
+ return outboundStringProperty3;
+ }
+
+ public void setOutboundStringProperty3(String outboundStringProperty3) {
+ this.outboundStringProperty3 = outboundStringProperty3;
+ }
+
+ public String getOutboundStringProperty4() {
+ return outboundStringProperty4;
+ }
+
+ public void setOutboundStringProperty4(String outboundStringProperty4) {
+ this.outboundStringProperty4 = outboundStringProperty4;
+ }
+
+ private String outboundStringProperty1;
+ private String outboundStringProperty2;
+ private String outboundStringProperty3;
+ private String outboundStringProperty4;
+
public void setResourceAdapter(ResourceAdapter resourceAdapter) throws
ResourceException {
assert this.resourceAdapter == null: "Setting ResourceAdapter twice";
assert resourceAdapter != null: "trying to set resourceAdapter to
null";
1.3 +12 -1
incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/mock/MockResourceAdapter.java
Index: MockResourceAdapter.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/connector/src/test/org/apache/geronimo/connector/mock/MockResourceAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockResourceAdapter.java 25 Feb 2004 09:57:12 -0000 1.2
+++ MockResourceAdapter.java 9 Mar 2004 22:48:26 -0000 1.3
@@ -36,6 +36,8 @@
private BootstrapContext bootstrapContext;
+ private String raStringProperty;
+
public void start(BootstrapContext bootstrapContext) throws
ResourceAdapterInternalException {
assert this.bootstrapContext == null : "Attempting to restart
adapter without stoppping";
assert bootstrapContext != null: "Null bootstrap context";
@@ -55,4 +57,13 @@
public XAResource[] getXAResources(ActivationSpec[] specs) throws
ResourceException {
return new XAResource[0];
}
+
+ public String getRAStringProperty() {
+ return raStringProperty;
+ }
+
+ public void setRAStringProperty(String raStringProperty) {
+ this.raStringProperty = raStringProperty;
+ }
+
}
1.9 +1 -1
incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml
Index: geronimo-ra.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- geronimo-ra.xml 21 Feb 2004 01:10:50 -0000 1.8
+++ geronimo-ra.xml 9 Mar 2004 22:48:26 -0000 1.9
@@ -45,7 +45,7 @@
<connectionfactory-interface>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-interface>
<connectiondefinition-instance>
<name>ThirdTestOutboundConnectionFactory</name>
- <config-property-setting
name="OutboundStringProperty">StringValue3</config-property-setting>
+ <config-property-setting
name="OutboundStringProperty1">StringValue3</config-property-setting>
<connectionmanager>
<realm-bridge>TargetRealm</realm-bridge>
<blockingTimeout>5000</blockingTimeout>
1.3 +1 -1
incubator-geronimo/modules/connector/src/test-data/connector_1_5/ra.xml
Index: ra.xml
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_5/ra.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ra.xml 20 Feb 2004 18:10:30 -0000 1.2
+++ ra.xml 9 Mar 2004 22:48:26 -0000 1.3
@@ -49,7 +49,7 @@
<connection-definition>
<managedconnectionfactory-class>org.apache.geronimo.connector.mock.MockManagedConnectionFactory</managedconnectionfactory-class>
<config-property>
-
<config-property-name>OutboundStringProperty</config-property-name>
+
<config-property-name>OutboundStringProperty1</config-property-name>
<config-property-type>java.lang.String</config-property-type>
</config-property>
<connectionfactory-interface>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-interface>
