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 2005/09/15 08:35:46 UTC
svn commit: r289167 - in /geronimo/trunk/modules: assembly/src/plan/
client-builder/src/test-resources/plans/
connector-builder/src/java/org/apache/geronimo/connector/deployment/
connector-builder/src/java/org/apache/geronimo/connector/deployment/dconf...
Author: djencks
Date: Wed Sep 14 23:35:31 2005
New Revision: 289167
URL: http://svn.apache.org/viewcvs?rev=289167&view=rev
Log:
GERONIMO-956 remove global-jndi-name element and unused credential-interface element and version attribute
Modified:
geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml
geronimo/trunk/modules/client-builder/src/test-resources/plans/plan2.xml
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstance.java
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapter_1_0DConfigRoot.java
geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector.xsd
geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
geronimo/trunk/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml
geronimo/trunk/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml
geronimo/trunk/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml
geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java
geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
geronimo/trunk/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml
geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ra.xml
Modified: geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml Wed Sep 14 23:35:31 2005
@@ -19,7 +19,6 @@
<!-- $Rev$ $Date$ -->
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
- version="1.5"
configId="org/apache/geronimo/DefaultDatabase"
parentId="org/apache/geronimo/Server">
Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml Wed Sep 14 23:35:31 2005
@@ -19,7 +19,6 @@
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
- version="1.5"
configId="org/apache/geronimo/SystemDatabase"
parentId="org/apache/geronimo/Server">
Modified: geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml Wed Sep 14 23:35:31 2005
@@ -19,7 +19,6 @@
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
- version="1.5"
configId="org/apache/geronimo/SystemJMS"
parentId="org/apache/geronimo/ActiveMQServer">
<resourceadapter>
@@ -49,8 +48,6 @@
<match-one/>
</single-pool>
</connectionmanager>
- <global-jndi-name>jms/ConnectionFactoryLocalTx</global-jndi-name>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</connectiondefinition-instance>
</connection-definition>
</outbound-resourceadapter>
Modified: geronimo/trunk/modules/client-builder/src/test-resources/plans/plan2.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/test-resources/plans/plan2.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/test-resources/plans/plan2.xml (original)
+++ geronimo/trunk/modules/client-builder/src/test-resources/plans/plan2.xml Wed Sep 14 23:35:31 2005
@@ -10,7 +10,6 @@
<resource>
<external-rar>tranql/rars/tranql-connector-1.0-SNAPSHOT</external-rar>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
- version="1.5"
configId="org/apache/geronimo/DefaultDatabase"
parentId="org/apache/geronimo/Server">
@@ -48,8 +47,6 @@
<match-one/>
</single-pool>
</connectionmanager>
- <global-jndi-name>tranql/axion</global-jndi-name>
- <!--credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface-->
</connectiondefinition-instance>
</connection-definition>
</outbound-resourceadapter>
Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Wed Sep 14 23:35:31 2005
@@ -658,14 +658,14 @@
}
private ObjectName configureConnectionManager(EARContext earContext, J2eeContext j2eeContext, String ddTransactionSupport, GerConnectiondefinitionInstanceType connectionfactoryInstance, ClassLoader cl) throws DeploymentException {
- if (connectionfactoryInstance.getConnectionmanagerRef() != null) {
+// if (connectionfactoryInstance.getConnectionmanagerRef() != null) {
//we don't configure anything, just use the supplied gbean
- try {
- return ObjectName.getInstance(connectionfactoryInstance.getConnectionmanagerRef());
- } catch (MalformedObjectNameException e) {
- throw new DeploymentException("Invalid ObjectName string supplied for ConnectionManager reference", e);
- }
- }
+// try {
+// return ObjectName.getInstance(connectionfactoryInstance.getConnectionmanagerRef());
+// } catch (MalformedObjectNameException e) {
+// throw new DeploymentException("Invalid ObjectName string supplied for ConnectionManager reference", e);
+// }
+// }
// create the object name for our connection manager
ObjectName connectionManagerObjectName = null;
@@ -761,9 +761,6 @@
// ManagedConnectionFactory
setDynamicGBeanDataAttributes(managedConnectionFactoryInstanceGBeanData, connectiondefinitionInstance.getConfigPropertySettingArray(), cl);
try {
- if (connectiondefinitionInstance.isSetGlobalJndiName()) {
- managedConnectionFactoryInstanceGBeanData.setAttribute("globalJNDIName", connectiondefinitionInstance.getGlobalJndiName().trim());
- }
if (resourceAdapterObjectName != null) {
managedConnectionFactoryInstanceGBeanData.setReferencePattern("ResourceAdapterWrapper", resourceAdapterObjectName);
}
Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstance.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstance.java?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstance.java (original)
+++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstance.java Wed Sep 14 23:35:31 2005
@@ -117,15 +117,15 @@
pcs.firePropertyChange("name", old, name);
}
- public String getGlobalJNDIName() {
- return getConnectiondefinitionInstance().getGlobalJndiName();
- }
-
- public void setGlobalJNDIName(String globalJNDIName) {
- String old = getGlobalJNDIName();
- getConnectiondefinitionInstance().setGlobalJndiName(globalJNDIName);
- pcs.firePropertyChange("globalJNDIName", old, globalJNDIName);
- }
+// public String getGlobalJNDIName() {
+// return getConnectiondefinitionInstance().getGlobalJndiName();
+// }
+//
+// public void setGlobalJNDIName(String globalJNDIName) {
+// String old = getGlobalJNDIName();
+// getConnectiondefinitionInstance().setGlobalJndiName(globalJNDIName);
+// pcs.firePropertyChange("globalJNDIName", old, globalJNDIName);
+// }
// public boolean isUseConnectionRequestInfo() {
// return getConnectionManager().getUseConnectionRequestInfo();
Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java (original)
+++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java Wed Sep 14 23:35:31 2005
@@ -28,7 +28,6 @@
import org.apache.geronimo.deployment.plugin.DConfigBeanRootSupport;
import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
import org.apache.geronimo.xbeans.geronimo.GerResourceadapterType;
-import org.apache.geronimo.xbeans.geronimo.GerVersionType;
import org.apache.xmlbeans.SchemaTypeLoader;
import org.apache.xmlbeans.XmlBeans;
import org.apache.xmlbeans.XmlException;
@@ -62,7 +61,6 @@
if(in == null) {
GerConnectorDocument doc = GerConnectorDocument.Factory.newInstance();
doc.addNewConnector().addNewResourceadapter();
- doc.getConnector().setVersion(GerVersionType.X_1_5);
return doc;
} else {
try {
@@ -102,9 +100,6 @@
public void fromXML(InputStream inputStream) throws XmlException, IOException {
super.fromXML(inputStream);
- if (!getConnectorDocument().getConnector().getVersion().equals(GerVersionType.X_1_5)) {
- throw new IllegalStateException("Wrong version, expected 1.5");
- }
//TODO this is so totally wrong...
replaceResourceAdapterDConfigBean(getConnectorDocument().getConnector().getResourceadapterArray()[0]);
}
Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapter_1_0DConfigRoot.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapter_1_0DConfigRoot.java?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapter_1_0DConfigRoot.java (original)
+++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapter_1_0DConfigRoot.java Wed Sep 14 23:35:31 2005
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.io.InputStream;
-
import javax.enterprise.deploy.model.DDBean;
import javax.enterprise.deploy.model.DDBeanRoot;
import javax.enterprise.deploy.spi.DConfigBean;
@@ -28,7 +27,6 @@
import org.apache.geronimo.deployment.plugin.DConfigBeanRootSupport;
import org.apache.geronimo.xbeans.geronimo.GerConnectionDefinitionType;
import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
-import org.apache.geronimo.xbeans.geronimo.GerVersionType;
import org.apache.xmlbeans.SchemaTypeLoader;
import org.apache.xmlbeans.XmlException;
@@ -49,7 +47,6 @@
public ResourceAdapter_1_0DConfigRoot(DDBeanRoot ddBean) {
super(ddBean, GerConnectorDocument.Factory.newInstance());
GerConnectionDefinitionType connectionDefinition = getConnectorDocument().addNewConnector().addNewResourceadapter().addNewOutboundResourceadapter().addNewConnectionDefinition();
- getConnectorDocument().getConnector().setVersion(GerVersionType.X_1_0);
replaceConnectionDefinitionDConfigBean(connectionDefinition);
}
@@ -76,9 +73,6 @@
public void fromXML(InputStream inputStream) throws XmlException, IOException {
super.fromXML(inputStream);
- if (!getConnectorDocument().getConnector().getVersion().equals(GerVersionType.X_1_0)) {
- throw new IllegalStateException("Wrong version, expected 1.0");
- }
//TODO this is so totally wrong...
replaceConnectionDefinitionDConfigBean(getConnectorDocument().getConnector().getResourceadapterArray()[0].getOutboundResourceadapter().getConnectionDefinitionArray(0));
}
Modified: geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector.xsd?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector.xsd (original)
+++ geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector.xsd Wed Sep 14 23:35:31 2005
@@ -213,19 +213,12 @@
type="ger:config-property-settingType"
minOccurs="0"
maxOccurs="unbounded"/>
- <xs:choice>
- <xs:element name="connectionmanager"
- type="ger:connectionmanagerType">
- </xs:element>
- <xs:element name="connectionmanager-ref" type="xs:string"/>
- </xs:choice>
- <!-- will be bound in ger: context if present -->
- <xs:element name="global-jndi-name"
- type="xs:string"
- minOccurs="0"/>
- <xs:element name="credential-interface"
- type="ger:credential-interfaceType"
- minOccurs="0"/>
+ <!-- <xs:choice>-->
+ <xs:element name="connectionmanager"
+ type="ger:connectionmanagerType">
+ </xs:element>
+ <!-- <xs:element name="connectionmanager-ref" type="xs:string"/>-->
+ <!-- </xs:choice>-->
</xs:sequence>
</xs:complexType>
@@ -305,54 +298,14 @@
<xs:element name="adminobject" type="ger:adminobjectType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
-<!-- <xs:element name="gbean" type="sys:gbeanType" minOccurs="0" maxOccurs="unbounded"/>-->
</xs:sequence>
- <xs:attribute name="version" type="ger:versionType" use="optional"/>
<xs:attribute name="configId" type="xs:string" use="required"/>
<xs:attribute name="parentId" type="xs:string" use="optional"/>
<xs:attribute name="suppressDefaultParentId" type="xs:boolean" use="optional"/>
</xs:complexType>
- <xs:simpleType name="versionType">
- <xs:restriction base="xs:string">
- <xs:whiteSpace value="collapse"/>
- <xs:enumeration value="1.0"/>
- <xs:enumeration value="1.5"/>
- </xs:restriction>
- </xs:simpleType>
<!-- **************************************************** -->
-
- <xs:simpleType name="credential-interfaceType">
- <xs:annotation>
- <xs:documentation>
-
- The credential-interfaceType specifies the
- interface that the resource adapter implementation
- supports for the representation of the
- credentials. This element(s) that use this type,
- i.e. credential-interface, should be used by
- application server to find out the Credential
- interface it should use as part of the security
- contract.
-
- The possible values are:
-
- javax.resource.spi.security.PasswordCredential
- org.ietf.jgss.GSSCredential
- javax.resource.spi.security.GenericCredential
-
- </xs:documentation>
- </xs:annotation>
- <xs:restriction base="ger:fully-qualified-classType">
- <xs:enumeration
- value="javax.resource.spi.security.PasswordCredential"/>
- <xs:enumeration
- value="org.ietf.jgss.GSSCredential"/>
- <xs:enumeration
- value="javax.resource.spi.security.GenericCredential"/>
- </xs:restriction>
- </xs:simpleType>
<xs:complexType name="emptyType"/>
Modified: geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml Wed Sep 14 23:35:31 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector" version="1.0"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
configId="org/apache/geronimo/j2ee/deployment/test"
parentId="org/apache/geronimo/Server">
@@ -40,8 +40,6 @@
<partition-by-subject/>
</partitioned-pool>
</connectionmanager>
- <global-jndi-name>connectionfactories/testcf</global-jndi-name>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</connectiondefinition-instance>
<connectiondefinition-instance>
<name>SecondTestOutboundConnectionFactory</name>
Modified: geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml Wed Sep 14 23:35:31 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector" version="1.5"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
configId="org/apache/geronimo/j2ee/deployment/test"
parentId="org/apache/geronimo/Server">
@@ -47,7 +47,6 @@
<partition-by-subject/>
</partitioned-pool>
</connectionmanager>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</connectiondefinition-instance>
<connectiondefinition-instance>
<name>SecondTestOutboundConnectionFactory</name>
Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml Wed Sep 14 23:35:31 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector" version="1.5"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
configId="org/apache/geronimo/j2ee/deployment/test"
parentId="org/apache/geronimo/Server">
Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml Wed Sep 14 23:35:31 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector" version="1.5"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
configId="org/apache/geronimo/j2ee/deployment/test"
parentId="org/apache/geronimo/Server">
@@ -45,8 +45,6 @@
<partition-by-subject/>
</partitioned-pool>
</connectionmanager>
- <global-jndi-name>connectionfactories/testcf</global-jndi-name>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</connectiondefinition-instance>
</connection-definition>
</outbound-resourceadapter>
@@ -76,8 +74,6 @@
<partition-by-subject/>
</partitioned-pool>
</connectionmanager>
- <global-jndi-name>connectionfactories/testcf</global-jndi-name>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</connectiondefinition-instance>
</connection-definition>
</outbound-resourceadapter>
Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml Wed Sep 14 23:35:31 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector" version="1.5"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
configId="org/apache/geronimo/j2ee/deployment/test"
parentId="org/apache/geronimo/Server">
Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml Wed Sep 14 23:35:31 2005
@@ -23,7 +23,7 @@
<module>
<connector>test-rar-10-noger.rar</connector>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector" version="1.0"
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
configId="org/apache/geronimo/j2ee/deployment/test"
parentId="org/apache/geronimo/Server">
@@ -47,8 +47,6 @@
<partition-by-subject/>
</partitioned-pool>
</connectionmanager>
- <global-jndi-name>connectionfactories/testcf</global-jndi-name>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</connectiondefinition-instance>
<connectiondefinition-instance>
<name>SecondTestOutboundConnectionFactory</name>
@@ -85,7 +83,7 @@
</module>
<module>
<connector>test-rar-15-noger.rar</connector>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector" version="1.5"
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
configId="org/apache/geronimo/j2ee/deployment/test"
parentId="org/apache/geronimo/Server">
@@ -116,8 +114,6 @@
<partition-by-subject/>
</partitioned-pool>
</connectionmanager>
- <global-jndi-name>connectionfactories/testcf</global-jndi-name>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</connectiondefinition-instance>
<connectiondefinition-instance>
<name>SecondTestOutboundConnectionFactory</name>
Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Wed Sep 14 23:35:31 2005
@@ -467,7 +467,7 @@
assertNotNull(managedConnectionFactoryInfo);
GBeanInfo managedConnectionFactoryGBeanInfo = managedConnectionFactoryInfo.getGBeanInfo();
List attributes3 = managedConnectionFactoryGBeanInfo.getPersistentAttributes();
- assertEquals(11, attributes3.size());
+ assertEquals(10, attributes3.size());
}
Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapper.java Wed Sep 14 23:35:31 2005
@@ -18,7 +18,6 @@
package org.apache.geronimo.connector.outbound;
import javax.management.ObjectName;
-import javax.naming.NamingException;
import javax.resource.ResourceException;
import javax.resource.spi.ManagedConnectionFactory;
import javax.resource.spi.ResourceAdapterAssociation;
@@ -34,7 +33,6 @@
import org.apache.geronimo.gbean.DynamicGBeanDelegate;
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.naming.geronimo.GeronimoContextManager;
import org.apache.geronimo.transaction.manager.NamedXAResource;
import org.apache.geronimo.transaction.manager.ResourceManager;
import org.apache.geronimo.management.JCAManagedConnectionFactory;
@@ -55,10 +53,8 @@
private final Class[] allImplementedInterfaces;
- private String globalJNDIName;
-
- private ResourceAdapterWrapper resourceAdapterWrapper;
- private ConnectionManagerContainer connectionManagerContainer;
+ private final ResourceAdapterWrapper resourceAdapterWrapper;
+ private final ConnectionManagerContainer connectionManagerContainer;
private ManagedConnectionFactory managedConnectionFactory;
@@ -88,6 +84,8 @@
allImplementedInterfaces = null;
isProxyable = false;
classLoader = null;
+ resourceAdapterWrapper = null;
+ connectionManagerContainer = null;
}
public ManagedConnectionFactoryWrapper(String managedConnectionFactoryClass,
@@ -96,7 +94,6 @@
String connectionFactoryImplClass,
String connectionInterface,
String connectionImplClass,
- String globalJNDIName,
ResourceAdapterWrapper resourceAdapterWrapper,
ConnectionManagerContainer connectionManagerContainer,
Kernel kernel,
@@ -125,7 +122,6 @@
}
isProxyable = mightBeProxyable;
- this.globalJNDIName = globalJNDIName;
this.resourceAdapterWrapper = resourceAdapterWrapper;
this.connectionManagerContainer = connectionManagerContainer;
@@ -164,26 +160,14 @@
return connectionImplClass;
}
- public String getGlobalJNDIName() {
- return globalJNDIName;
- }
-
public ResourceAdapterWrapper getResourceAdapterWrapper() {
return resourceAdapterWrapper;
}
- public void setResourceAdapterWrapper(ResourceAdapterWrapper resourceAdapterWrapper) {
- this.resourceAdapterWrapper = resourceAdapterWrapper;
- }
-
public ConnectionManagerContainer getConnectionManagerFactory() {
return connectionManagerContainer;
}
- public void setConnectionManagerFactory(ConnectionManagerContainer connectionManagerContainer) {
- this.connectionManagerContainer = connectionManagerContainer;
- }
-
public void doStart() throws Exception {
//register with resource adapter if not yet done
if (!registered && (managedConnectionFactory instanceof ResourceAdapterAssociation)) {
@@ -215,12 +199,6 @@
if (interceptor != null) {
interceptor.setInternalProxy(connectionFactory);
}
- //If a globalJNDIName is supplied, bind it.
- if (globalJNDIName != null) {
- GeronimoContextManager.bind(globalJNDIName, proxy);
- log.debug("Bound connection factory into global 'ger:' context at " + globalJNDIName);
- }
-
}
public void doStop() {
@@ -228,14 +206,6 @@
interceptor.setInternalProxy(null);
}
connectionFactory = null;
- if (globalJNDIName != null) {
- try {
- GeronimoContextManager.unbind(globalJNDIName);
- } catch (NamingException e) {
- // this will happen on failure since doStop is called twice
- // the error is not important
- }
- }
}
public void doFail() {
Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java Wed Sep 14 23:35:31 2005
@@ -41,7 +41,6 @@
infoFactory.addAttribute("connectionFactoryImplClass", String.class, true);
infoFactory.addAttribute("connectionInterface", String.class, true);
infoFactory.addAttribute("connectionImplClass", String.class, true);
- infoFactory.addAttribute("globalJNDIName", String.class, true);
infoFactory.addAttribute("kernel", Kernel.class, false);
infoFactory.addAttribute("objectName", String.class, false);
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
@@ -63,7 +62,6 @@
"connectionFactoryImplClass",
"connectionInterface",
"connectionImplClass",
- "globalJNDIName",
"ResourceAdapterWrapper",
"ConnectionManagerContainer",
"kernel",
Modified: geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java (original)
+++ geronimo/trunk/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java Wed Sep 14 23:35:31 2005
@@ -23,11 +23,7 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collections;
-import java.util.Hashtable;
import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.resource.cci.Connection;
import javax.resource.cci.ConnectionFactory;
@@ -39,14 +35,14 @@
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoPool;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoTransactions;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.KernelFactory;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelFactory;
/**
* @version $Rev$ $Date$
@@ -57,7 +53,6 @@
private ObjectName managedConnectionFactoryName;
private ObjectName ctcName;
private ObjectName cmfName;
- private static final String GLOBAL_NAME = "GLOBAL_NAME";
private static final String KERNEL_NAME = "testKernel";
private static final String TARGET_NAME = "testCFName";
@@ -108,40 +103,6 @@
}
- public void testGlobalLookup() throws Exception {
- Hashtable env = new Hashtable();
- env.put("java.naming.factory.initial", "com.sun.jndi.rmi.registry.RegistryContextFactory");
- env.put("java.naming.factory.url.pkgs", "org.apache.geronimo.naming");
- env.put("java.naming.provider.url", "rmi://localhost:1099");
-
- Context ctx = new InitialContext(env);
- ConnectionFactory cf = (ConnectionFactory) ctx.lookup("geronimo:" + GLOBAL_NAME);
- assertNotNull(cf);
- kernel.stopGBean(managedConnectionFactoryName);
- try {
- ctx.lookup("geronimo:" + GLOBAL_NAME);
- fail();
- } catch (NamingException ne) {
- }
- kernel.startGBean(managedConnectionFactoryName);
- ConnectionFactory cf2 = (ConnectionFactory) ctx.lookup("geronimo:" + GLOBAL_NAME);
- assertNotNull(cf2);
- }
-
-// public void testLocalLookup() throws Exception {
-// ReferenceFactory referenceFactory = new JMXReferenceFactory("geronimo.server", "geronimo");
-// ComponentContextBuilder builder = new ComponentContextBuilder();
-// GerLocalRefType localRef = GerLocalRefType.Factory.newInstance();
-// localRef.setRefName("resourceref");
-// localRef.setKernelName(KERNEL_NAME);
-// localRef.setTargetName(TARGET_NAME);
-//// builder.addResourceRef("resourceref", ConnectionFactory.class, localRef);
-// ReadOnlyContext roc = builder.getContext();
-// Object o = roc.lookup("env/resourceref");
-// assertNotNull(o);
-// assertTrue(o instanceof ConnectionFactory);
-// }
-
protected void setUp() throws Exception {
kernel = KernelFactory.newInstance().createKernel(KERNEL_NAME);
kernel.boot();
@@ -167,7 +128,6 @@
mcfw.setAttribute("connectionFactoryImplClass", MockConnectionFactory.class.getName());
mcfw.setAttribute("connectionInterface", Connection.class.getName());
mcfw.setAttribute("connectionImplClass", MockConnection.class.getName());
- mcfw.setAttribute("globalJNDIName", GLOBAL_NAME);
//"ResourceAdapterWrapper",
mcfw.setReferencePatterns("ConnectionManagerContainer", Collections.singleton(cmfName));
//"ManagedConnectionFactoryListener",
Modified: geronimo/trunk/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-ear/test-rar/META-INF/geronimo-ra.xml Wed Sep 14 23:35:31 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee" version="1.5"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee"
configId="org/apache/geronimo/j2ee/deployment/test"
parentId="org/apache/geronimo/Server">
Modified: geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ra.xml?rev=289167&r1=289166&r2=289167&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ra.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ra.xml Wed Sep 14 23:35:31 2005
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee" version="1.5"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee"
configId="org/apache/geronimo/j2ee/deployment/test"
parentId="org/apache/geronimo/Server">