Return-Path: Delivered-To: apmail-incubator-geronimo-cvs-archive@www.apache.org Received: (qmail 73232 invoked from network); 9 Mar 2004 22:48:31 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 9 Mar 2004 22:48:31 -0000 Received: (qmail 68822 invoked by uid 500); 9 Mar 2004 22:48:15 -0000 Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org Received: (qmail 68778 invoked by uid 500); 9 Mar 2004 22:48:15 -0000 Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: geronimo-dev@incubator.apache.org Delivered-To: mailing list geronimo-cvs@incubator.apache.org Received: (qmail 68730 invoked from network); 9 Mar 2004 22:48:14 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 9 Mar 2004 22:48:14 -0000 Received: (qmail 73208 invoked by uid 1712); 9 Mar 2004 22:48:26 -0000 Date: 9 Mar 2004 22:48:26 -0000 Message-ID: <20040309224826.73207.qmail@minotaur.apache.org> From: djencks@apache.org To: incubator-geronimo-cvs@apache.org Subject: cvs commit: incubator-geronimo/modules/connector/src/test-data/connector_1_5 geronimo-ra.xml ra.xml X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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 @@ org.apache.geronimo.connector.mock.MockConnectionFactory ThirdTestOutboundConnectionFactory - StringValue3 + StringValue3 TargetRealm 5000 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 @@ org.apache.geronimo.connector.mock.MockManagedConnectionFactory - OutboundStringProperty + OutboundStringProperty1 java.lang.String org.apache.geronimo.connector.mock.MockConnectionFactory