Issue #23507 Fixing connectors tests, group 1
- copypasted modules moved to maven
- one wasn't compiled since 2001
- second since 2009
- both obsoleted, still used javax packages
- both are an evidence that GF doesn't support even 1.x xsd and dtd files
- differences were merged
- a bit faster build
diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml b/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml
new file mode 100644
index 0000000..cebf45e
--- /dev/null
+++ b/appserver/tests/appserv-tests/cciblackbox-tx/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.tests</groupId>
+ <artifactId>ant-tests</artifactId>
+ <version>6.2.5-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>cciblackbox-tx</artifactId>
+ <name>GlassFish Ant Tests - CCI BlackBox TX</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.corba</groupId>
+ <artifactId>glassfish-corba-orb</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnection.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnection.java
new file mode 100644
index 0000000..3b35852
--- /dev/null
+++ b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnection.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.connector.cciblackbox;
+
+import jakarta.resource.NotSupportedException;
+import jakarta.resource.ResourceException;
+import jakarta.resource.cci.ConnectionMetaData;
+import jakarta.resource.cci.Interaction;
+import jakarta.resource.cci.ResultSetInfo;
+import jakarta.resource.spi.ConnectionEvent;
+import jakarta.resource.spi.IllegalStateException;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.rmi.PortableRemoteObject;
+
+//import wlstest.functional.connector.common.apps.ejb.test_proxy.ConnectorTest;
+//import weblogic.jndi.Environment;
+
+/**
+ * This implementation class represents an application level connection
+ * handle that is used by a component to access an EIS instance.
+ *
+ * @author Sheetal Vartak
+ */
+public class CciConnection implements jakarta.resource.cci.Connection {
+
+ private boolean destroyed;
+
+ private CciManagedConnection mc;
+
+ // if mc is null, means connection is invalid
+
+ CciConnection(CciManagedConnection mc) {
+ this.mc = mc;
+ }
+
+
+ CciManagedConnection getManagedConnection() {
+ return mc;
+ }
+
+
+ @Override
+ public Interaction createInteraction() throws ResourceException {
+ return new CciInteraction(this);
+ }
+
+
+ @Override
+ public jakarta.resource.cci.LocalTransaction getLocalTransaction() throws ResourceException {
+ try {
+ java.sql.Connection con = getJdbcConnection();
+ if (con.getTransactionIsolation() == Connection.TRANSACTION_NONE) {
+ throw new ResourceException("Local Transaction not supported!!");
+ }
+ } catch (Exception e) {
+ throw new ResourceException(e.getMessage());
+ }
+ return new CciLocalTransactionImpl(mc);
+ }
+
+
+ public void setAutoCommit(boolean autoCommit) throws ResourceException {
+ try {
+ java.sql.Connection con = getJdbcConnection();
+ if (con.getTransactionIsolation() == Connection.TRANSACTION_NONE) {
+ throw new ResourceException("Local Transaction not " + "supported!!");
+ }
+ con.setAutoCommit(autoCommit);
+ } catch (Exception e) {
+ throw new ResourceException(e.getMessage());
+ }
+ }
+
+
+ public boolean getAutoCommit() throws ResourceException {
+ boolean val = false;
+ try {
+ java.sql.Connection con = getJdbcConnection();
+ if (con.getTransactionIsolation() == Connection.TRANSACTION_NONE) {
+ throw new ResourceException("Local Transaction not " + "supported!!");
+ }
+ val = con.getAutoCommit();
+ } catch (SQLException e) {
+ throw new ResourceException(e.getMessage());
+ }
+ return val;
+ }
+
+
+ @Override
+ public ResultSetInfo getResultSetInfo() throws ResourceException {
+ throw new NotSupportedException("ResultSet is not supported.");
+ }
+
+
+ @Override
+ public void close() throws ResourceException {
+ if (mc == null) {
+ return; // already be closed
+ }
+ mc.removeCciConnection(this);
+ mc.sendEvent(ConnectionEvent.CONNECTION_CLOSED, null, this);
+ mc = null;
+ }
+
+
+ @Override
+ public ConnectionMetaData getMetaData() throws ResourceException {
+ return new CciConnectionMetaDataImpl(mc);
+ }
+
+
+ void associateConnection(CciManagedConnection newMc) throws ResourceException {
+ try {
+ checkIfValid();
+ } catch (ResourceException ex) {
+ throw new IllegalStateException("Connection is invalid");
+ }
+ // dissociate handle with current managed connection
+ mc.removeCciConnection(this);
+ // associate handle with new managed connection
+ newMc.addCciConnection(this);
+ mc = newMc;
+ }
+
+
+ void checkIfValid() throws ResourceException {
+ if (mc == null) {
+ throw new ResourceException("Connection is invalid");
+ }
+ }
+
+
+ java.sql.Connection getJdbcConnection() throws SQLException {
+ java.sql.Connection con = null;
+ try {
+ checkIfValid();
+ // mc.getJdbcConnection() returns a SQL connection object
+ con = mc.getJdbcConnection();
+ } catch (ResourceException ex) {
+ throw new SQLException("Connection is invalid.");
+ }
+ return con;
+ }
+
+
+ void invalidate() {
+ mc = null;
+ }
+
+
+ private void checkIfDestroyed() throws ResourceException {
+ if (destroyed) {
+ throw new IllegalStateException("Managed connection is closed");
+ }
+ }
+
+ class Internal {
+
+ public Object narrow(Object ref, Class c) {
+ return PortableRemoteObject.narrow(ref, c);
+ }
+ }
+//
+// public boolean calcMultiply(String serverUrl, String testUser, String testPassword,
+// String testJndiName, int num1, int num2) {
+//
+// Context ctx = null;
+// ConnectorTest connectorTest = null;
+// Environment env = null;
+// boolean result;
+// try {
+// System.out.println("### calcMultiply");
+// env = new Environment();
+// env.setProviderUrl(serverUrl);
+// env.setSecurityPrincipal(testUser);
+// env.setSecurityCredentials(testPassword);
+// ctx = env.getInitialContext();
+// System.out.println("Lookup for " + testJndiName);
+// connectorTest = (ConnectorTest) ctx.lookup(testJndiName);
+// //Internal intenalRef = new Internal();
+// System.out.println("ConnectorTest is " + connectorTest);
+// //ConnectorTest connectorTestRemote = (ConnectorTest) intenalRef.narrow(connectorTestHome.create(), ConnectorTest.class);
+// if (connectorTest.calcMultiply(num1, num2) == (num1 * num2)) {
+// result = true;
+// } else {
+// result = false;
+// }
+// }
+// catch (Exception e) {
+//
+// result = false;
+// System.out.println("Exception in calcMultiply ");
+// e.printStackTrace();
+// }
+// return result;
+// }
+}
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionEventListener.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionEventListener.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionEventListener.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionEventListener.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionFactory.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionFactory.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionFactory.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionFactory.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionManager.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionManager.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionManager.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionManager.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionMetaDataImpl.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionMetaDataImpl.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionMetaDataImpl.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionMetaDataImpl.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionRequestInfo.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionRequestInfo.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionRequestInfo.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionRequestInfo.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionSpec.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionSpec.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnectionSpec.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciConnectionSpec.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciIndexedRecord.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciIndexedRecord.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciIndexedRecord.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciIndexedRecord.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciInteraction.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteraction.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciInteraction.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteraction.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciInteractionSpec.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteractionSpec.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciInteractionSpec.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciInteractionSpec.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciLocalTransactionImpl.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciLocalTransactionImpl.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciLocalTransactionImpl.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciLocalTransactionImpl.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciLocalTxManagedConnectionFactory.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciLocalTxManagedConnectionFactory.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciLocalTxManagedConnectionFactory.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciLocalTxManagedConnectionFactory.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciManagedConnection.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciManagedConnection.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciManagedConnection.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciManagedConnection.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciManagedConnectionMetaDataImpl.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciManagedConnectionMetaDataImpl.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciManagedConnectionMetaDataImpl.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciManagedConnectionMetaDataImpl.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciNoTxManagedConnectionFactory.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciNoTxManagedConnectionFactory.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciNoTxManagedConnectionFactory.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciNoTxManagedConnectionFactory.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciRecordFactory.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciRecordFactory.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciRecordFactory.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciRecordFactory.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciResourceAdapterMetaData.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciResourceAdapterMetaData.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciResourceAdapterMetaData.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciResourceAdapterMetaData.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/Mapping.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/Mapping.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/Mapping.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/Mapping.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/Parameter.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/Parameter.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/Parameter.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/Parameter.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/SpiLocalTransactionImpl.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/SpiLocalTransactionImpl.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/SpiLocalTransactionImpl.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/SpiLocalTransactionImpl.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/TransactionImpl.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/TransactionImpl.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/TransactionImpl.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/TransactionImpl.java
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/Util.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/Util.java
similarity index 100%
rename from appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/Util.java
rename to appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/Util.java
diff --git a/appserver/tests/appserv-tests/config/common.xml b/appserver/tests/appserv-tests/config/common.xml
index 9755b95..c99c57f 100644
--- a/appserver/tests/appserv-tests/config/common.xml
+++ b/appserver/tests/appserv-tests/config/common.xml
@@ -53,8 +53,13 @@
-->
<!-- ================================================================ -->
<target name="compile-common" depends="init-common">
+ <tstamp>
+ <format property="TIMESTAMP" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ" />
+ </tstamp>
+ <echo>Current time (ISO): ${TIMESTAMP}</echo>
<mkdir dir="${build.classes.dir}" />
<echo message="common.xml: Compiling test source files" level="verbose" />
+
<mkdir dir="${src}" />
<javac srcdir="${src}" destdir="${build.classes.dir}" classpath="${s1astest.classpath}"
debug="on" includeantruntime="false" failonerror="true" fork="yes" />
@@ -1021,6 +1026,10 @@
</target>
<target name="deploy-dir" depends="init-common">
+ <tstamp>
+ <format property="TIMESTAMP" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ" />
+ </tstamp>
+ <echo>Current time (ISO): ${TIMESTAMP}</echo>
<echo message="Deploying files: ${assemble.dir}" level="verbose" />
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy" />
@@ -1034,6 +1043,10 @@
<!-- deploy the applications in AppServ -->
<target name="deploy-common" depends="init-common">
+ <tstamp>
+ <format property="TIMESTAMP" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ" />
+ </tstamp>
+ <echo>Current time (ISO): ${TIMESTAMP}</echo>
<antcall target="deploy-common-pe" />
<antcall target="deploy-common-ee" />
</target>
diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml
new file mode 100644
index 0000000..1ec9745
--- /dev/null
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/pom.xml
@@ -0,0 +1,61 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.tests.connectors</groupId>
+ <artifactId>connectors-ra-redeploy</artifactId>
+ <version>6.2.5-SNAPSHOT</version>
+ </parent>
+ <artifactId>connectors-ra-redeploy-jars</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.jdbc.jdbc-ra.jdbc-core</groupId>
+ <artifactId>jdbc-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <ra-redeploy-version>1</ra-redeploy-version>
+ <Extension-Name>connectors-ra-redeploy-jars.jar</Extension-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>version2</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>v2</classifier>
+ <archive>
+ <manifestEntries>
+ <ra-redeploy-version>2</ra-redeploy-version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/appserv/jdbcra/DataSource.java
old mode 100644
new mode 100755
similarity index 93%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/appserv/jdbcra/DataSource.java
index b6ef30b..0676688
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/appserv/jdbcra/DataSource.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -50,6 +51,6 @@
* @return <code>java.sql.Connection</code> implementation of the driver.
* @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
*/
- public Connection getConnection(Connection con) throws SQLException;
+ Connection getConnection(Connection con) throws SQLException;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/common/DataSourceObjectBuilder.java
old mode 100644
new mode 100755
similarity index 63%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/common/DataSourceObjectBuilder.java
index 88a0950..2d86380
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/common/DataSourceObjectBuilder.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,16 +17,16 @@
package com.sun.jdbcra.common;
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.StringTokenizer;
-import java.util.Enumeration;
import com.sun.jdbcra.util.MethodExecutor;
+
import jakarta.resource.ResourceException;
-import java.util.logging.Logger;
-import java.util.logging.Level;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
/**
* Utility class, which would create necessary Datasource object according to the
* specification.
@@ -33,21 +34,15 @@
* @version 1.0, 02/07/23
* @author Binod P.G
* @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
+ * @see com.sun.jdbcra.util.MethodExecutor
*/
public class DataSourceObjectBuilder implements java.io.Serializable{
- private DataSourceSpec spec;
+ private final DataSourceSpec spec;
+ private final MethodExecutor executor;
+ private Hashtable driverProperties;
- private Hashtable driverProperties = null;
- private MethodExecutor executor = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
/**
* Construct a DataSource Object from the spec.
*
@@ -66,65 +61,65 @@
* some method.
*/
public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
+ driverProperties = parseDriverProperties(spec);
Object dataSourceObject = getDataSourceObject();
Method[] methods = dataSourceObject.getClass().getMethods();
- for (int i=0; i < methods.length; i++) {
- String methodName = methods[i].getName();
+ for (Method method : methods) {
+ String methodName = method.getName();
if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),method,dataSourceObject);
} else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
+ executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),method,dataSourceObject);
} else if (driverProperties.containsKey(methodName.toUpperCase())){
Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
+ executor.runMethod(method,dataSourceObject, values);
}
}
return dataSourceObject;
@@ -140,76 +135,72 @@
* @throws ResourceException If delimiter is not provided and property string
* is not null.
*/
- private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
+ private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException {
+ String delim = spec.getDetail(DataSourceSpec.DELIMITER);
String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
+ if (prop == null || prop.trim().equals("")) {
return new Hashtable();
} else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
+ throw new ResourceException("Delimiter is not provided in the configuration");
}
Hashtable properties = new Hashtable();
delim = delim.trim();
- String sep = delim+delim;
+ String sep = delim + delim;
int sepLen = sep.length();
String cache = prop;
Vector methods = new Vector();
while (cache.indexOf(sep) != -1) {
int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
+ String name = cache.substring(0, index);
if (name.trim() != "") {
methods.add(name);
- cache = cache.substring(index+sepLen);
+ cache = cache.substring(index + sepLen);
}
}
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
+ Enumeration allMethods = methods.elements();
+ while (allMethods.hasMoreElements()) {
+ String oneMethod = (String) allMethods.nextElement();
+ if (!oneMethod.trim().equals("")) {
+ String methodName = null;
+ Vector parms = new Vector();
+ StringTokenizer methodDetails = new StringTokenizer(oneMethod, delim);
+ for (int i = 0; methodDetails.hasMoreTokens(); i++) {
+ String token = methodDetails.nextToken();
+ if (i == 0) {
+ methodName = token.toUpperCase();
} else {
- parms.add(token);
+ parms.add(token);
}
}
- properties.put(methodName,parms);
- }
+ properties.put(methodName, parms);
}
- return properties;
+ }
+ return properties;
}
+
/**
* Creates a Datasource object according to the spec.
*
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
+ * @return Initial DataSource Object instance.
+ * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
+ * properly.
*/
private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
+ String className = spec.getDetail(DataSourceSpec.CLASSNAME);
try {
- Class dataSourceClass = Class.forName(className);
- Object dataSourceObject = dataSourceClass.newInstance();
- return dataSourceObject;
+ Class<?> dataSourceClass = Class.forName(className);
+ return dataSourceClass.getDeclaredConstructor().newInstance();
} catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
- throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
- } catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
- throw new ResourceException("Error in instantiating" + className);
+ throw new ResourceException("Class Name is wrong or Class path is not set for :" + className, cfne);
+ } catch(InstantiationException | InvocationTargetException | NoSuchMethodException ce) {
+ throw new ResourceException("Error in instantiating" + className, ce);
} catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
- throw new ResourceException("Access Error in instantiating" + className);
+ throw new ResourceException("Access Error in instantiating" + className, ce);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/common/DataSourceSpec.java
old mode 100644
new mode 100755
similarity index 96%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/common/DataSourceSpec.java
index 1c4b072..610056c
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/common/DataSourceSpec.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -61,7 +62,7 @@
public static final int TRANSACTIONISOLATION = 28;
public static final int GUARANTEEISOLATIONLEVEL = 29;
- private Hashtable details = new Hashtable();
+ private final Hashtable details = new Hashtable();
/**
* Set the property.
@@ -92,6 +93,7 @@
*
* @param obj Instance of <code>DataSourceSpec</code> object.
*/
+ @Override
public boolean equals(Object obj) {
if (obj instanceof DataSourceSpec) {
return this.details.equals(((DataSourceSpec)obj).details);
@@ -104,6 +106,7 @@
*
* @return hashCode of this object.
*/
+ @Override
public int hashCode() {
return this.details.hashCode();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionHolder.java
similarity index 93%
rename from appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionHolder.java
index 55dedad..1373414 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionHolder.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,9 +18,7 @@
package com.sun.jdbcra.spi;
import java.sql.*;
-import java.util.Hashtable;
import java.util.Map;
-import java.util.Enumeration;
import java.util.Properties;
import java.util.concurrent.Executor;
@@ -118,6 +117,7 @@
*
* @throws SQLException In case of a database error.
*/
+ @Override
public void clearWarnings() throws SQLException{
checkValidity();
con.clearWarnings();
@@ -128,6 +128,7 @@
*
* @throws SQLException In case of a database error.
*/
+ @Override
public void close() throws SQLException{
isClosed = true;
mc.connectionClosed(null, this);
@@ -154,6 +155,7 @@
*
* @throws SQLException In case of a database error.
*/
+ @Override
public void commit() throws SQLException {
checkValidity();
con.commit();
@@ -165,6 +167,7 @@
* @return <code>Statement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public Statement createStatement() throws SQLException {
checkValidity();
return con.createStatement();
@@ -178,6 +181,7 @@
* @return <code>Statement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
checkValidity();
return con.createStatement(resultSetType, resultSetConcurrency);
@@ -192,6 +196,7 @@
* @return <code>Statement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency,
int resultSetHoldabilty) throws SQLException {
checkValidity();
@@ -205,6 +210,7 @@
* @return The current state of connection's auto-commit mode.
* @throws SQLException In case of a database error.
*/
+ @Override
public boolean getAutoCommit() throws SQLException {
checkValidity();
return con.getAutoCommit();
@@ -216,6 +222,7 @@
* @return Catalog Name.
* @throws SQLException In case of a database error.
*/
+ @Override
public String getCatalog() throws SQLException {
checkValidity();
return con.getCatalog();
@@ -228,6 +235,7 @@
* @return holdability value.
* @throws SQLException In case of a database error.
*/
+ @Override
public int getHoldability() throws SQLException {
checkValidity();
return con.getHoldability();
@@ -240,6 +248,7 @@
* @return <code>DatabaseMetaData</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public DatabaseMetaData getMetaData() throws SQLException {
checkValidity();
return con.getMetaData();
@@ -251,6 +260,7 @@
* @return Transaction level
* @throws SQLException In case of a database error.
*/
+ @Override
public int getTransactionIsolation() throws SQLException {
checkValidity();
return con.getTransactionIsolation();
@@ -263,6 +273,7 @@
* @return TypeMap set in this object.
* @throws SQLException In case of a database error.
*/
+ @Override
public Map getTypeMap() throws SQLException {
checkValidity();
return con.getTypeMap();
@@ -275,6 +286,7 @@
* @return First <code> SQLWarning</code> Object or null.
* @throws SQLException In case of a database error.
*/
+ @Override
public SQLWarning getWarnings() throws SQLException {
checkValidity();
return con.getWarnings();
@@ -287,6 +299,7 @@
* if it is closed.
* @throws SQLException In case of a database error.
*/
+ @Override
public boolean isClosed() throws SQLException {
return isClosed;
}
@@ -297,6 +310,7 @@
* @return true if <code> Connection </code> is read-only, false other-wise
* @throws SQLException In case of a database error.
*/
+ @Override
public boolean isReadOnly() throws SQLException {
checkValidity();
return con.isReadOnly();
@@ -309,6 +323,7 @@
* @return Converted SQL string.
* @throws SQLException In case of a database error.
*/
+ @Override
public String nativeSQL(String sql) throws SQLException {
checkValidity();
return con.nativeSQL(sql);
@@ -322,6 +337,7 @@
* @return <code> CallableStatement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public CallableStatement prepareCall(String sql) throws SQLException {
checkValidity();
return con.prepareCall(sql);
@@ -337,6 +353,7 @@
* @return <code> CallableStatement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public CallableStatement prepareCall(String sql,int resultSetType,
int resultSetConcurrency) throws SQLException{
checkValidity();
@@ -354,6 +371,7 @@
* @return <code> CallableStatement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType,
int resultSetConcurrency,
int resultSetHoldabilty) throws SQLException{
@@ -370,6 +388,7 @@
* @return <code> PreparedStatement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
checkValidity();
return con.prepareStatement(sql);
@@ -384,6 +403,7 @@
* @return <code> PreparedStatement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
checkValidity();
return con.prepareStatement(sql,autoGeneratedKeys);
@@ -399,6 +419,7 @@
* @return <code> PreparedStatement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
checkValidity();
return con.prepareStatement(sql,columnIndexes);
@@ -414,6 +435,7 @@
* @return <code> PreparedStatement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public PreparedStatement prepareStatement(String sql,int resultSetType,
int resultSetConcurrency) throws SQLException{
checkValidity();
@@ -431,6 +453,7 @@
* @return <code> PreparedStatement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType,
int resultSetConcurrency,
int resultSetHoldabilty) throws SQLException {
@@ -448,53 +471,65 @@
* @return <code> PreparedStatement</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
checkValidity();
return con.prepareStatement(sql,columnNames);
}
+ @Override
public Clob createClob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return con.createClob();
}
+ @Override
public Blob createBlob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return con.createBlob();
}
+ @Override
public NClob createNClob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return con.createNClob();
}
+ @Override
public SQLXML createSQLXML() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return con.createSQLXML();
}
+ @Override
public boolean isValid(int timeout) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return con.isValid(timeout);
}
+ @Override
public void setClientInfo(String name, String value) throws SQLClientInfoException {
- //To change body of implemented methods use File | Settings | File Templates.
+ con.setClientInfo(name, value);
}
+ @Override
public void setClientInfo(Properties properties) throws SQLClientInfoException {
- //To change body of implemented methods use File | Settings | File Templates.
+ con.setClientInfo(properties);
}
+ @Override
public String getClientInfo(String name) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return con.getClientInfo(name);
}
+ @Override
public Properties getClientInfo() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return getClientInfo();
}
+ @Override
public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return createArrayOf(typeName, elements);
}
+ @Override
public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return createStruct(typeName, attributes);
}
/**
@@ -503,6 +538,7 @@
* @param savepoint <code>Savepoint</code> object
* @throws SQLException In case of a database error.
*/
+ @Override
public void releaseSavepoint(Savepoint savepoint) throws SQLException {
checkValidity();
con.releaseSavepoint(savepoint);
@@ -513,6 +549,7 @@
*
* @throws SQLException In case of a database error.
*/
+ @Override
public void rollback() throws SQLException {
checkValidity();
con.rollback();
@@ -523,6 +560,7 @@
*
* @throws SQLException In case of a database error.
*/
+ @Override
public void rollback(Savepoint savepoint) throws SQLException {
checkValidity();
con.rollback(savepoint);
@@ -534,6 +572,7 @@
* @param autoCommit boolean value indicating the auto-commit mode.
* @throws SQLException In case of a database error.
*/
+ @Override
public void setAutoCommit(boolean autoCommit) throws SQLException {
checkValidity();
con.setAutoCommit(autoCommit);
@@ -545,6 +584,7 @@
* @param catalog Catalog name.
* @throws SQLException In case of a database error.
*/
+ @Override
public void setCatalog(String catalog) throws SQLException {
checkValidity();
con.setCatalog(catalog);
@@ -557,6 +597,7 @@
* @param holdability A <code>ResultSet</code> holdability constant
* @throws SQLException In case of a database error.
*/
+ @Override
public void setHoldability(int holdability) throws SQLException {
checkValidity();
con.setHoldability(holdability);
@@ -569,6 +610,7 @@
* @param readOnly true enables read-only mode, false disables it.
* @throws SQLException In case of a database error.
*/
+ @Override
public void setReadOnly(boolean readOnly) throws SQLException {
checkValidity();
con.setReadOnly(readOnly);
@@ -580,6 +622,7 @@
* @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public Savepoint setSavepoint() throws SQLException {
checkValidity();
return con.setSavepoint();
@@ -592,6 +635,7 @@
* @return <code>Savepoint</code> object.
* @throws SQLException In case of a database error.
*/
+ @Override
public Savepoint setSavepoint(String name) throws SQLException {
checkValidity();
return con.setSavepoint(name);
@@ -603,6 +647,7 @@
* @param level transaction isolation level.
* @throws SQLException In case of a database error.
*/
+ @Override
public void setTransactionIsolation(int level) throws SQLException {
checkValidity();
con.setTransactionIsolation(level);
@@ -615,27 +660,33 @@
* @param map <code>Map</code> a Map object to install.
* @throws SQLException In case of a database error.
*/
+ @Override
public void setTypeMap(Map map) throws SQLException {
checkValidity();
con.setTypeMap(map);
}
+ @Override
public int getNetworkTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
+ @Override
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
+ @Override
public void abort(Executor executor) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
+ @Override
public String getSchema() throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
+ @Override
public void setSchema(String schema) throws SQLException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
}
@@ -645,8 +696,12 @@
* Checks the validity of this object
*/
private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
+ if (isClosed) {
+ throw new SQLException ("Connection closed");
+ }
+ if (!valid) {
+ throw new SQLException ("Invalid Connection");
+ }
if(active == false) {
mc.checkIfActive(this);
}
@@ -661,11 +716,13 @@
active = actv;
}
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return con.unwrap(iface);
}
+ @Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return con.isWrapperFor(iface);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionManager.java
old mode 100644
new mode 100755
similarity index 96%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionManager.java
index 2ee36c5..46e9a9b
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionManager.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,10 +17,10 @@
package com.sun.jdbcra.spi;
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ManagedConnection;
import jakarta.resource.ResourceException;
import jakarta.resource.spi.ConnectionRequestInfo;
+import jakarta.resource.spi.ManagedConnection;
+import jakarta.resource.spi.ManagedConnectionFactory;
/**
* ConnectionManager implementation for Generic JDBC Connector.
@@ -37,6 +38,7 @@
* @return A <code>Connection</code> Object.
* @throws ResourceException In case of an error in getting the <code>Connection</code>.
*/
+ @Override
public Object allocateConnection(ManagedConnectionFactory mcf,
ConnectionRequestInfo info)
throws ResourceException {
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionRequestInfo.java
old mode 100644
new mode 100755
similarity index 92%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionRequestInfo.java
index ddd0a28..20ce8fe
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ConnectionRequestInfo.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,8 +25,8 @@
*/
public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
- private String user;
- private String password;
+ private final String user;
+ private final String password;
/**
* Constructs a new <code>ConnectionRequestInfo</code> object
@@ -61,8 +62,11 @@
*
* @return True, if they are equal and false otherwise.
*/
+ @Override
public boolean equals(Object obj) {
- if (obj == null) return false;
+ if (obj == null) {
+ return false;
+ }
if (obj instanceof ConnectionRequestInfo) {
ConnectionRequestInfo other = (ConnectionRequestInfo) obj;
return (isEqual(this.user, other.user) &&
@@ -77,6 +81,7 @@
*
* @return hashCode.
*/
+ @Override
public int hashCode() {
String result = "" + user + password;
return result.hashCode();
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
similarity index 88%
rename from appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
index 0fe51e4..073384b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,25 +17,29 @@
package com.sun.jdbcra.spi;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import jakarta.resource.spi.ConnectionDefinition;
-import jakarta.resource.spi.ConfigProperty;
-
-import com.sun.jdbcra.common.DataSourceSpec;
import com.sun.jdbcra.common.DataSourceObjectBuilder;
+import com.sun.jdbcra.common.DataSourceSpec;
import com.sun.jdbcra.util.SecurityUtils;
+
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.ConfigProperty;
+import jakarta.resource.spi.ConnectionDefinition;
+import jakarta.resource.spi.ConnectionRequestInfo;
+import jakarta.resource.spi.ResourceAllocationException;
import jakarta.resource.spi.security.PasswordCredential;
-import java.util.logging.Logger;
+
+import java.sql.Connection;
import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.sql.DataSource;
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
*
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
+ * @version 1.0, 02/07/30
+ * @author Evani Sai Surya Kiran
*/
-
@ConnectionDefinition(
connection = java.sql.Connection.class,
connectionImpl = com.sun.jdbcra.spi.ConnectionHolder.class,
@@ -43,13 +48,9 @@
)
public class DSManagedConnectionFactory extends ManagedConnectionFactory {
- private transient javax.sql.DataSource dataSourceObj;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
+ private static Logger _logger = Logger.getAnonymousLogger();
+ private transient DataSource dataSourceObj;
+ private String aliasTest;
/**
* Creates a new physical connection to the underlying EIS resource
@@ -68,10 +69,11 @@
* @throws ResourceAllocationException if there is an error in allocating the
* physical connection
*/
+ @Override
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In createManagedConnection");
+ if (logWriter != null) {
+ logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
@@ -80,7 +82,6 @@
dsObjBuilder = new DataSourceObjectBuilder(spec);
}
- System.out.println("V3-TEST : before getting datasource object");
try {
dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
} catch(ClassCastException cce) {
@@ -89,8 +90,7 @@
}
}
- java.sql.Connection dsConn = null;
-
+ final Connection dsConn;
try {
/* For the case where the user/passwd of the connection pool is
* equal to the PasswordCredential for the connection request
@@ -100,27 +100,18 @@
if ( isEqual( pc, getUser(), getPassword() ) ) {
dsConn = dataSourceObj.getConnection();
} else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
+ dsConn = dataSourceObj.getConnection(pc.getUserName(), new String(pc.getPassword()));
}
} catch(java.sql.SQLException sqle) {
- sqle.printStackTrace();
_logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
sqle.getMessage());
- } catch(Exception e){
- System.out.println("V3-TEST : unable to get connection");
- e.printStackTrace();
}
- System.out.println("V3-TEST : got connection");
+// com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(dsConn, null, pc, this);
com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
- //GJCINT
-/*
setIsolation(mc);
isValid(mc);
-*/
- System.out.println("V3-TEST : returning connection");
return mc;
}
@@ -133,17 +124,17 @@
* <code>ManagedConnectionFactory</code> objects are the same
* false otherwise
*/
+ @Override
public boolean equals(Object other) {
- if(logWriter != null) {
- logWriter.println("In equals");
+ if (logWriter != null) {
+ logWriter.println("In equals");
}
/**
* The check below means that two ManagedConnectionFactory objects are equal
* if and only if their properties are the same.
*/
- if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
- (com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
+ if (other instanceof DSManagedConnectionFactory) {
+ DSManagedConnectionFactory otherMCF = (DSManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
@@ -169,25 +160,22 @@
return spec.getDetail(DataSourceSpec.SERVERNAME);
}
+
/**
* Sets the server name.
*
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
+ * @param serverName <code>String</code>
*/
- @ConfigProperty(
- defaultValue = "localhost",
- type = java.lang.String.class
- )
+ @ConfigProperty(defaultValue = "localhost", type = java.lang.String.class)
public void setServerName(String serverName) {
spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
}
+
/**
* Gets the server name.
*
- * @return serverName
- * @see <code>setServerName</code>
+ * @return serverName
*/
public String getServerName() {
return spec.getDetail(DataSourceSpec.SERVERNAME);
@@ -569,13 +557,32 @@
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
- /*
+
+ @ConfigProperty(defaultValue = "DEFAULT_ALIAS_FOR_TEST", type = java.lang.String.class, confidential = true)
+ public void setAliasTest(String value) {
+ validateDealiasing("AliasTest", value);
+ System.out.println("setAliasTest called : " + value);
+ aliasTest = value;
+ }
+
+
+ public String getAliasTest() {
+ return aliasTest;
+ }
+
+
+ private void validateDealiasing(String propertyName, String propertyValue) {
+ System.out.println("Validating property [" + propertyName + "] with value [" + propertyValue + "] in DSMCF");
+ if (propertyValue != null && propertyValue.contains("${ALIAS")) {
+ throw new IllegalArgumentException(propertyName + "'s value is not de-aliased : " + propertyValue);
+ }
+ }
+
+ /**
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
- String password) {
-
+ private boolean isEqual(PasswordCredential pc, String user, String password) {
//if equal get direct connection else
//get connection with user and password.
@@ -583,25 +590,24 @@
return true;
}
- if ( user == null && pc != null ) {
+ if (user == null && pc != null) {
return false;
}
- if( pc == null ) {
+ if (pc == null) {
return true;
}
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
+ if (user.equals(pc.getUserName())) {
+ if (password == null && pc.getPassword() == null) {
return true;
}
}
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ if (user.equals(pc.getUserName()) && password.equals(pc.getPassword())) {
return true;
}
-
return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/DataSource.java
similarity index 89%
rename from appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DataSource.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/DataSource.java
index f8f534e..09a1c28 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/DataSource.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,17 +17,17 @@
package com.sun.jdbcra.spi;
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.ConnectionManager;
+import jakarta.resource.spi.ManagedConnectionFactory;
+
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ConnectionManager;
-import jakarta.resource.ResourceException;
-import javax.naming.Reference;
-
import java.util.logging.Logger;
-import java.util.logging.Level;
+
+import javax.naming.Reference;
/**
* Holds the <code>java.sql.Connection</code> object, which is to be
* passed to the application program.
@@ -37,19 +38,13 @@
public class DataSource implements javax.sql.DataSource, java.io.Serializable,
com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
- private ManagedConnectionFactory mcf;
+ private final ManagedConnectionFactory mcf;
private ConnectionManager cm;
private int loginTimeout;
private PrintWriter logWriter;
private String description;
private Reference reference;
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
/**
* Constructs <code>DataSource</code> object. This is created by the
* <code>ManagedConnectionFactory</code> object.
@@ -62,7 +57,7 @@
public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
this.mcf = mcf;
if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
+ this.cm = new com.sun.jdbcra.spi.ConnectionManager();
} else {
this.cm = cm;
}
@@ -74,13 +69,12 @@
* @return <code> Connection </code> object.
* @throws SQLException In case of an error.
*/
+ @Override
public Connection getConnection() throws SQLException {
try {
return (Connection) cm.allocateConnection(mcf,null);
} catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
+ throw new SQLException(re.getMessage(), re);
}
}
@@ -92,14 +86,13 @@
* @return <code> Connection </code> object.
* @throws SQLException In case of an error.
*/
+ @Override
public Connection getConnection(String user, String pwd) throws SQLException {
try {
ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
return (Connection) cm.allocateConnection(mcf,info);
} catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
+ throw new SQLException(re.getMessage(), re);
}
}
@@ -112,6 +105,7 @@
* @return <code>java.sql.Connection</code> implementation of the driver.
* @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
*/
+ @Override
public Connection getConnection(Connection con) throws SQLException {
Connection driverCon = con;
@@ -128,6 +122,7 @@
* @return login timeout.
* @throws SQLException If a database error occurs.
*/
+ @Override
public int getLoginTimeout() throws SQLException{
return loginTimeout;
}
@@ -138,6 +133,7 @@
* @param loginTimeout Login timeout.
* @throws SQLException If a database error occurs.
*/
+ @Override
public void setLoginTimeout(int loginTimeout) throws SQLException{
this.loginTimeout = loginTimeout;
}
@@ -148,6 +144,7 @@
* @return <code> PrintWriter </code> object.
* @throws SQLException If a database error occurs.
*/
+ @Override
public PrintWriter getLogWriter() throws SQLException{
return logWriter;
}
@@ -158,10 +155,12 @@
* @param <code>PrintWriter</code> object.
* @throws SQLException If a database error occurs.
*/
+ @Override
public void setLogWriter(PrintWriter logWriter) throws SQLException{
this.logWriter = logWriter;
}
+ @Override
public Logger getParentLogger() throws SQLFeatureNotSupportedException{
throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
}
@@ -188,6 +187,7 @@
*
* @return <code>Reference</code>object.
*/
+ @Override
public Reference getReference() {
return reference;
}
@@ -197,14 +197,17 @@
*
* @param reference <code>Reference</code> object.
*/
+ @Override
public void setReference(Reference reference) {
this.reference = reference;
}
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ @Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false; //To change body of implemented methods use File | Settings | File Templates.
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/JdbcSetupAdmin.java
similarity index 68%
rename from appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/JdbcSetupAdmin.java
index 824510d..dd17b9e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/JdbcSetupAdmin.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -18,24 +19,24 @@
public interface JdbcSetupAdmin {
- public void setTableName(String db);
+ void setTableName(String db);
- public String getTableName();
+ String getTableName();
- public void setJndiName(String name);
+ void setJndiName(String name);
- public String getJndiName();
+ String getJndiName();
- public void setSchemaName(String name);
+ void setSchemaName(String name);
- public String getSchemaName();
+ String getSchemaName();
- public void setNoOfRows(Integer i);
+ void setNoOfRows(Integer i);
- public Integer getNoOfRows();
+ Integer getNoOfRows();
- public boolean checkSetup();
+ boolean checkSetup();
- public int getVersion();
+ int getVersion();
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
similarity index 63%
rename from appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
index 44a8e60..939b203 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,10 +17,16 @@
package com.sun.jdbcra.spi;
-import javax.naming.*;
-import javax.sql.*;
-import java.sql.*;
+import jakarta.resource.spi.AdministeredObject;
+import jakarta.resource.spi.ConfigProperty;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import javax.naming.InitialContext;
+
+@AdministeredObject(adminObjectInterfaces = {com.sun.jdbcra.spi.JdbcSetupAdmin.class})
public class JdbcSetupAdminImpl implements JdbcSetupAdmin {
private String tableName;
@@ -30,47 +37,67 @@
private Integer noOfRows;
+ @Override
+ @ConfigProperty(type = java.lang.String.class)
public void setTableName(String db) {
tableName = db;
}
- public String getTableName(){
+
+ @Override
+ public String getTableName() {
return tableName;
}
- public void setJndiName(String name){
+
+ @Override
+ @ConfigProperty(type = java.lang.String.class)
+ public void setJndiName(String name) {
jndiName = name;
}
+
+ @Override
public String getJndiName() {
return jndiName;
}
- public void setSchemaName(String name){
+
+ @Override
+ @ConfigProperty(type = java.lang.String.class)
+ public void setSchemaName(String name) {
schemaName = name;
}
+
+ @Override
public String getSchemaName() {
return schemaName;
}
+
+ @Override
+ @ConfigProperty(type = java.lang.Integer.class, defaultValue = "0")
public void setNoOfRows(Integer i) {
System.out.println("Setting no of rows :" + i);
noOfRows = i;
}
+
+ @Override
public Integer getNoOfRows() {
return noOfRows;
}
- public boolean checkSetup(){
- if (jndiName== null || jndiName.trim().equals("")) {
- return false;
+ @Override
+ public boolean checkSetup() {
+ if (jndiName == null || jndiName.trim().equals("")) {
+ return false;
}
- if (tableName== null || tableName.trim().equals("")) {
- return false;
+ if (tableName == null || tableName.trim().equals("")) {
+ return false;
}
Connection con = null;
@@ -101,27 +128,35 @@
System.out.println("No of rows expected:" + noOfRows);
if (i == noOfRows.intValue()) {
- b = true;
+ b = true;
} else {
- b = false;
+ b = false;
}
- } catch(Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
b = false;
} finally {
try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
+ if (rs != null) {
+ rs.close();
+ }
+ if (s != null) {
+ s.close();
+ }
+ if (con != null) {
+ con.close();
+ }
} catch (Exception e) {
}
}
- System.out.println("Returning setup :" +b);
+ System.out.println("Returning setup :" + b);
return b;
}
- public int getVersion(){
- return ResourceAdapter.VERSION;
+
+ @Override
+ public int getVersion() {
+ return ResourceAdapter.VERSION;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/LocalTransaction.java
old mode 100644
new mode 100755
similarity index 95%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/LocalTransaction.java
index ce8635b..8b54780
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/LocalTransaction.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,7 +17,6 @@
package com.sun.jdbcra.spi;
-import com.sun.jdbcra.spi.ManagedConnection;
import jakarta.resource.ResourceException;
import jakarta.resource.spi.LocalTransactionException;
@@ -28,7 +28,7 @@
*/
public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
- private ManagedConnection mc;
+ private final ManagedConnection mc;
/**
* Constructor for <code>LocalTransaction</code>.
@@ -47,6 +47,7 @@
* the autocommit mode of the physical
* connection
*/
+ @Override
public void begin() throws ResourceException {
//GJCINT
mc.transactionStarted();
@@ -63,6 +64,7 @@
* the autocommit mode of the physical
* connection or committing the transaction
*/
+ @Override
public void commit() throws ResourceException {
Exception e = null;
try {
@@ -82,6 +84,7 @@
* the autocommit mode of the physical
* connection or rolling back the transaction
*/
+ @Override
public void rollback() throws ResourceException {
try {
mc.getActualConnection().rollback();
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnection.java
old mode 100644
new mode 100755
similarity index 93%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnection.java
index f0443d0..1fdd294
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnection.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,27 +17,26 @@
package com.sun.jdbcra.spi;
-import jakarta.resource.spi.*;
-import jakarta.resource.*;
-import javax.security.auth.Subject;
+import com.sun.jdbcra.util.SecurityUtils;
+
+import jakarta.resource.NotSupportedException;
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.ConnectionEvent;
+import jakarta.resource.spi.ConnectionEventListener;
+import jakarta.resource.spi.security.PasswordCredential;
+
import java.io.PrintWriter;
-import javax.transaction.xa.XAResource;
-import java.util.Set;
+import java.sql.SQLException;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.security.auth.Subject;
import javax.sql.PooledConnection;
import javax.sql.XAConnection;
-import java.sql.Connection;
-import java.sql.SQLException;
-import jakarta.resource.NotSupportedException;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.LocalTransaction;
-import com.sun.jdbcra.spi.ManagedConnectionMetaData;
-import com.sun.jdbcra.util.SecurityUtils;
-import com.sun.jdbcra.spi.ConnectionHolder;
-import java.util.logging.Logger;
-import java.util.logging.Level;
+import javax.transaction.xa.XAResource;
/**
* <code>ManagedConnection</code> implementation for Generic JDBC Connector.
@@ -53,7 +53,7 @@
private boolean isDestroyed = false;
private boolean isUsable = true;
- private int connectionType = ISNOTAPOOLEDCONNECTION;
+ private final int connectionType;
private PooledConnection pc = null;
private java.sql.Connection actualConnection = null;
private Hashtable connectionHandles;
@@ -105,6 +105,7 @@
throw new ResourceException("Connection object cannot be null");
}
+ connectionType = getConnectionType(pooledConn);
if (connectionType == ISNOTAPOOLEDCONNECTION ) {
actualConnection = sqlConn;
}
@@ -130,6 +131,7 @@
* @param listener <code>ConnectionEventListener</code>
* @see <code>removeConnectionEventListener</code>
*/
+ @Override
public void addConnectionEventListener(ConnectionEventListener listener) {
this.listener = listener;
}
@@ -143,6 +145,7 @@
* @throws ResourceException if the physical connection is no more
* valid or the connection handle passed is null
*/
+ @Override
public void associateConnection(Object connection) throws ResourceException {
if(logWriter != null) {
logWriter.println("In associateConnection");
@@ -153,7 +156,7 @@
}
ConnectionHolder ch = (ConnectionHolder) connection;
- com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
+ com.sun.jdbcra.spi.ManagedConnection mc = ch.getManagedConnection();
mc.activeConnectionHandle = null;
isClean = false;
@@ -181,6 +184,7 @@
*
* @throws ResourceException if the physical connection is no more valid
*/
+ @Override
public void cleanup() throws ResourceException {
if(logWriter != null) {
logWriter.println("In cleanup");
@@ -232,6 +236,7 @@
*
* @throws ResourceException if there is an error in closing the physical connection
*/
+ @Override
public void destroy() throws ResourceException{
if(logWriter != null) {
logWriter.println("In destroy");
@@ -276,6 +281,7 @@
* @throws SecurityException if there is a mismatch between the
* password credentials or reauthentication is requested
*/
+ @Override
public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
throws ResourceException {
if(logWriter != null) {
@@ -324,6 +330,7 @@
* @return <code>LocalTransaction</code> instance
* @throws ResourceException if the physical connection is not valid
*/
+ @Override
public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getLocalTransaction");
@@ -340,6 +347,7 @@
* @throws ResourceException if the physical connection is not valid
* @see <code>setLogWriter</code>
*/
+ @Override
public PrintWriter getLogWriter() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getLogWriter");
@@ -356,6 +364,7 @@
* @return <code>ManagedConnectionMetaData</code> instance
* @throws ResourceException if the physical connection is not valid
*/
+ @Override
public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
if(logWriter != null) {
logWriter.println("In getMetaData");
@@ -375,36 +384,34 @@
* @throws NotSupportedException if underlying datasource is not an
* <code>XADataSource</code>
*/
+ @Override
public XAResource getXAResource() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getXAResource");
+ if (logWriter != null) {
+ logWriter.println("In getXAResource");
}
checkIfValid();
- if(connectionType == ISXACONNECTION) {
- try {
- if(xar == null) {
- /**
- * Using the wrapper XAResource.
- */
- xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
- }
- return xar;
- } catch(SQLException sqle) {
- throw new ResourceException(sqle.getMessage());
- }
- } else {
+ if (connectionType != ISXACONNECTION) {
throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
}
+ try {
+ if(xar == null) {
+ xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
+ }
+ return xar;
+ } catch(SQLException sqle) {
+ throw new ResourceException(sqle.getMessage());
+ }
}
+
/**
* Removes an already registered connection event listener from the
* <code>ManagedConnection</code> instance.
*
- * @param listener <code>ConnectionEventListener</code> to be removed
- * @see <code>addConnectionEventListener</code>
+ * @param listener <code>ConnectionEventListener</code> to be removed
*/
+ @Override
public void removeConnectionEventListener(ConnectionEventListener listener) {
listener = null;
}
@@ -464,6 +471,7 @@
* @throws ResourceException if the physical connection is not valid
* @see <code>getLogWriter</code>
*/
+ @Override
public void setLogWriter(PrintWriter out) throws ResourceException {
checkIfValid();
logWriter = out;
@@ -476,10 +484,10 @@
* @param pooledConn <code>PooledConnection</code>
* @return connection type
*/
- private int getConnectionType(PooledConnection pooledConn) {
- if(pooledConn == null) {
+ private static int getConnectionType(PooledConnection pooledConn) {
+ if (pooledConn == null) {
return ISNOTAPOOLEDCONNECTION;
- } else if(pooledConn instanceof XAConnection) {
+ } else if (pooledConn instanceof XAConnection) {
return ISXACONNECTION;
} else {
return ISPOOLEDCONNECTION;
@@ -651,14 +659,4 @@
throw new SQLException("The connection handle cannot be used as another connection is currently active");
}
}
-
- /**
- * sets the connection type of this connection. This method is called
- * by the MCF while creating this ManagedConnection. Saves us a costly
- * instanceof operation in the getConnectionType
- */
- public void initializeConnectionType( int _connectionType ) {
- connectionType = _connectionType;
- }
-
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionFactory.java
old mode 100644
new mode 100755
similarity index 98%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionFactory.java
index fb0fdab..1b05a72
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionFactory.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,18 +17,18 @@
package com.sun.jdbcra.spi;
+import com.sun.jdbcra.common.DataSourceObjectBuilder;
+import com.sun.jdbcra.common.DataSourceSpec;
+import com.sun.jdbcra.util.SecurityUtils;
+
import jakarta.resource.ResourceException;
import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.util.SecurityUtils;
+import jakarta.resource.spi.ResourceAllocationException;
import jakarta.resource.spi.security.PasswordCredential;
-import java.sql.DriverManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import java.sql.SQLException;
-import java.util.logging.Logger;
import java.util.logging.Level;
+import java.util.logging.Logger;
+
/**
* <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
* This class is extended by the DataSource specific <code>ManagedConnection</code> factories
@@ -36,7 +37,6 @@
* @version 1.0, 02/08/03
* @author Evani Sai Surya Kiran
*/
-
public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
java.io.Serializable {
@@ -50,19 +50,20 @@
static {
_logger = Logger.getAnonymousLogger();
}
- private boolean debug = false;
+ private final boolean debug = false;
/**
* Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
* of the resource adapter is used here.
*
* @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
+ @Override
public Object createConnectionFactory() {
if(logWriter != null) {
logWriter.println("In createConnectionFactory()");
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, null);
+ this, null);
return cf;
}
@@ -74,12 +75,13 @@
* @param cxManager <code>ConnectionManager</code> passed by the application server
* @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
*/
+ @Override
public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
if(logWriter != null) {
logWriter.println("In createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager)");
}
com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
+ this, cxManager);
return cf;
}
@@ -100,6 +102,7 @@
* @throws ResourceAllocationException if there is an error in allocating the
* physical connection
*/
+ @Override
public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException;
@@ -112,6 +115,7 @@
* <code>ManagedConnectionFactory</code> objects are the same
* false otherwise
*/
+ @Override
public abstract boolean equals(Object other);
/**
@@ -120,6 +124,7 @@
* @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
* @see <code>setLogWriter</code>
*/
+ @Override
public java.io.PrintWriter getLogWriter() {
return logWriter;
}
@@ -142,6 +147,7 @@
*
* @return hash code for this <code>ManagedConnectionFactory</code>
*/
+ @Override
public int hashCode(){
if(logWriter != null) {
logWriter.println("In hashCode");
@@ -164,6 +170,7 @@
* parameter or the <code>Set</code> of <code>ManagedConnection</code>
* objects passed by the application server
*/
+ @Override
public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
if(logWriter != null) {
@@ -448,6 +455,7 @@
* @param out <code>PrintWriter</code> passed by the application server
* @see <code>getLogWriter</code>
*/
+ @Override
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
old mode 100644
new mode 100755
similarity index 96%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
index 5ec326c..79d57bd
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,12 +17,13 @@
package com.sun.jdbcra.spi;
-import com.sun.jdbcra.spi.ManagedConnection;
-import java.sql.SQLException;
import jakarta.resource.ResourceException;
-import java.util.logging.Logger;
+import java.sql.SQLException;
import java.util.logging.Level;
+import java.util.logging.Logger;
+
+
/**
* <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
*
@@ -37,7 +39,7 @@
static {
_logger = Logger.getAnonymousLogger();
}
- private boolean debug = false;
+ private final boolean debug = false;
/**
* Constructor for <code>ManagedConnectionMetaData</code>
*
@@ -61,6 +63,7 @@
* @return Product name of the EIS instance
* @throws <code>ResourceException</code>
*/
+ @Override
public String getEISProductName() throws ResourceException {
try {
return dmd.getDatabaseProductName();
@@ -77,6 +80,7 @@
* @return Product version of the EIS instance
* @throws <code>ResourceException</code>
*/
+ @Override
public String getEISProductVersion() throws ResourceException {
try {
return dmd.getDatabaseProductVersion();
@@ -93,6 +97,7 @@
* @return Maximum limit for number of active concurrent connections
* @throws <code>ResourceException</code>
*/
+ @Override
public int getMaxConnections() throws ResourceException {
try {
return dmd.getMaxConnections();
@@ -110,6 +115,7 @@
* @return name of the user
* @throws <code>ResourceException</code>
*/
+ @Override
public String getUserName() throws ResourceException {
jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
if(pc != null) {
diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ResourceAdapter.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ResourceAdapter.java
new file mode 100755
index 0000000..2ca6767
--- /dev/null
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ResourceAdapter.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.jdbcra.spi;
+
+import jakarta.resource.NotSupportedException;
+import jakarta.resource.spi.ActivationSpec;
+import jakarta.resource.spi.AuthenticationMechanism;
+import jakarta.resource.spi.BootstrapContext;
+import jakarta.resource.spi.Connector;
+import jakarta.resource.spi.ResourceAdapterInternalException;
+import jakarta.resource.spi.TransactionSupport;
+import jakarta.resource.spi.endpoint.MessageEndpointFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.jar.Manifest;
+
+import javax.transaction.xa.XAResource;
+
+/**
+ * <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
+ *
+ * @version 1.0, 02/08/05
+ * @author Evani Sai Surya Kiran
+ */
+@Connector(
+ description = "Resource adapter wrapping Datasource implementation of driver",
+ displayName = "DataSource Resource Adapter",
+ vendorName = "Sun Microsystems",
+ eisType = "Database",
+ version = "1.0",
+ licenseRequired = false,
+ transactionSupport = TransactionSupport.TransactionSupportLevel.LocalTransaction,
+ authMechanisms = {
+ @AuthenticationMechanism(
+ authMechanism = "BasicPassword",
+ credentialInterface = AuthenticationMechanism.CredentialInterface.PasswordCredential
+ )
+ },
+ reauthenticationSupport = false
+)
+public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
+
+ private static int loadVersion() {
+ ClassLoader cl = ResourceAdapter.class.getClassLoader();
+ try {
+ Enumeration<URL> urls = cl.getResources("META-INF/MANIFEST.MF");
+ while (urls.hasMoreElements()) {
+ URL url = urls.nextElement();
+ try (InputStream stream = url.openStream()) {
+ Manifest manifest = new Manifest(stream);
+// manifest.write(System.out);
+ String value = manifest.getMainAttributes().getValue("ra-redeploy-version");
+ if (value != null) {
+ return Integer.parseInt(value);
+ }
+ }
+ }
+ return -1;
+ } catch (IOException e) {
+ throw new Error("Cannot detect version value!", e);
+ }
+ }
+
+ public static final int VERSION = loadVersion();
+
+ public String raProp;
+
+ private String aliasTest;
+
+ /**
+ * Empty method implementation for endpointActivation
+ * which just throws <code>NotSupportedException</code>
+ *
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ * @throws <code>NotSupportedException</code>
+ */
+ @Override
+ public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
+ throw new NotSupportedException("This method is not supported for this JDBC connector");
+ }
+
+ /**
+ * Empty method implementation for endpointDeactivation
+ *
+ * @param mef <code>MessageEndpointFactory</code>
+ * @param as <code>ActivationSpec</code>
+ */
+ @Override
+ public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
+
+ }
+
+ /**
+ * Empty method implementation for getXAResources
+ * which just throws <code>NotSupportedException</code>
+ *
+ * @param specs <code>ActivationSpec</code> array
+ * @throws <code>NotSupportedException</code>
+ */
+ @Override
+ public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
+ throw new NotSupportedException("This method is not supported for this JDBC connector");
+ }
+
+ /**
+ * Empty implementation of start method
+ *
+ * @param ctx <code>BootstrapContext</code>
+ */
+ @Override
+ public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
+/*
+NO NEED TO CHECK THIS AS THE TEST's PURPOSE IS TO CHECK THE VERSION ALONE
+
+ System.out.println("Resource Adapter is starting with configuration :" + raProp);
+ if (raProp == null || !raProp.equals("VALID")) {
+ throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
+ }
+*/
+ }
+
+ /**
+ * Empty implementation of stop method
+ */
+ @Override
+ public void stop() {
+
+ }
+
+ public void setRAProperty(String s) {
+ raProp = s;
+ }
+
+ public String getRAProperty() {
+ return raProp;
+ }
+//
+//
+// @ConfigProperty(defaultValue = "${ALIAS=ALIAS_TEST_PROPERTY}", type = java.lang.String.class, confidential = true)
+// public void setAliasTest(String value) {
+// validateDealiasing("AliasTest", value);
+// System.out.println("setAliasTest called : " + value);
+// aliasTest = value;
+// }
+//
+//
+// public String getAliasTest() {
+// return aliasTest;
+// }
+//
+//
+// private void validateDealiasing(String propertyName, String propertyValue){
+// System.out.println("Validating property ["+propertyName+"] with value ["+propertyValue+"] in ResourceAdapter bean");
+// //check whether the value is dealiased or not and fail
+// //if it's not dealiased.
+// if(propertyValue != null && propertyValue.contains("${ALIAS")){
+// throw new IllegalArgumentException(propertyName + "'s value is not de-aliased : " + propertyValue);
+// }
+// }
+}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/XAManagedConnectionFactory.java
old mode 100644
new mode 100755
similarity index 80%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/XAManagedConnectionFactory.java
index 614ffa9..e0e6624
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/XAManagedConnectionFactory.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,17 +17,20 @@
package com.sun.jdbcra.spi;
+import com.sun.jdbcra.common.DataSourceObjectBuilder;
+import com.sun.jdbcra.common.DataSourceSpec;
+import com.sun.jdbcra.util.SecurityUtils;
+
import jakarta.resource.ResourceException;
import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import com.sun.jdbcra.util.SecurityUtils;
+import jakarta.resource.spi.ResourceAllocationException;
+import jakarta.resource.spi.SecurityException;
import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ManagedConnectionFactory;
-import com.sun.jdbcra.common.DataSourceSpec;
-import java.util.logging.Logger;
+
import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.sql.XAConnection;
/**
* Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
@@ -35,77 +39,72 @@
* @author Evani Sai Surya Kiran
*/
-public class DSManagedConnectionFactory extends ManagedConnectionFactory {
+public class XAManagedConnectionFactory extends ManagedConnectionFactory {
- private transient javax.sql.DataSource dataSourceObj;
+ private transient javax.sql.XADataSource dataSourceObj;
private static Logger _logger;
static {
_logger = Logger.getAnonymousLogger();
}
- private boolean debug = false;
/**
* Creates a new physical connection to the underlying EIS resource
* manager.
*
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
+ * @param subject <code>Subject</code> instance passed by the application server
+ * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
+ * as a result of the invocation <code>getConnection(user, password)</code>
+ * on the <code>DataSource</code> object
+ * @return <code>ManagedConnection</code> object created
+ * @throws ResourceException if there is an error in instantiating the
+ * <code>DataSource</code> object used for the
+ * creation of the <code>ManagedConnection</code> object
+ * @throws SecurityException if there ino <code>PasswordCredential</code> object
+ * satisfying this request
+ * @throws ResourceAllocationException if there is an error in allocating the
+ * physical connection
*/
+ @Override
public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In createManagedConnection");
+ if (logWriter != null) {
+ logWriter.println("In createManagedConnection");
}
PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
- if(dataSourceObj == null) {
- if(dsObjBuilder == null) {
+ if (dataSourceObj == null) {
+ if (dsObjBuilder == null) {
dsObjBuilder = new DataSourceObjectBuilder(spec);
}
try {
- dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
- } catch(ClassCastException cce) {
+ dataSourceObj = (javax.sql.XADataSource) dsObjBuilder.constructDataSourceObject();
+ } catch (ClassCastException cce) {
_logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
throw new jakarta.resource.ResourceException(cce.getMessage());
}
}
- java.sql.Connection dsConn = null;
+ final XAConnection xaConn;
try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
+ // For the case where the user/passwd of the connection pool is
+ // equal to the PasswordCredential for the connection request
+ // get a connection from this pool directly.
+ // for all other conditions go create a new connection
+ if (isEqual(pc, getUser(), getPassword())) {
+ xaConn = dataSourceObj.getXAConnection();
} else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
+ xaConn = dataSourceObj.getXAConnection(pc.getUserName(), new String(pc.getPassword()));
}
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
- sqle.getMessage());
+
+
+ } catch (java.sql.SQLException sqle) {
+ throw new ResourceAllocationException("cannot allocate connection", sqle);
}
- com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
- //GJCINT
- setIsolation(mc);
- isValid(mc);
+ com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(xaConn, null, pc, this);
return mc;
}
@@ -118,17 +117,17 @@
* <code>ManagedConnectionFactory</code> objects are the same
* false otherwise
*/
+ @Override
public boolean equals(Object other) {
- if(logWriter != null) {
- logWriter.println("In equals");
+ if (logWriter != null) {
+ logWriter.println("In equals");
}
/**
* The check below means that two ManagedConnectionFactory objects are equal
* if and only if their properties are the same.
*/
- if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
- (com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
+ if (other instanceof com.sun.jdbcra.spi.XAManagedConnectionFactory) {
+ com.sun.jdbcra.spi.XAManagedConnectionFactory otherMCF = (com.sun.jdbcra.spi.XAManagedConnectionFactory) other;
return this.spec.equals(otherMCF.spec);
}
return false;
@@ -535,39 +534,36 @@
return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
}
- /*
+ /**
* Check if the PasswordCredential passed for this get connection
* request is equal to the user/passwd of this connection pool.
*/
- private boolean isEqual( PasswordCredential pc, String user,
- String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
+ private boolean isEqual(PasswordCredential pc, String user, String password) {
+ // if equal get direct connection else
+ // get connection with user and password.
if (user == null && pc == null) {
return true;
}
- if ( user == null && pc != null ) {
+ if (user == null && pc != null) {
return false;
}
- if( pc == null ) {
+ if (pc == null) {
return true;
}
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
+ if (user.equals(pc.getUserName())) {
+ if (password == null && pc.getPassword() == null) {
return true;
}
}
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
+ if (user.equals(pc.getUserName()) && password.equals(pc.getPassword())) {
return true;
}
-
return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/XAResourceImpl.java
old mode 100644
new mode 100755
similarity index 96%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/XAResourceImpl.java
index f0ba663..98f289d
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/XAResourceImpl.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,10 +17,9 @@
package com.sun.jdbcra.spi;
-import javax.transaction.xa.Xid;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
-import com.sun.jdbcra.spi.ManagedConnection;
+import javax.transaction.xa.Xid;
/**
* <code>XAResource</code> wrapper for Generic JDBC Connector.
@@ -50,6 +50,7 @@
* @param onePhase If true, the resource manager should use a one-phase commit
* protocol to commit the work done on behalf of xid.
*/
+ @Override
public void commit(Xid xid, boolean onePhase) throws XAException {
//the mc.transactionCompleted call has come here becasue
//the transaction *actually* completes after the flow
@@ -68,6 +69,7 @@
* was used previously in the start method.
* @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
*/
+ @Override
public void end(Xid xid, int flags) throws XAException {
xar.end(xid, flags);
//GJCINT
@@ -79,6 +81,7 @@
*
* @param xid A global transaction identifier
*/
+ @Override
public void forget(Xid xid) throws XAException {
xar.forget(xid);
}
@@ -89,6 +92,7 @@
*
* @return the transaction timeout value in seconds
*/
+ @Override
public int getTransactionTimeout() throws XAException {
return xar.getTransactionTimeout();
}
@@ -102,6 +106,7 @@
* instance is to be compared with the resource
* @return true if it's the same RM instance; otherwise false.
*/
+ @Override
public boolean isSameRM(XAResource xares) throws XAException {
return xar.isSameRM(xares);
}
@@ -117,6 +122,7 @@
* to roll back the transaction, it should do so
* by raising an appropriate <code>XAException</code> in the prepare method.
*/
+ @Override
public int prepare(Xid xid) throws XAException {
return xar.prepare(xid);
}
@@ -131,6 +137,7 @@
* completed state. If an error occurs during the operation, the resource
* manager should throw the appropriate <code>XAException</code>.
*/
+ @Override
public Xid[] recover(int flag) throws XAException {
return xar.recover(flag);
}
@@ -140,6 +147,7 @@
*
* @param xid A global transaction identifier
*/
+ @Override
public void rollback(Xid xid) throws XAException {
//the mc.transactionCompleted call has come here becasue
//the transaction *actually* completes after the flow
@@ -157,6 +165,7 @@
* @param seconds the transaction timeout value in seconds.
* @return true if transaction timeout value is set successfully; otherwise false.
*/
+ @Override
public boolean setTransactionTimeout(int seconds) throws XAException {
return xar.setTransactionTimeout(seconds);
}
@@ -167,6 +176,7 @@
* @param xid A global transaction identifier to be associated with the resource
* @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
*/
+ @Override
public void start(Xid xid, int flags) throws XAException {
//GJCINT
mc.transactionStarted();
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/util/MethodExecutor.java
old mode 100644
new mode 100755
similarity index 98%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/util/MethodExecutor.java
index de4a961..423665a
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/util/MethodExecutor.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,13 +17,14 @@
package com.sun.jdbcra.util;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Vector;
import jakarta.resource.ResourceException;
-import java.util.logging.Logger;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Vector;
import java.util.logging.Level;
+import java.util.logging.Logger;
+
/**
* Execute the methods based on the parameters.
*
@@ -35,7 +37,7 @@
static {
_logger = Logger.getAnonymousLogger();
}
- private boolean debug = false;
+ private final boolean debug = false;
/**
* Exceute a simple set Method.
*
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/util/SecurityUtils.java
old mode 100644
new mode 100755
similarity index 95%
rename from appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
rename to appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/util/SecurityUtils.java
index bed9dd7..ab6a714
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/util/SecurityUtils.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,15 +17,16 @@
package com.sun.jdbcra.util;
-import javax.security.auth.Subject;
+import jakarta.resource.ResourceException;
+import jakarta.resource.spi.ManagedConnectionFactory;
+import jakarta.resource.spi.security.PasswordCredential;
+
import java.security.AccessController;
import java.security.PrivilegedAction;
-import jakarta.resource.spi.security.PasswordCredential;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.*;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import java.util.Set;
import java.util.Iterator;
+import java.util.Set;
+
+import javax.security.auth.Subject;
/**
* SecurityUtils for Generic JDBC Connector.
@@ -64,6 +66,7 @@
} else {
PasswordCredential pc = (PasswordCredential) AccessController.doPrivileged
(new PrivilegedAction() {
+ @Override
public Object run() {
Set passwdCredentialSet = subject.getPrivateCredentials(PasswordCredential.class);
Iterator iter = passwdCredentialSet.iterator();
@@ -115,10 +118,12 @@
* false otherwise
*/
static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
- if (pC1 == pC2)
+ if (pC1 == pC2) {
return true;
- if(pC1 == null || pC2 == null)
+ }
+ if(pC1 == null || pC2 == null) {
return (pC1 == pC2);
+ }
if (!isEqual(pC1.getUserName(), pC2.getUserName())) {
return false;
}
diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml
new file mode 100644
index 0000000..556f176
--- /dev/null
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/pom.xml
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.tests</groupId>
+ <artifactId>ant-tests</artifactId>
+ <version>6.2.5-SNAPSHOT</version>
+ </parent>
+ <groupId>org.glassfish.main.tests.connectors</groupId>
+ <artifactId>connectors-ra-redeploy</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>jars</module>
+ <module>rars</module>
+ <module>rars-xa</module>
+ </modules>
+</project>
diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml
new file mode 100644
index 0000000..c18cfce
--- /dev/null
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/pom.xml
@@ -0,0 +1,63 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.tests.connectors</groupId>
+ <artifactId>connectors-ra-redeploy</artifactId>
+ <version>6.2.5-SNAPSHOT</version>
+ </parent>
+ <artifactId>connectors-ra-redeploy-rars-xa</artifactId>
+ <packaging>rar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.main.tests.connectors</groupId>
+ <artifactId>connectors-ra-redeploy-jars</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <stripClassifier>true</stripClassifier>
+ <stripVersion>true</stripVersion>
+ <includeArtifactIds>connectors-ra-redeploy-jars</includeArtifactIds>
+ </configuration>
+ <executions>
+ <execution>
+ <id>version1</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/v1</outputDirectory>
+ <excludeClassifiers>v2</excludeClassifiers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-rar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-rar</id>
+ <goals>
+ <goal>rar</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <rarSourceDirectory>${project.build.directory}/v1</rarSourceDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/src/main/rar/META-INF/ra.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/src/main/rar/META-INF/ra.xml
new file mode 100755
index 0000000..eab31a6
--- /dev/null
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars-xa/src/main/rar/META-INF/ra.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
+ <description>Resource adapter wrapping Datasource implementation of driver</description>
+ <display-name>DataSource Resource Adapter</display-name>
+ <icon>
+ <small-icon></small-icon>
+ <large-icon></large-icon>
+ </icon>
+ <vendor-name>Sun Microsystems</vendor-name>
+ <eis-type>Database</eis-type>
+ <resourceadapter-version>1.0</resourceadapter-version>
+ <license>
+ <license-required>false</license-required>
+ </license>
+ <resourceadapter>
+ <resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <managedconnectionfactory-class>com.sun.jdbcra.spi.XAManagedConnectionFactory</managedconnectionfactory-class>
+ <config-property>
+ <config-property-name>ServerName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>localhost</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>PortNumber</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>1527</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>User</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>dbuser</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>UserName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>dbuser</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>Password</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>dbpassword</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>URL</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ConnectionAttributes</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>;create=true</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>DatabaseName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>testdb</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>Description</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>Oracle thin driver Datasource</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NetworkProtocol</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>RoleName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>LoginTimeOut</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>DriverProperties</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>Delimiter</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>#</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>org.apache.derby.jdbc.ClientXADataSource40</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+
+ <connectionfactory-interface>javax.sql.XADataSource</connectionfactory-interface>
+ <connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
+
+ <connection-interface>java.sql.Connection</connection-interface>
+ <connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
+ </connection-definition>
+
+ <transaction-support>XATransaction</transaction-support>
+
+ <authentication-mechanism>
+ <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+ <credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
+ </authentication-mechanism>
+
+ <reauthentication-support>false</reauthentication-support>
+ </outbound-resourceadapter>
+
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
+ </adminobject>
+
+ </resourceadapter>
+
+</connector>
diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml
new file mode 100644
index 0000000..1c04d63
--- /dev/null
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/pom.xml
@@ -0,0 +1,122 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.tests.connectors</groupId>
+ <artifactId>connectors-ra-redeploy</artifactId>
+ <version>6.2.5-SNAPSHOT</version>
+ </parent>
+ <artifactId>connectors-ra-redeploy-rars</artifactId>
+ <packaging>rar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.main.tests.connectors</groupId>
+ <artifactId>connectors-ra-redeploy-jars</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.tests.connectors</groupId>
+ <artifactId>connectors-ra-redeploy-jars</artifactId>
+ <version>${project.version}</version>
+ <classifier>v2</classifier>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.resource</groupId>
+ <artifactId>jakarta.resource-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <stripClassifier>true</stripClassifier>
+ <stripVersion>true</stripVersion>
+ <includeArtifactIds>connectors-ra-redeploy-jars</includeArtifactIds>
+ </configuration>
+ <executions>
+ <execution>
+ <id>version1</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/v1</outputDirectory>
+ <excludeClassifiers>v2</excludeClassifiers>
+ </configuration>
+ </execution>
+ <execution>
+ <id>version2</id>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/v2</outputDirectory>
+ <includeClassifiers>v2</includeClassifiers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-rar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-rar</id>
+ <goals>
+ <goal>rar</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <rarSourceDirectory>${project.build.directory}/v1</rarSourceDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>version2</id>
+ <goals>
+ <goal>rar</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <rarSourceDirectory>${project.build.directory}/v2</rarSourceDirectory>
+ <overwrite>true</overwrite>
+ <classifier>v2</classifier>
+ </configuration>
+ </execution>
+ <execution>
+ <id>nojar</id>
+ <goals>
+ <goal>rar</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <rarSourceDirectory>${project.build.directory}/nojar</rarSourceDirectory>
+ <workDirectory>${project.build.directory}/nojar</workDirectory>
+ <overwrite>true</overwrite>
+ <classifier>nojar</classifier>
+ <archive>
+ <manifestEntries>
+ <Extension-List>connectors-ra-redeploy-jars</Extension-List>
+ <connectors-ra-redeploy-jars-Extension-Name>connectors-ra-redeploy-jars.jar</connectors-ra-redeploy-jars-Extension-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/src/main/rar/META-INF/ra.xml b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/src/main/rar/META-INF/ra.xml
new file mode 100755
index 0000000..4bdf875
--- /dev/null
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/src/main/rar/META-INF/ra.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
+ <description>Resource adapter wrapping Datasource implementation of driver</description>
+ <display-name>DataSource Resource Adapter</display-name>
+ <icon>
+ <small-icon></small-icon>
+ <large-icon></large-icon>
+ </icon>
+ <vendor-name>Sun Microsystems</vendor-name>
+ <eis-type>Database</eis-type>
+ <resourceadapter-version>1.0</resourceadapter-version>
+ <license>
+ <license-required>false</license-required>
+ </license>
+ <resourceadapter>
+ <resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
+ <config-property>
+ <config-property-name>ServerName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>localhost</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>PortNumber</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>1527</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>User</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>dbuser</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>UserName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>dbuser</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>Password</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>dbpassword</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>URL</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ConnectionAttributes</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>;create=true</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>DatabaseName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>testdb</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>Description</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>Oracle thin driver Datasource</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NetworkProtocol</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>RoleName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>LoginTimeOut</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>DriverProperties</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>Delimiter</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>#</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ClassName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ConnectionValidationRequired</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>ValidationTableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>TransactionIsolation</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>GuaranteeIsolationLevel</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
+
+ <connection-interface>java.sql.Connection</connection-interface>
+ <connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
+ </connection-definition>
+
+ <transaction-support>LocalTransaction</transaction-support>
+
+ <authentication-mechanism>
+ <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+ <credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
+ </authentication-mechanism>
+
+ <reauthentication-support>false</reauthentication-support>
+ </outbound-resourceadapter>
+
+ <adminobject>
+ <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
+ <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
+ <config-property>
+ <config-property-name>TableName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>SchemaName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>JndiName</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value></config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>NoOfRows</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
+ </adminobject>
+
+ </resourceadapter>
+
+</connector>
diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/src/test/java/org/glassfish/main/tests/connectors/ra/ResourceAdapterITest.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/src/test/java/org/glassfish/main/tests/connectors/ra/ResourceAdapterITest.java
new file mode 100644
index 0000000..72fae05
--- /dev/null
+++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/rars/src/test/java/org/glassfish/main/tests/connectors/ra/ResourceAdapterITest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 Eclipse Foundation and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.main.tests.connectors.ra;
+
+import com.sun.jdbcra.spi.ResourceAdapter;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author David Matejcek
+ */
+public class ResourceAdapterITest {
+
+ @Test
+ public void testClassLoading() {
+ System.out.println(ResourceAdapter.class.getClassLoader());
+ assertEquals(1, ResourceAdapter.VERSION);
+ }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
index 21deb93..f269940 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
index 21deb93..f269940 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties
index 814b7dd..8868341 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.properties
@@ -19,7 +19,7 @@
<property name="module" value="connector"/>
<property name="app.type" value="application"/>
-<property name="cciblackbox.path" value="../lib/cciblackbox-tx.jar"/>
+<property name="cciblackbox.path" value="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"/>
<property name="appname" value="${module}-embedded-cci"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml
index d8bb024..7961579 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/build.xml
@@ -211,7 +211,7 @@
<target name="create-rar">
<copy file="descriptor/ra.xml" tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
<copy file="descriptor/sun-ra.xml" tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
- <copy file="${env.APS_HOME}/sqetests/connector/lib/cciblackbox-tx.jar" tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
+ <copy file="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar" tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
<replace file="${assemble.dir}/rar/META-INF/ra.xml" token="DBURL" value="${db.url}"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties
index 95cae5f..1c16f40 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.properties
@@ -19,7 +19,7 @@
<property name="module" value="connector"/>
<property name="app.type" value="application"/>
-<property name="cciblackbox.path" value="../lib/cciblackbox-tx.jar"/>
+<property name="cciblackbox.path" value="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"/>
<property name="appname" value="connector-cci"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml
index 889f95d..76c9549 100755
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/build.xml
@@ -219,7 +219,7 @@
tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
<copy file="descriptor/sun-ra.xml"
tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
- <copy file="${env.APS_HOME}/sqetests/connector/lib/cciblackbox-tx.jar"
+ <copy file="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"
tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
<replace file="${assemble.dir}/rar/META-INF/ra.xml"
token="DBURL" value="${db.url}"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/META-INF/ra.xml
index 21deb93..f269940 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/META-INF/ra.xml
index 21deb93..f269940 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/META-INF/ra.xml
index 21deb93..235d1b6 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,15 +17,13 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/META-INF/ra.xml
index 21deb93..f269940 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/build.xml
index 7b6653a..8866761 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/build.xml
@@ -24,8 +24,8 @@
<project name="connector1.5 MDB" default="all" basedir=".">
- <property name="j2ee.home" value="../../.."/>
- <property name="earfile" value="generic-embedded.ear"/>
+ <property name="j2ee.home" value="../../.." />
+ <property name="earfile" value="generic-embedded.ear" />
<!-- include common.xml and testcommon.xml -->
@@ -34,74 +34,68 @@
&testcommon;
<target name="all" depends="init-common, clean-common">
- <ant dir="src" inheritAll="false" target="all"/>
- <antcall target="build-ear"/>
- <!--
- <antcall target="ear-common">
- <param name="appname" value="generic-embedded"/>
- <param name="application.xml" value="META-INF/application.xml"/>
- </antcall>
- -->
+ <ant dir="src" inheritAll="false" target="all" />
+ <antcall target="build-ear" />
</target>
<target name="build-ear">
- <delete file="${assemble.dir}/generic-embeddedApp.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/generic-embeddedApp.ear" appxml="META-INF/application.xml">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="../ra">
- <include name="*.rar"/>
- </fileset>
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
- </ear>
+ <delete file="${assemble.dir}/generic-embeddedApp.ear" />
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <ear earfile="${assemble.dir}/generic-embeddedApp.ear" appxml="META-INF/application.xml">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar" />
+ <include name="*.war" />
+ </fileset>
+ <fileset dir="../ra">
+ <include name="*.rar" />
+ </fileset>
+ <fileset dir="${env.APS_HOME}/lib">
+ <include name="reporter.jar" />
+ </fileset>
+ </ear>
</target>
<target name="setupJdbc" depends="init-common">
- <antcall target="create-jdbc-conpool-connector">
- <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
- <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
- </antcall>
- <antcall target="create-jdbc-resource-common">
- <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1"/>
- <param name="jdbc.resource.name" value="jdbc/XAPointbase"/>
- </antcall>
+ <antcall target="create-jdbc-conpool-connector">
+ <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource" />
+ <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1" />
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource" />
+ </antcall>
+ <antcall target="create-jdbc-resource-common">
+ <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1" />
+ <param name="jdbc.resource.name" value="jdbc/Derby" />
+ </antcall>
- <antcall target="execute-sql-connector">
- <param name="sql.file" value="createdb.sql"/>
- </antcall>
- </target>
+ <antcall target="execute-sql-connector">
+ <param name="sql.file" value="createdb.sql" />
+ </antcall>
+ </target>
<target name="unsetJdbc" depends="init-common">
- <antcall target="delete-jdbc-resource-common">
- <param name="jdbc.resource.name" value="jdbc/XAPointbase"/>
- </antcall>
- <antcall target="delete-jdbc-connpool-common">
- <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1"/>
- </antcall>
+ <antcall target="delete-jdbc-resource-common">
+ <param name="jdbc.resource.name" value="jdbc/Derby" />
+ </antcall>
+ <antcall target="delete-jdbc-connpool-common">
+ <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1" />
+ </antcall>
</target>
<target name="deploy-ear" depends="init-common">
<antcall target="deploy-common">
- <param name="appname" value="generic-embedded"/>
+ <param name="appname" value="generic-embedded" />
</antcall>
</target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common">
- <param name="deployedapp.name" value="generic-embeddedApp"/>
+ <param name="deployedapp.name" value="generic-embeddedApp" />
</antcall>
</target>
<target name="clean">
- <antcall target="clean-common"/>
+ <antcall target="clean-common" />
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/META-INF/sun-ejb-jar.xml
index 099a715..e101147 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/META-INF/sun-ejb-jar.xml
@@ -54,7 +54,7 @@
</ior-security-config>
<resource-ref>
<res-ref-name>MyDB</res-ref-name>
- <jndi-name>jdbc/XAPointbase</jndi-name>
+ <jndi-name>jdbc/Derby</jndi-name>
</resource-ref>
<gen-classes />
</ejb>
@@ -79,7 +79,7 @@
</ior-security-config>
<resource-ref>
<res-ref-name>MyDB</res-ref-name>
- <jndi-name>jdbc/XAPointbase</jndi-name>
+ <jndi-name>jdbc/Derby</jndi-name>
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/META-INF/ra.xml
index 21deb93..f269940 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 65338d1..1c73201 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,9 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<!-- There can be any number of "description" elements including 0 -->
<!-- This field can be optionally used by the driver vendor to provide a
@@ -221,7 +226,7 @@
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ <credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
<reauthentication-support>false</reauthentication-support>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml
index d2fe0d2..2796a5f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml
@@ -38,9 +38,9 @@
<target name="run-test" depends="build,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear"/>
-->
- <target name="all" depends="build, deploy-ear, setup, run-ear, unsetup, undeploy-ear"/>
+ <target name="all" depends="build, deploy-ear, setup, run-ear, unsetup, undeploy-ear"/>
-<!--
+ <!--
<antcall target="build"/>
<antcall target="setup"/>
<antcall target="deploy-war"/>
@@ -53,126 +53,118 @@
</target>
-->
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <ant dir="ra" target="clean"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common"/>
+ </target>
- <target name="setup">
+ <target name="setup">
<antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/simpleBank.sql"/>
+ <param name="sql.file" value="sql/simpleBank.sql"/>
</antcall>
<antcall target="create-pool"/>
<antcall target="create-resource"/>
<antcall target="create-admin-object"/>
- </target>
- <target name="create-pool">
- <antcall target="create-connector-connpool-common">
- <param name="ra.name" value="${appname}App#jdbcra"/>
- <param name="connection.defname" value="javax.sql.DataSource"/>
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- </antcall>
- <antcall target="set-oracle-props">
- <param name="pool.type" value="connector"/>
- <param name="conpool.name" value="embedded-ra-pool"/>
- </antcall>
- </target>
- <target name="create-resource">
- <antcall target="create-connector-resource-common">
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
- </target>
+ </target>
+ <target name="create-pool">
+ <antcall target="create-connector-connpool-common">
+ <param name="ra.name" value="${appname}App#connectors-ra-redeploy-rars"/>
+ <param name="connection.defname" value="javax.sql.DataSource"/>
+ <param name="connector.conpool.name" value="embedded-ra-pool"/>
+ </antcall>
+ <antcall target="set-oracle-props">
+ <param name="pool.type" value="connector"/>
+ <param name="conpool.name" value="embedded-ra-pool"/>
+ </antcall>
+ </target>
+ <target name="create-resource">
+ <antcall target="create-connector-resource-common">
+ <param name="connector.conpool.name" value="embedded-ra-pool"/>
+ <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
+ </antcall>
+ </target>
- <target name="create-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=connector:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
- </antcall>
- </target>
+ <target name="create-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#connectors-ra-redeploy-rars --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=connector:NoOfRows=1"/>
+ <param name="operand.props" value="eis/jdbcAdmin"/>
+ </antcall>
+ </target>
- <target name="delete-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- </target>
+ <target name="delete-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-admin-object"/>
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
+ </antcall>
+ </target>
- <target name="restart">
+ <target name="restart">
<antcall target="restart-server-instance-common"/>
- </target>
+ </target>
- <target name="create-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- </target>
+ <target name="create-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
+ <param name="operand.props" value="${appname}App#connectors-ra-redeploy-rars"/>
+ </antcall>
+ </target>
- <target name="delete-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- </target>
+ <target name="delete-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="${appname}App#connectors-ra-redeploy-rars"/>
+ </antcall>
+ </target>
- <target name="unsetup">
+ <target name="unsetup">
<antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/dropBankTables.sql"/>
- </antcall>
+ <param name="sql.file" value="sql/dropBankTables.sql"/>
+ </antcall>
<antcall target="delete-resource"/>
<antcall target="delete-pool"/>
<antcall target="delete-admin-object"/>
- </target>
+ </target>
- <target name="delete-pool">
- <antcall target="delete-connector-connpool-common">
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- </antcall>
- </target>
+ <target name="delete-pool">
+ <antcall target="delete-connector-connpool-common">
+ <param name="connector.conpool.name" value="embedded-ra-pool"/>
+ </antcall>
+ </target>
- <target name="delete-resource">
- <antcall target="delete-connector-resource-common">
- <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
- </target>
+ <target name="delete-resource">
+ <antcall target="delete-connector-resource-common">
+ <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
+ </antcall>
+ </target>
- <target name="compile" depends="clean">
- <ant dir="ra" target="compile"/>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-servlet" />
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="ejb"/>
+ </antcall>
+ <antcall target="compile-servlet" />
+ </target>
- <target name="compile-servlet" depends="init-common">
- <mkdir dir="${build.classes.dir}"/>
- <echo message="common.xml: Compiling test source files" level="verbose"/>
- <javac srcdir="servlet"
+ <target name="compile-servlet" depends="init-common">
+ <mkdir dir="${build.classes.dir}"/>
+ <echo message="common.xml: Compiling test source files" level="verbose"/>
+ <javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
debug="on"
failonerror="true"/>
- </target>
+ </target>
-
- <target name="build-ra">
- <ant dir="ra" target="build"/>
- </target>
-
- <target name="build" depends="compile">
+ <target name="build" depends="compile">
<property name="hasWebclient" value="yes"/>
- <ant dir="ra" target="assemble"/>
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="hasWebclient" value="yes" />
+ <param name="webclient.war.classes" value="**/*.class" />
</antcall>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="**/*.class"/>
+ <param name="ejbjar.classes" value="**/*.class"/>
</antcall>
@@ -181,48 +173,48 @@
<mkdir dir="${build.classes.dir}/META-INF"/>
<ear earfile="${assemble.dir}/${appname}App.ear"
appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="ra/publish/lib">
- <include name="*.rar"/>
- </fileset>
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar"/>
+ <include name="*.war"/>
+ </fileset>
+ <fileset dir="${env.APS_HOME}/connectors-ra-redeploy/rars/target">
+ <include name="connectors-ra-redeploy-rars.rar"/>
+ </fileset>
</ear>
- </target>
+ </target>
- <target name="deploy-ear" depends="init-common">
- <antcall target="create-ra-config"/>
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear" depends="init-common">
+ <antcall target="create-ra-config"/>
+ <antcall target="deploy-common"/>
+ </target>
- <target name="deploy-war" depends="init-common">
- <antcall target="deploy-war-common"/>
- </target>
+ <target name="deploy-war" depends="init-common">
+ <antcall target="deploy-war-common"/>
+ </target>
- <target name="run-war" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (stand-alone war based)"/>
- </antcall>
- </target>
+ <target name="run-war" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="web-to-ejb (stand-alone war based)"/>
+ </antcall>
+ </target>
- <target name="run-ear" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-ejb (ear based)"/>
- </antcall>
- </target>
+ <target name="run-ear" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="web-to-ejb (ear based)"/>
+ </antcall>
+ </target>
- <target name="undeploy-ear" depends="init-common">
- <antcall target="delete-ra-config"/>
- <antcall target="undeploy-common"/>
- </target>
+ <target name="undeploy-ear" depends="init-common">
+ <antcall target="delete-ra-config"/>
+ <antcall target="undeploy-common"/>
+ </target>
- <target name="undeploy-war" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy-war" depends="init-common">
+ <antcall target="undeploy-war-common"/>
+ </target>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <target name="usage">
+ <antcall target="usage-common"/>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/descriptor/application.xml
index 7fb3227..39abc00 100755
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/descriptor/application.xml
@@ -25,7 +25,7 @@
</module>
<module>
- <connector>jdbcra.rar</connector>
+ <connector>connectors-ra-redeploy-rars.rar</connector>
</module>
<module>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.properties
deleted file mode 100644
index fd21c3d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0, which is available at
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-
-### Component Properties ###
-src.dir=src
-component.publish.home=.
-component.classes.dir=${component.publish.home}/internal/classes
-component.lib.home=${component.publish.home}/lib
-component.publish.home=publish
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.xml
deleted file mode 100644
index c50d290..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE project [
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
- <!ENTITY common SYSTEM "../../../../config/common.xml">
- <!ENTITY testcommon SYSTEM "../../../../config/properties.xml">
-]>
-
-<project name="JDBCConnector top level" default="build">
- <property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
- &common;
- &testcommon;
- <property file="./build.properties"/>
-
- <target name="build" depends="compile,assemble" />
-
-
- <!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
- <target name="init" description="${component.name} initialization">
- <tstamp>
- <format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
- <echo message="Building component ${component.name}"/>
- <mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
- </target>
- <!-- compile -->
- <target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
- <!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
- destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- <include name="com/sun/jdbcra/**"/>
- <include name="com/sun/appserv/**"/>
- </javac>
- </target>
-
- <target name="all" depends="build"/>
-
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
-
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete file="${component.lib.home}/ra.xml"/>
-
- </target>
-
- <target name="clean" description="Clean the build">
- <delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${component.classes.dir}"/>
- <fileset dir="${component.lib.home}"/>
- </delete>
- </target>
-
-</project>
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
deleted file mode 100644
index 3b4faeb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/common"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/common.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
deleted file mode 100644
index 8983ff2..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ /dev/null
@@ -1,688 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.sql.*;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-
-/**
- * Holds the java.sql.Connection object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class ConnectionHolder implements Connection{
-
- private Connection con;
-
- private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
- private boolean isClosed = false;
-
- private boolean valid = true;
-
- private boolean active = false;
- /**
- * The active flag is false when the connection handle is
- * created. When a method is invoked on this object, it asks
- * the ManagedConnection if it can be the active connection
- * handle out of the multiple connection handles. If the
- * ManagedConnection reports that this connection handle
- * can be active by setting this flag to true via the setActive
- * function, the above method invocation succeeds; otherwise
- * an exception is thrown.
- */
-
- /**
- * Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
- */
- public ConnectionHolder(Connection con, ManagedConnection mc) {
- this.con = con;
- this.mc = mc;
- }
-
- /**
- * Returns the actual connection in this holder object.
- *
- * @return Connection object.
- */
- Connection getConnection() {
- return con;
- }
-
- /**
- * Sets the flag to indicate that, the connection is wrapped already or not.
- *
- * @param wrapFlag
- */
- void wrapped(boolean wrapFlag){
- this.wrappedAlready = wrapFlag;
- }
-
- /**
- * Returns whether it is wrapped already or not.
- *
- * @return wrapped flag.
- */
- boolean isWrapped(){
- return wrappedAlready;
- }
-
- /**
- * Returns the <code>ManagedConnection</code> instance responsible
- * for this connection.
- *
- * @return <code>ManagedConnection</code> instance.
- */
- ManagedConnection getManagedConnection() {
- return mc;
- }
-
- /**
- * Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
- *
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
- */
- void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
- }
-
- /**
- * Clears all warnings reported for the underlying connection object.
- *
- * @throws SQLException In case of a database error.
- */
- public void clearWarnings() throws SQLException{
- checkValidity();
- con.clearWarnings();
- }
-
- /**
- * Closes the logical connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void close() throws SQLException{
- isClosed = true;
- mc.connectionClosed(null, this);
- }
-
- /**
- * Invalidates this object.
- */
- public void invalidate() {
- valid = false;
- }
-
- /**
- * Closes the physical connection involved in this.
- *
- * @throws SQLException In case of a database error.
- */
- void actualClose() throws SQLException{
- con.close();
- }
-
- /**
- * Commit the changes in the underlying Connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void commit() throws SQLException {
- checkValidity();
- con.commit();
- }
-
- /**
- * Creates a statement from the underlying Connection
- *
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement() throws SQLException {
- checkValidity();
- return con.createStatement();
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
- *
- * @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
- /**
- * Retrieves the underlying <code>Connection</code> object's catalog name.
- *
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
- */
- public String getCatalog() throws SQLException {
- checkValidity();
- return con.getCatalog();
- }
-
- /**
- * Retrieves the current holdability of <code>ResultSet</code> objects created
- * using this connection object.
- *
- * @return holdability value.
- * @throws SQLException In case of a database error.
- */
- public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
- }
-
- /**
- * Retrieves the <code>DatabaseMetaData</code>object from the underlying
- * <code> Connection </code> object.
- *
- * @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
- */
- public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
- }
-
- /**
- * Retrieves this <code>Connection</code> object's current transaction isolation level.
- *
- * @return Transaction level
- * @throws SQLException In case of a database error.
- */
- public int getTransactionIsolation() throws SQLException {
- checkValidity();
- return con.getTransactionIsolation();
- }
-
- /**
- * Retrieves the <code>Map</code> object associated with
- * <code> Connection</code> Object.
- *
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
- */
- public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
- }
-
- /**
- * Retrieves the the first warning reported by calls on the underlying
- * <code>Connection</code> object.
- *
- * @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
- */
- public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
- }
-
- /**
- * Retrieves whether underlying <code>Connection</code> object is closed.
- *
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
- */
- public boolean isClosed() throws SQLException {
- return isClosed;
- }
-
- /**
- * Retrieves whether this <code>Connection</code> object is read-only.
- *
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
- */
- public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
- }
-
- /**
- * Converts the given SQL statement into the system's native SQL grammer.
- *
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
- */
- public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
- }
-
- @Override
- public Clob createClob() throws SQLException {
- return null;
- }
-
- @Override
- public Blob createBlob() throws SQLException {
- return null;
- }
-
- @Override
- public NClob createNClob() throws SQLException {
- return null;
- }
-
- @Override
- public SQLXML createSQLXML() throws SQLException {
- return null;
- }
-
- @Override
- public boolean isValid(int timeout) throws SQLException {
- return false;
- }
-
- @Override
- public void setClientInfo(String name, String value) throws SQLClientInfoException {
-
- }
-
- @Override
- public void setClientInfo(Properties properties) throws SQLClientInfoException {
-
- }
-
- @Override
- public String getClientInfo(String name) throws SQLException {
- return null;
- }
-
- @Override
- public Properties getClientInfo() throws SQLException {
- return null;
- }
-
- @Override
- public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
- return null;
- }
-
- @Override
- public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
- return null;
- }
-
- @Override
- public void setSchema(String schema) throws SQLException {
-
- }
-
- @Override
- public String getSchema() throws SQLException {
- return null;
- }
-
- @Override
- public void abort(Executor executor) throws SQLException {
-
- }
-
- @Override
- public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
-
- }
-
- @Override
- public int getNetworkTimeout() throws SQLException {
- return 0;
- }
-
- /**
- * Removes the given <code>Savepoint</code> object from the current transaction.
- *
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
- */
- public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
- /**
- * Rolls back the changes made in the current transaction.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
- }
-
- /**
- * Rolls back the changes made after the savepoint.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
- }
-
- /**
- * Sets the auto-commmit mode of the <code>Connection</code> object.
- *
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
- }
-
- /**
- * Sets the catalog name to the <code>Connection</code> object
- *
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
- */
- public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
- }
-
- /**
- * Sets the holdability of <code>ResultSet</code> objects created
- * using this <code>Connection</code> object.
- *
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
- */
- public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
- }
-
- /**
- * Puts the connection in read-only mode as a hint to the driver to
- * perform database optimizations.
- *
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
- */
- public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
- }
-
- /**
- * Creates and unnamed savepoint and returns an object corresponding to that.
- *
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
- }
-
- /**
- * Creates a savepoint with the name and returns an object corresponding to that.
- *
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
- /**
- * Creates the transaction isolation level.
- *
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
- */
- public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
- /**
- * Installs the given <code>Map</code> object as the tyoe map for this
- * <code> Connection </code> object.
- *
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
- */
- public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
- }
-
- /**
- * Checks the validity of this object
- */
- private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
- }
-
- /**
- * Sets the active flag to true
- *
- * @param actv boolean
- */
- void setActive(boolean actv) {
- active = actv;
- }
-
- @Override
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null;
- }
-
- @Override
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
deleted file mode 100644
index e2840ea..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.endpoint.MessageEndpointFactory;
-import jakarta.resource.spi.ActivationSpec;
-import jakarta.resource.NotSupportedException;
-import javax.transaction.xa.XAResource;
-import jakarta.resource.spi.BootstrapContext;
-import jakarta.resource.spi.ResourceAdapterInternalException;
-
-/**
- * <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
- */
-public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
-
- public String raProp = null;
-
- /**
- * Empty method implementation for endpointActivation
- * which just throws <code>NotSupportedException</code>
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
- */
- public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty method implementation for endpointDeactivation
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- */
- public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
- }
-
- /**
- * Empty method implementation for getXAResources
- * which just throws <code>NotSupportedException</code>
- *
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
- */
- public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty implementation of start method
- *
- * @param ctx <code>BootstrapContext</code>
- */
- public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
- System.out.println("Resource Adapter is starting with configuration :" + raProp);
- if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
- }
-
- /**
- * Empty implementation of stop method
- */
- public void stop() {
-
- }
-
- public void setRAProperty(String s) {
- raProp = s;
- }
-
- public String getRAProperty() {
- return raProp;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
deleted file mode 100644
index e006b1d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
- </target>
-
- <target name="build14" depends="compile14, package14"/>
- <target name="build13"/>
- <target name="build" depends="build14, build13"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
deleted file mode 100644
index 65338d1..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
- <!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
- description for the resource adapter.
- -->
- <description>Resource adapter wrapping Datasource implementation of driver</description>
-
- <!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
- is intended to be displayed by tools.
- -->
- <display-name>DataSource Resource Adapter</display-name>
-
- <!-- There can be any number of "icon" elements including 0 -->
- <!-- The following is an example.
- <icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
- icon - JPEG or GIF image. The following is an example.
- <small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
- icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
- </icon>
- -->
- <icon>
- <small-icon></small-icon>
- <large-icon></large-icon>
- </icon>
-
- <!-- The "vendor-name" element should occur exactly once. -->
- <!-- This should specify the name of the driver vendor. The following is an example.
- <vendor-name>XYZ INC.</vendor-name>
- -->
- <vendor-name>Sun Microsystems</vendor-name>
-
- <!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
- the database independent of any version information. The following
- is an example.
- <eis-type>XYZ</eis-type>
- -->
- <eis-type>Database</eis-type>
-
- <!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
- the driver vendor. The default is being set as 1.0. The driver
- vendor can change it as required.
- -->
- <resourceadapter-version>1.0</resourceadapter-version>
-
- <!-- This "license" element can occur atmost once -->
- <!-- This specifies licensing requirements for the resource adapter module.
- The following is an example.
- <license>
- There can be any number of "description" elements including 0.
- <description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
- restrictions.
- </description>
-
- This specifies whether a license is required to deploy and use the resource adapter.
- Default is false.
- <license-required>false</license-required>
- </license>
- -->
- <license>
- <license-required>false</license-required>
- </license>
-
- <resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
- elements. The "description" elements are not being included
- in the "config-property" elements below. The driver vendor can
- add them as required.
- -->
-
- <resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
- <outbound-resourceadapter>
-
- <connection-definition>
-
- <managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
- <!-- There can be any number of these elements including 0 -->
- <config-property>
- <config-property-name>ServerName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>localhost</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>PortNumber</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>9092</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>User</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>DBUSER</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Password</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>DBPASSWORD</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DatabaseName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>jdbc:pointbase:server://localhost:9092/sqe-samples,new</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DataSourceName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Description</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>Oracle thin driver Datasource</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NetworkProtocol</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>RoleName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>LoginTimeOut</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DriverProperties</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Delimiter</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>#</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ClassName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>com.pointbase.jdbc.jdbcDataSource</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
-
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
- <connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
- <connection-interface>java.sql.Connection</connection-interface>
-
- <connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
- </connection-definition>
-
- <transaction-support>LocalTransaction</transaction-support>
-
- <authentication-mechanism>
- <!-- There can be any number of "description" elements including 0 -->
- <!-- Not including the "description" element -->
-
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
-
- <reauthentication-support>false</reauthentication-support>
-
- </outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- </adminobject>
-
- </resourceadapter>
-
-</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
deleted file mode 100644
index 4b12d49..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ConnectionManager;
-import jakarta.resource.ResourceException;
-import javax.naming.Reference;
-
-import java.sql.SQLFeatureNotSupportedException;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
- private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
- private int loginTimeout;
- private PrintWriter logWriter;
- private String description;
- private Reference reference;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Constructs <code>DataSource</code> object. This is created by the
- * <code>ManagedConnectionFactory</code> object.
- *
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
- */
- public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException {
-
- Connection driverCon = con;
- if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
-
- return driverCon;
- }
-
- /**
- * Get the login timeout
- *
- * @return login timeout.
- * @throws SQLException If a database error occurs.
- */
- public int getLoginTimeout() throws SQLException{
- return loginTimeout;
- }
-
- @Override
- public Logger getParentLogger() throws SQLFeatureNotSupportedException {
- return null;
- }
-
- /**
- * Set the login timeout
- *
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
- */
- public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
- }
-
- /**
- * Get the logwriter object.
- *
- * @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
- */
- public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
- }
-
- /**
- * Set the logwriter on this object.
- *
- * @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
- */
- public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
- /**
- * Retrieves the description.
- *
- * @return Description about the DataSource.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Set the description.
- *
- * @param description Description about the DataSource.
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Get the reference.
- *
- * @return <code>Reference</code>object.
- */
- public Reference getReference() {
- return reference;
- }
-
- /**
- * Get the reference.
- *
- * @param reference <code>Reference</code> object.
- */
- public void setReference(Reference reference) {
- this.reference = reference;
- }
-
- @Override
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null;
- }
-
- @Override
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
deleted file mode 100644
index bec0d6b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-public interface JdbcSetupAdmin {
-
- public void setTableName(String db);
-
- public String getTableName();
-
- public void setJndiName(String name);
-
- public String getJndiName();
-
- public void setSchemaName(String name);
-
- public String getSchemaName();
-
- public void setNoOfRows(Integer i);
-
- public Integer getNoOfRows();
-
- public boolean checkSetup();
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
deleted file mode 100644
index 82c50b5..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.naming.*;
-import javax.sql.*;
-import java.sql.*;
-// import javax.sql.DataSource;
-public class JdbcSetupAdminImpl implements JdbcSetupAdmin {
-
- private String tableName;
-
- private String jndiName;
-
- private String schemaName;
-
- private Integer noOfRows;
-
- public void setTableName(String db) {
- tableName = db;
- }
-
- public String getTableName(){
- return tableName;
- }
-
- public void setJndiName(String name){
- jndiName = name;
- }
-
- public String getJndiName() {
- return jndiName;
- }
-
- public void setSchemaName(String name){
- schemaName = name;
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- public void setNoOfRows(Integer i) {
- System.out.println("Setting no of rows :" + i);
- noOfRows = i;
- }
-
- public Integer getNoOfRows() {
- return noOfRows;
- }
-
-private void printHierarchy(ClassLoader cl, int cnt){
-while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
-}
-}
-
-private void compareHierarchy(ClassLoader cl1, ClassLoader cl2 , int cnt){
-while(cl1 != null || cl2 != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
- cl1 = cl1.getParent();
- cl2 = cl2.getParent();
- cnt += 3;
-}
-}
-
-
- public boolean checkSetup(){
-
- if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
-
- if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
-
- Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
- try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
-/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
-
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
-
- System.out.println("Before lookup");
-*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
-
- DataSource ds = (DataSource)o ;
-/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-*/
- con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
-
- System.out.println("Executing query :" + qry);
-
- s = con.createStatement();
- rs = s.executeQuery(qry);
-
- int i = 0;
- if (rs.next()) {
- i++;
- }
-
- System.out.println("No of rows found:" + i);
- System.out.println("No of rows expected:" + noOfRows);
-
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
- } catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
deleted file mode 100644
index 7ca9cfb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile13">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="build13" depends="compile13">
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="build14" depends="compile14"/>
-
- <target name="build" depends="build13, build14"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
deleted file mode 100644
index f060e7d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/util"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index ae213ea..d887867 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,9 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<!-- There can be any number of "description" elements including 0 -->
<!-- This field can be optionally used by the driver vendor to provide a
@@ -232,7 +237,7 @@
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ <credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
<reauthentication-support>false</reauthentication-support>
diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/META-INF/ra.xml
index ed74085..5cd800f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringraproperties/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/META-INF/ra.xml
index 02c031d..d868ee9 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Test Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ra-xa.xml b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ra-xa.xml
index 3dfc37d..7e71025 100755
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ra-xa.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ra/src/com/sun/jdbcra/spi/1.4/ra-xa.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,9 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<!-- There can be any number of "description" elements including 0 -->
<!-- This field can be optionally used by the driver vendor to provide a
@@ -243,7 +248,7 @@
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ <credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
<reauthentication-support>false</reauthentication-support>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties
index 0e55a95..9a5b7df 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.properties
@@ -19,7 +19,7 @@
<property name="module" value="connector"/>
<property name="app.type" value="application"/>
-<property name="cciblackbox.path" value="../lib/cciblackbox-tx.jar"/>
+<property name="cciblackbox.path" value="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"/>
<property name="appname" value="${module}-embedded-cci"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml
index 638aa44..7f6d290 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml
@@ -275,7 +275,7 @@
<target name="create-rar">
<copy file="descriptor/ra.xml" tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
<copy file="descriptor/sun-ra.xml" tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
- <copy file="${env.APS_HOME}/sqetests/connector/lib/cciblackbox-tx.jar"
+ <copy file="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"
tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
<copy file="${env.APS_HOME}/sqetests/connector/lib/cci-derby-proc.jar"
tofile="${assemble.dir}/rar/cci-derby-proc.jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application-client.xml
index a752ab5..d61feb9 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application-client.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE application-client PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN'
+ 'http://java.sun.com/dtd/application-client_1_3.dtd'>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -17,11 +18,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
- 'http://java.sun.com/dtd/application-client_1_3.dtd'>
-
-
-
<application-client>
<display-name>connector-embedded-cciClient</display-name>
<ejb-ref>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application-withrar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application-withrar.xml
index 31baa79..be58133 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application-withrar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application-withrar.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN'
+ 'http://java.sun.com/dtd/application_1_3.dtd'>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -18,10 +19,6 @@
-->
- 'http://java.sun.com/dtd/application_1_3.dtd'>
-
-
-
<application>
<display-name>CoffeeApp</display-name>
<description>Sample application to showcase CCI (Common Client Interface) of JCA (Java Connector Architecture)
@@ -29,23 +26,14 @@
<module>
<ejb>cci-embedded-ejb.jar</ejb>
</module>
- <!--
- <module>
- <java>cci-embedded-client.jar</java>
- </module>
- -->
-
<module>
<connector>cciblackbox-tx.rar</connector>
</module>
-
-
<module>
<web>
<web-uri>cci-embedded-web.war</web-uri>
<context-root>cci-embedded</context-root>
</web>
</module>
-
</application>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application.xml
index 524dd0b..55470de 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/application.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN'
+ 'http://java.sun.com/dtd/application_1_3.dtd'>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -18,22 +19,12 @@
-->
- 'http://java.sun.com/dtd/application_1_3.dtd'>
-
-
-
<application>
<display-name>EmbeddedCoffeeApp</display-name>
- <description>Sample application to showcase CCI (Common Client Interface) of JCA (Java Connector Architecture)
- </description>
+ <description>Sample application to showcase CCI (Common Client Interface) of JCA (Java Connector Architecture)</description>
<module>
<ejb>cci-embedded-ejb.jar</ejb>
</module>
- <!--
- <module>
- <java>cci-embedded-client.jar</java>
- </module>
- -->
<module>
<connector>cciblackbox-tx.rar</connector>
</module>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/ejb-jar.xml
index 5da7172..71917bc 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/ejb-jar.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN'
+ 'http://java.sun.com/dtd/ejb-jar_2_0.dtd'>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -17,11 +18,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
- 'http://java.sun.com/dtd/ejb-jar_2_0.dtd'>
-
-
-
<ejb-jar>
<display-name>CoffeeJAR</display-name>
<enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/web.xml
index 2f03e0a..d1fc7e0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/descriptor/web.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN'
+ 'http://java.sun.com/j2ee/dtds/web-app_2_3.dtd'>
<!--
Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
@@ -17,9 +18,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
- 'http://java.sun.com/j2ee/dtds/web-app_2_3.dtd'>
-
<web-app>
<display-name>cci-embedded-web</display-name>
<distributable></distributable>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties
index 385a87c..d51f9ca 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.properties
@@ -19,7 +19,7 @@
<property name="module" value="connector"/>
<property name="app.type" value="application"/>
-<property name="cciblackbox.path" value="../lib/cciblackbox-tx.jar"/>
+<property name="cciblackbox.path" value="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"/>
<property name="appname" value="connector-cci"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.xml
index 92b423d..e4c6695 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.xml
@@ -272,7 +272,7 @@
tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
<copy file="descriptor/sun-ra.xml"
tofile="${assemble.dir}/rar/META-INF/sun-ra.xml"/>
- <copy file="${env.APS_HOME}/sqetests/connector/lib/cciblackbox-tx.jar"
+ <copy file="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"
tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
<copy file="${env.APS_HOME}/sqetests/connector/lib/cci-derby-proc.jar"
tofile="${assemble.dir}/rar/cci-derby-proc.jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application-client.xml
index 7e8bc4e..5004d64 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application-client.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application-client PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN'
+<!DOCTYPE application-client PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN' 'http://java.sun.com/dtd/application-client_1_3.dtd'>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -18,10 +18,6 @@
-->
- 'http://java.sun.com/dtd/application-client_1_3.dtd'>
-
-
-
<application-client>
<display-name>connector-cciClient</display-name>
<ejb-ref>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application-withrar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application-withrar.xml
index c25c043..e5952fa 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application-withrar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application-withrar.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN'
+<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -18,10 +18,6 @@
-->
- 'http://java.sun.com/dtd/application_1_3.dtd'>
-
-
-
<application>
<display-name>CoffeeApp</display-name>
<description>Sample application to showcase CCI (Common Client Interface) of JCA (Java Connector Architecture)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application.xml
index eba6acd..9a1f9c8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/application.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN'
+<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN' 'http://java.sun.com/dtd/application_1_3.dtd'>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -18,10 +18,6 @@
-->
- 'http://java.sun.com/dtd/application_1_3.dtd'>
-
-
-
<application>
<display-name>CoffeeApp</display-name>
<description>Sample application to showcase CCI (Common Client Interface) of JCA (Java Connector Architecture)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/ejb-jar.xml
index 158a985..1a04d9c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/ejb-jar.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN'
+<!DOCTYPE ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN' 'http://java.sun.com/dtd/ejb-jar_2_0.dtd'>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -18,10 +18,6 @@
-->
- 'http://java.sun.com/dtd/ejb-jar_2_0.dtd'>
-
-
-
<ejb-jar>
<display-name>CoffeeJAR</display-name>
<enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/sun-application-client.xml
index e9f6448..0740422 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/sun-application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/sun-application-client.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sun-application-client PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 Application Client 1.3//EN"
+ "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_3-0.dtd">
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -18,8 +20,6 @@
-->
- "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 Application Client 1.3//EN"
- "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_3-0.dtd">
<sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/sun-ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/sun-ra.xml
index c822be5..0e7e0fe 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/sun-ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/sun-ra.xml
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sun-connector PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 Connector 1.0//EN"
+ "http://www.sun.com/software/sunone/appserver/dtds/sun-connector_1_0-0.dtd">
<!--
Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -16,9 +18,6 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
-<!DOCTYPE sun-connector PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 Connector 1.0//EN"
- "http://www.sun.com/software/sunone/appserver/dtds/sun-connector_1_0-0.dtd">
<sun-connector>
<resource-adapter jndi-name="eis/CCIEIS" max-pool-size="20" steady-pool-size="10" max-wait-time-in-millis="300000"
idle-timeout-in-seconds="5000">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/web.xml
index 41ab057..0ad5517 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/descriptor/web.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN'
+ 'http://java.sun.com/j2ee/dtds/web-app_2_3.dtd'>
<!--
Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
@@ -18,8 +19,6 @@
-->
- 'http://java.sun.com/j2ee/dtds/web-app_2_3.dtd'>
-
<web-app>
<display-name>connector-cci-web</display-name>
<distributable></distributable>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/lib/cciblackbox-tx.jar b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/lib/cciblackbox-tx.jar
deleted file mode 100755
index 730b04d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/lib/cciblackbox-tx.jar
+++ /dev/null
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml
index 5be17df..c23bac3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml
@@ -33,222 +33,193 @@
&commonRun;
&testproperties;
-<!--
- <target name="all" depends="build,setup,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear, unsetup"/>
+ <target name="all" depends="build, disable-resource-validation, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
- <target name="run-test" depends="build,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear"/>
--->
- <target name="all" depends="build, disable-resource-validation, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common"/>
+ </target>
-<!--
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="deploy-war"/>
- <antcall target="run-war"/>
- <antcall target="undeploy-war"/>
- <antcall target="deploy-ear"/>
- <antcall target="run-ear"/>
- <antcall target="undeploy-ear"/>
- <antcall target="unsetup"/>
- </target>
--->
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <ant dir="ra" target="clean"/>
- </target>
-
- <target name="setup">
+ <target name="setup">
<antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/simpleBank.sql"/>
+ <param name="sql.file" value="sql/simpleBank.sql"/>
</antcall>
<antcall target="create-pool"/>
<antcall target="create-resource"/>
<antcall target="create-admin-object"/>
- </target>
- <target name="create-pool">
- <antcall target="create-connector-connpool-common">
- <param name="ra.name" value="${appname}App#jdbcra"/>
- <param name="connection.defname" value="javax.sql.DataSource"/>
- <param name="extra-params" value="--matchconnections=false"/>
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- </antcall>
- <antcall target="set-oracle-props">
- <param name="pool.type" value="connector"/>
- <param name="conpool.name" value="embedded-ra-pool"/>
- </antcall>
- </target>
+ </target>
+ <target name="create-pool">
+ <antcall target="create-connector-connpool-common">
+ <param name="ra.name" value="${appname}App#connectors-ra-redeploy-rars"/>
+ <param name="connection.defname" value="javax.sql.DataSource"/>
+ <param name="extra-params" value="--matchconnections=false"/>
+ <param name="connector.conpool.name" value="embedded-ra-pool"/>
+ </antcall>
+ <antcall target="set-oracle-props">
+ <param name="pool.type" value="connector"/>
+ <param name="conpool.name" value="embedded-ra-pool"/>
+ </antcall>
+ </target>
- <target name="disable-resource-validation">
- <antcall target="create-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="disable-resource-validation">
+ <antcall target="create-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false"/>
+ </antcall>
+ <antcall target="restart-server"/>
+ </target>
- <target name="enable-resource-validation">
- <antcall target="delete-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="enable-resource-validation">
+ <antcall target="delete-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false"/>
+ </antcall>
+ <antcall target="restart-server"/>
+ </target>
- <target name="create-resource">
- <antcall target="create-connector-resource-common">
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- <param name="connector.jndi.name" value="jdbc/ejb-annotation-subclassing"/>
- </antcall>
- </target>
+ <target name="create-resource">
+ <antcall target="create-connector-resource-common">
+ <param name="connector.conpool.name" value="embedded-ra-pool"/>
+ <param name="connector.jndi.name" value="jdbc/ejb-annotation-subclassing"/>
+ </antcall>
+ </target>
- <target name="create-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-annotation-subclassing:SchemaName=DBUSER:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
- </antcall>
- </target>
+ <target name="create-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#connectors-ra-redeploy-rars --property TableName=customer2:JndiName=jdbc/ejb-annotation-subclassing:SchemaName=DBUSER:NoOfRows=1"/>
+ <param name="operand.props" value="eis/jdbcAdmin"/>
+ </antcall>
+ </target>
- <target name="delete-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
- </target>
+ <target name="delete-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-admin-object"/>
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
+ </antcall>
+ </target>
- <target name="restart">
+ <target name="restart">
<antcall target="restart-server-instance-common"/>
- </target>
+ </target>
- <target name="create-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- </target>
+ <target name="create-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
+ <param name="operand.props" value="${appname}App#connectors-ra-redeploy-rars"/>
+ </antcall>
+ </target>
- <target name="delete-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
- </target>
+ <target name="delete-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-resource-adapter-config"/>
+ <param name="operand.props" value="${appname}App#connectors-ra-redeploy-rars"/>
+ </antcall>
+ </target>
- <target name="unsetup">
+ <target name="unsetup">
<antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/dropBankTables.sql"/>
- </antcall>
+ <param name="sql.file" value="sql/dropBankTables.sql"/>
+ </antcall>
<antcall target="delete-resource"/>
<antcall target="delete-pool"/>
<antcall target="delete-admin-object"/>
- </target>
+ </target>
- <target name="delete-pool">
- <antcall target="delete-connector-connpool-common">
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- </antcall>
- </target>
+ <target name="delete-pool">
+ <antcall target="delete-connector-connpool-common">
+ <param name="connector.conpool.name" value="embedded-ra-pool"/>
+ </antcall>
+ </target>
- <target name="delete-resource">
- <antcall target="delete-connector-resource-common">
- <param name="connector.jndi.name" value="jdbc/ejb-annotation-subclassing"/>
- </antcall>
- </target>
+ <target name="delete-resource">
+ <antcall target="delete-connector-resource-common">
+ <param name="connector.jndi.name" value="jdbc/ejb-annotation-subclassing"/>
+ </antcall>
+ </target>
- <target name="compile" depends="clean">
- <ant dir="ra" target="compile"/>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-servlet" />
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="ejb"/>
+ </antcall>
+ <antcall target="compile-servlet" />
+ </target>
- <target name="compile-servlet" depends="init-common">
- <mkdir dir="${build.classes.dir}"/>
- <echo message="common.xml: Compiling test source files" level="verbose"/>
- <javac srcdir="servlet"
+ <target name="compile-servlet" depends="init-common">
+ <mkdir dir="${build.classes.dir}"/>
+ <echo message="common.xml: Compiling test source files" level="verbose"/>
+ <javac srcdir="servlet"
destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
+ classpath="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
debug="on"
failonerror="true"/>
- </target>
+ </target>
-
- <target name="build-ra">
- <ant dir="ra" target="build"/>
- </target>
-
- <target name="build" depends="compile, build-ra">
+ <target name="build" depends="compile">
<property name="hasWebclient" value="yes"/>
- <ant dir="ra" target="assemble"/>
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="hasWebclient" value="yes"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="**/*.class"/>
+ <param name="ejbjar.classes" value="**/*.class"/>
</antcall>
<delete file="${assemble.dir}/${appname}.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
- appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="ra/publish/lib">
- <include name="*.rar"/>
- </fileset>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar" />
+ <include name="*.war" />
+ </fileset>
+ <fileset dir="${env.APS_HOME}/connectors-ra-redeploy/rars/target">
+ <include name="connectors-ra-redeploy-rars.rar" />
+ </fileset>
</ear>
- </target>
+ </target>
- <target name="deploy-ear" depends="init-common">
- <antcall target="create-password-alias">
- <param name="password.alias.name" value="ALIAS_TEST_PROPERTY"/>
- <param name="password.alias.file" value="aliaspassword.txt"/>
- </antcall>
- <antcall target="create-ra-config"/>
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear" depends="init-common">
+ <antcall target="create-password-alias">
+ <param name="password.alias.name" value="ALIAS_TEST_PROPERTY" />
+ <param name="password.alias.file" value="aliaspassword.txt" />
+ </antcall>
+ <antcall target="create-ra-config" />
+ <antcall target="deploy-common" />
+ </target>
- <target name="deploy-war" depends="init-common">
- <antcall target="deploy-war-common"/>
- </target>
+ <target name="deploy-war" depends="init-common">
+ <antcall target="deploy-war-common" />
+ </target>
- <target name="run-war" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="annotation-embeddedweb (stand-alone war based)"/>
- </antcall>
- </target>
+ <target name="run-war" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="annotation-embeddedweb (stand-alone war based)"/>
+ </antcall>
+ </target>
- <target name="run-ear" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="annotation-embeddedweb (ear based)"/>
- </antcall>
- </target>
+ <target name="run-ear" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="annotation-embeddedweb (ear based)"/>
+ </antcall>
+ </target>
- <target name="undeploy-ear" depends="init-common">
- <antcall target="delete-ra-config"/>
- <antcall target="undeploy-common"/>
- <antcall target="delete-password-alias">
- <param name="password.alias.name" value="ALIAS_TEST_PROPERTY"/>
- </antcall>
- </target>
+ <target name="undeploy-ear" depends="init-common">
+ <antcall target="delete-ra-config"/>
+ <antcall target="undeploy-common"/>
+ <antcall target="delete-password-alias">
+ <param name="password.alias.name" value="ALIAS_TEST_PROPERTY"/>
+ </antcall>
+ </target>
- <target name="undeploy-war" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy-war" depends="init-common">
+ <antcall target="undeploy-war-common"/>
+ </target>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <target name="usage">
+ <antcall target="usage-common"/>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/descriptor/application.xml
index 4ea2779..faf67c3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/descriptor/application.xml
@@ -25,7 +25,7 @@
</module>
<module>
- <connector>jdbcra.rar</connector>
+ <connector>connectors-ra-redeploy-rars.rar</connector>
</module>
<module>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.properties
deleted file mode 100755
index fd21c3d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0, which is available at
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-
-### Component Properties ###
-src.dir=src
-component.publish.home=.
-component.classes.dir=${component.publish.home}/internal/classes
-component.lib.home=${component.publish.home}/lib
-component.publish.home=publish
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.xml
deleted file mode 100755
index 7e681aa..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE project [
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
- <!ENTITY common SYSTEM "../../../../../config/common.xml">
- <!ENTITY testcommon SYSTEM "../../../../../config/properties.xml">
-]>
-
-<project name="JDBCConnector top level" default="build">
- <property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
- &common;
- &testcommon;
- <property file="./build.properties"/>
-
- <target name="build" depends="compile,assemble" />
-
-
- <!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
- <target name="init" description="${component.name} initialization">
- <tstamp>
- <format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
- <echo message="Building component ${component.name}"/>
- <mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
- </target>
- <!-- compile -->
- <target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
- <!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
- destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- <include name="com/sun/jdbcra/**"/>
- <include name="com/sun/appserv/**"/>
- </javac>
- </target>
-
- <target name="all" depends="build"/>
-
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
-
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete file="${component.lib.home}/ra.xml"/>
-
- </target>
-
- <target name="clean" description="Clean the build">
- <delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${component.classes.dir}"/>
- <fileset dir="${component.lib.home}"/>
- </delete>
- </target>
-
-</project>
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
deleted file mode 100755
index b6ef30b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.appserv.jdbcra;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
- * server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
- * application server.
- * <p>A sample code for getting driver's connection implementation would like
- * the following.
- * <pre>
- InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
- Connection con = ds.getConnection();
- Connection drivercon = ds.getConnection(con);
-
- // Do db operations.
-
- con.close();
- </pre>
- *
- * @author Binod P.G
- */
-public interface DataSource extends javax.sql.DataSource {
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
deleted file mode 100755
index 8c55d51..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.StringTokenizer;
-import java.util.Enumeration;
-import com.sun.jdbcra.util.MethodExecutor;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Utility class, which would create necessary Datasource object according to the
- * specification.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
- */
-public class DataSourceObjectBuilder implements java.io.Serializable{
-
- private DataSourceSpec spec;
-
- private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
- */
- public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
- }
-
- /**
- * Construct the DataSource Object from the spec.
- *
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
- */
- public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
- Object dataSourceObject = getDataSourceObject();
- System.out.println("V3-TEST : " + dataSourceObject);
- Method[] methods = dataSourceObject.getClass().getMethods();
- for (int i=0; i < methods.length; i++) {
- String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
- }
- return dataSourceObject;
- }
-
- /**
- * Get the extra driver properties from the DataSourceSpec object and
- * parse them to a set of methodName and parameters. Prepare a hashtable
- * containing these details and return.
- *
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
- */
- private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
-
- String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
- }
-
- /**
- * Creates a Datasource object according to the spec.
- *
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
- */
- private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
- Class dataSourceClass = Class.forName(className);
- Object dataSourceObject = dataSourceClass.newInstance();
- System.out.println("V3-TEST : " + dataSourceObject);
- return dataSourceObject;
- } catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
- throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
- } catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
- throw new ResourceException("Error in instantiating" + className);
- } catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
- throw new ResourceException("Access Error in instantiating" + className);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
deleted file mode 100755
index 1c4b072..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.util.Hashtable;
-
-/**
- * Encapsulate the DataSource object details obtained from
- * ManagedConnectionFactory.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class DataSourceSpec implements java.io.Serializable{
-
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
- private Hashtable details = new Hashtable();
-
- /**
- * Set the property.
- *
- * @param property Property Name to be set.
- * @param value Value of property to be set.
- */
- public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
- }
-
- /**
- * Get the value of property
- *
- * @return Value of the property.
- */
- public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
- }
-
- /**
- * Checks whether two <code>DataSourceSpec</code> objects
- * are equal or not.
- *
- * @param obj Instance of <code>DataSourceSpec</code> object.
- */
- public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
- }
-
- /**
- * Retrieves the hashCode of this <code>DataSourceSpec</code> object.
- *
- * @return hashCode of this object.
- */
- public int hashCode() {
- return this.details.hashCode();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
deleted file mode 100755
index 3b4faeb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/common"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/common.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
deleted file mode 100755
index c6e2b60..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ /dev/null
@@ -1,677 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.sql.*;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-
-/**
- * Holds the java.sql.Connection object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class ConnectionHolder implements Connection{
-
- private Connection con;
-
- private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
- private boolean isClosed = false;
-
- private boolean valid = true;
-
- private boolean active = false;
- /**
- * The active flag is false when the connection handle is
- * created. When a method is invoked on this object, it asks
- * the ManagedConnection if it can be the active connection
- * handle out of the multiple connection handles. If the
- * ManagedConnection reports that this connection handle
- * can be active by setting this flag to true via the setActive
- * function, the above method invocation succeeds; otherwise
- * an exception is thrown.
- */
-
- /**
- * Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
- */
- public ConnectionHolder(Connection con, ManagedConnection mc) {
- this.con = con;
- this.mc = mc;
- }
-
- /**
- * Returns the actual connection in this holder object.
- *
- * @return Connection object.
- */
- Connection getConnection() {
- return con;
- }
-
- /**
- * Sets the flag to indicate that, the connection is wrapped already or not.
- *
- * @param wrapFlag
- */
- void wrapped(boolean wrapFlag){
- this.wrappedAlready = wrapFlag;
- }
-
- /**
- * Returns whether it is wrapped already or not.
- *
- * @return wrapped flag.
- */
- boolean isWrapped(){
- return wrappedAlready;
- }
-
- /**
- * Returns the <code>ManagedConnection</code> instance responsible
- * for this connection.
- *
- * @return <code>ManagedConnection</code> instance.
- */
- ManagedConnection getManagedConnection() {
- return mc;
- }
-
- /**
- * Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
- *
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
- */
- void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
- }
-
- /**
- * Clears all warnings reported for the underlying connection object.
- *
- * @throws SQLException In case of a database error.
- */
- public void clearWarnings() throws SQLException{
- checkValidity();
- con.clearWarnings();
- }
-
- /**
- * Closes the logical connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void close() throws SQLException{
- isClosed = true;
- mc.connectionClosed(null, this);
- }
-
- /**
- * Invalidates this object.
- */
- public void invalidate() {
- valid = false;
- }
-
- /**
- * Closes the physical connection involved in this.
- *
- * @throws SQLException In case of a database error.
- */
- void actualClose() throws SQLException{
- con.close();
- }
-
- /**
- * Commit the changes in the underlying Connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void commit() throws SQLException {
- checkValidity();
- con.commit();
- }
-
- /**
- * Creates a statement from the underlying Connection
- *
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement() throws SQLException {
- checkValidity();
- return con.createStatement();
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
- *
- * @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
- /**
- * Retrieves the underlying <code>Connection</code> object's catalog name.
- *
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
- */
- public String getCatalog() throws SQLException {
- checkValidity();
- return con.getCatalog();
- }
-
- /**
- * Retrieves the current holdability of <code>ResultSet</code> objects created
- * using this connection object.
- *
- * @return holdability value.
- * @throws SQLException In case of a database error.
- */
- public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
- }
-
- /**
- * Retrieves the <code>DatabaseMetaData</code>object from the underlying
- * <code> Connection </code> object.
- *
- * @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
- */
- public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
- }
-
- /**
- * Retrieves this <code>Connection</code> object's current transaction isolation level.
- *
- * @return Transaction level
- * @throws SQLException In case of a database error.
- */
- public int getTransactionIsolation() throws SQLException {
- checkValidity();
- return con.getTransactionIsolation();
- }
-
- /**
- * Retrieves the <code>Map</code> object associated with
- * <code> Connection</code> Object.
- *
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
- */
- public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
- }
-
-/*
- public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-*/
-
- /**
- * Retrieves the the first warning reported by calls on the underlying
- * <code>Connection</code> object.
- *
- * @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
- */
- public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
- }
-
- /**
- * Retrieves whether underlying <code>Connection</code> object is closed.
- *
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
- */
- public boolean isClosed() throws SQLException {
- return isClosed;
- }
-
- /**
- * Retrieves whether this <code>Connection</code> object is read-only.
- *
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
- */
- public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
- }
-
- /**
- * Converts the given SQL statement into the system's native SQL grammer.
- *
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
- */
- public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
- }
-
- public Clob createClob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Blob createBlob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public NClob createNClob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public SQLXML createSQLXML() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isValid(int timeout) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void setClientInfo(String name, String value) throws SQLClientInfoException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void setClientInfo(Properties properties) throws SQLClientInfoException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public String getClientInfo(String name) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Properties getClientInfo() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- /**
- * Removes the given <code>Savepoint</code> object from the current transaction.
- *
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
- */
- public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
- /**
- * Rolls back the changes made in the current transaction.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
- }
-
- /**
- * Rolls back the changes made after the savepoint.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
- }
-
- /**
- * Sets the auto-commmit mode of the <code>Connection</code> object.
- *
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
- }
-
- /**
- * Sets the catalog name to the <code>Connection</code> object
- *
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
- */
- public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
- }
-
- /**
- * Sets the holdability of <code>ResultSet</code> objects created
- * using this <code>Connection</code> object.
- *
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
- */
- public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
- }
-
- /**
- * Puts the connection in read-only mode as a hint to the driver to
- * perform database optimizations.
- *
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
- */
- public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
- }
-
- /**
- * Creates and unnamed savepoint and returns an object corresponding to that.
- *
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
- }
-
- /**
- * Creates a savepoint with the name and returns an object corresponding to that.
- *
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
- /**
- * Creates the transaction isolation level.
- *
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
- */
- public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
- /**
- * Installs the given <code>Map</code> object as the tyoe map for this
- * <code> Connection </code> object.
- *
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
- */
- public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
- }
-
- public int getNetworkTimeout() throws SQLException {
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void abort(Executor executor) throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public String getSchema() throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void setSchema(String schema) throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
-
- /**
- * Checks the validity of this object
- */
- private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
- }
-
- /**
- * Sets the active flag to true
- *
- * @param actv boolean
- */
- void setActive(boolean actv) {
- active = actv;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
deleted file mode 100755
index fb0fdab..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import java.sql.DriverManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import java.sql.SQLException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- * This class is extended by the DataSource specific <code>ManagedConnection</code> factories
- * and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
- java.io.Serializable {
-
- protected DataSourceSpec spec = new DataSourceSpec();
- protected transient DataSourceObjectBuilder dsObjBuilder;
-
- protected java.io.PrintWriter logWriter = null;
- protected jakarta.resource.spi.ResourceAdapter ra = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory() {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory()");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
- return cf;
- }
-
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager)");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
- }
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public abstract boolean equals(Object other);
-
- /**
- * Get the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
- */
- public java.io.PrintWriter getLogWriter() {
- return logWriter;
- }
-
- /**
- * Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
- */
- public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
- if(logWriter != null) {
- logWriter.println("In getResourceAdapter");
- }
- return ra;
- }
-
- /**
- * Returns the hash code for this <code>ManagedConnectionFactory</code>.
- *
- * @return hash code for this <code>ManagedConnectionFactory</code>
- */
- public int hashCode(){
- if(logWriter != null) {
- logWriter.println("In hashCode");
- }
- return spec.hashCode();
- }
-
- /**
- * Returns a matched <code>ManagedConnection</code> from the candidate
- * set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- */
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
- javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In matchManagedConnections");
- }
-
- if(connectionSet == null) {
- return null;
- }
-
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- java.util.Iterator iter = connectionSet.iterator();
- com.sun.jdbcra.spi.ManagedConnection mc = null;
- while(iter.hasNext()) {
- try {
- mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
- } catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
- throw new ResourceException(nsee.getMessage());
- }
- if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
- mc.connectionErrorOccurred(re, null);
- }
- } else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
- mc.connectionErrorOccurred(re, null);
- }
- }
- }
- return null;
- }
-
- //GJCINT
- /**
- * Checks if a <code>ManagedConnection</code> is to be validated or not
- * and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
- */
- void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- if(mc.isTransactionInProgress()) {
- return;
- }
-
- boolean connectionValidationRequired =
- (new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
- if( connectionValidationRequired == false || mc == null) {
- return;
- }
-
-
- String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
- mc.checkIfValid();
- /**
- * The above call checks if the actual physical connection
- * is usable or not.
- */
- java.sql.Connection con = mc.getActualConnection();
-
- if(validationMethod.equals("auto-commit") == true) {
- isValidByAutoCommit(con);
- } else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
- isValidByMetaData(con);
- } else if(validationMethod.equalsIgnoreCase("table") == true) {
- isValidByTableQuery(con, spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME));
- } else {
- throw new ResourceException("The validation method is not proper");
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- // Notice that using something like
- // dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
- // some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
- // Also notice that some XA data sources will throw and exception if
- // you try to call setAutoCommit, for them this method is not recommended
-
- boolean ac = con.getAutoCommit();
- if (ac) {
- con.setAutoCommit(false);
- } else {
- con.rollback(); // prevents uncompleted transaction exceptions
- con.setAutoCommit(true);
- }
-
- con.setAutoCommit(ac);
-
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.DatabaseMetaData dmd = con.getMetaData();
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException("The connection is not valid as "
- + "getting the meta data failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByTableQuery(java.sql.Connection con,
- String tableName) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.Statement stmt = con.createStatement();
- java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
- throw new ResourceException("The connection is not valid as "
- + "querying the table " + tableName + " failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
- * for the <code>ManagedConnection</code> passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
- }
-
- /**
- * Resets the isolation level for the <code>ManagedConnection</code> passed.
- * If the transaction level is to be guaranteed to be the same as the one
- * present when this <code>ManagedConnection</code> was created, as specified
- * by the <code>ConnectionRequestInfo</code> passed, it sets the transaction
- * isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
- * it sets it to the transaction isolation passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
- }
-
- /**
- * Gets the integer equivalent of the string specifying
- * the transaction isolation.
- *
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
- */
- private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
- }
-
- /**
- * Set the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(java.io.PrintWriter out) {
- logWriter = out;
- }
-
- /**
- * Set the associated <code>ResourceAdapter</code> JavaBean.
- *
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
- */
- public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setUser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getUser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setuser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getuser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setPassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getPassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setpassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getpassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setClassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getClassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setclassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getclassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setConnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getConnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setconnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getconnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setValidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getValidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setvalidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getvalidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setValidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getValidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setvalidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getvalidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void setTransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String getTransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void settransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String gettransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getGuaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setguaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getguaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
deleted file mode 100755
index 35ab2b9..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.endpoint.MessageEndpointFactory;
-import jakarta.resource.NotSupportedException;
-import javax.transaction.xa.XAResource;
-import jakarta.resource.spi.*;
-
-/**
- * <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
- */
-@Connector(
- description = "Resource adapter wrapping Datasource implementation of driver",
- displayName = "DataSource Resource Adapter",
- vendorName = "Sun Microsystems",
- eisType = "Database",
- version = "1.0",
- licenseRequired = false,
- transactionSupport = TransactionSupport.TransactionSupportLevel.LocalTransaction,
- authMechanisms = { @AuthenticationMechanism(
- authMechanism = "BasicPassword",
- credentialInterface = AuthenticationMechanism.CredentialInterface.PasswordCredential
- )},
- reauthenticationSupport = false
-)
-public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
-
- public String raProp = null;
-
- /**
- * Empty method implementation for endpointActivation
- * which just throws <code>NotSupportedException</code>
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
- */
- public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty method implementation for endpointDeactivation
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- */
- public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
- }
-
- /**
- * Empty method implementation for getXAResources
- * which just throws <code>NotSupportedException</code>
- *
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
- */
- public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty implementation of start method
- *
- * @param ctx <code>BootstrapContext</code>
- */
- public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
- System.out.println("Resource Adapter is starting with configuration :" + raProp);
- if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
- }
-
- /**
- * Empty implementation of stop method
- */
- public void stop() {
-
- }
-
- public void setRAProperty(String s) {
- raProp = s;
- }
-
- public String getRAProperty() {
- return raProp;
- }
-
- private void validateDealiasing(String propertyName, String propertyValue){
- System.out.println("Validating property ["+propertyName+"] with value ["+propertyValue+"] in ResourceAdapter bean");
- //check whether the value is dealiased or not and fail
- //if it's not dealiased.
- if(propertyValue != null && propertyValue.contains("${ALIAS")){
- throw new IllegalArgumentException(propertyName + "'s value is not de-aliased : " + propertyValue);
- }
- }
-
- private String aliasTest;
-
- @ConfigProperty(
- defaultValue = "${ALIAS=ALIAS_TEST_PROPERTY}",
- type = java.lang.String.class,
- confidential = true
- )
- public void setAliasTest (String value) {
- validateDealiasing("AliasTest", value);
- System.out.println("setAliasTest called : " + value);
- aliasTest = value;
- }
-
- public String getAliasTest () {
- return aliasTest;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
deleted file mode 100755
index e006b1d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
- </target>
-
- <target name="build14" depends="compile14, package14"/>
- <target name="build13"/>
- <target name="build" depends="build14, build13"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
deleted file mode 100755
index d126fab..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<connector xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false" version="1.6" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/connector_1_6.xsd">
-
- <vendor-name>Sun Microsystems</vendor-name>
- <eis-type>Database</eis-type>
- <resourceadapter-version>1.0</resourceadapter-version>
-
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
- <!-- There can be any number of these elements including 0 -->
- <config-property>
- <config-property-name>User</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbuser</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>UserName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbuser</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Password</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbpassword</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>URL</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Description</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>Oracle thin driver Datasource</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ClassName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ConnectionAttributes</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>;create=true</config-property-value>
- </config-property>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
- <connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
- <connection-interface>java.sql.Connection</connection-interface>
-
- <connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
- </connection-definition>
-
- <transaction-support>LocalTransaction</transaction-support>
- <authentication-mechanism>
- <!-- There can be any number of "description" elements including 0 -->
- <!-- Not including the "description" element -->
-
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
-
- <reauthentication-support>false</reauthentication-support>
-
- </outbound-resourceadapter>
- </resourceadapter>
-</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
deleted file mode 100755
index 2ee36c5..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-
-/**
- * ConnectionManager implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
-
- /**
- * Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
- *
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
- */
- public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
- }
-
- /*
- * This class could effectively implement Connection pooling also.
- * Could be done for FCS.
- */
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
deleted file mode 100755
index ddd0a28..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-/**
- * ConnectionRequestInfo implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
-
- private String user;
- private String password;
-
- /**
- * Constructs a new <code>ConnectionRequestInfo</code> object
- *
- * @param user User Name.
- * @param password Password
- */
- public ConnectionRequestInfo(String user, String password) {
- this.user = user;
- this.password = password;
- }
-
- /**
- * Retrieves the user name of the ConnectionRequestInfo.
- *
- * @return User name of ConnectionRequestInfo.
- */
- public String getUser() {
- return user;
- }
-
- /**
- * Retrieves the password of the ConnectionRequestInfo.
- *
- * @return Password of ConnectionRequestInfo.
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Verify whether two ConnectionRequestInfos are equal.
- *
- * @return True, if they are equal and false otherwise.
- */
- public boolean equals(Object obj) {
- if (obj == null) return false;
- if (obj instanceof ConnectionRequestInfo) {
- ConnectionRequestInfo other = (ConnectionRequestInfo) obj;
- return (isEqual(this.user, other.user) &&
- isEqual(this.password, other.password));
- } else {
- return false;
- }
- }
-
- /**
- * Retrieves the hashcode of the object.
- *
- * @return hashCode.
- */
- public int hashCode() {
- String result = "" + user + password;
- return result.hashCode();
- }
-
- /**
- * Compares two objects.
- *
- * @param o1 First object.
- * @param o2 Second object.
- */
- private boolean isEqual(Object o1, Object o2) {
- if (o1 == null) {
- return (o2 == null);
- } else {
- return o1.equals(o2);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
deleted file mode 100755
index 5d69782..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import jakarta.resource.spi.ConnectionDefinition;
-import jakarta.resource.spi.ConfigProperty;
-
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
- */
-
-@ConnectionDefinition(
- connection = java.sql.Connection.class,
- connectionImpl = com.sun.jdbcra.spi.ConnectionHolder.class,
- connectionFactory = javax.sql.DataSource.class,
- connectionFactoryImpl = com.sun.jdbcra.spi.DataSource.class
-)
-public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
- private transient javax.sql.DataSource dataSourceObj;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In createManagedConnection");
- }
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- if(dataSourceObj == null) {
- if(dsObjBuilder == null) {
- dsObjBuilder = new DataSourceObjectBuilder(spec);
- }
-
- System.out.println("V3-TEST : before getting datasource object");
- try {
- dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
- } catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
- throw new jakarta.resource.ResourceException(cce.getMessage());
- }
- }
-
- java.sql.Connection dsConn = null;
-
- try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
- } catch(java.sql.SQLException sqle) {
- sqle.printStackTrace();
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
- sqle.getMessage());
- } catch(Exception e){
- System.out.println("V3-TEST : unable to get connection");
- e.printStackTrace();
- }
- System.out.println("V3-TEST : got connection");
-
- com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
- //GJCINT
-/*
- setIsolation(mc);
- isValid(mc);
-*/
- System.out.println("V3-TEST : returning connection");
- return mc;
- }
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public boolean equals(Object other) {
- if(logWriter != null) {
- logWriter.println("In equals");
- }
- /**
- * The check below means that two ManagedConnectionFactory objects are equal
- * if and only if their properties are the same.
- */
- if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
- (com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
- return this.spec.equals(otherMCF.spec);
- }
- return false;
- }
-
- /**
- * Sets the server name.
- *
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
- */
- public void setserverName(String serverName) {
- spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
- }
-
- /**
- * Gets the server name.
- *
- * @return serverName
- * @see <code>setServerName</code>
- */
- public String getserverName() {
- return spec.getDetail(DataSourceSpec.SERVERNAME);
- }
-
- private void validateDealiasing(String propertyName, String propertyValue){
- System.out.println("Validating property ["+propertyName+"] with value ["+propertyValue+"] in DSMCF");
- //check whether the value is dealiased or not and fail
- //if it's not dealiased.
- if(propertyValue != null && propertyValue.contains("${ALIAS")){
- throw new IllegalArgumentException(propertyName + "'s value is not de-aliased : " + propertyValue);
- }
- }
-
-
- /**
- * Sets the server name.
- *
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
- */
- @ConfigProperty(
- defaultValue = "localhost",
- type = java.lang.String.class
- )
- public void setServerName(String serverName) {
- spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
- }
-
- /**
- * Gets the server name.
- *
- * @return serverName
- * @see <code>setServerName</code>
- */
- public String getServerName() {
- return spec.getDetail(DataSourceSpec.SERVERNAME);
- }
-
- private String aliasTest;
-
- @ConfigProperty(
- defaultValue = "${ALIAS=ALIAS_TEST_PROPERTY}",
- type = java.lang.String.class,
- confidential = true
- )
- public void setAliasTest (String value) {
- validateDealiasing("AliasTest", value);
- System.out.println("setAliasTest called : " + value);
- aliasTest = value;
- }
-
- public String getAliasTest () {
- return aliasTest;
- }
-
- /**
- * Sets the port number.
- *
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
- */
- public void setportNumber(String portNumber) {
- spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
- }
-
- /**
- * Gets the port number.
- *
- * @return portNumber
- * @see <code>setPortNumber</code>
- */
- public String getportNumber() {
- return spec.getDetail(DataSourceSpec.PORTNUMBER);
- }
-
- /**
- * Sets the port number.
- *
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
- */
- @ConfigProperty(
- defaultValue = "1527",
- type = java.lang.String.class
- )
- public void setPortNumber(String portNumber) {
- spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
- }
-
- /**
- * Gets the port number.
- *
- * @return portNumber
- * @see <code>setPortNumber</code>
- */
- public String getPortNumber() {
- return spec.getDetail(DataSourceSpec.PORTNUMBER);
- }
-
- /**
- * Sets the database name.
- *
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
- */
- public void setdatabaseName(String databaseName) {
- spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
- }
-
- /**
- * Gets the database name.
- *
- * @return databaseName
- * @see <code>setDatabaseName</code>
- */
- public String getdatabaseName() {
- return spec.getDetail(DataSourceSpec.DATABASENAME);
- }
-
- /**
- * Sets the database name.
- *
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
- */
- @ConfigProperty(
- defaultValue="testdb",
- type=java.lang.String.class
- )
- public void setDatabaseName(String databaseName) {
- spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
- }
-
- /**
- * Gets the database name.
- *
- * @return databaseName
- * @see <code>setDatabaseName</code>
- */
- public String getDatabaseName() {
- return spec.getDetail(DataSourceSpec.DATABASENAME);
- }
-
- /**
- * Sets the data source name.
- *
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
- */
- public void setdataSourceName(String dsn) {
- spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
- }
-
- /**
- * Gets the data source name.
- *
- * @return dsn
- * @see <code>setDataSourceName</code>
- */
- public String getdataSourceName() {
- return spec.getDetail(DataSourceSpec.DATASOURCENAME);
- }
-
- /**
- * Sets the data source name.
- *
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
- */
- @ConfigProperty(
- type=java.lang.String.class
- )
- public void setDataSourceName(String dsn) {
- spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
- }
-
- /**
- * Gets the data source name.
- *
- * @return dsn
- * @see <code>setDataSourceName</code>
- */
- public String getDataSourceName() {
- return spec.getDetail(DataSourceSpec.DATASOURCENAME);
- }
-
- /**
- * Sets the description.
- *
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
- */
- public void setdescription(String desc) {
- spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
- }
-
- /**
- * Gets the description.
- *
- * @return desc
- * @see <code>setDescription</code>
- */
- public String getdescription() {
- return spec.getDetail(DataSourceSpec.DESCRIPTION);
- }
-
- /**
- * Sets the description.
- *
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
- */
- public void setDescription(String desc) {
- spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
- }
-
- /**
- * Gets the description.
- *
- * @return desc
- * @see <code>setDescription</code>
- */
- public String getDescription() {
- return spec.getDetail(DataSourceSpec.DESCRIPTION);
- }
-
- /**
- * Sets the network protocol.
- *
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
- */
- public void setnetworkProtocol(String nwProtocol) {
- spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
- }
-
- /**
- * Gets the network protocol.
- *
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
- */
- public String getnetworkProtocol() {
- return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
- }
-
- /**
- * Sets the network protocol.
- *
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
- */
- public void setNetworkProtocol(String nwProtocol) {
- spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
- }
-
- /**
- * Gets the network protocol.
- *
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
- */
- public String getNetworkProtocol() {
- return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
- }
-
- /**
- * Sets the role name.
- *
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
- */
- public void setroleName(String roleName) {
- spec.setDetail(DataSourceSpec.ROLENAME, roleName);
- }
-
- /**
- * Gets the role name.
- *
- * @return roleName
- * @see <code>setRoleName</code>
- */
- public String getroleName() {
- return spec.getDetail(DataSourceSpec.ROLENAME);
- }
-
- /**
- * Sets the role name.
- *
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
- */
- public void setRoleName(String roleName) {
- spec.setDetail(DataSourceSpec.ROLENAME, roleName);
- }
-
- /**
- * Gets the role name.
- *
- * @return roleName
- * @see <code>setRoleName</code>
- */
- public String getRoleName() {
- return spec.getDetail(DataSourceSpec.ROLENAME);
- }
-
-
- /**
- * Sets the login timeout.
- *
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
- */
- public void setloginTimeOut(String loginTimeOut) {
- spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
- }
-
- /**
- * Gets the login timeout.
- *
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
- */
- public String getloginTimeOut() {
- return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
- }
-
- /**
- * Sets the login timeout.
- *
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
- */
- public void setLoginTimeOut(String loginTimeOut) {
- spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
- }
-
- /**
- * Gets the login timeout.
- *
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
- */
- public String getLoginTimeOut() {
- return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
- }
-
- /**
- * Sets the delimiter.
- *
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
- */
- public void setdelimiter(String delim) {
- spec.setDetail(DataSourceSpec.DELIMITER, delim);
- }
-
- /**
- * Gets the delimiter.
- *
- * @return delim
- * @see <code>setDelimiter</code>
- */
- public String getdelimiter() {
- return spec.getDetail(DataSourceSpec.DELIMITER);
- }
-
- /**
- * Sets the delimiter.
- *
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
- */
- @ConfigProperty(
- defaultValue = "#",
- type = java.lang.String.class
- )
- public void setDelimiter(String delim) {
- spec.setDetail(DataSourceSpec.DELIMITER, delim);
- }
-
- /**
- * Gets the delimiter.
- *
- * @return delim
- * @see <code>setDelimiter</code>
- */
- public String getDelimiter() {
- return spec.getDetail(DataSourceSpec.DELIMITER);
- }
-
- /**
- * Sets the driver specific properties.
- *
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
- */
- public void setdriverProperties(String driverProps) {
- spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
- }
-
- /**
- * Gets the driver specific properties.
- *
- * @return driverProps
- * @see <code>setDriverProperties</code>
- */
- public String getdriverProperties() {
- return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- }
-
- /**
- * Sets the driver specific properties.
- *
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
- */
- public void setDriverProperties(String driverProps) {
- spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
- }
-
- /**
- * Gets the driver specific properties.
- *
- * @return driverProps
- * @see <code>setDriverProperties</code>
- */
- public String getDriverProperties() {
- return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- }
-
- /*
- * Check if the PasswordCredential passed for this get connection
- * request is equal to the user/passwd of this connection pool.
- */
- private boolean isEqual( PasswordCredential pc, String user,
- String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
-
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
deleted file mode 100755
index 4436215..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ConnectionManager;
-import jakarta.resource.ResourceException;
-import javax.naming.Reference;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
- private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
- private int loginTimeout;
- private PrintWriter logWriter;
- private String description;
- private Reference reference;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Constructs <code>DataSource</code> object. This is created by the
- * <code>ManagedConnectionFactory</code> object.
- *
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
- */
- public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- re.printStackTrace();
- throw new SQLException (re.getMessage());
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException {
-
- Connection driverCon = con;
- if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
-
- return driverCon;
- }
-
- /**
- * Get the login timeout
- *
- * @return login timeout.
- * @throws SQLException If a database error occurs.
- */
- public int getLoginTimeout() throws SQLException{
- return loginTimeout;
- }
-
- /**
- * Set the login timeout
- *
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
- */
- public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
- }
-
- /**
- * Get the logwriter object.
- *
- * @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
- */
- public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
- }
-
- /**
- * Set the logwriter on this object.
- *
- * @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
- */
- public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
- public Logger getParentLogger() throws SQLFeatureNotSupportedException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
- }
- /**
- * Retrieves the description.
- *
- * @return Description about the DataSource.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Set the description.
- *
- * @param description Description about the DataSource.
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Get the reference.
- *
- * @return <code>Reference</code>object.
- */
- public Reference getReference() {
- return reference;
- }
-
- /**
- * Get the reference.
- *
- * @param reference <code>Reference</code> object.
- */
- public void setReference(Reference reference) {
- this.reference = reference;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
deleted file mode 100755
index bec0d6b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-public interface JdbcSetupAdmin {
-
- public void setTableName(String db);
-
- public String getTableName();
-
- public void setJndiName(String name);
-
- public String getJndiName();
-
- public void setSchemaName(String name);
-
- public String getSchemaName();
-
- public void setNoOfRows(Integer i);
-
- public Integer getNoOfRows();
-
- public boolean checkSetup();
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
deleted file mode 100755
index 0ade38f..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.naming.*;
-import javax.sql.*;
-import jakarta.resource.spi.Activation;
-import jakarta.resource.spi.AdministeredObject;
-import jakarta.resource.spi.ConfigProperty;
-import java.sql.*;
-// import javax.sql.DataSource;
-@AdministeredObject(
- adminObjectInterfaces = {com.sun.jdbcra.spi.JdbcSetupAdmin.class}
-)
-public class JdbcSetupAdminImpl implements JdbcSetupAdmin {
-
- private String tableName;
-
- private String jndiName;
-
- private String schemaName;
-
- private Integer noOfRows;
-
- @ConfigProperty(
- type = java.lang.String.class
- )
- public void setTableName(String db) {
- tableName = db;
- }
-
- public String getTableName(){
- return tableName;
- }
-
- @ConfigProperty(
- type = java.lang.String.class
- )
- public void setJndiName(String name){
- jndiName = name;
- }
-
- public String getJndiName() {
- return jndiName;
- }
-
- @ConfigProperty(
- type = java.lang.String.class
- )
- public void setSchemaName(String name){
- schemaName = name;
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- @ConfigProperty(
- type = java.lang.Integer.class,
- defaultValue = "0"
- )
- public void setNoOfRows(Integer i) {
- System.out.println("Setting no of rows :" + i);
- noOfRows = i;
- }
-
- public Integer getNoOfRows() {
- return noOfRows;
- }
-
-private void printHierarchy(ClassLoader cl, int cnt){
-while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
-}
-}
-
-private void compareHierarchy(ClassLoader cl1, ClassLoader cl2 , int cnt){
-while(cl1 != null || cl2 != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
- cl1 = cl1.getParent();
- cl2 = cl2.getParent();
- cnt += 3;
-}
-}
-
-
- public boolean checkSetup(){
-
- if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
-
- if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
-
- Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
- try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
-/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
-
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
-
- System.out.println("Before lookup");
-*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
-
- DataSource ds = (DataSource)o ;
-/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-*/
- con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
-
- System.out.println("Executing query :" + qry);
-
- s = con.createStatement();
- rs = s.executeQuery(qry);
-
- int i = 0;
- if (rs.next()) {
- i++;
- }
-
- System.out.println("No of rows found:" + i);
- System.out.println("No of rows expected:" + noOfRows);
-
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
- } catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
deleted file mode 100755
index ce8635b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.LocalTransactionException;
-
-/**
- * <code>LocalTransaction</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
- private ManagedConnection mc;
-
- /**
- * Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
- */
- public LocalTransaction(ManagedConnection mc) {
- this.mc = mc;
- }
-
- /**
- * Begin a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
- */
- public void begin() throws ResourceException {
- //GJCINT
- mc.transactionStarted();
- try {
- mc.getActualConnection().setAutoCommit(false);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- }
-
- /**
- * Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
- */
- public void commit() throws ResourceException {
- Exception e = null;
- try {
- mc.getActualConnection().commit();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
- /**
- * Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
- */
- public void rollback() throws ResourceException {
- try {
- mc.getActualConnection().rollback();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
deleted file mode 100755
index f0443d0..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.*;
-import jakarta.resource.*;
-import javax.security.auth.Subject;
-import java.io.PrintWriter;
-import javax.transaction.xa.XAResource;
-import java.util.Set;
-import java.util.Hashtable;
-import java.util.Iterator;
-import javax.sql.PooledConnection;
-import javax.sql.XAConnection;
-import java.sql.Connection;
-import java.sql.SQLException;
-import jakarta.resource.NotSupportedException;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.LocalTransaction;
-import com.sun.jdbcra.spi.ManagedConnectionMetaData;
-import com.sun.jdbcra.util.SecurityUtils;
-import com.sun.jdbcra.spi.ConnectionHolder;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * <code>ManagedConnection</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
-
- public static final int ISNOTAPOOLEDCONNECTION = 0;
- public static final int ISPOOLEDCONNECTION = 1;
- public static final int ISXACONNECTION = 2;
-
- private boolean isDestroyed = false;
- private boolean isUsable = true;
-
- private int connectionType = ISNOTAPOOLEDCONNECTION;
- private PooledConnection pc = null;
- private java.sql.Connection actualConnection = null;
- private Hashtable connectionHandles;
- private PrintWriter logWriter;
- private PasswordCredential passwdCredential;
- private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
- private XAResource xar = null;
- public ConnectionHolder activeConnectionHandle;
-
- //GJCINT
- private int isolationLevelWhenCleaned;
- private boolean isClean = false;
-
- private boolean transactionInProgress = false;
-
- private ConnectionEventListener listener = null;
-
- private ConnectionEvent ce = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
-
- /**
- * Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
- * pooledConn parameter is expected to be non null and sqlConn parameter
- * is expected to be null in the case where the datasource object is a
- * connection pool datasource or an xa datasource.
- *
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
- */
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
- PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
- if(pooledConn == null && sqlConn == null) {
- throw new ResourceException("Connection object cannot be null");
- }
-
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
-
- pc = pooledConn;
- connectionHandles = new Hashtable();
- passwdCredential = passwdCred;
- this.mcf = mcf;
- if(passwdCredential != null &&
- this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
- "ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
- " the PasswordCredential for this ManagedConnection");
- }
- logWriter = mcf.getLogWriter();
- activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
- }
-
- /**
- * Adds a connection event listener to the ManagedConnection instance.
- *
- * @param listener <code>ConnectionEventListener</code>
- * @see <code>removeConnectionEventListener</code>
- */
- public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
- }
-
- /**
- * Used by the container to change the association of an application-level
- * connection handle with a <code>ManagedConnection</code> instance.
- *
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
- */
- public void associateConnection(Object connection) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In associateConnection");
- }
- checkIfValid();
- if(connection == null) {
- throw new ResourceException("Connection handle cannot be null");
- }
- ConnectionHolder ch = (ConnectionHolder) connection;
-
- com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
- ch.associateConnection(actualConnection, this);
- /**
- * The expectation from the above method is that the connection holder
- * replaces the actual sql connection it holds with the sql connection
- * handle being passed in this method call. Also, it replaces the reference
- * to the ManagedConnection instance with this ManagedConnection instance.
- * Any previous statements and result sets also need to be removed.
- */
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- ch.setActive(true);
- activeConnectionHandle = ch;
- }
-
- /**
- * Application server calls this method to force any cleanup on the
- * <code>ManagedConnection</code> instance. This method calls the invalidate
- * method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
- */
- public void cleanup() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In cleanup");
- }
- checkIfValid();
-
- /**
- * may need to set the autocommit to true for the non-pooled case.
- */
- //GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- throw new ResourceException("The isolation level for the physical connection "
- + "could not be retrieved");
- }
- }
- isClean = true;
-
- activeConnectionHandle = null;
- }
-
- /**
- * This method removes all the connection handles from the table
- * of connection handles and invalidates all of them so that any
- * operation on those connection handles throws an exception.
- *
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
- */
- private void invalidateAllConnectionHandles() throws ResourceException {
- Set handles = connectionHandles.keySet();
- Iterator iter = handles.iterator();
- try {
- while(iter.hasNext()) {
- ConnectionHolder ch = (ConnectionHolder)iter.next();
- ch.invalidate();
- }
- } catch(java.util.NoSuchElementException nsee) {
- throw new ResourceException("Could not find the connection handle: "+ nsee.getMessage());
- }
- connectionHandles.clear();
- }
-
- /**
- * Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
- */
- public void destroy() throws ResourceException{
- if(logWriter != null) {
- logWriter.println("In destroy");
- }
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
-
- activeConnectionHandle = null;
- try {
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- pc.close();
- pc = null;
- actualConnection = null;
- } else {
- actualConnection.close();
- actualConnection = null;
- }
- } catch(SQLException sqle) {
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
- + sqle.getMessage());
- }
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- }
-
- /**
- * Creates a new connection handle for the underlying physical
- * connection represented by the <code>ManagedConnection</code> instance.
- *
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
- */
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
- throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getConnection");
- }
- checkIfValid();
- com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
- PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
- if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
- throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
- }
-
- //GJCINT
- getActualConnection();
-
- /**
- * The following code in the if statement first checks if this ManagedConnection
- * is clean or not. If it is, it resets the transaction isolation level to what
- * it was when it was when this ManagedConnection was cleaned up depending on the
- * ConnectionRequestInfo passed.
- */
- if(isClean) {
- ((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
- }
-
-
- ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- connHolderObject.setActive(true);
- activeConnectionHandle = connHolderObject;
-
- return connHolderObject;
-
- }
-
- /**
- * Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
- *
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLocalTransaction");
- }
- checkIfValid();
- return new com.sun.jdbcra.spi.LocalTransaction(this);
- }
-
- /**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>setLogWriter</code>
- */
- public PrintWriter getLogWriter() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLogWriter");
- }
- checkIfValid();
-
- return logWriter;
- }
-
- /**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
- *
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getMetaData");
- }
- checkIfValid();
-
- return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
- }
-
- /**
- * Returns an <code>XAResource</code> instance.
- *
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
- */
- public XAResource getXAResource() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getXAResource");
- }
- checkIfValid();
-
- if(connectionType == ISXACONNECTION) {
- try {
- if(xar == null) {
- /**
- * Using the wrapper XAResource.
- */
- xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
- }
- return xar;
- } catch(SQLException sqle) {
- throw new ResourceException(sqle.getMessage());
- }
- } else {
- throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
- }
- }
-
- /**
- * Removes an already registered connection event listener from the
- * <code>ManagedConnection</code> instance.
- *
- * @param listener <code>ConnectionEventListener</code> to be removed
- * @see <code>addConnectionEventListener</code>
- */
- public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.start() has been called or from
- * LocalTransaction object when its begin() method is called.
- */
- void transactionStarted() {
- transactionInProgress = true;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.end() has been called or from
- * LocalTransaction object when its end() method is called.
- */
- void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
- }
-
- try {
- actualConnection.close();
- actualConnection = null;
- } catch(SQLException sqle) {
- actualConnection = null;
- }
- }
-
-
- isClean = true;
-
- activeConnectionHandle = null;
-
- }
-
- /**
- * Checks if a this ManagedConnection is involved in a transaction
- * or not.
- */
- public boolean isTransactionInProgress() {
- return transactionInProgress;
- }
-
- /**
- * Sets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(PrintWriter out) throws ResourceException {
- checkIfValid();
- logWriter = out;
- }
-
- /**
- * This method determines the type of the connection being held
- * in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
- */
- private int getConnectionType(PooledConnection pooledConn) {
- if(pooledConn == null) {
- return ISNOTAPOOLEDCONNECTION;
- } else if(pooledConn instanceof XAConnection) {
- return ISXACONNECTION;
- } else {
- return ISPOOLEDCONNECTION;
- }
- }
-
- /**
- * Returns the <code>ManagedConnectionFactory</code> instance that
- * created this <code>ManagedConnection</code> instance.
- *
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
- */
- ManagedConnectionFactory getManagedConnectionFactory() {
- return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
- }
-
- /**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
- *
- * @return the physical <code>java.sql.Connection</code>
- */
- //GJCINT
- java.sql.Connection getActualConnection() throws ResourceException {
- //GJCINT
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- try {
- if(actualConnection == null) {
- actualConnection = pc.getConnection();
- }
-
- } catch(SQLException sqle) {
- sqle.printStackTrace();
- throw new ResourceException(sqle.getMessage());
- }
- }
- return actualConnection;
- }
-
- /**
- * Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
- *
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
- */
- PasswordCredential getPasswordCredential() {
- return passwdCredential;
- }
-
- /**
- * Checks if this <code>ManagedConnection</code> is valid or not and throws an
- * exception if it is not valid. A <code>ManagedConnection</code> is not valid if
- * destroy has not been called and no physical connection error has
- * occurred rendering the physical connection unusable.
- *
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
- */
- //GJCINT
- void checkIfValid() throws ResourceException {
- if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
- "connection is not usable.");
- }
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when its close method is
- * called. This <code>ManagedConnection</code> instance invalidates the connection handle
- * and sends a CONNECTION_CLOSED event to all the registered event listeners.
- *
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
- */
- void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
- connHolderObject.invalidate();
-
- activeConnectionHandle = null;
-
- ce.setConnectionHandle(connHolderObject);
- listener.connectionClosed(ce);
-
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when it detects a connecion
- * related error.
- *
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
- */
- void connectionErrorOccurred(Exception e,
- com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
- ConnectionEventListener cel = this.listener;
- ConnectionEvent ce = null;
- ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
- : new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
- if (connHolderObject != null) {
- ce.setConnectionHandle(connHolderObject);
- }
-
- cel.connectionErrorOccurred(ce);
- isUsable = false;
- }
-
-
-
- /**
- * This method is called by the <code>XAResource</code> object when its start method
- * has been invoked.
- *
- */
- void XAStartOccurred() {
- try {
- actualConnection.setAutoCommit(false);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by the <code>XAResource</code> object when its end method
- * has been invoked.
- *
- */
- void XAEndOccurred() {
- try {
- actualConnection.setAutoCommit(true);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by a Connection Handle to check if it is
- * the active Connection Handle. If it is not the active Connection
- * Handle, this method throws an SQLException. Else, it
- * returns setting the active Connection Handle to the calling
- * Connection Handle object to this object if the active Connection
- * Handle is null.
- *
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
- */
-
- void checkIfActive(ConnectionHolder ch) throws SQLException {
- if(isDestroyed == true || isUsable == false) {
- throw new SQLException("The physical connection is not usable");
- }
-
- if(activeConnectionHandle == null) {
- activeConnectionHandle = ch;
- ch.setActive(true);
- return;
- }
-
- if(activeConnectionHandle != ch) {
- throw new SQLException("The connection handle cannot be used as another connection is currently active");
- }
- }
-
- /**
- * sets the connection type of this connection. This method is called
- * by the MCF while creating this ManagedConnection. Saves us a costly
- * instanceof operation in the getConnectionType
- */
- public void initializeConnectionType( int _connectionType ) {
- connectionType = _connectionType;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
deleted file mode 100755
index 5ec326c..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import java.sql.SQLException;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
-
- private java.sql.DatabaseMetaData dmd = null;
- private ManagedConnection mc;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Constructor for <code>ManagedConnectionMetaData</code>
- *
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
- */
- public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
- try {
- this.mc = mc;
- dmd = mc.getActualConnection().getMetaData();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product name of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductName() throws ResourceException {
- try {
- return dmd.getDatabaseProductName();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product version of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductVersion() throws ResourceException {
- try {
- return dmd.getDatabaseProductVersion();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
- throw new ResourceException(sqle.getMessage(), sqle.getMessage());
- }
- }
-
- /**
- * Returns maximum limit on number of active concurrent connections
- * that an EIS instance can support across client processes.
- *
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
- */
- public int getMaxConnections() throws ResourceException {
- try {
- return dmd.getMaxConnections();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns name of the user associated with the ManagedConnection instance. The name
- * corresponds to the resource principal under whose whose security context, a connection
- * to the EIS instance has been established.
- *
- * @return name of the user
- * @throws <code>ResourceException</code>
- */
- public String getUserName() throws ResourceException {
- jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
- if(pc != null) {
- return pc.getUserName();
- }
-
- return mc.getManagedConnectionFactory().getUser();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
deleted file mode 100755
index f0ba663..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.transaction.xa.Xid;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import com.sun.jdbcra.spi.ManagedConnection;
-
-/**
- * <code>XAResource</code> wrapper for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
- */
-public class XAResourceImpl implements XAResource {
-
- XAResource xar;
- ManagedConnection mc;
-
- /**
- * Constructor for XAResourceImpl
- *
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
- */
- public XAResourceImpl(XAResource xar, ManagedConnection mc) {
- this.xar = xar;
- this.mc = mc;
- }
-
- /**
- * Commit the global transaction specified by xid.
- *
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
- */
- public void commit(Xid xid, boolean onePhase) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.commit(xid, onePhase);
- }
-
- /**
- * Ends the work performed on behalf of a transaction branch.
- *
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
- */
- public void end(Xid xid, int flags) throws XAException {
- xar.end(xid, flags);
- //GJCINT
- //mc.transactionCompleted();
- }
-
- /**
- * Tell the resource manager to forget about a heuristically completed transaction branch.
- *
- * @param xid A global transaction identifier
- */
- public void forget(Xid xid) throws XAException {
- xar.forget(xid);
- }
-
- /**
- * Obtain the current transaction timeout value set for this
- * <code>XAResource</code> instance.
- *
- * @return the transaction timeout value in seconds
- */
- public int getTransactionTimeout() throws XAException {
- return xar.getTransactionTimeout();
- }
-
- /**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
- * instance represented by the parameter xares.
- *
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
- */
- public boolean isSameRM(XAResource xares) throws XAException {
- return xar.isSameRM(xares);
- }
-
- /**
- * Ask the resource manager to prepare for a transaction commit
- * of the transaction specified in xid.
- *
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
- */
- public int prepare(Xid xid) throws XAException {
- return xar.prepare(xid);
- }
-
- /**
- * Obtain a list of prepared transaction branches from a resource manager.
- *
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
- */
- public Xid[] recover(int flag) throws XAException {
- return xar.recover(flag);
- }
-
- /**
- * Inform the resource manager to roll back work done on behalf of a transaction branch
- *
- * @param xid A global transaction identifier
- */
- public void rollback(Xid xid) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.rollback(xid);
- }
-
- /**
- * Set the current transaction timeout value for this <code>XAResource</code> instance.
- *
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
- */
- public boolean setTransactionTimeout(int seconds) throws XAException {
- return xar.setTransactionTimeout(seconds);
- }
-
- /**
- * Start work on behalf of a transaction branch specified in xid.
- *
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
- */
- public void start(Xid xid, int flags) throws XAException {
- //GJCINT
- mc.transactionStarted();
- xar.start(xid, flags);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
deleted file mode 100755
index 7ca9cfb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile13">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="build13" depends="compile13">
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="build14" depends="compile14"/>
-
- <target name="build" depends="build13, build14"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
deleted file mode 100755
index de4a961..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Vector;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Execute the methods based on the parameters.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class MethodExecutor implements java.io.Serializable{
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Exceute a simple set Method.
- *
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Executes the method.
- *
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Converts the type from String to the Class type.
- *
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
-
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
- }
-
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
deleted file mode 100755
index bed9dd7..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import javax.security.auth.Subject;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import jakarta.resource.spi.security.PasswordCredential;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.*;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import java.util.Set;
-import java.util.Iterator;
-
-/**
- * SecurityUtils for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class SecurityUtils {
-
- /**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
- * it constructs a <code>PasswordCredential</code> object with
- * the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
- * the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
- * <code>ManagedConnectionFactory</code>, instance equivalent
- * to the <code>ManagedConnectionFactory</code>, parameter.
- *
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
- */
- public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
- final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
-
- if (info == null) {
- if (subject == null) {
- return null;
- } else {
- PasswordCredential pc = (PasswordCredential) AccessController.doPrivileged
- (new PrivilegedAction() {
- public Object run() {
- Set passwdCredentialSet = subject.getPrivateCredentials(PasswordCredential.class);
- Iterator iter = passwdCredentialSet.iterator();
- while (iter.hasNext()) {
- PasswordCredential temp = (PasswordCredential) iter.next();
- if (temp.getManagedConnectionFactory().equals(mcf)) {
- return temp;
- }
- }
- return null;
- }
- });
- if (pc == null) {
- throw new jakarta.resource.spi.SecurityException("No PasswordCredential found");
- } else {
- return pc;
- }
- }
- } else {
- com.sun.jdbcra.spi.ConnectionRequestInfo cxReqInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) info;
- PasswordCredential pc = new PasswordCredential(cxReqInfo.getUser(), cxReqInfo.getPassword().toCharArray());
- pc.setManagedConnectionFactory(mcf);
- return pc;
- }
- }
-
- /**
- * Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
- */
- static private boolean isEqual(String str1, String str2) {
- if (str1 == null) {
- return (str2 == null);
- } else {
- return str1.equals(str2);
- }
- }
-
- /**
- * Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
- *
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
- */
- static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
- if (pC1 == pC2)
- return true;
- if(pC1 == null || pC2 == null)
- return (pC1 == pC2);
- if (!isEqual(pC1.getUserName(), pC2.getUserName())) {
- return false;
- }
- String p1 = null;
- String p2 = null;
- if (pC1.getPassword() != null) {
- p1 = new String(pC1.getPassword());
- }
- if (pC2.getPassword() != null) {
- p2 = new String(pC2.getPassword());
- }
- return (isEqual(p1, p2));
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
deleted file mode 100755
index f060e7d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/util"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/descriptor/blackbox-tx.xml b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/descriptor/blackbox-tx.xml
index 44d53da..b3673a5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/descriptor/blackbox-tx.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/rar/descriptor/blackbox-tx.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,12 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>BlackBoxLocalTx</display-name>
<vendor-name>Java Software</vendor-name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/META-INF/ra.xml
index 32b46e3..dbd4cf7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/WorkDispatcher.java.modified b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/WorkDispatcher.java.modified
index 4625e93..89279c3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/WorkDispatcher.java.modified
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/ra/src/connector/WorkDispatcher.java.modified
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,13 +21,13 @@
import org.glassfish.security.common.PrincipalImpl;
import java.lang.reflect.Method;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.XATerminator;
-import javax.resource.spi.endpoint.MessageEndpoint;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.resource.spi.work.*;
-import javax.transaction.xa.Xid;
+import jakarta.resource.spi.ActivationSpec;
+import jakarta.resource.spi.BootstrapContext;
+import jakarta.resource.spi.XATerminator;
+import jakarta.resource.spi.endpoint.MessageEndpoint;
+import jakarta.resource.spi.endpoint.MessageEndpointFactory;
+import jakarta.resource.spi.work.*;
+import jakarta.transaction.xa.Xid;
/**
* @author Qingqing Ouyang
@@ -85,14 +86,14 @@
/*if (!factory.isDeliveryTransacted(onMessage)) {
//MessageEndpoint ep = factory.createEndpoint(null);
- //DeliveryWork d = new DeliveryWork("NO_TX", ep);
+ //DeliveryWork d = new DeliveryWork("NO_TX", ep);
//wm.doWork(d, 0, null, null);
} else*/ {
String jagadish="jagadish";
String prasath = "prasath";
String groupName = "iec";
-
+
boolean translationRequired = determineIdentityType();
if(translationRequired){
jagadish= "eis-jagadish";
@@ -100,7 +101,7 @@
groupName="eis-group";
}
newLine(1);
-
+
int count =0;
// count = testExecutionContext(count);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/META-INF/ra.xml
index ad950c7..7ce78ed 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,11 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"
- version="1.6">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/WorkDispatcher.java.modified b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/WorkDispatcher.java.modified
index 4625e93..89279c3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/WorkDispatcher.java.modified
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/ra/src/connector/WorkDispatcher.java.modified
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,13 +21,13 @@
import org.glassfish.security.common.PrincipalImpl;
import java.lang.reflect.Method;
-import javax.resource.spi.ActivationSpec;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.XATerminator;
-import javax.resource.spi.endpoint.MessageEndpoint;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.resource.spi.work.*;
-import javax.transaction.xa.Xid;
+import jakarta.resource.spi.ActivationSpec;
+import jakarta.resource.spi.BootstrapContext;
+import jakarta.resource.spi.XATerminator;
+import jakarta.resource.spi.endpoint.MessageEndpoint;
+import jakarta.resource.spi.endpoint.MessageEndpointFactory;
+import jakarta.resource.spi.work.*;
+import jakarta.transaction.xa.Xid;
/**
* @author Qingqing Ouyang
@@ -85,14 +86,14 @@
/*if (!factory.isDeliveryTransacted(onMessage)) {
//MessageEndpoint ep = factory.createEndpoint(null);
- //DeliveryWork d = new DeliveryWork("NO_TX", ep);
+ //DeliveryWork d = new DeliveryWork("NO_TX", ep);
//wm.doWork(d, 0, null, null);
} else*/ {
String jagadish="jagadish";
String prasath = "prasath";
String groupName = "iec";
-
+
boolean translationRequired = determineIdentityType();
if(translationRequired){
jagadish= "eis-jagadish";
@@ -100,7 +101,7 @@
groupName="eis-group";
}
newLine(1);
-
+
int count =0;
// count = testExecutionContext(count);
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml
index 026c63a..24661f3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/build.xml
@@ -18,13 +18,13 @@
<!DOCTYPE project [
<!ENTITY common SYSTEM "../../../../../config/common.xml">
- <!ENTITY testcommon SYSTEM "../../../../../config/properties.xml">
+<!ENTITY testcommon SYSTEM "../../../../../config/properties.xml">
]>
<project name="connector1.5 MDB" default="all" basedir=".">
- <property name="j2ee.home" value="../../../.."/>
- <property name="earfile" value="generic-embedded.ear"/>
+ <property name="j2ee.home" value="../../../.." />
+ <property name="earfile" value="generic-embedded.ear" />
<!-- include common.xml and testcommon.xml -->
@@ -32,9 +32,9 @@
&testcommon;
<target name="all" depends="init-common, clean-common">
- <ant dir="src" inheritAll="false" target="all"/>
- <antcall target="build-ear"/>
- <!--
+ <ant dir="src" inheritAll="false" target="all" />
+ <antcall target="build-ear" />
+ <!--
<antcall target="ear-common">
<param name="appname" value="generic-embedded"/>
<param name="application.xml" value="META-INF/application.xml"/>
@@ -43,99 +43,98 @@
</target>
<target name="build-ear">
-<echo message="Building EAR with sivajdbcra"/>
- <delete file="${assemble.dir}/generic-embeddedApp.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/generic-embeddedApp.ear"
- appxml="META-INF/application.xml">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="../ra">
- <!-- <include name="*.rar"/> -->
- <!--<include name="sivajdbcra.rar"/>-->
- <include name="generic-ra.rar"/>
- </fileset>
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
- </ear>
+ <echo message="Building EAR" />
+ <delete file="${assemble.dir}/generic-embeddedApp.ear" />
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <ear earfile="${assemble.dir}/generic-embeddedApp.ear" appxml="META-INF/application.xml">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar" />
+ <include name="*.war" />
+ </fileset>
+ <fileset dir="../ra">
+ <include name="generic-ra.rar" />
+ </fileset>
+ <fileset dir="${env.APS_HOME}/lib">
+ <include name="reporter.jar" />
+ </fileset>
+ </ear>
</target>
- <target name="setupJdbc" depends="init-common">
+ <target name="setupJdbc" depends="init-common">
- <antcall target="deploy-jdbc-common">
- <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1"/>
- <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
- <param name="jdbc.resource.name" value="jdbc/XAPointbase"/>
- </antcall>
+ <antcall target="deploy-jdbc-common">
+ <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1" />
+ <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource" />
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource" />
+ <param name="jdbc.resource.name" value="jdbc/XAPointbase" />
+ </antcall>
- <antcall target="execute-sql-common">
- <param name="sql.file" value="createdb.sql"/>
- </antcall>
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="createdb.sql" />
+ </antcall>
- </target>
+ </target>
- <target name="unsetJdbc" depends="init-common">
- <antcall target="execute-sql-common">
- <param name="sql.file" value="dropdb.sql"/>
- </antcall>
+ <target name="unsetJdbc" depends="init-common">
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="dropdb.sql" />
+ </antcall>
- <antcall target="undeploy-jdbc-common">
- <param name="jdbc.resource.name" value="jdbc/XAPointbase"/>
- <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1"/>
- </antcall>
- </target>
+ <antcall target="undeploy-jdbc-common">
+ <param name="jdbc.resource.name" value="jdbc/XAPointbase" />
+ <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1" />
+ </antcall>
+ </target>
<target name="deploy-ear" depends="init-common">
<antcall target="deploy-common">
- <param name="appname" value="generic-embedded"/>
+ <param name="appname" value="generic-embedded" />
</antcall>
</target>
- <target name="deploy-rar" depends="init-common">
+ <target name="deploy-rar" depends="init-common">
<antcall target="deploy-rar-common">
- <param name="rarfile" value="../ra/sivajdbcra.rar"/>
+ <param name="rarfile" value="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar" />
</antcall>
</target>
- <target name="deploy-war" depends="init-common">
- <antcall target="deploy-war-common"/>
- </target>
+ <target name="deploy-war" depends="init-common">
+ <antcall target="deploy-war-common" />
+ </target>
- <target name="run-war" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="defaultConnectorResource-standalone-rar (stand-alone war based)"/>
- </antcall>
- </target>
+ <target name="run-war" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id"
+ value="defaultConnectorResource-standalone-rar (stand-alone war based)"
+ />
+ </antcall>
+ </target>
- <target name="undeploy-war" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy-war" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common">
- <param name="deployedapp.name" value="generic-embeddedApp"/>
+ <param name="deployedapp.name" value="generic-embeddedApp" />
</antcall>
- <antcall target="undeploy-rar"/>
+ <antcall target="undeploy-rar" />
</target>
- <target name="undeploy-rar" depends="init-common">
+ <target name="undeploy-rar" depends="init-common">
<antcall target="undeploy-rar-common">
- <param name="undeployrar" value="sivajdbcra"/>
+ <param name="undeployrar" value="connectors-ra-redeploy-rars.rar" />
</antcall>
</target>
<target name="clean">
- <antcall target="clean-common"/>
+ <antcall target="clean-common" />
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/META-INF/sun-ejb-jar.xml
index 9ca6f13..482c779 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/META-INF/sun-ejb-jar.xml
@@ -58,7 +58,7 @@
<res-ref-name>MyDB</res-ref-name>
<!-- Using the default connector resource generated by the system
for the jdbcra resource adapter -->
- <jndi-name>__SYSTEM/resource/sivajdbcra#javax.sql.XADataSource</jndi-name>
+ <jndi-name>__SYSTEM/resource/connectors-ra-redeploy-rars#javax.sql.XADataSource</jndi-name>
<!-- <jndi-name>jdbc/XAPointbase</jndi-name> -->
</resource-ref>
@@ -88,7 +88,7 @@
<!-- <jndi-name>jdbc/XAPointbase</jndi-name> -->
<!-- Using the default connector resource generated by the system
for the jdbcra resource adapter -->
- <jndi-name>__SYSTEM/resource/sivajdbcra#javax.sql.XADataSource</jndi-name>
+ <jndi-name>__SYSTEM/resource/connectors-ra-redeploy-rars#javax.sql.XADataSource</jndi-name>
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/META-INF/ra.xml
index 21deb93..f269940 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/sivajdbcra.rar b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/sivajdbcra.rar
deleted file mode 100644
index 701df2f..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/ra/sivajdbcra.rar
+++ /dev/null
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/META-INF/application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/META-INF/application.xml
index 1efa6d9..ddc5590 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/META-INF/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/META-INF/application.xml
@@ -27,7 +27,7 @@
</module>
<module>
- <connector>sivajdbcra.rar</connector>
+ <connector>connectors-ra-redeploy-rars-xa.rar</connector>
</module>
<module>
@@ -40,11 +40,4 @@
<context-root>defaultResource</context-root>
</web>
</module>
-
- <!--
- <module>
- <java>generic-embedded-client.jar</java>
- </module>
- -->
-
</application>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml
index 654a6de..6e20482 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/build.xml
@@ -18,13 +18,13 @@
<!DOCTYPE project [
<!ENTITY common SYSTEM "../../../../../config/common.xml">
- <!ENTITY testcommon SYSTEM "../../../../../config/properties.xml">
+<!ENTITY testcommon SYSTEM "../../../../../config/properties.xml">
]>
<project name="connector1.5 MDB" default="all" basedir=".">
- <property name="j2ee.home" value="../../../.."/>
- <property name="earfile" value="generic-embedded.ear"/>
+ <property name="j2ee.home" value="../../../.." />
+ <property name="earfile" value="generic-embedded.ear" />
<!-- include common.xml and testcommon.xml -->
@@ -32,96 +32,90 @@
&testcommon;
<target name="all" depends="init-common, clean-common">
- <ant dir="src" inheritAll="false" target="all"/>
- <antcall target="build-ear"/>
- <!--
- <antcall target="ear-common">
- <param name="appname" value="generic-embedded"/>
- <param name="application.xml" value="META-INF/application.xml"/>
- </antcall>
- -->
+ <ant dir="src" inheritAll="false" target="all" />
+ <antcall target="build-ear" />
</target>
<target name="build-ear">
-<echo message="Building EAR with sivajdbcra"/>
- <delete file="${assemble.dir}/generic-embeddedApp.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/generic-embeddedApp.ear"
- appxml="META-INF/application.xml">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="../ra">
- <!-- <include name="*.rar"/> -->
- <include name="sivajdbcra.rar"/>
- <include name="generic-ra.rar"/>
- </fileset>
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
- </ear>
+ <echo message="Building EAR with two ra" />
+ <delete file="${assemble.dir}/generic-embeddedApp.ear" />
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <ear earfile="${assemble.dir}/generic-embeddedApp.ear" appxml="META-INF/application.xml">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar" />
+ <include name="*.war" />
+ </fileset>
+ <fileset dir="../ra">
+ <include name="generic-ra.rar" />
+ </fileset>
+ <fileset dir="${env.APS_HOME}/connectors-ra-redeploy/rars-xa/target">
+ <include name="connectors-ra-redeploy-rars-xa.rar" />
+ </fileset>
+ <fileset dir="${env.APS_HOME}/lib">
+ <include name="reporter.jar" />
+ </fileset>
+ </ear>
</target>
- <target name="setupJdbc" depends="init-common">
+ <target name="setupJdbc" depends="init-common">
- <antcall target="deploy-jdbc-common">
- <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1"/>
- <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
- <param name="jdbc.resource.name" value="jdbc/XAPointbase"/>
- </antcall>
+ <antcall target="deploy-jdbc-common">
+ <param name="jdbc.conpool.name" value="jdbc-derby-pool1" />
+ <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource" />
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource" />
+ <param name="jdbc.resource.name" value="jdbc/DerbyDb" />
+ </antcall>
- <antcall target="execute-sql-common">
- <param name="sql.file" value="createdb.sql"/>
- </antcall>
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="createdb.sql" />
+ </antcall>
- </target>
+ </target>
- <target name="unsetJdbc" depends="init-common">
- <antcall target="execute-sql-common">
- <param name="sql.file" value="dropdb.sql"/>
- </antcall>
+ <target name="unsetJdbc" depends="init-common">
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="dropdb.sql" />
+ </antcall>
- <antcall target="undeploy-jdbc-common">
- <param name="jdbc.resource.name" value="jdbc/XAPointbase"/>
- <param name="jdbc.conpool.name" value="jdbc-pointbase-pool1"/>
- </antcall>
- </target>
+ <antcall target="undeploy-jdbc-common">
+ <param name="jdbc.resource.name" value="jdbc/DerbyDb" />
+ <param name="jdbc.conpool.name" value="jdbc-derby-pool1" />
+ </antcall>
+ </target>
<target name="deploy-ear" depends="init-common">
<antcall target="deploy-common">
- <param name="appname" value="generic-embedded"/>
+ <param name="appname" value="generic-embedded" />
</antcall>
</target>
- <target name="deploy-war" depends="init-common">
- <antcall target="deploy-war-common"/>
- </target>
+ <target name="deploy-war" depends="init-common">
+ <antcall target="deploy-war-common" />
+ </target>
- <target name="run-war" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="defaultConnectorResource (stand-alone war based)"/>
- </antcall>
- </target>
+ <target name="run-war" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="defaultConnectorResource (stand-alone war based)" />
+ </antcall>
+ </target>
- <target name="undeploy-war" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy-war" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common">
- <param name="extra-params" value="--cascade=true"/>
- <param name="deployedapp.name" value="generic-embeddedApp"/>
+ <param name="extra-params" value="--cascade=true" />
+ <param name="deployedapp.name" value="generic-embeddedApp" />
</antcall>
</target>
<target name="clean">
- <antcall target="clean-common"/>
+ <antcall target="clean-common" />
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/META-INF/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/META-INF/sun-ejb-jar.xml
index dff773d..5d25eb2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/META-INF/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/META-INF/sun-ejb-jar.xml
@@ -56,10 +56,7 @@
<resource-ref>
<res-ref-name>MyDB</res-ref-name>
- <!-- Using the default connector resource generated by the system
- for the jdbcra resource adapter -->
- <jndi-name>__SYSTEM/resource/generic-embeddedApp#sivajdbcra#javax.sql.XADataSource</jndi-name>
- <!-- <jndi-name>jdbc/XAPointbase</jndi-name> -->
+ <jndi-name>__SYSTEM/resource/generic-embeddedApp#connectors-ra-redeploy-rars-xa#javax.sql.XADataSource</jndi-name>
</resource-ref>
<gen-classes/>
@@ -85,10 +82,7 @@
</ior-security-config>
<resource-ref>
<res-ref-name>MyDB</res-ref-name>
- <!-- <jndi-name>jdbc/XAPointbase</jndi-name> -->
- <!-- Using the default connector resource generated by the system
- for the jdbcra resource adapter -->
- <jndi-name>__SYSTEM/resource/generic-embeddedApp#sivajdbcra#javax.sql.XADataSource</jndi-name>
+ <jndi-name>__SYSTEM/resource/generic-embeddedApp#connectors-ra-redeploy-rars-xa#javax.sql.XADataSource</jndi-name>
</resource-ref>
<resource-env-ref>
<resource-env-ref-name>eis/testAdmin</resource-env-ref-name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/build.xml
index 560a658..ed31933 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/build.xml
@@ -55,25 +55,6 @@
<param name="sun-web.xml" value="META-INF/sun-web.xml"/>
<param name="webclient.war.classes" value="servlet/*.class, beans/*.class"/>
</antcall>
-
-
- <!--
- <antcall target="appclient-jar-common">
- <param name="appname" value="generic-embedded" />
- <param name="application-client.xml" value="META-INF/application-client.xml" />
- <param name="appclientjar.classes" value="mdb/*.class, beans/*.class, connector/*.class, client/Client.class" />
- <param name="sun-application-client.xml" value="META-INF/sun-application-client.xml" />
- </antcall>
- -->
- <!--
- <jar jarfile="../ejb.jar" basedir="classes"
- includes="mdb/*.class, beans/*.class, connector/*.class" >
- <metainf dir="META-INF">
- <include name="ejb-jar.xml"/>
- <include name="sun-ejb-jar.xml"/>
- </metainf>
- </jar>
- -->
</target>
<target name="clean">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/build.xml
index 2deee39..d647a84 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/build.xml
@@ -18,95 +18,87 @@
<!DOCTYPE project [
<!ENTITY common SYSTEM "../../../../config/common.xml">
- <!ENTITY testcommon SYSTEM "../../../../config/properties.xml">
- <!ENTITY testproperties SYSTEM "./build.properties">
+<!ENTITY testcommon SYSTEM "../../../../config/properties.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
]>
<project name="connector1.5 TEST" default="all" basedir=".">
-<property name="j2ee.home" value="../../.."/>
-<property name="client.class" value="client/Client"/>
+ <property name="j2ee.home" value="../../.." />
+ <property name="client.class" value="client/Client" />
<!-- include common.xml and testcommon.xml -->
&common;
&testcommon;
&testproperties;
- <target name="all" depends="init-common, build, disable-resource-validation, setup, runtest, unset, enable-resource-validation"/>
+ <target name="all"
+ depends="init-common, build, disable-resource-validation, setup, runtest, unset, enable-resource-validation"
+ />
<target name="build" depends="init-common">
- <ant dir="ra" inheritAll="false" target="all"/>
- <ant dir="app" inheritAll="false" target="all"/>
+ <ant dir="ra" inheritAll="false" target="all" />
+ <ant dir="app" inheritAll="false" target="all" />
</target>
<target name="setup">
- <ant dir="app" inheritAll="false" target="setupJdbc"/>
- <ant dir="." inheritAll="false" target="deploy"/>
+ <ant dir="app" inheritAll="false" target="setupJdbc" />
+ <ant dir="." inheritAll="false" target="deploy" />
</target>
<target name="deploy">
- <ant dir="app" inheritAll="false" target="deploy-ear"/>
- <ant dir="ra" inheritAll="false" target="testAddAdmin"/>
- <ant dir="." inheritAll="false" target="restart"/>
+ <ant dir="app" inheritAll="false" target="deploy-ear" />
+ <ant dir="ra" inheritAll="false" target="testAddAdmin" />
+ <ant dir="." inheritAll="false" target="restart" />
</target>
<target name="disable-resource-validation">
<antcall target="create-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
+ <param name="option" value="-Ddeployment.resource.validation=false" />
</antcall>
- <antcall target="restart-server"/>
+ <antcall target="restart-server" />
</target>
<target name="enable-resource-validation">
<antcall target="delete-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
+ <param name="option" value="-Ddeployment.resource.validation=false" />
</antcall>
- <antcall target="restart-server"/>
+ <antcall target="restart-server" />
</target>
+ <target name="runtest" depends="init-common">
- <!--
- <target name="runtest" depends="init-common">
- <antcall target="runclient-common">
- <param name="appname" value="generic-embedded" />
- </antcall>
- </target>
- -->
+ <java classname="client.WebTest">
+ <arg value="${http.host}" />
+ <arg value="${http.port}" />
+ <arg value="${contextroot}" />
+ <classpath>
+ <pathelement location="${env.APS_HOME}/lib/reporter.jar" />
+ <pathelement location="app" />
+ </classpath>
+ </java>
- <target name="runtest" depends="init-common">
-
- <java classname="client.WebTest">
- <arg value="${http.host}"/>
- <arg value="${http.port}"/>
- <arg value="${contextroot}"/>
- <classpath>
- <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
- <pathelement location="app"/>
- </classpath>
- </java>
-
- </target>
+ </target>
<target name="unset">
- <ant dir="app" inheritAll="false" target="unsetJdbc"/>
- <ant dir="." inheritAll="false" target="undeploy"/>
- <ant dir="." inheritAll="false" target="restart"/>
+ <ant dir="app" inheritAll="false" target="unsetJdbc" />
+ <ant dir="." inheritAll="false" target="undeploy" />
+ <ant dir="." inheritAll="false" target="restart" />
</target>
<target name="undeploy">
- <!--ant dir="ra" inheritAll="false" target="testDelAdmin"/-->
- <ant dir="app" inheritAll="false" target="undeploy"/>
+ <ant dir="app" inheritAll="false" target="undeploy" />
</target>
<target name="restart" depends="init-common">
- <echo message="Not required to restart"/>
+ <echo message="Not required to restart" />
</target>
<target name="clean">
- <ant dir="ra" inheritAll="false" target="clean"/>
- <ant dir="app" inheritAll="false" target="clean"/>
- <ant dir="." inheritAll="false" target="unset"/>
- <ant dir="." inheritAll="false" target="undeploy"/>
- <ant dir="." inheritAll="false" target="restart"/>
+ <ant dir="ra" inheritAll="false" target="clean" />
+ <ant dir="app" inheritAll="false" target="clean" />
+ <ant dir="." inheritAll="false" target="unset" />
+ <ant dir="." inheritAll="false" target="undeploy" />
+ <ant dir="." inheritAll="false" target="restart" />
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/META-INF/ra.xml
index 21deb93..f269940 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,14 +18,13 @@
-->
-<!--
-<!DOCTYPE connector PUBLIC '-//Sun Microsystems, Inc.//DTD Connector 1.5//EN' 'http://java.sun.com/dtd/connector_1_5.dtd'>
--->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>Simple Resource Adapter</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>Generic Type</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/build.xml
index 75a4493..d521569 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/build.xml
@@ -58,7 +58,6 @@
<param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype connector.MyAdminObject --raname generic-embeddedApp#generic-ra --property ResetControl=BEGINNING"/>
<param name="operand.props" value="eis/testAdmin"/>
</antcall>
- <!--<antcall target="reconfig-common"/>-->
</target>
<target name="testDelAdmin" depends="init-common">
@@ -66,7 +65,6 @@
<param name="admin.command" value="delete-admin-object"/>
<param name="operand.props" value="--target ${appserver.instance.name} eis/testAdmin"/>
</antcall>
- <!--<antcall target="reconfig-common"/>-->
</target>
<target name="sendMessage" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/sivajdbcra.rar b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/sivajdbcra.rar
deleted file mode 100644
index 701df2f..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/ra/sivajdbcra.rar
+++ /dev/null
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ra/META-INF/ra.xml
index f32f21d..e6f1bb1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ra/META-INF/ra.xml
@@ -1,6 +1,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,12 +17,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<description>Generic ResourceAdapter</description>
<display-name>Generic ResourceAdapter</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index e129138..8e575fe 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,9 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<!-- There can be any number of "description" elements including 0 -->
<!-- This field can be optionally used by the driver vendor to provide a
@@ -243,7 +248,7 @@
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ <credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
<reauthentication-support>false</reauthentication-support>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml
index a8b0f36..c498f04 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/build.xml
@@ -33,216 +33,196 @@
&commonRun;
&testproperties;
-<!--
- <target name="all" depends="build,setup,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear, unsetup"/>
+ <target name="all"
+ depends="build, disable-resource-validation, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"
+ />
- <target name="run-test" depends="build,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear"/>
--->
- <target name="all" depends="build, disable-resource-validation, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
-<!--
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="deploy-war"/>
- <antcall target="run-war"/>
- <antcall target="undeploy-war"/>
- <antcall target="deploy-ear"/>
- <antcall target="run-ear"/>
- <antcall target="undeploy-ear"/>
- <antcall target="unsetup"/>
- </target>
--->
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <ant dir="ra" target="clean"/>
- </target>
-
- <target name="setup">
- <antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/simpleBank.sql"/>
- </antcall>
- <antcall target="create-pool"/>
- <antcall target="create-resource"/>
- <antcall target="create-admin-object"/>
- </target>
-
- <target name="disable-resource-validation">
- <antcall target="create-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
-
- <target name="enable-resource-validation">
- <antcall target="delete-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
-
- <target name="create-pool">
- <antcall target="create-connector-connpool-common">
- <param name="ra.name" value="${appname}App#jdbcra"/>
- <param name="extra-params" value="--matchconnections=false"/>
- <param name="connection.defname" value="javax.sql.DataSource"/>
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- </antcall>
- <antcall target="set-oracle-props">
- <param name="pool.type" value="connector"/>
- <param name="conpool.name" value="embedded-ra-pool"/>
- </antcall>
- </target>
- <target name="create-resource">
- <antcall target="create-connector-resource-common">
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
- </target>
-
-
- <target name="create-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=DBUSER:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
- </antcall>
- </target>
-
- <target name="delete-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
- </target>
-
- <target name="restart">
- <antcall target="restart-server-instance-common"/>
- </target>
-
- <target name="create-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- </target>
-
- <target name="delete-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
- </target>
-
- <target name="unsetup">
+ <target name="setup">
<antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/dropBankTables.sql"/>
- </antcall>
+ <param name="sql.file" value="sql/simpleBank.sql" />
+ </antcall>
+ <antcall target="create-pool" />
+ <antcall target="create-resource" />
+ <antcall target="create-admin-object" />
+ </target>
-<!-- <antcall target="delete-resource"/>
+ <target name="disable-resource-validation">
+ <antcall target="create-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false" />
+ </antcall>
+ <antcall target="restart-server" />
+ </target>
+
+ <target name="enable-resource-validation">
+ <antcall target="delete-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false" />
+ </antcall>
+ <antcall target="restart-server" />
+ </target>
+
+ <target name="create-pool">
+ <antcall target="create-connector-connpool-common">
+ <param name="ra.name" value="${appname}App#connectors-ra-redeploy-rars" />
+ <param name="extra-params" value="--matchconnections=false" />
+ <param name="connection.defname" value="javax.sql.DataSource" />
+ <param name="connector.conpool.name" value="embedded-ra-pool" />
+ </antcall>
+ <antcall target="set-oracle-props">
+ <param name="pool.type" value="connector" />
+ <param name="conpool.name" value="embedded-ra-pool" />
+ </antcall>
+ </target>
+ <target name="create-resource">
+ <antcall target="create-connector-resource-common">
+ <param name="connector.conpool.name" value="embedded-ra-pool" />
+ <param name="connector.jndi.name" value="jdbc/ejb-subclassing" />
+ </antcall>
+ </target>
+
+
+ <target name="create-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command"
+ value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#connectors-ra-redeploy-rars --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=DBUSER:NoOfRows=1"
+ />
+ <param name="operand.props" value="eis/jdbcAdmin" />
+ </antcall>
+ </target>
+
+ <target name="delete-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-admin-object" />
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin" />
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
+ </target>
+
+ <target name="restart">
+ <antcall target="restart-server-instance-common" />
+ </target>
+
+ <target name="create-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command"
+ value="create-resource-adapter-config --property RAProperty=VALID"
+ />
+ <param name="operand.props" value="${appname}App#connectors-ra-redeploy-rars" />
+ </antcall>
+ </target>
+
+ <target name="delete-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-resource-adapter-config" />
+ <param name="operand.props" value="${appname}App#connectors-ra-redeploy-rars" />
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
+ </target>
+
+ <target name="unsetup">
+ <antcall target="execute-sql-connector">
+ <param name="sql.file" value="sql/dropBankTables.sql" />
+ </antcall>
+
+ <!-- <antcall target="delete-resource"/>
<antcall target="delete-pool"/>
<antcall target="delete-admin-object"/>-->
- </target>
+ </target>
- <target name="delete-pool">
- <antcall target="delete-connector-connpool-common">
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- </antcall>
- </target>
+ <target name="delete-pool">
+ <antcall target="delete-connector-connpool-common">
+ <param name="connector.conpool.name" value="embedded-ra-pool" />
+ </antcall>
+ </target>
- <target name="delete-resource">
- <antcall target="delete-connector-resource-common">
- <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
- </target>
+ <target name="delete-resource">
+ <antcall target="delete-connector-resource-common">
+ <param name="connector.jndi.name" value="jdbc/ejb-subclassing" />
+ </antcall>
+ </target>
- <target name="compile" depends="clean">
- <ant dir="ra" target="compile"/>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-servlet" />
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="ejb" />
+ </antcall>
+ <antcall target="compile-servlet" />
+ </target>
- <target name="compile-servlet" depends="init-common">
- <mkdir dir="${build.classes.dir}"/>
- <echo message="common.xml: Compiling test source files" level="verbose"/>
- <javac srcdir="servlet"
- destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
- debug="on"
- failonerror="true"/>
- </target>
+ <target name="compile-servlet" depends="init-common">
+ <mkdir dir="${build.classes.dir}" />
+ <echo message="common.xml: Compiling test source files" level="verbose" />
+ <javac srcdir="servlet"
+ destdir="${build.classes.dir}"
+ classpath="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
+ debug="on"
+ failonerror="true"
+ />
+ </target>
-
- <target name="build-ra">
- <ant dir="ra" target="build"/>
- </target>
-
- <target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
- <ant dir="ra" target="assemble"/>
+ <target name="build" depends="compile">
+ <property name="hasWebclient" value="yes" />
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="hasWebclient" value="yes" />
+ <param name="webclient.war.classes" value="**/*.class" />
</antcall>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="**/*.class"/>
+ <param name="ejbjar.classes" value="**/*.class" />
</antcall>
- <delete file="${assemble.dir}/${appname}.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
- appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="ra/publish/lib">
- <include name="*.rar"/>
- </fileset>
+ <delete file="${assemble.dir}/${appname}.ear" />
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar" />
+ <include name="*.war" />
+ </fileset>
+ <fileset dir="${env.APS_HOME}/connectors-ra-redeploy/rars/target">
+ <include name="connectors-ra-redeploy-rars.rar" />
+ </fileset>
</ear>
- </target>
+ </target>
- <target name="deploy-ear" depends="init-common">
- <antcall target="create-ra-config"/>
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear" depends="init-common">
+ <antcall target="create-ra-config" />
+ <antcall target="deploy-common" />
+ </target>
- <target name="deploy-war" depends="init-common">
- <antcall target="deploy-war-common"/>
- </target>
+ <target name="deploy-war" depends="init-common">
+ <antcall target="deploy-war-common" />
+ </target>
- <target name="run-war" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="embeddedweb (stand-alone war based)"/>
- </antcall>
- </target>
+ <target name="run-war" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="embeddedweb (stand-alone war based)" />
+ </antcall>
+ </target>
- <target name="run-ear" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="embeddedweb (ear based)"/>
- </antcall>
- </target>
+ <target name="run-ear" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="embeddedweb (ear based)" />
+ </antcall>
+ </target>
- <target name="undeploy-ear" depends="init-common">
- <antcall target="delete-ra-config"/>
- <antcall target="undeploy-common">
- <param name="extra-params" value="--cascade=true"/>
- </antcall>
- </target>
+ <target name="undeploy-ear" depends="init-common">
+ <antcall target="delete-ra-config" />
+ <antcall target="undeploy-common">
+ <param name="extra-params" value="--cascade=true" />
+ </antcall>
+ </target>
- <target name="undeploy-war" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy-war" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <target name="usage">
+ <antcall target="usage-common" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/descriptor/application.xml
index 7fb3227..39abc00 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/descriptor/application.xml
@@ -25,7 +25,7 @@
</module>
<module>
- <connector>jdbcra.rar</connector>
+ <connector>connectors-ra-redeploy-rars.rar</connector>
</module>
<module>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.properties
deleted file mode 100755
index fd21c3d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0, which is available at
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-
-### Component Properties ###
-src.dir=src
-component.publish.home=.
-component.classes.dir=${component.publish.home}/internal/classes
-component.lib.home=${component.publish.home}/lib
-component.publish.home=publish
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.xml
deleted file mode 100755
index d46131f..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE project [
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
- <!ENTITY common SYSTEM "../../../../../config/common.xml">
- <!ENTITY testcommon SYSTEM "../../../../../config/properties.xml">
-]>
-
-<project name="JDBCConnector top level" default="build">
- <property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
- &common;
- &testcommon;
- <property file="./build.properties"/>
-
- <target name="build" depends="compile,assemble" />
-
-
- <!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
- <target name="init" description="${component.name} initialization">
- <tstamp>
- <format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
- <echo message="Building component ${component.name}"/>
- <mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
- </target>
- <!-- compile -->
- <target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
- <!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
- destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- <include name="com/sun/jdbcra/**"/>
- <include name="com/sun/appserv/**"/>
- </javac>
- </target>
-
- <target name="all" depends="build"/>
-
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
-
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete file="${component.lib.home}/ra.xml"/>
-
- </target>
-
- <target name="clean" description="Clean the build">
- <delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${component.classes.dir}"/>
- <fileset dir="${component.lib.home}"/>
- </delete>
- </target>
-
-</project>
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
deleted file mode 100755
index b6ef30b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.appserv.jdbcra;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
- * server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
- * application server.
- * <p>A sample code for getting driver's connection implementation would like
- * the following.
- * <pre>
- InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
- Connection con = ds.getConnection();
- Connection drivercon = ds.getConnection(con);
-
- // Do db operations.
-
- con.close();
- </pre>
- *
- * @author Binod P.G
- */
-public interface DataSource extends javax.sql.DataSource {
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
deleted file mode 100755
index 8c55d51..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.StringTokenizer;
-import java.util.Enumeration;
-import com.sun.jdbcra.util.MethodExecutor;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Utility class, which would create necessary Datasource object according to the
- * specification.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
- */
-public class DataSourceObjectBuilder implements java.io.Serializable{
-
- private DataSourceSpec spec;
-
- private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
- */
- public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
- }
-
- /**
- * Construct the DataSource Object from the spec.
- *
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
- */
- public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
- Object dataSourceObject = getDataSourceObject();
- System.out.println("V3-TEST : " + dataSourceObject);
- Method[] methods = dataSourceObject.getClass().getMethods();
- for (int i=0; i < methods.length; i++) {
- String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
- }
- return dataSourceObject;
- }
-
- /**
- * Get the extra driver properties from the DataSourceSpec object and
- * parse them to a set of methodName and parameters. Prepare a hashtable
- * containing these details and return.
- *
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
- */
- private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
-
- String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
- }
-
- /**
- * Creates a Datasource object according to the spec.
- *
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
- */
- private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
- Class dataSourceClass = Class.forName(className);
- Object dataSourceObject = dataSourceClass.newInstance();
- System.out.println("V3-TEST : " + dataSourceObject);
- return dataSourceObject;
- } catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
- throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
- } catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
- throw new ResourceException("Error in instantiating" + className);
- } catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
- throw new ResourceException("Access Error in instantiating" + className);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
deleted file mode 100755
index 1c4b072..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.util.Hashtable;
-
-/**
- * Encapsulate the DataSource object details obtained from
- * ManagedConnectionFactory.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class DataSourceSpec implements java.io.Serializable{
-
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
- private Hashtable details = new Hashtable();
-
- /**
- * Set the property.
- *
- * @param property Property Name to be set.
- * @param value Value of property to be set.
- */
- public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
- }
-
- /**
- * Get the value of property
- *
- * @return Value of the property.
- */
- public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
- }
-
- /**
- * Checks whether two <code>DataSourceSpec</code> objects
- * are equal or not.
- *
- * @param obj Instance of <code>DataSourceSpec</code> object.
- */
- public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
- }
-
- /**
- * Retrieves the hashCode of this <code>DataSourceSpec</code> object.
- *
- * @return hashCode of this object.
- */
- public int hashCode() {
- return this.details.hashCode();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
deleted file mode 100755
index 3b4faeb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/common/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/common"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/common.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
deleted file mode 100755
index c6e2b60..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ /dev/null
@@ -1,677 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.sql.*;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-
-/**
- * Holds the java.sql.Connection object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class ConnectionHolder implements Connection{
-
- private Connection con;
-
- private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
- private boolean isClosed = false;
-
- private boolean valid = true;
-
- private boolean active = false;
- /**
- * The active flag is false when the connection handle is
- * created. When a method is invoked on this object, it asks
- * the ManagedConnection if it can be the active connection
- * handle out of the multiple connection handles. If the
- * ManagedConnection reports that this connection handle
- * can be active by setting this flag to true via the setActive
- * function, the above method invocation succeeds; otherwise
- * an exception is thrown.
- */
-
- /**
- * Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
- */
- public ConnectionHolder(Connection con, ManagedConnection mc) {
- this.con = con;
- this.mc = mc;
- }
-
- /**
- * Returns the actual connection in this holder object.
- *
- * @return Connection object.
- */
- Connection getConnection() {
- return con;
- }
-
- /**
- * Sets the flag to indicate that, the connection is wrapped already or not.
- *
- * @param wrapFlag
- */
- void wrapped(boolean wrapFlag){
- this.wrappedAlready = wrapFlag;
- }
-
- /**
- * Returns whether it is wrapped already or not.
- *
- * @return wrapped flag.
- */
- boolean isWrapped(){
- return wrappedAlready;
- }
-
- /**
- * Returns the <code>ManagedConnection</code> instance responsible
- * for this connection.
- *
- * @return <code>ManagedConnection</code> instance.
- */
- ManagedConnection getManagedConnection() {
- return mc;
- }
-
- /**
- * Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
- *
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
- */
- void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
- }
-
- /**
- * Clears all warnings reported for the underlying connection object.
- *
- * @throws SQLException In case of a database error.
- */
- public void clearWarnings() throws SQLException{
- checkValidity();
- con.clearWarnings();
- }
-
- /**
- * Closes the logical connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void close() throws SQLException{
- isClosed = true;
- mc.connectionClosed(null, this);
- }
-
- /**
- * Invalidates this object.
- */
- public void invalidate() {
- valid = false;
- }
-
- /**
- * Closes the physical connection involved in this.
- *
- * @throws SQLException In case of a database error.
- */
- void actualClose() throws SQLException{
- con.close();
- }
-
- /**
- * Commit the changes in the underlying Connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void commit() throws SQLException {
- checkValidity();
- con.commit();
- }
-
- /**
- * Creates a statement from the underlying Connection
- *
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement() throws SQLException {
- checkValidity();
- return con.createStatement();
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
- *
- * @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
- /**
- * Retrieves the underlying <code>Connection</code> object's catalog name.
- *
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
- */
- public String getCatalog() throws SQLException {
- checkValidity();
- return con.getCatalog();
- }
-
- /**
- * Retrieves the current holdability of <code>ResultSet</code> objects created
- * using this connection object.
- *
- * @return holdability value.
- * @throws SQLException In case of a database error.
- */
- public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
- }
-
- /**
- * Retrieves the <code>DatabaseMetaData</code>object from the underlying
- * <code> Connection </code> object.
- *
- * @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
- */
- public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
- }
-
- /**
- * Retrieves this <code>Connection</code> object's current transaction isolation level.
- *
- * @return Transaction level
- * @throws SQLException In case of a database error.
- */
- public int getTransactionIsolation() throws SQLException {
- checkValidity();
- return con.getTransactionIsolation();
- }
-
- /**
- * Retrieves the <code>Map</code> object associated with
- * <code> Connection</code> Object.
- *
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
- */
- public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
- }
-
-/*
- public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-*/
-
- /**
- * Retrieves the the first warning reported by calls on the underlying
- * <code>Connection</code> object.
- *
- * @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
- */
- public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
- }
-
- /**
- * Retrieves whether underlying <code>Connection</code> object is closed.
- *
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
- */
- public boolean isClosed() throws SQLException {
- return isClosed;
- }
-
- /**
- * Retrieves whether this <code>Connection</code> object is read-only.
- *
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
- */
- public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
- }
-
- /**
- * Converts the given SQL statement into the system's native SQL grammer.
- *
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
- */
- public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
- }
-
- public Clob createClob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Blob createBlob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public NClob createNClob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public SQLXML createSQLXML() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isValid(int timeout) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void setClientInfo(String name, String value) throws SQLClientInfoException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void setClientInfo(Properties properties) throws SQLClientInfoException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public String getClientInfo(String name) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Properties getClientInfo() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- /**
- * Removes the given <code>Savepoint</code> object from the current transaction.
- *
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
- */
- public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
- /**
- * Rolls back the changes made in the current transaction.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
- }
-
- /**
- * Rolls back the changes made after the savepoint.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
- }
-
- /**
- * Sets the auto-commmit mode of the <code>Connection</code> object.
- *
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
- }
-
- /**
- * Sets the catalog name to the <code>Connection</code> object
- *
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
- */
- public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
- }
-
- /**
- * Sets the holdability of <code>ResultSet</code> objects created
- * using this <code>Connection</code> object.
- *
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
- */
- public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
- }
-
- /**
- * Puts the connection in read-only mode as a hint to the driver to
- * perform database optimizations.
- *
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
- */
- public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
- }
-
- /**
- * Creates and unnamed savepoint and returns an object corresponding to that.
- *
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
- }
-
- /**
- * Creates a savepoint with the name and returns an object corresponding to that.
- *
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
- /**
- * Creates the transaction isolation level.
- *
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
- */
- public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
- /**
- * Installs the given <code>Map</code> object as the tyoe map for this
- * <code> Connection </code> object.
- *
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
- */
- public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
- }
-
- public int getNetworkTimeout() throws SQLException {
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void abort(Executor executor) throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public String getSchema() throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void setSchema(String schema) throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
-
- /**
- * Checks the validity of this object
- */
- private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
- }
-
- /**
- * Sets the active flag to true
- *
- * @param actv boolean
- */
- void setActive(boolean actv) {
- active = actv;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
deleted file mode 100755
index fb0fdab..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import java.sql.DriverManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import java.sql.SQLException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- * This class is extended by the DataSource specific <code>ManagedConnection</code> factories
- * and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
- java.io.Serializable {
-
- protected DataSourceSpec spec = new DataSourceSpec();
- protected transient DataSourceObjectBuilder dsObjBuilder;
-
- protected java.io.PrintWriter logWriter = null;
- protected jakarta.resource.spi.ResourceAdapter ra = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory() {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory()");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
- return cf;
- }
-
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager)");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
- }
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public abstract boolean equals(Object other);
-
- /**
- * Get the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
- */
- public java.io.PrintWriter getLogWriter() {
- return logWriter;
- }
-
- /**
- * Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
- */
- public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
- if(logWriter != null) {
- logWriter.println("In getResourceAdapter");
- }
- return ra;
- }
-
- /**
- * Returns the hash code for this <code>ManagedConnectionFactory</code>.
- *
- * @return hash code for this <code>ManagedConnectionFactory</code>
- */
- public int hashCode(){
- if(logWriter != null) {
- logWriter.println("In hashCode");
- }
- return spec.hashCode();
- }
-
- /**
- * Returns a matched <code>ManagedConnection</code> from the candidate
- * set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- */
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
- javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In matchManagedConnections");
- }
-
- if(connectionSet == null) {
- return null;
- }
-
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- java.util.Iterator iter = connectionSet.iterator();
- com.sun.jdbcra.spi.ManagedConnection mc = null;
- while(iter.hasNext()) {
- try {
- mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
- } catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
- throw new ResourceException(nsee.getMessage());
- }
- if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
- mc.connectionErrorOccurred(re, null);
- }
- } else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
- mc.connectionErrorOccurred(re, null);
- }
- }
- }
- return null;
- }
-
- //GJCINT
- /**
- * Checks if a <code>ManagedConnection</code> is to be validated or not
- * and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
- */
- void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- if(mc.isTransactionInProgress()) {
- return;
- }
-
- boolean connectionValidationRequired =
- (new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
- if( connectionValidationRequired == false || mc == null) {
- return;
- }
-
-
- String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
- mc.checkIfValid();
- /**
- * The above call checks if the actual physical connection
- * is usable or not.
- */
- java.sql.Connection con = mc.getActualConnection();
-
- if(validationMethod.equals("auto-commit") == true) {
- isValidByAutoCommit(con);
- } else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
- isValidByMetaData(con);
- } else if(validationMethod.equalsIgnoreCase("table") == true) {
- isValidByTableQuery(con, spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME));
- } else {
- throw new ResourceException("The validation method is not proper");
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- // Notice that using something like
- // dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
- // some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
- // Also notice that some XA data sources will throw and exception if
- // you try to call setAutoCommit, for them this method is not recommended
-
- boolean ac = con.getAutoCommit();
- if (ac) {
- con.setAutoCommit(false);
- } else {
- con.rollback(); // prevents uncompleted transaction exceptions
- con.setAutoCommit(true);
- }
-
- con.setAutoCommit(ac);
-
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.DatabaseMetaData dmd = con.getMetaData();
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException("The connection is not valid as "
- + "getting the meta data failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByTableQuery(java.sql.Connection con,
- String tableName) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.Statement stmt = con.createStatement();
- java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
- throw new ResourceException("The connection is not valid as "
- + "querying the table " + tableName + " failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
- * for the <code>ManagedConnection</code> passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
- }
-
- /**
- * Resets the isolation level for the <code>ManagedConnection</code> passed.
- * If the transaction level is to be guaranteed to be the same as the one
- * present when this <code>ManagedConnection</code> was created, as specified
- * by the <code>ConnectionRequestInfo</code> passed, it sets the transaction
- * isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
- * it sets it to the transaction isolation passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
- }
-
- /**
- * Gets the integer equivalent of the string specifying
- * the transaction isolation.
- *
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
- */
- private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
- }
-
- /**
- * Set the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(java.io.PrintWriter out) {
- logWriter = out;
- }
-
- /**
- * Set the associated <code>ResourceAdapter</code> JavaBean.
- *
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
- */
- public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setUser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getUser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setuser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getuser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setPassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getPassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setpassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getpassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setClassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getClassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setclassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getclassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setConnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getConnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setconnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getconnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setValidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getValidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setvalidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getvalidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setValidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getValidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setvalidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getvalidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void setTransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String getTransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void settransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String gettransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getGuaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setguaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getguaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
deleted file mode 100755
index e2840ea..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.endpoint.MessageEndpointFactory;
-import jakarta.resource.spi.ActivationSpec;
-import jakarta.resource.NotSupportedException;
-import javax.transaction.xa.XAResource;
-import jakarta.resource.spi.BootstrapContext;
-import jakarta.resource.spi.ResourceAdapterInternalException;
-
-/**
- * <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
- */
-public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
-
- public String raProp = null;
-
- /**
- * Empty method implementation for endpointActivation
- * which just throws <code>NotSupportedException</code>
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
- */
- public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty method implementation for endpointDeactivation
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- */
- public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
- }
-
- /**
- * Empty method implementation for getXAResources
- * which just throws <code>NotSupportedException</code>
- *
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
- */
- public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty implementation of start method
- *
- * @param ctx <code>BootstrapContext</code>
- */
- public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
- System.out.println("Resource Adapter is starting with configuration :" + raProp);
- if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
- }
-
- /**
- * Empty implementation of stop method
- */
- public void stop() {
-
- }
-
- public void setRAProperty(String s) {
- raProp = s;
- }
-
- public String getRAProperty() {
- return raProp;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
deleted file mode 100755
index e006b1d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
- </target>
-
- <target name="build14" depends="compile14, package14"/>
- <target name="build13"/>
- <target name="build" depends="build14, build13"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
deleted file mode 100755
index e129138..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
- <!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
- description for the resource adapter.
- -->
- <description>Resource adapter wrapping Datasource implementation of driver</description>
-
- <!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
- is intended to be displayed by tools.
- -->
- <display-name>DataSource Resource Adapter</display-name>
-
- <!-- There can be any number of "icon" elements including 0 -->
- <!-- The following is an example.
- <icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
- icon - JPEG or GIF image. The following is an example.
- <small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
- icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
- </icon>
- -->
- <icon>
- <small-icon></small-icon>
- <large-icon></large-icon>
- </icon>
-
- <!-- The "vendor-name" element should occur exactly once. -->
- <!-- This should specify the name of the driver vendor. The following is an example.
- <vendor-name>XYZ INC.</vendor-name>
- -->
- <vendor-name>Sun Microsystems</vendor-name>
-
- <!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
- the database independent of any version information. The following
- is an example.
- <eis-type>XYZ</eis-type>
- -->
- <eis-type>Database</eis-type>
-
- <!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
- the driver vendor. The default is being set as 1.0. The driver
- vendor can change it as required.
- -->
- <resourceadapter-version>1.0</resourceadapter-version>
-
- <!-- This "license" element can occur atmost once -->
- <!-- This specifies licensing requirements for the resource adapter module.
- The following is an example.
- <license>
- There can be any number of "description" elements including 0.
- <description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
- restrictions.
- </description>
-
- This specifies whether a license is required to deploy and use the resource adapter.
- Default is false.
- <license-required>false</license-required>
- </license>
- -->
- <license>
- <license-required>false</license-required>
- </license>
-
- <resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
- elements. The "description" elements are not being included
- in the "config-property" elements below. The driver vendor can
- add them as required.
- -->
-
- <resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
- <outbound-resourceadapter>
-
- <connection-definition>
-
- <managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
- <!-- There can be any number of these elements including 0 -->
- <config-property>
- <config-property-name>ServerName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>localhost</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>PortNumber</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>1527</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>databaseName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>testdb</config-property-value>
- </config-property>
-
- <config-property>
- <config-property-name>User</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbuser</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>UserName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbuser</config-property-value>
- </config-property>
-
- <config-property>
- <config-property-name>Password</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbpassword</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>URL</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
- </config-property>
- <!--<config-property>
- <config-property-name>DataSourceName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>-->
- <config-property>
- <config-property-name>Description</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>Oracle thin driver Datasource</config-property-value>
- </config-property>
-<!--
- <config-property>
- <config-property-name>NetworkProtocol</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>RoleName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>LoginTimeOut</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DriverProperties</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
--->
- <config-property>
- <config-property-name>Delimiter</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>#</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ClassName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ConnectionAttributes</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>;create=true</config-property-value>
- </config-property>
-
-<!--
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
--->
-
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
- <connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
- <connection-interface>java.sql.Connection</connection-interface>
-
- <connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
- </connection-definition>
-
- <transaction-support>LocalTransaction</transaction-support>
-
- <authentication-mechanism>
- <!-- There can be any number of "description" elements including 0 -->
- <!-- Not including the "description" element -->
-
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
-
- <reauthentication-support>false</reauthentication-support>
-
- </outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- </adminobject>
-
- </resourceadapter>
-
-</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
deleted file mode 100755
index 2ee36c5..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-
-/**
- * ConnectionManager implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
-
- /**
- * Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
- *
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
- */
- public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
- }
-
- /*
- * This class could effectively implement Connection pooling also.
- * Could be done for FCS.
- */
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
deleted file mode 100755
index ddd0a28..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-/**
- * ConnectionRequestInfo implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
-
- private String user;
- private String password;
-
- /**
- * Constructs a new <code>ConnectionRequestInfo</code> object
- *
- * @param user User Name.
- * @param password Password
- */
- public ConnectionRequestInfo(String user, String password) {
- this.user = user;
- this.password = password;
- }
-
- /**
- * Retrieves the user name of the ConnectionRequestInfo.
- *
- * @return User name of ConnectionRequestInfo.
- */
- public String getUser() {
- return user;
- }
-
- /**
- * Retrieves the password of the ConnectionRequestInfo.
- *
- * @return Password of ConnectionRequestInfo.
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Verify whether two ConnectionRequestInfos are equal.
- *
- * @return True, if they are equal and false otherwise.
- */
- public boolean equals(Object obj) {
- if (obj == null) return false;
- if (obj instanceof ConnectionRequestInfo) {
- ConnectionRequestInfo other = (ConnectionRequestInfo) obj;
- return (isEqual(this.user, other.user) &&
- isEqual(this.password, other.password));
- } else {
- return false;
- }
- }
-
- /**
- * Retrieves the hashcode of the object.
- *
- * @return hashCode.
- */
- public int hashCode() {
- String result = "" + user + password;
- return result.hashCode();
- }
-
- /**
- * Compares two objects.
- *
- * @param o1 First object.
- * @param o2 Second object.
- */
- private boolean isEqual(Object o1, Object o2) {
- if (o1 == null) {
- return (o2 == null);
- } else {
- return o1.equals(o2);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
deleted file mode 100755
index 40f4676..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ManagedConnectionFactory;
-import com.sun.jdbcra.common.DataSourceSpec;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
- */
-
-public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
- private transient javax.sql.DataSource dataSourceObj;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In createManagedConnection");
- }
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- if(dataSourceObj == null) {
- if(dsObjBuilder == null) {
- dsObjBuilder = new DataSourceObjectBuilder(spec);
- }
-
- System.out.println("V3-TEST : before getting datasource object");
- try {
- dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
- } catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
- throw new jakarta.resource.ResourceException(cce.getMessage());
- }
- }
-
- java.sql.Connection dsConn = null;
-
- try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
- } catch(java.sql.SQLException sqle) {
- sqle.printStackTrace();
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
- sqle.getMessage());
- } catch(Exception e){
- System.out.println("V3-TEST : unable to get connection");
- e.printStackTrace();
- }
- System.out.println("V3-TEST : got connection");
-
- com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
- //GJCINT
-/*
- setIsolation(mc);
- isValid(mc);
-*/
- System.out.println("V3-TEST : returning connection");
- return mc;
- }
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public boolean equals(Object other) {
- if(logWriter != null) {
- logWriter.println("In equals");
- }
- /**
- * The check below means that two ManagedConnectionFactory objects are equal
- * if and only if their properties are the same.
- */
- if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
- (com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
- return this.spec.equals(otherMCF.spec);
- }
- return false;
- }
-
- /**
- * Sets the server name.
- *
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
- */
- public void setserverName(String serverName) {
- spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
- }
-
- /**
- * Gets the server name.
- *
- * @return serverName
- * @see <code>setServerName</code>
- */
- public String getserverName() {
- return spec.getDetail(DataSourceSpec.SERVERNAME);
- }
-
- /**
- * Sets the server name.
- *
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
- */
- public void setServerName(String serverName) {
- spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
- }
-
- /**
- * Gets the server name.
- *
- * @return serverName
- * @see <code>setServerName</code>
- */
- public String getServerName() {
- return spec.getDetail(DataSourceSpec.SERVERNAME);
- }
-
- /**
- * Sets the port number.
- *
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
- */
- public void setportNumber(String portNumber) {
- spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
- }
-
- /**
- * Gets the port number.
- *
- * @return portNumber
- * @see <code>setPortNumber</code>
- */
- public String getportNumber() {
- return spec.getDetail(DataSourceSpec.PORTNUMBER);
- }
-
- /**
- * Sets the port number.
- *
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
- */
- public void setPortNumber(String portNumber) {
- spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
- }
-
- /**
- * Gets the port number.
- *
- * @return portNumber
- * @see <code>setPortNumber</code>
- */
- public String getPortNumber() {
- return spec.getDetail(DataSourceSpec.PORTNUMBER);
- }
-
- /**
- * Sets the database name.
- *
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
- */
- public void setdatabaseName(String databaseName) {
- spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
- }
-
- /**
- * Gets the database name.
- *
- * @return databaseName
- * @see <code>setDatabaseName</code>
- */
- public String getdatabaseName() {
- return spec.getDetail(DataSourceSpec.DATABASENAME);
- }
-
- /**
- * Sets the database name.
- *
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
- */
- public void setDatabaseName(String databaseName) {
- spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
- }
-
- /**
- * Gets the database name.
- *
- * @return databaseName
- * @see <code>setDatabaseName</code>
- */
- public String getDatabaseName() {
- return spec.getDetail(DataSourceSpec.DATABASENAME);
- }
-
- /**
- * Sets the data source name.
- *
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
- */
- public void setdataSourceName(String dsn) {
- spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
- }
-
- /**
- * Gets the data source name.
- *
- * @return dsn
- * @see <code>setDataSourceName</code>
- */
- public String getdataSourceName() {
- return spec.getDetail(DataSourceSpec.DATASOURCENAME);
- }
-
- /**
- * Sets the data source name.
- *
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
- */
- public void setDataSourceName(String dsn) {
- spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
- }
-
- /**
- * Gets the data source name.
- *
- * @return dsn
- * @see <code>setDataSourceName</code>
- */
- public String getDataSourceName() {
- return spec.getDetail(DataSourceSpec.DATASOURCENAME);
- }
-
- /**
- * Sets the description.
- *
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
- */
- public void setdescription(String desc) {
- spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
- }
-
- /**
- * Gets the description.
- *
- * @return desc
- * @see <code>setDescription</code>
- */
- public String getdescription() {
- return spec.getDetail(DataSourceSpec.DESCRIPTION);
- }
-
- /**
- * Sets the description.
- *
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
- */
- public void setDescription(String desc) {
- spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
- }
-
- /**
- * Gets the description.
- *
- * @return desc
- * @see <code>setDescription</code>
- */
- public String getDescription() {
- return spec.getDetail(DataSourceSpec.DESCRIPTION);
- }
-
- /**
- * Sets the network protocol.
- *
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
- */
- public void setnetworkProtocol(String nwProtocol) {
- spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
- }
-
- /**
- * Gets the network protocol.
- *
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
- */
- public String getnetworkProtocol() {
- return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
- }
-
- /**
- * Sets the network protocol.
- *
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
- */
- public void setNetworkProtocol(String nwProtocol) {
- spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
- }
-
- /**
- * Gets the network protocol.
- *
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
- */
- public String getNetworkProtocol() {
- return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
- }
-
- /**
- * Sets the role name.
- *
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
- */
- public void setroleName(String roleName) {
- spec.setDetail(DataSourceSpec.ROLENAME, roleName);
- }
-
- /**
- * Gets the role name.
- *
- * @return roleName
- * @see <code>setRoleName</code>
- */
- public String getroleName() {
- return spec.getDetail(DataSourceSpec.ROLENAME);
- }
-
- /**
- * Sets the role name.
- *
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
- */
- public void setRoleName(String roleName) {
- spec.setDetail(DataSourceSpec.ROLENAME, roleName);
- }
-
- /**
- * Gets the role name.
- *
- * @return roleName
- * @see <code>setRoleName</code>
- */
- public String getRoleName() {
- return spec.getDetail(DataSourceSpec.ROLENAME);
- }
-
-
- /**
- * Sets the login timeout.
- *
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
- */
- public void setloginTimeOut(String loginTimeOut) {
- spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
- }
-
- /**
- * Gets the login timeout.
- *
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
- */
- public String getloginTimeOut() {
- return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
- }
-
- /**
- * Sets the login timeout.
- *
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
- */
- public void setLoginTimeOut(String loginTimeOut) {
- spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
- }
-
- /**
- * Gets the login timeout.
- *
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
- */
- public String getLoginTimeOut() {
- return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
- }
-
- /**
- * Sets the delimiter.
- *
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
- */
- public void setdelimiter(String delim) {
- spec.setDetail(DataSourceSpec.DELIMITER, delim);
- }
-
- /**
- * Gets the delimiter.
- *
- * @return delim
- * @see <code>setDelimiter</code>
- */
- public String getdelimiter() {
- return spec.getDetail(DataSourceSpec.DELIMITER);
- }
-
- /**
- * Sets the delimiter.
- *
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
- */
- public void setDelimiter(String delim) {
- spec.setDetail(DataSourceSpec.DELIMITER, delim);
- }
-
- /**
- * Gets the delimiter.
- *
- * @return delim
- * @see <code>setDelimiter</code>
- */
- public String getDelimiter() {
- return spec.getDetail(DataSourceSpec.DELIMITER);
- }
-
- /**
- * Sets the driver specific properties.
- *
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
- */
- public void setdriverProperties(String driverProps) {
- spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
- }
-
- /**
- * Gets the driver specific properties.
- *
- * @return driverProps
- * @see <code>setDriverProperties</code>
- */
- public String getdriverProperties() {
- return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- }
-
- /**
- * Sets the driver specific properties.
- *
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
- */
- public void setDriverProperties(String driverProps) {
- spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
- }
-
- /**
- * Gets the driver specific properties.
- *
- * @return driverProps
- * @see <code>setDriverProperties</code>
- */
- public String getDriverProperties() {
- return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- }
-
- /*
- * Check if the PasswordCredential passed for this get connection
- * request is equal to the user/passwd of this connection pool.
- */
- private boolean isEqual( PasswordCredential pc, String user,
- String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
-
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
deleted file mode 100755
index 4436215..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ConnectionManager;
-import jakarta.resource.ResourceException;
-import javax.naming.Reference;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
- private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
- private int loginTimeout;
- private PrintWriter logWriter;
- private String description;
- private Reference reference;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Constructs <code>DataSource</code> object. This is created by the
- * <code>ManagedConnectionFactory</code> object.
- *
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
- */
- public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- re.printStackTrace();
- throw new SQLException (re.getMessage());
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException {
-
- Connection driverCon = con;
- if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
-
- return driverCon;
- }
-
- /**
- * Get the login timeout
- *
- * @return login timeout.
- * @throws SQLException If a database error occurs.
- */
- public int getLoginTimeout() throws SQLException{
- return loginTimeout;
- }
-
- /**
- * Set the login timeout
- *
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
- */
- public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
- }
-
- /**
- * Get the logwriter object.
- *
- * @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
- */
- public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
- }
-
- /**
- * Set the logwriter on this object.
- *
- * @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
- */
- public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
- public Logger getParentLogger() throws SQLFeatureNotSupportedException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
- }
- /**
- * Retrieves the description.
- *
- * @return Description about the DataSource.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Set the description.
- *
- * @param description Description about the DataSource.
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Get the reference.
- *
- * @return <code>Reference</code>object.
- */
- public Reference getReference() {
- return reference;
- }
-
- /**
- * Get the reference.
- *
- * @param reference <code>Reference</code> object.
- */
- public void setReference(Reference reference) {
- this.reference = reference;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
deleted file mode 100755
index bec0d6b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-public interface JdbcSetupAdmin {
-
- public void setTableName(String db);
-
- public String getTableName();
-
- public void setJndiName(String name);
-
- public String getJndiName();
-
- public void setSchemaName(String name);
-
- public String getSchemaName();
-
- public void setNoOfRows(Integer i);
-
- public Integer getNoOfRows();
-
- public boolean checkSetup();
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
deleted file mode 100755
index 82c50b5..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.naming.*;
-import javax.sql.*;
-import java.sql.*;
-// import javax.sql.DataSource;
-public class JdbcSetupAdminImpl implements JdbcSetupAdmin {
-
- private String tableName;
-
- private String jndiName;
-
- private String schemaName;
-
- private Integer noOfRows;
-
- public void setTableName(String db) {
- tableName = db;
- }
-
- public String getTableName(){
- return tableName;
- }
-
- public void setJndiName(String name){
- jndiName = name;
- }
-
- public String getJndiName() {
- return jndiName;
- }
-
- public void setSchemaName(String name){
- schemaName = name;
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- public void setNoOfRows(Integer i) {
- System.out.println("Setting no of rows :" + i);
- noOfRows = i;
- }
-
- public Integer getNoOfRows() {
- return noOfRows;
- }
-
-private void printHierarchy(ClassLoader cl, int cnt){
-while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
-}
-}
-
-private void compareHierarchy(ClassLoader cl1, ClassLoader cl2 , int cnt){
-while(cl1 != null || cl2 != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
- cl1 = cl1.getParent();
- cl2 = cl2.getParent();
- cnt += 3;
-}
-}
-
-
- public boolean checkSetup(){
-
- if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
-
- if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
-
- Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
- try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
-/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
-
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
-
- System.out.println("Before lookup");
-*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
-
- DataSource ds = (DataSource)o ;
-/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-*/
- con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
-
- System.out.println("Executing query :" + qry);
-
- s = con.createStatement();
- rs = s.executeQuery(qry);
-
- int i = 0;
- if (rs.next()) {
- i++;
- }
-
- System.out.println("No of rows found:" + i);
- System.out.println("No of rows expected:" + noOfRows);
-
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
- } catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
deleted file mode 100755
index ce8635b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.LocalTransactionException;
-
-/**
- * <code>LocalTransaction</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
- private ManagedConnection mc;
-
- /**
- * Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
- */
- public LocalTransaction(ManagedConnection mc) {
- this.mc = mc;
- }
-
- /**
- * Begin a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
- */
- public void begin() throws ResourceException {
- //GJCINT
- mc.transactionStarted();
- try {
- mc.getActualConnection().setAutoCommit(false);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- }
-
- /**
- * Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
- */
- public void commit() throws ResourceException {
- Exception e = null;
- try {
- mc.getActualConnection().commit();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
- /**
- * Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
- */
- public void rollback() throws ResourceException {
- try {
- mc.getActualConnection().rollback();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
deleted file mode 100755
index f0443d0..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.*;
-import jakarta.resource.*;
-import javax.security.auth.Subject;
-import java.io.PrintWriter;
-import javax.transaction.xa.XAResource;
-import java.util.Set;
-import java.util.Hashtable;
-import java.util.Iterator;
-import javax.sql.PooledConnection;
-import javax.sql.XAConnection;
-import java.sql.Connection;
-import java.sql.SQLException;
-import jakarta.resource.NotSupportedException;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.LocalTransaction;
-import com.sun.jdbcra.spi.ManagedConnectionMetaData;
-import com.sun.jdbcra.util.SecurityUtils;
-import com.sun.jdbcra.spi.ConnectionHolder;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * <code>ManagedConnection</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
-
- public static final int ISNOTAPOOLEDCONNECTION = 0;
- public static final int ISPOOLEDCONNECTION = 1;
- public static final int ISXACONNECTION = 2;
-
- private boolean isDestroyed = false;
- private boolean isUsable = true;
-
- private int connectionType = ISNOTAPOOLEDCONNECTION;
- private PooledConnection pc = null;
- private java.sql.Connection actualConnection = null;
- private Hashtable connectionHandles;
- private PrintWriter logWriter;
- private PasswordCredential passwdCredential;
- private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
- private XAResource xar = null;
- public ConnectionHolder activeConnectionHandle;
-
- //GJCINT
- private int isolationLevelWhenCleaned;
- private boolean isClean = false;
-
- private boolean transactionInProgress = false;
-
- private ConnectionEventListener listener = null;
-
- private ConnectionEvent ce = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
-
- /**
- * Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
- * pooledConn parameter is expected to be non null and sqlConn parameter
- * is expected to be null in the case where the datasource object is a
- * connection pool datasource or an xa datasource.
- *
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
- */
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
- PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
- if(pooledConn == null && sqlConn == null) {
- throw new ResourceException("Connection object cannot be null");
- }
-
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
-
- pc = pooledConn;
- connectionHandles = new Hashtable();
- passwdCredential = passwdCred;
- this.mcf = mcf;
- if(passwdCredential != null &&
- this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
- "ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
- " the PasswordCredential for this ManagedConnection");
- }
- logWriter = mcf.getLogWriter();
- activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
- }
-
- /**
- * Adds a connection event listener to the ManagedConnection instance.
- *
- * @param listener <code>ConnectionEventListener</code>
- * @see <code>removeConnectionEventListener</code>
- */
- public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
- }
-
- /**
- * Used by the container to change the association of an application-level
- * connection handle with a <code>ManagedConnection</code> instance.
- *
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
- */
- public void associateConnection(Object connection) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In associateConnection");
- }
- checkIfValid();
- if(connection == null) {
- throw new ResourceException("Connection handle cannot be null");
- }
- ConnectionHolder ch = (ConnectionHolder) connection;
-
- com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
- ch.associateConnection(actualConnection, this);
- /**
- * The expectation from the above method is that the connection holder
- * replaces the actual sql connection it holds with the sql connection
- * handle being passed in this method call. Also, it replaces the reference
- * to the ManagedConnection instance with this ManagedConnection instance.
- * Any previous statements and result sets also need to be removed.
- */
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- ch.setActive(true);
- activeConnectionHandle = ch;
- }
-
- /**
- * Application server calls this method to force any cleanup on the
- * <code>ManagedConnection</code> instance. This method calls the invalidate
- * method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
- */
- public void cleanup() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In cleanup");
- }
- checkIfValid();
-
- /**
- * may need to set the autocommit to true for the non-pooled case.
- */
- //GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- throw new ResourceException("The isolation level for the physical connection "
- + "could not be retrieved");
- }
- }
- isClean = true;
-
- activeConnectionHandle = null;
- }
-
- /**
- * This method removes all the connection handles from the table
- * of connection handles and invalidates all of them so that any
- * operation on those connection handles throws an exception.
- *
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
- */
- private void invalidateAllConnectionHandles() throws ResourceException {
- Set handles = connectionHandles.keySet();
- Iterator iter = handles.iterator();
- try {
- while(iter.hasNext()) {
- ConnectionHolder ch = (ConnectionHolder)iter.next();
- ch.invalidate();
- }
- } catch(java.util.NoSuchElementException nsee) {
- throw new ResourceException("Could not find the connection handle: "+ nsee.getMessage());
- }
- connectionHandles.clear();
- }
-
- /**
- * Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
- */
- public void destroy() throws ResourceException{
- if(logWriter != null) {
- logWriter.println("In destroy");
- }
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
-
- activeConnectionHandle = null;
- try {
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- pc.close();
- pc = null;
- actualConnection = null;
- } else {
- actualConnection.close();
- actualConnection = null;
- }
- } catch(SQLException sqle) {
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
- + sqle.getMessage());
- }
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- }
-
- /**
- * Creates a new connection handle for the underlying physical
- * connection represented by the <code>ManagedConnection</code> instance.
- *
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
- */
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
- throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getConnection");
- }
- checkIfValid();
- com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
- PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
- if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
- throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
- }
-
- //GJCINT
- getActualConnection();
-
- /**
- * The following code in the if statement first checks if this ManagedConnection
- * is clean or not. If it is, it resets the transaction isolation level to what
- * it was when it was when this ManagedConnection was cleaned up depending on the
- * ConnectionRequestInfo passed.
- */
- if(isClean) {
- ((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
- }
-
-
- ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- connHolderObject.setActive(true);
- activeConnectionHandle = connHolderObject;
-
- return connHolderObject;
-
- }
-
- /**
- * Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
- *
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLocalTransaction");
- }
- checkIfValid();
- return new com.sun.jdbcra.spi.LocalTransaction(this);
- }
-
- /**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>setLogWriter</code>
- */
- public PrintWriter getLogWriter() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLogWriter");
- }
- checkIfValid();
-
- return logWriter;
- }
-
- /**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
- *
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getMetaData");
- }
- checkIfValid();
-
- return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
- }
-
- /**
- * Returns an <code>XAResource</code> instance.
- *
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
- */
- public XAResource getXAResource() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getXAResource");
- }
- checkIfValid();
-
- if(connectionType == ISXACONNECTION) {
- try {
- if(xar == null) {
- /**
- * Using the wrapper XAResource.
- */
- xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
- }
- return xar;
- } catch(SQLException sqle) {
- throw new ResourceException(sqle.getMessage());
- }
- } else {
- throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
- }
- }
-
- /**
- * Removes an already registered connection event listener from the
- * <code>ManagedConnection</code> instance.
- *
- * @param listener <code>ConnectionEventListener</code> to be removed
- * @see <code>addConnectionEventListener</code>
- */
- public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.start() has been called or from
- * LocalTransaction object when its begin() method is called.
- */
- void transactionStarted() {
- transactionInProgress = true;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.end() has been called or from
- * LocalTransaction object when its end() method is called.
- */
- void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
- }
-
- try {
- actualConnection.close();
- actualConnection = null;
- } catch(SQLException sqle) {
- actualConnection = null;
- }
- }
-
-
- isClean = true;
-
- activeConnectionHandle = null;
-
- }
-
- /**
- * Checks if a this ManagedConnection is involved in a transaction
- * or not.
- */
- public boolean isTransactionInProgress() {
- return transactionInProgress;
- }
-
- /**
- * Sets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(PrintWriter out) throws ResourceException {
- checkIfValid();
- logWriter = out;
- }
-
- /**
- * This method determines the type of the connection being held
- * in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
- */
- private int getConnectionType(PooledConnection pooledConn) {
- if(pooledConn == null) {
- return ISNOTAPOOLEDCONNECTION;
- } else if(pooledConn instanceof XAConnection) {
- return ISXACONNECTION;
- } else {
- return ISPOOLEDCONNECTION;
- }
- }
-
- /**
- * Returns the <code>ManagedConnectionFactory</code> instance that
- * created this <code>ManagedConnection</code> instance.
- *
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
- */
- ManagedConnectionFactory getManagedConnectionFactory() {
- return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
- }
-
- /**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
- *
- * @return the physical <code>java.sql.Connection</code>
- */
- //GJCINT
- java.sql.Connection getActualConnection() throws ResourceException {
- //GJCINT
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- try {
- if(actualConnection == null) {
- actualConnection = pc.getConnection();
- }
-
- } catch(SQLException sqle) {
- sqle.printStackTrace();
- throw new ResourceException(sqle.getMessage());
- }
- }
- return actualConnection;
- }
-
- /**
- * Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
- *
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
- */
- PasswordCredential getPasswordCredential() {
- return passwdCredential;
- }
-
- /**
- * Checks if this <code>ManagedConnection</code> is valid or not and throws an
- * exception if it is not valid. A <code>ManagedConnection</code> is not valid if
- * destroy has not been called and no physical connection error has
- * occurred rendering the physical connection unusable.
- *
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
- */
- //GJCINT
- void checkIfValid() throws ResourceException {
- if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
- "connection is not usable.");
- }
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when its close method is
- * called. This <code>ManagedConnection</code> instance invalidates the connection handle
- * and sends a CONNECTION_CLOSED event to all the registered event listeners.
- *
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
- */
- void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
- connHolderObject.invalidate();
-
- activeConnectionHandle = null;
-
- ce.setConnectionHandle(connHolderObject);
- listener.connectionClosed(ce);
-
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when it detects a connecion
- * related error.
- *
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
- */
- void connectionErrorOccurred(Exception e,
- com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
- ConnectionEventListener cel = this.listener;
- ConnectionEvent ce = null;
- ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
- : new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
- if (connHolderObject != null) {
- ce.setConnectionHandle(connHolderObject);
- }
-
- cel.connectionErrorOccurred(ce);
- isUsable = false;
- }
-
-
-
- /**
- * This method is called by the <code>XAResource</code> object when its start method
- * has been invoked.
- *
- */
- void XAStartOccurred() {
- try {
- actualConnection.setAutoCommit(false);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by the <code>XAResource</code> object when its end method
- * has been invoked.
- *
- */
- void XAEndOccurred() {
- try {
- actualConnection.setAutoCommit(true);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by a Connection Handle to check if it is
- * the active Connection Handle. If it is not the active Connection
- * Handle, this method throws an SQLException. Else, it
- * returns setting the active Connection Handle to the calling
- * Connection Handle object to this object if the active Connection
- * Handle is null.
- *
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
- */
-
- void checkIfActive(ConnectionHolder ch) throws SQLException {
- if(isDestroyed == true || isUsable == false) {
- throw new SQLException("The physical connection is not usable");
- }
-
- if(activeConnectionHandle == null) {
- activeConnectionHandle = ch;
- ch.setActive(true);
- return;
- }
-
- if(activeConnectionHandle != ch) {
- throw new SQLException("The connection handle cannot be used as another connection is currently active");
- }
- }
-
- /**
- * sets the connection type of this connection. This method is called
- * by the MCF while creating this ManagedConnection. Saves us a costly
- * instanceof operation in the getConnectionType
- */
- public void initializeConnectionType( int _connectionType ) {
- connectionType = _connectionType;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
deleted file mode 100755
index 5ec326c..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import java.sql.SQLException;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
-
- private java.sql.DatabaseMetaData dmd = null;
- private ManagedConnection mc;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Constructor for <code>ManagedConnectionMetaData</code>
- *
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
- */
- public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
- try {
- this.mc = mc;
- dmd = mc.getActualConnection().getMetaData();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product name of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductName() throws ResourceException {
- try {
- return dmd.getDatabaseProductName();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product version of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductVersion() throws ResourceException {
- try {
- return dmd.getDatabaseProductVersion();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
- throw new ResourceException(sqle.getMessage(), sqle.getMessage());
- }
- }
-
- /**
- * Returns maximum limit on number of active concurrent connections
- * that an EIS instance can support across client processes.
- *
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
- */
- public int getMaxConnections() throws ResourceException {
- try {
- return dmd.getMaxConnections();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns name of the user associated with the ManagedConnection instance. The name
- * corresponds to the resource principal under whose whose security context, a connection
- * to the EIS instance has been established.
- *
- * @return name of the user
- * @throws <code>ResourceException</code>
- */
- public String getUserName() throws ResourceException {
- jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
- if(pc != null) {
- return pc.getUserName();
- }
-
- return mc.getManagedConnectionFactory().getUser();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
deleted file mode 100755
index f0ba663..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.transaction.xa.Xid;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import com.sun.jdbcra.spi.ManagedConnection;
-
-/**
- * <code>XAResource</code> wrapper for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
- */
-public class XAResourceImpl implements XAResource {
-
- XAResource xar;
- ManagedConnection mc;
-
- /**
- * Constructor for XAResourceImpl
- *
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
- */
- public XAResourceImpl(XAResource xar, ManagedConnection mc) {
- this.xar = xar;
- this.mc = mc;
- }
-
- /**
- * Commit the global transaction specified by xid.
- *
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
- */
- public void commit(Xid xid, boolean onePhase) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.commit(xid, onePhase);
- }
-
- /**
- * Ends the work performed on behalf of a transaction branch.
- *
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
- */
- public void end(Xid xid, int flags) throws XAException {
- xar.end(xid, flags);
- //GJCINT
- //mc.transactionCompleted();
- }
-
- /**
- * Tell the resource manager to forget about a heuristically completed transaction branch.
- *
- * @param xid A global transaction identifier
- */
- public void forget(Xid xid) throws XAException {
- xar.forget(xid);
- }
-
- /**
- * Obtain the current transaction timeout value set for this
- * <code>XAResource</code> instance.
- *
- * @return the transaction timeout value in seconds
- */
- public int getTransactionTimeout() throws XAException {
- return xar.getTransactionTimeout();
- }
-
- /**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
- * instance represented by the parameter xares.
- *
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
- */
- public boolean isSameRM(XAResource xares) throws XAException {
- return xar.isSameRM(xares);
- }
-
- /**
- * Ask the resource manager to prepare for a transaction commit
- * of the transaction specified in xid.
- *
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
- */
- public int prepare(Xid xid) throws XAException {
- return xar.prepare(xid);
- }
-
- /**
- * Obtain a list of prepared transaction branches from a resource manager.
- *
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
- */
- public Xid[] recover(int flag) throws XAException {
- return xar.recover(flag);
- }
-
- /**
- * Inform the resource manager to roll back work done on behalf of a transaction branch
- *
- * @param xid A global transaction identifier
- */
- public void rollback(Xid xid) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.rollback(xid);
- }
-
- /**
- * Set the current transaction timeout value for this <code>XAResource</code> instance.
- *
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
- */
- public boolean setTransactionTimeout(int seconds) throws XAException {
- return xar.setTransactionTimeout(seconds);
- }
-
- /**
- * Start work on behalf of a transaction branch specified in xid.
- *
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
- */
- public void start(Xid xid, int flags) throws XAException {
- //GJCINT
- mc.transactionStarted();
- xar.start(xid, flags);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
deleted file mode 100755
index 7ca9cfb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/spi/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile13">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="build13" depends="compile13">
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="build14" depends="compile14"/>
-
- <target name="build" depends="build13, build14"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
deleted file mode 100755
index de4a961..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Vector;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Execute the methods based on the parameters.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class MethodExecutor implements java.io.Serializable{
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Exceute a simple set Method.
- *
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Executes the method.
- *
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Converts the type from String to the Class type.
- *
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
-
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
- }
-
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
deleted file mode 100755
index bed9dd7..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import javax.security.auth.Subject;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import jakarta.resource.spi.security.PasswordCredential;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.*;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import java.util.Set;
-import java.util.Iterator;
-
-/**
- * SecurityUtils for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class SecurityUtils {
-
- /**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
- * it constructs a <code>PasswordCredential</code> object with
- * the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
- * the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
- * <code>ManagedConnectionFactory</code>, instance equivalent
- * to the <code>ManagedConnectionFactory</code>, parameter.
- *
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
- */
- public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
- final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
-
- if (info == null) {
- if (subject == null) {
- return null;
- } else {
- PasswordCredential pc = (PasswordCredential) AccessController.doPrivileged
- (new PrivilegedAction() {
- public Object run() {
- Set passwdCredentialSet = subject.getPrivateCredentials(PasswordCredential.class);
- Iterator iter = passwdCredentialSet.iterator();
- while (iter.hasNext()) {
- PasswordCredential temp = (PasswordCredential) iter.next();
- if (temp.getManagedConnectionFactory().equals(mcf)) {
- return temp;
- }
- }
- return null;
- }
- });
- if (pc == null) {
- throw new jakarta.resource.spi.SecurityException("No PasswordCredential found");
- } else {
- return pc;
- }
- }
- } else {
- com.sun.jdbcra.spi.ConnectionRequestInfo cxReqInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) info;
- PasswordCredential pc = new PasswordCredential(cxReqInfo.getUser(), cxReqInfo.getPassword().toCharArray());
- pc.setManagedConnectionFactory(mcf);
- return pc;
- }
- }
-
- /**
- * Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
- */
- static private boolean isEqual(String str1, String str2) {
- if (str1 == null) {
- return (str2 == null);
- } else {
- return str1.equals(str2);
- }
- }
-
- /**
- * Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
- *
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
- */
- static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
- if (pC1 == pC2)
- return true;
- if(pC1 == null || pC2 == null)
- return (pC1 == pC2);
- if (!isEqual(pC1.getUserName(), pC2.getUserName())) {
- return false;
- }
- String p1 = null;
- String p2 = null;
- if (pC1.getPassword() != null) {
- p1 = new String(pC1.getPassword());
- }
- if (pC2.getPassword() != null) {
- p2 = new String(pC2.getPassword());
- }
- return (isEqual(p1, p2));
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
deleted file mode 100755
index f060e7d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ra/src/com/sun/jdbcra/util/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/util"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/README b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/README
index 082f756..a840cc2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/README
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/README
@@ -1,21 +1,22 @@
To test "deploy --force=true .rar"
To test "undeploy --cascade=true rarname"
-This test is similar to redeployRAR test, difference being we do not undeploy first version of testjdbcra.rar and deploy second version of testjdbcra.rar.
-Instead we do "deploy --force=true" for second version of testjdbcra.rar without undeploying first version of testjdbcra.rar
-deploy --force=true should undeploy the first version of resource-adapter , its resources, resource-adapter-config and use the second version's testjdbcra.rar, use the same resource-adapter-config
-and recreate the resources
+This test is similar to redeployRAR test, difference being we do not undeploy first version of
+connectors-ra-redeploy-rars.rar and deploy second version of connectors-ra-redeploy-rars.rar.
+Instead we do "deploy --force=true" for second version of connectors-ra-redeploy-rars.rar without
+undeploying first version of connectors-ra-redeploy-rars.rar
+deploy --force=true should undeploy the first version of resource-adapter, its resources,
+resource-adapter-config and use the second version's connectors-ra-redeploy-rars.rar,
+use the same resource-adapter-config and recreate the resources
-This test is executed twice to make sure that "undeploy --cascade=true rarname" works fine. Second run will try to create same resource which will fail in case the resource by the name exists.
+This test is executed twice to make sure that "undeploy --cascade=true rarname" works fine.
+Second run will try to create same resource which will fail in case the resource by the name exists.
Resource types include : Connector-connection-pool, connector-resource, admin-object-resource, resource-adapter-config
How to run :
pwd :(force-deploy-rar directory)
-cd ra
-ant all - will create necessary resource adapter bundles, classes
-cd ../
ant all
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/build.xml
index bfdafb2..b17857a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/build.xml
@@ -32,12 +32,12 @@
<target name="all" depends="init-common">
<antcall target="compile-common">
<param name="src" value="." />
- <param name="s1astest.classpath" value="${s1astest.classpath}:../versions/version1/test/testjdbcra.rar:../../ra/publish/internal/classes" />
+ <param name="s1astest.classpath" value="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes" />
</antcall>
<antcall target="ejb-jar-common">
<param name="ejb-jar.xml" value="META-INF/ejb-jar.xml" />
- <param name="ejbjar.classes" value=" beans/*.class, ../../ra/publish/internal/classes/**/*.class " />
+ <param name="ejbjar.classes" value=" beans/*.class, ${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes/**/*.class " />
<param name="sun-ejb-jar.xml" value="META-INF/sun-ejb-jar.xml" />
<param name="appname" value="generic-embedded" />
</antcall>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml
index 828b005..6d892bb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/build.xml
@@ -18,10 +18,10 @@
-->
- <!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
- <!ENTITY commonRun SYSTEM "./../../../../config/run.xml">
- <!ENTITY testproperties SYSTEM "./build.properties">
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY commonRun SYSTEM "./../../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
]>
<project name="force-deploy-rar" default="usage" basedir=".">
@@ -31,212 +31,223 @@
&commonRun;
&testproperties;
- <target name="all" depends="build,setup,run"/>
+ <target name="all" depends="build,setup,run" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="compile" depends="clean">
- <ant dir="ra" inheritAll="false" target="compile"/>
+ <target name="compile" depends="clean">
+ <ant dir="ra" inheritAll="false" target="compile" />
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- <param name="s1astest.classpath" value="${s1astest.classpath}:./ra/publish/internal/classes/"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="servlet"/>
- </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="ejb" />
+ <param name="s1astest.classpath"
+ value="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
+ />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="client" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="servlet" />
+ </antcall>
- <javac
- srcdir="."
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/WebTest.java" destdir="."/>
+ <javac srcdir="."
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/WebTest.java"
+ destdir="."
+ />
- </target>
+ </target>
- <target name="build" depends="compile">
- <ant dir="ra" inheritAll="false" target="build"/>
+ <target name="build" depends="compile">
+ <ant dir="ra" inheritAll="false" target="build" />
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="appname" value="force-deploy-rar"/>
- <param name="web.xml" value="descriptor/web.xml"/>
- <param name="sun-web.xml" value="descriptor/sun-web.xml"/>
- <param name="webclient.war.classes" value="servlet/*.class, beans/*.class"/>
- </antcall>
+ <antcall target="webclient-war-common">
+ <param name="hasWebclient" value="yes" />
+ <param name="appname" value="force-deploy-rar" />
+ <param name="web.xml" value="descriptor/web.xml" />
+ <param name="sun-web.xml" value="descriptor/sun-web.xml" />
+ <param name="webclient.war.classes" value="servlet/*.class, beans/*.class" />
+ </antcall>
- <antcall target="build-ear-common">
- <param name="ejbjar.classes"
- value="**/*Vers*.class"/>
- </antcall>
+ <antcall target="build-ear-common">
+ <param name="ejbjar.classes" value="**/*Vers*.class" />
+ </antcall>
- </target>
+ </target>
- <target name="setup" depends="init-common"/>
+ <target name="setup" depends="init-common" />
- <target name="setupone" depends="init-common">
- <antcall target="create-ra-config"/>
- <antcall target="deploy-rar-common">
- <param name="rarfile" value="versions/ver1/testjdbcra.rar"/>
- <param name="force" value="true"/>
- </antcall>
- </target>
+ <target name="setupone" depends="init-common">
+ <antcall target="create-ra-config" />
+ <antcall target="deploy-rar-common">
+ <param name="rarfile"
+ value="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar"
+ />
+ <param name="force" value="true" />
+ </antcall>
+ </target>
- <target name="setuptwo" depends="init-common">
-<!--
- We need not create-ra-config as we are not undeploying first testjdbcra.rar and its ra-config, we will be doing
- force=true with second testjdbcra.rar
+ <target name="setuptwo" depends="init-common">
+ <!--
+ We need not create-ra-config as we are not undeploying first connectors-ra-redeploy-rars and its ra-config, we will be doing
+ force=true with second connectors-ra-redeploy-rars
<antcall target="create-ra-config"/>
-->
- <antcall target="deploy-rar-common">
- <param name="rarfile" value="versions/ver2/testjdbcra.rar"/>
- <param name="force" value="true"/>
- </antcall>
- </target>
+ <!-- Applications must have the same filename, which is used as an application name -->
+ <copy file="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars-v2.rar"
+ tofile="connectors-ra-redeploy-rars.rar"
+ />
+ <antcall target="deploy-rar-common">
+ <param name="rarfile" value="connectors-ra-redeploy-rars.rar" />
+ <param name="force" value="true" />
+ </antcall>
+ </target>
- <target name="deploy" depends="init-common">
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy" depends="init-common">
+ <antcall target="deploy-common" />
+ </target>
- <target name="run" depends="init-common">
- <!-- Running the redeploy cycle (twice) to test version 1 classes getting reset after verison 2 is undeployed -->
- <antcall target="runCycle"/>
- <antcall target="runCycle"/>
- </target>
+ <target name="run" depends="init-common">
+ <!-- Running the redeploy cycle (twice) to test version 1 classes getting reset after verison 2 is undeployed -->
+ <antcall target="runCycle" />
+ <antcall target="runCycle" />
+ </target>
- <target name="runCycle" depends="init-common">
+ <target name="runCycle" depends="init-common">
- <antcall target="setupone"/>
+ <antcall target="setupone" />
- <antcall target="create-pool"/>
- <antcall target="create-resource"/>
- <antcall target="create-admin-object"/>
- <antcall target="deploy"/>
+ <antcall target="create-pool" />
+ <antcall target="create-resource" />
+ <antcall target="create-admin-object" />
+ <antcall target="deploy" />
- <java classname="client.WebTest">
- <arg value="${http.host}"/>
- <arg value="${http.port}"/>
- <arg value="${contextroot}"/>
- <arg value=" 1 "/>
- <classpath>
- <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
- <pathelement location="."/>
- </classpath>
- </java>
+ <java classname="client.WebTest">
+ <arg value="${http.host}" />
+ <arg value="${http.port}" />
+ <arg value="${contextroot}" />
+ <arg value=" 1 " />
+ <classpath>
+ <pathelement location="${env.APS_HOME}/lib/reporter.jar" />
+ <pathelement location="." />
+ </classpath>
+ </java>
- <antcall target="undeploy-common"/>
+ <antcall target="undeploy-common" />
- <antcall target="setuptwo"/>
- <antcall target="deploy"/>
- <java classname="client.WebTest">
- <arg value="${http.host}"/>
- <arg value="${http.port}"/>
- <arg value="${contextroot}"/>
- <arg value=" 2 "/>
- <classpath>
- <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
- <pathelement location="."/>
- </classpath>
- </java>
- <antcall target="unsetup"/>
- </target>
+ <antcall target="setuptwo" />
+ <antcall target="deploy" />
+ <java classname="client.WebTest">
+ <arg value="${http.host}" />
+ <arg value="${http.port}" />
+ <arg value="${contextroot}" />
+ <arg value=" 2 " />
+ <classpath>
+ <pathelement location="${env.APS_HOME}/lib/reporter.jar" />
+ <pathelement location="." />
+ </classpath>
+ </java>
+ <antcall target="unsetup" />
+ </target>
- <target name="unsetup" depends="init-common">
-<!--
+ <target name="unsetup" depends="init-common">
+ <!--
<antcall target="delete-admin-object"/>
<antcall target="delete-resource"/>
<antcall target="delete-pool"/>
<antcall target="delete-ra-config"/>-->
- <antcall target="undeploy"/>
- </target>
+ <antcall target="undeploy" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- <antcall target="undeploy-rar-common">
- <param name="undeployrar" value="testjdbcra"/>
- <param name="cascade" value="true"/>
- </antcall>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ <antcall target="undeploy-rar-common">
+ <param name="undeployrar" value="connectors-ra-redeploy-rars" />
+ <param name="cascade" value="true" />
+ </antcall>
+ </target>
- <target name="create-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command"
- value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname testjdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=connector:NoOfRows=1"/>
- <param name="operand.props" value="eis/testAdmin"/>
- </antcall>
- </target>
+ <target name="create-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command"
+ value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname connectors-ra-redeploy-rars --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=connector:NoOfRows=1"
+ />
+ <param name="operand.props" value="eis/testAdmin" />
+ </antcall>
+ </target>
- <target name="delete-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/testAdmin"/>
- </antcall>
- </target>
+ <target name="delete-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-admin-object" />
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/testAdmin" />
+ </antcall>
+ </target>
- <target name="create-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="testjdbcra"/>
- </antcall>
- </target>
- <target name="delete-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="testjdbcra"/>
- </antcall>
- </target>
+ <target name="create-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command"
+ value="create-resource-adapter-config --property RAProperty=VALID"
+ />
+ <param name="operand.props" value="connectors-ra-redeploy-rars" />
+ </antcall>
+ </target>
+ <target name="delete-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-resource-adapter-config" />
+ <param name="operand.props" value="connectors-ra-redeploy-rars" />
+ </antcall>
+ </target>
- <target name="create-pool">
- <antcall target="create-connector-connpool-common">
- <param name="ra.name" value="testjdbcra"/>
- <param name="connection.defname" value="javax.sql.DataSource"/>
- <param name="connector.conpool.name" value="versiontest-ra-pool"/>
- <param name="failonerror" value="true"/>
- </antcall>
-<!--
+ <target name="create-pool">
+ <antcall target="create-connector-connpool-common">
+ <param name="ra.name" value="connectors-ra-redeploy-rars" />
+ <param name="connection.defname" value="javax.sql.DataSource" />
+ <param name="connector.conpool.name" value="versiontest-ra-pool" />
+ <param name="failonerror" value="true" />
+ </antcall>
+ <!--
<antcall target="set-oracle-props">
<param name="pool.type" value="connector"/>
<param name="conpool.name" value="versiontest-ra-pool"/>
</antcall>
-->
- </target>
+ </target>
- <target name="create-resource">
- <antcall target="create-connector-resource-common">
- <param name="connector.conpool.name" value="versiontest-ra-pool"/>
- <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- <param name="failonerror" value="true"/>
- </antcall>
- </target>
+ <target name="create-resource">
+ <antcall target="create-connector-resource-common">
+ <param name="connector.conpool.name" value="versiontest-ra-pool" />
+ <param name="connector.jndi.name" value="jdbc/ejb-subclassing" />
+ <param name="failonerror" value="true" />
+ </antcall>
+ </target>
- <target name="delete-pool">
- <antcall target="delete-connector-connpool-common">
- <param name="connector.conpool.name" value="versiontest-ra-pool"/>
- </antcall>
- </target>
+ <target name="delete-pool">
+ <antcall target="delete-connector-connpool-common">
+ <param name="connector.conpool.name" value="versiontest-ra-pool" />
+ </antcall>
+ </target>
- <target name="delete-resource">
- <antcall target="delete-connector-resource-common">
- <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
- </target>
+ <target name="delete-resource">
+ <antcall target="delete-connector-resource-common">
+ <param name="connector.jndi.name" value="jdbc/ejb-subclassing" />
+ </antcall>
+ </target>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <target name="usage">
+ <antcall target="usage-common" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.properties
deleted file mode 100755
index fd21c3d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0, which is available at
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-
-### Component Properties ###
-src.dir=src
-component.publish.home=.
-component.classes.dir=${component.publish.home}/internal/classes
-component.lib.home=${component.publish.home}/lib
-component.publish.home=publish
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.xml
deleted file mode 100755
index 38d3c2f..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE project [
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
- <!ENTITY common SYSTEM "../../../../../config/common.xml">
- <!ENTITY testcommon SYSTEM "../../../../../config/properties.xml">
-]>
-
-<project name="JDBCConnector top level" default="build">
- <property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
- &common;
- &testcommon;
- <property file="./build.properties"/>
-
- <target name="build" depends="compile,assemble" />
-
-
- <!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
- <target name="init" description="${component.name} initialization">
- <tstamp>
- <format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
- <echo message="Building component ${component.name}"/>
- <mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
- </target>
- <!-- compile -->
- <target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
- <!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
- destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- <include name="com/sun/jdbcra/**"/>
- <include name="com/sun/appserv/**"/>
- </javac>
- </target>
-
- <target name="all" depends="build"/>
-
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${component.lib.home}/testjdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
-
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete file="${component.lib.home}/ra.xml"/>
-
- </target>
-
- <target name="clean" description="Clean the build">
- <delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${component.classes.dir}"/>
- <fileset dir="${component.lib.home}"/>
- </delete>
- </target>
-
-</project>
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/appserv/jdbcra/DataSource.java
deleted file mode 100755
index b6ef30b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.appserv.jdbcra;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
- * server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
- * application server.
- * <p>A sample code for getting driver's connection implementation would like
- * the following.
- * <pre>
- InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
- Connection con = ds.getConnection();
- Connection drivercon = ds.getConnection(con);
-
- // Do db operations.
-
- con.close();
- </pre>
- *
- * @author Binod P.G
- */
-public interface DataSource extends javax.sql.DataSource {
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
deleted file mode 100755
index 88a0950..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.StringTokenizer;
-import java.util.Enumeration;
-import com.sun.jdbcra.util.MethodExecutor;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Utility class, which would create necessary Datasource object according to the
- * specification.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
- */
-public class DataSourceObjectBuilder implements java.io.Serializable{
-
- private DataSourceSpec spec;
-
- private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
- */
- public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
- }
-
- /**
- * Construct the DataSource Object from the spec.
- *
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
- */
- public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
- Object dataSourceObject = getDataSourceObject();
- Method[] methods = dataSourceObject.getClass().getMethods();
- for (int i=0; i < methods.length; i++) {
- String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
- }
- return dataSourceObject;
- }
-
- /**
- * Get the extra driver properties from the DataSourceSpec object and
- * parse them to a set of methodName and parameters. Prepare a hashtable
- * containing these details and return.
- *
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
- */
- private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
-
- String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
- }
-
- /**
- * Creates a Datasource object according to the spec.
- *
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
- */
- private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
- Class dataSourceClass = Class.forName(className);
- Object dataSourceObject = dataSourceClass.newInstance();
- return dataSourceObject;
- } catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
- throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
- } catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
- throw new ResourceException("Error in instantiating" + className);
- } catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
- throw new ResourceException("Access Error in instantiating" + className);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
deleted file mode 100755
index 1c4b072..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.util.Hashtable;
-
-/**
- * Encapsulate the DataSource object details obtained from
- * ManagedConnectionFactory.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class DataSourceSpec implements java.io.Serializable{
-
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
- private Hashtable details = new Hashtable();
-
- /**
- * Set the property.
- *
- * @param property Property Name to be set.
- * @param value Value of property to be set.
- */
- public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
- }
-
- /**
- * Get the value of property
- *
- * @return Value of the property.
- */
- public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
- }
-
- /**
- * Checks whether two <code>DataSourceSpec</code> objects
- * are equal or not.
- *
- * @param obj Instance of <code>DataSourceSpec</code> object.
- */
- public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
- }
-
- /**
- * Retrieves the hashCode of this <code>DataSourceSpec</code> object.
- *
- * @return hashCode of this object.
- */
- public int hashCode() {
- return this.details.hashCode();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/build.xml
deleted file mode 100755
index 3b4faeb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/common/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/common"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/common.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
deleted file mode 100755
index fb0fdab..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import java.sql.DriverManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import java.sql.SQLException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- * This class is extended by the DataSource specific <code>ManagedConnection</code> factories
- * and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
- java.io.Serializable {
-
- protected DataSourceSpec spec = new DataSourceSpec();
- protected transient DataSourceObjectBuilder dsObjBuilder;
-
- protected java.io.PrintWriter logWriter = null;
- protected jakarta.resource.spi.ResourceAdapter ra = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory() {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory()");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
- return cf;
- }
-
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager)");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
- }
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public abstract boolean equals(Object other);
-
- /**
- * Get the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
- */
- public java.io.PrintWriter getLogWriter() {
- return logWriter;
- }
-
- /**
- * Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
- */
- public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
- if(logWriter != null) {
- logWriter.println("In getResourceAdapter");
- }
- return ra;
- }
-
- /**
- * Returns the hash code for this <code>ManagedConnectionFactory</code>.
- *
- * @return hash code for this <code>ManagedConnectionFactory</code>
- */
- public int hashCode(){
- if(logWriter != null) {
- logWriter.println("In hashCode");
- }
- return spec.hashCode();
- }
-
- /**
- * Returns a matched <code>ManagedConnection</code> from the candidate
- * set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- */
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
- javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In matchManagedConnections");
- }
-
- if(connectionSet == null) {
- return null;
- }
-
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- java.util.Iterator iter = connectionSet.iterator();
- com.sun.jdbcra.spi.ManagedConnection mc = null;
- while(iter.hasNext()) {
- try {
- mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
- } catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
- throw new ResourceException(nsee.getMessage());
- }
- if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
- mc.connectionErrorOccurred(re, null);
- }
- } else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
- mc.connectionErrorOccurred(re, null);
- }
- }
- }
- return null;
- }
-
- //GJCINT
- /**
- * Checks if a <code>ManagedConnection</code> is to be validated or not
- * and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
- */
- void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- if(mc.isTransactionInProgress()) {
- return;
- }
-
- boolean connectionValidationRequired =
- (new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
- if( connectionValidationRequired == false || mc == null) {
- return;
- }
-
-
- String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
- mc.checkIfValid();
- /**
- * The above call checks if the actual physical connection
- * is usable or not.
- */
- java.sql.Connection con = mc.getActualConnection();
-
- if(validationMethod.equals("auto-commit") == true) {
- isValidByAutoCommit(con);
- } else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
- isValidByMetaData(con);
- } else if(validationMethod.equalsIgnoreCase("table") == true) {
- isValidByTableQuery(con, spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME));
- } else {
- throw new ResourceException("The validation method is not proper");
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- // Notice that using something like
- // dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
- // some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
- // Also notice that some XA data sources will throw and exception if
- // you try to call setAutoCommit, for them this method is not recommended
-
- boolean ac = con.getAutoCommit();
- if (ac) {
- con.setAutoCommit(false);
- } else {
- con.rollback(); // prevents uncompleted transaction exceptions
- con.setAutoCommit(true);
- }
-
- con.setAutoCommit(ac);
-
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.DatabaseMetaData dmd = con.getMetaData();
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException("The connection is not valid as "
- + "getting the meta data failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByTableQuery(java.sql.Connection con,
- String tableName) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.Statement stmt = con.createStatement();
- java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
- throw new ResourceException("The connection is not valid as "
- + "querying the table " + tableName + " failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
- * for the <code>ManagedConnection</code> passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
- }
-
- /**
- * Resets the isolation level for the <code>ManagedConnection</code> passed.
- * If the transaction level is to be guaranteed to be the same as the one
- * present when this <code>ManagedConnection</code> was created, as specified
- * by the <code>ConnectionRequestInfo</code> passed, it sets the transaction
- * isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
- * it sets it to the transaction isolation passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
- }
-
- /**
- * Gets the integer equivalent of the string specifying
- * the transaction isolation.
- *
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
- */
- private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
- }
-
- /**
- * Set the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(java.io.PrintWriter out) {
- logWriter = out;
- }
-
- /**
- * Set the associated <code>ResourceAdapter</code> JavaBean.
- *
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
- */
- public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setUser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getUser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setuser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getuser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setPassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getPassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setpassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getpassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setClassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getClassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setclassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getclassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setConnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getConnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setconnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getconnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setValidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getValidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setvalidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getvalidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setValidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getValidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setvalidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getvalidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void setTransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String getTransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void settransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String gettransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getGuaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setguaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getguaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
deleted file mode 100755
index 50c6e41..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.endpoint.MessageEndpointFactory;
-import jakarta.resource.spi.ActivationSpec;
-import jakarta.resource.NotSupportedException;
-import javax.transaction.xa.XAResource;
-import jakarta.resource.spi.BootstrapContext;
-import jakarta.resource.spi.ResourceAdapterInternalException;
-
-/**
- * <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
- */
-public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
-public static final int VERSION = 2;
- public String raProp = null;
-
- /**
- * Empty method implementation for endpointActivation
- * which just throws <code>NotSupportedException</code>
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
- */
- public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty method implementation for endpointDeactivation
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- */
- public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
- }
-
- /**
- * Empty method implementation for getXAResources
- * which just throws <code>NotSupportedException</code>
- *
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
- */
- public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty implementation of start method
- *
- * @param ctx <code>BootstrapContext</code>
- */
- public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
-/*
-NO NEED TO CHECK THIS AS THE TEST's PURPOSE IS TO CHECK THE VERSION ALONE
-
- System.out.println("Resource Adapter is starting with configuration :" + raProp);
- if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
-*/
- }
-
- /**
- * Empty implementation of stop method
- */
- public void stop() {
-
- }
-
- public void setRAProperty(String s) {
- raProp = s;
- }
-
- public String getRAProperty() {
- return raProp;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/build.xml
deleted file mode 100755
index e006b1d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
- </target>
-
- <target name="build14" depends="compile14, package14"/>
- <target name="build13"/>
- <target name="build" depends="build14, build13"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
deleted file mode 100755
index 65338d1..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
- <!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
- description for the resource adapter.
- -->
- <description>Resource adapter wrapping Datasource implementation of driver</description>
-
- <!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
- is intended to be displayed by tools.
- -->
- <display-name>DataSource Resource Adapter</display-name>
-
- <!-- There can be any number of "icon" elements including 0 -->
- <!-- The following is an example.
- <icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
- icon - JPEG or GIF image. The following is an example.
- <small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
- icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
- </icon>
- -->
- <icon>
- <small-icon></small-icon>
- <large-icon></large-icon>
- </icon>
-
- <!-- The "vendor-name" element should occur exactly once. -->
- <!-- This should specify the name of the driver vendor. The following is an example.
- <vendor-name>XYZ INC.</vendor-name>
- -->
- <vendor-name>Sun Microsystems</vendor-name>
-
- <!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
- the database independent of any version information. The following
- is an example.
- <eis-type>XYZ</eis-type>
- -->
- <eis-type>Database</eis-type>
-
- <!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
- the driver vendor. The default is being set as 1.0. The driver
- vendor can change it as required.
- -->
- <resourceadapter-version>1.0</resourceadapter-version>
-
- <!-- This "license" element can occur atmost once -->
- <!-- This specifies licensing requirements for the resource adapter module.
- The following is an example.
- <license>
- There can be any number of "description" elements including 0.
- <description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
- restrictions.
- </description>
-
- This specifies whether a license is required to deploy and use the resource adapter.
- Default is false.
- <license-required>false</license-required>
- </license>
- -->
- <license>
- <license-required>false</license-required>
- </license>
-
- <resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
- elements. The "description" elements are not being included
- in the "config-property" elements below. The driver vendor can
- add them as required.
- -->
-
- <resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
- <outbound-resourceadapter>
-
- <connection-definition>
-
- <managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
- <!-- There can be any number of these elements including 0 -->
- <config-property>
- <config-property-name>ServerName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>localhost</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>PortNumber</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>9092</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>User</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>DBUSER</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Password</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>DBPASSWORD</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DatabaseName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>jdbc:pointbase:server://localhost:9092/sqe-samples,new</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DataSourceName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Description</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>Oracle thin driver Datasource</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NetworkProtocol</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>RoleName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>LoginTimeOut</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DriverProperties</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Delimiter</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>#</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ClassName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>com.pointbase.jdbc.jdbcDataSource</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
-
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
- <connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
- <connection-interface>java.sql.Connection</connection-interface>
-
- <connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
- </connection-definition>
-
- <transaction-support>LocalTransaction</transaction-support>
-
- <authentication-mechanism>
- <!-- There can be any number of "description" elements including 0 -->
- <!-- Not including the "description" element -->
-
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
-
- <reauthentication-support>false</reauthentication-support>
-
- </outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- </adminobject>
-
- </resourceadapter>
-
-</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
deleted file mode 100755
index 2ee36c5..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-
-/**
- * ConnectionManager implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
-
- /**
- * Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
- *
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
- */
- public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
- }
-
- /*
- * This class could effectively implement Connection pooling also.
- * Could be done for FCS.
- */
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
deleted file mode 100755
index ddd0a28..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-/**
- * ConnectionRequestInfo implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
-
- private String user;
- private String password;
-
- /**
- * Constructs a new <code>ConnectionRequestInfo</code> object
- *
- * @param user User Name.
- * @param password Password
- */
- public ConnectionRequestInfo(String user, String password) {
- this.user = user;
- this.password = password;
- }
-
- /**
- * Retrieves the user name of the ConnectionRequestInfo.
- *
- * @return User name of ConnectionRequestInfo.
- */
- public String getUser() {
- return user;
- }
-
- /**
- * Retrieves the password of the ConnectionRequestInfo.
- *
- * @return Password of ConnectionRequestInfo.
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Verify whether two ConnectionRequestInfos are equal.
- *
- * @return True, if they are equal and false otherwise.
- */
- public boolean equals(Object obj) {
- if (obj == null) return false;
- if (obj instanceof ConnectionRequestInfo) {
- ConnectionRequestInfo other = (ConnectionRequestInfo) obj;
- return (isEqual(this.user, other.user) &&
- isEqual(this.password, other.password));
- } else {
- return false;
- }
- }
-
- /**
- * Retrieves the hashcode of the object.
- *
- * @return hashCode.
- */
- public int hashCode() {
- String result = "" + user + password;
- return result.hashCode();
- }
-
- /**
- * Compares two objects.
- *
- * @param o1 First object.
- * @param o2 Second object.
- */
- private boolean isEqual(Object o1, Object o2) {
- if (o1 == null) {
- return (o2 == null);
- } else {
- return o1.equals(o2);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
deleted file mode 100755
index 614ffa9..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ManagedConnectionFactory;
-import com.sun.jdbcra.common.DataSourceSpec;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
- */
-
-public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
- private transient javax.sql.DataSource dataSourceObj;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In createManagedConnection");
- }
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- if(dataSourceObj == null) {
- if(dsObjBuilder == null) {
- dsObjBuilder = new DataSourceObjectBuilder(spec);
- }
-
- try {
- dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
- } catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
- throw new jakarta.resource.ResourceException(cce.getMessage());
- }
- }
-
- java.sql.Connection dsConn = null;
-
- try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
- sqle.getMessage());
- }
-
- com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
- //GJCINT
- setIsolation(mc);
- isValid(mc);
- return mc;
- }
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public boolean equals(Object other) {
- if(logWriter != null) {
- logWriter.println("In equals");
- }
- /**
- * The check below means that two ManagedConnectionFactory objects are equal
- * if and only if their properties are the same.
- */
- if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
- (com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
- return this.spec.equals(otherMCF.spec);
- }
- return false;
- }
-
- /**
- * Sets the server name.
- *
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
- */
- public void setserverName(String serverName) {
- spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
- }
-
- /**
- * Gets the server name.
- *
- * @return serverName
- * @see <code>setServerName</code>
- */
- public String getserverName() {
- return spec.getDetail(DataSourceSpec.SERVERNAME);
- }
-
- /**
- * Sets the server name.
- *
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
- */
- public void setServerName(String serverName) {
- spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
- }
-
- /**
- * Gets the server name.
- *
- * @return serverName
- * @see <code>setServerName</code>
- */
- public String getServerName() {
- return spec.getDetail(DataSourceSpec.SERVERNAME);
- }
-
- /**
- * Sets the port number.
- *
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
- */
- public void setportNumber(String portNumber) {
- spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
- }
-
- /**
- * Gets the port number.
- *
- * @return portNumber
- * @see <code>setPortNumber</code>
- */
- public String getportNumber() {
- return spec.getDetail(DataSourceSpec.PORTNUMBER);
- }
-
- /**
- * Sets the port number.
- *
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
- */
- public void setPortNumber(String portNumber) {
- spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
- }
-
- /**
- * Gets the port number.
- *
- * @return portNumber
- * @see <code>setPortNumber</code>
- */
- public String getPortNumber() {
- return spec.getDetail(DataSourceSpec.PORTNUMBER);
- }
-
- /**
- * Sets the database name.
- *
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
- */
- public void setdatabaseName(String databaseName) {
- spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
- }
-
- /**
- * Gets the database name.
- *
- * @return databaseName
- * @see <code>setDatabaseName</code>
- */
- public String getdatabaseName() {
- return spec.getDetail(DataSourceSpec.DATABASENAME);
- }
-
- /**
- * Sets the database name.
- *
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
- */
- public void setDatabaseName(String databaseName) {
- spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
- }
-
- /**
- * Gets the database name.
- *
- * @return databaseName
- * @see <code>setDatabaseName</code>
- */
- public String getDatabaseName() {
- return spec.getDetail(DataSourceSpec.DATABASENAME);
- }
-
- /**
- * Sets the data source name.
- *
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
- */
- public void setdataSourceName(String dsn) {
- spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
- }
-
- /**
- * Gets the data source name.
- *
- * @return dsn
- * @see <code>setDataSourceName</code>
- */
- public String getdataSourceName() {
- return spec.getDetail(DataSourceSpec.DATASOURCENAME);
- }
-
- /**
- * Sets the data source name.
- *
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
- */
- public void setDataSourceName(String dsn) {
- spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
- }
-
- /**
- * Gets the data source name.
- *
- * @return dsn
- * @see <code>setDataSourceName</code>
- */
- public String getDataSourceName() {
- return spec.getDetail(DataSourceSpec.DATASOURCENAME);
- }
-
- /**
- * Sets the description.
- *
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
- */
- public void setdescription(String desc) {
- spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
- }
-
- /**
- * Gets the description.
- *
- * @return desc
- * @see <code>setDescription</code>
- */
- public String getdescription() {
- return spec.getDetail(DataSourceSpec.DESCRIPTION);
- }
-
- /**
- * Sets the description.
- *
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
- */
- public void setDescription(String desc) {
- spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
- }
-
- /**
- * Gets the description.
- *
- * @return desc
- * @see <code>setDescription</code>
- */
- public String getDescription() {
- return spec.getDetail(DataSourceSpec.DESCRIPTION);
- }
-
- /**
- * Sets the network protocol.
- *
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
- */
- public void setnetworkProtocol(String nwProtocol) {
- spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
- }
-
- /**
- * Gets the network protocol.
- *
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
- */
- public String getnetworkProtocol() {
- return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
- }
-
- /**
- * Sets the network protocol.
- *
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
- */
- public void setNetworkProtocol(String nwProtocol) {
- spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
- }
-
- /**
- * Gets the network protocol.
- *
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
- */
- public String getNetworkProtocol() {
- return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
- }
-
- /**
- * Sets the role name.
- *
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
- */
- public void setroleName(String roleName) {
- spec.setDetail(DataSourceSpec.ROLENAME, roleName);
- }
-
- /**
- * Gets the role name.
- *
- * @return roleName
- * @see <code>setRoleName</code>
- */
- public String getroleName() {
- return spec.getDetail(DataSourceSpec.ROLENAME);
- }
-
- /**
- * Sets the role name.
- *
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
- */
- public void setRoleName(String roleName) {
- spec.setDetail(DataSourceSpec.ROLENAME, roleName);
- }
-
- /**
- * Gets the role name.
- *
- * @return roleName
- * @see <code>setRoleName</code>
- */
- public String getRoleName() {
- return spec.getDetail(DataSourceSpec.ROLENAME);
- }
-
-
- /**
- * Sets the login timeout.
- *
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
- */
- public void setloginTimeOut(String loginTimeOut) {
- spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
- }
-
- /**
- * Gets the login timeout.
- *
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
- */
- public String getloginTimeOut() {
- return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
- }
-
- /**
- * Sets the login timeout.
- *
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
- */
- public void setLoginTimeOut(String loginTimeOut) {
- spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
- }
-
- /**
- * Gets the login timeout.
- *
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
- */
- public String getLoginTimeOut() {
- return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
- }
-
- /**
- * Sets the delimiter.
- *
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
- */
- public void setdelimiter(String delim) {
- spec.setDetail(DataSourceSpec.DELIMITER, delim);
- }
-
- /**
- * Gets the delimiter.
- *
- * @return delim
- * @see <code>setDelimiter</code>
- */
- public String getdelimiter() {
- return spec.getDetail(DataSourceSpec.DELIMITER);
- }
-
- /**
- * Sets the delimiter.
- *
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
- */
- public void setDelimiter(String delim) {
- spec.setDetail(DataSourceSpec.DELIMITER, delim);
- }
-
- /**
- * Gets the delimiter.
- *
- * @return delim
- * @see <code>setDelimiter</code>
- */
- public String getDelimiter() {
- return spec.getDetail(DataSourceSpec.DELIMITER);
- }
-
- /**
- * Sets the driver specific properties.
- *
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
- */
- public void setdriverProperties(String driverProps) {
- spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
- }
-
- /**
- * Gets the driver specific properties.
- *
- * @return driverProps
- * @see <code>setDriverProperties</code>
- */
- public String getdriverProperties() {
- return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- }
-
- /**
- * Sets the driver specific properties.
- *
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
- */
- public void setDriverProperties(String driverProps) {
- spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
- }
-
- /**
- * Gets the driver specific properties.
- *
- * @return driverProps
- * @see <code>setDriverProperties</code>
- */
- public String getDriverProperties() {
- return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- }
-
- /*
- * Check if the PasswordCredential passed for this get connection
- * request is equal to the user/passwd of this connection pool.
- */
- private boolean isEqual( PasswordCredential pc, String user,
- String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
-
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
deleted file mode 100755
index ce8635b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.LocalTransactionException;
-
-/**
- * <code>LocalTransaction</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
- private ManagedConnection mc;
-
- /**
- * Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
- */
- public LocalTransaction(ManagedConnection mc) {
- this.mc = mc;
- }
-
- /**
- * Begin a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
- */
- public void begin() throws ResourceException {
- //GJCINT
- mc.transactionStarted();
- try {
- mc.getActualConnection().setAutoCommit(false);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- }
-
- /**
- * Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
- */
- public void commit() throws ResourceException {
- Exception e = null;
- try {
- mc.getActualConnection().commit();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
- /**
- * Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
- */
- public void rollback() throws ResourceException {
- try {
- mc.getActualConnection().rollback();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
deleted file mode 100755
index f0443d0..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.*;
-import jakarta.resource.*;
-import javax.security.auth.Subject;
-import java.io.PrintWriter;
-import javax.transaction.xa.XAResource;
-import java.util.Set;
-import java.util.Hashtable;
-import java.util.Iterator;
-import javax.sql.PooledConnection;
-import javax.sql.XAConnection;
-import java.sql.Connection;
-import java.sql.SQLException;
-import jakarta.resource.NotSupportedException;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.LocalTransaction;
-import com.sun.jdbcra.spi.ManagedConnectionMetaData;
-import com.sun.jdbcra.util.SecurityUtils;
-import com.sun.jdbcra.spi.ConnectionHolder;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * <code>ManagedConnection</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
-
- public static final int ISNOTAPOOLEDCONNECTION = 0;
- public static final int ISPOOLEDCONNECTION = 1;
- public static final int ISXACONNECTION = 2;
-
- private boolean isDestroyed = false;
- private boolean isUsable = true;
-
- private int connectionType = ISNOTAPOOLEDCONNECTION;
- private PooledConnection pc = null;
- private java.sql.Connection actualConnection = null;
- private Hashtable connectionHandles;
- private PrintWriter logWriter;
- private PasswordCredential passwdCredential;
- private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
- private XAResource xar = null;
- public ConnectionHolder activeConnectionHandle;
-
- //GJCINT
- private int isolationLevelWhenCleaned;
- private boolean isClean = false;
-
- private boolean transactionInProgress = false;
-
- private ConnectionEventListener listener = null;
-
- private ConnectionEvent ce = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
-
- /**
- * Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
- * pooledConn parameter is expected to be non null and sqlConn parameter
- * is expected to be null in the case where the datasource object is a
- * connection pool datasource or an xa datasource.
- *
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
- */
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
- PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
- if(pooledConn == null && sqlConn == null) {
- throw new ResourceException("Connection object cannot be null");
- }
-
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
-
- pc = pooledConn;
- connectionHandles = new Hashtable();
- passwdCredential = passwdCred;
- this.mcf = mcf;
- if(passwdCredential != null &&
- this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
- "ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
- " the PasswordCredential for this ManagedConnection");
- }
- logWriter = mcf.getLogWriter();
- activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
- }
-
- /**
- * Adds a connection event listener to the ManagedConnection instance.
- *
- * @param listener <code>ConnectionEventListener</code>
- * @see <code>removeConnectionEventListener</code>
- */
- public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
- }
-
- /**
- * Used by the container to change the association of an application-level
- * connection handle with a <code>ManagedConnection</code> instance.
- *
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
- */
- public void associateConnection(Object connection) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In associateConnection");
- }
- checkIfValid();
- if(connection == null) {
- throw new ResourceException("Connection handle cannot be null");
- }
- ConnectionHolder ch = (ConnectionHolder) connection;
-
- com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
- ch.associateConnection(actualConnection, this);
- /**
- * The expectation from the above method is that the connection holder
- * replaces the actual sql connection it holds with the sql connection
- * handle being passed in this method call. Also, it replaces the reference
- * to the ManagedConnection instance with this ManagedConnection instance.
- * Any previous statements and result sets also need to be removed.
- */
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- ch.setActive(true);
- activeConnectionHandle = ch;
- }
-
- /**
- * Application server calls this method to force any cleanup on the
- * <code>ManagedConnection</code> instance. This method calls the invalidate
- * method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
- */
- public void cleanup() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In cleanup");
- }
- checkIfValid();
-
- /**
- * may need to set the autocommit to true for the non-pooled case.
- */
- //GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- throw new ResourceException("The isolation level for the physical connection "
- + "could not be retrieved");
- }
- }
- isClean = true;
-
- activeConnectionHandle = null;
- }
-
- /**
- * This method removes all the connection handles from the table
- * of connection handles and invalidates all of them so that any
- * operation on those connection handles throws an exception.
- *
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
- */
- private void invalidateAllConnectionHandles() throws ResourceException {
- Set handles = connectionHandles.keySet();
- Iterator iter = handles.iterator();
- try {
- while(iter.hasNext()) {
- ConnectionHolder ch = (ConnectionHolder)iter.next();
- ch.invalidate();
- }
- } catch(java.util.NoSuchElementException nsee) {
- throw new ResourceException("Could not find the connection handle: "+ nsee.getMessage());
- }
- connectionHandles.clear();
- }
-
- /**
- * Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
- */
- public void destroy() throws ResourceException{
- if(logWriter != null) {
- logWriter.println("In destroy");
- }
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
-
- activeConnectionHandle = null;
- try {
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- pc.close();
- pc = null;
- actualConnection = null;
- } else {
- actualConnection.close();
- actualConnection = null;
- }
- } catch(SQLException sqle) {
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
- + sqle.getMessage());
- }
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- }
-
- /**
- * Creates a new connection handle for the underlying physical
- * connection represented by the <code>ManagedConnection</code> instance.
- *
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
- */
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
- throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getConnection");
- }
- checkIfValid();
- com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
- PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
- if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
- throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
- }
-
- //GJCINT
- getActualConnection();
-
- /**
- * The following code in the if statement first checks if this ManagedConnection
- * is clean or not. If it is, it resets the transaction isolation level to what
- * it was when it was when this ManagedConnection was cleaned up depending on the
- * ConnectionRequestInfo passed.
- */
- if(isClean) {
- ((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
- }
-
-
- ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- connHolderObject.setActive(true);
- activeConnectionHandle = connHolderObject;
-
- return connHolderObject;
-
- }
-
- /**
- * Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
- *
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLocalTransaction");
- }
- checkIfValid();
- return new com.sun.jdbcra.spi.LocalTransaction(this);
- }
-
- /**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>setLogWriter</code>
- */
- public PrintWriter getLogWriter() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLogWriter");
- }
- checkIfValid();
-
- return logWriter;
- }
-
- /**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
- *
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getMetaData");
- }
- checkIfValid();
-
- return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
- }
-
- /**
- * Returns an <code>XAResource</code> instance.
- *
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
- */
- public XAResource getXAResource() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getXAResource");
- }
- checkIfValid();
-
- if(connectionType == ISXACONNECTION) {
- try {
- if(xar == null) {
- /**
- * Using the wrapper XAResource.
- */
- xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
- }
- return xar;
- } catch(SQLException sqle) {
- throw new ResourceException(sqle.getMessage());
- }
- } else {
- throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
- }
- }
-
- /**
- * Removes an already registered connection event listener from the
- * <code>ManagedConnection</code> instance.
- *
- * @param listener <code>ConnectionEventListener</code> to be removed
- * @see <code>addConnectionEventListener</code>
- */
- public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.start() has been called or from
- * LocalTransaction object when its begin() method is called.
- */
- void transactionStarted() {
- transactionInProgress = true;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.end() has been called or from
- * LocalTransaction object when its end() method is called.
- */
- void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
- }
-
- try {
- actualConnection.close();
- actualConnection = null;
- } catch(SQLException sqle) {
- actualConnection = null;
- }
- }
-
-
- isClean = true;
-
- activeConnectionHandle = null;
-
- }
-
- /**
- * Checks if a this ManagedConnection is involved in a transaction
- * or not.
- */
- public boolean isTransactionInProgress() {
- return transactionInProgress;
- }
-
- /**
- * Sets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(PrintWriter out) throws ResourceException {
- checkIfValid();
- logWriter = out;
- }
-
- /**
- * This method determines the type of the connection being held
- * in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
- */
- private int getConnectionType(PooledConnection pooledConn) {
- if(pooledConn == null) {
- return ISNOTAPOOLEDCONNECTION;
- } else if(pooledConn instanceof XAConnection) {
- return ISXACONNECTION;
- } else {
- return ISPOOLEDCONNECTION;
- }
- }
-
- /**
- * Returns the <code>ManagedConnectionFactory</code> instance that
- * created this <code>ManagedConnection</code> instance.
- *
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
- */
- ManagedConnectionFactory getManagedConnectionFactory() {
- return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
- }
-
- /**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
- *
- * @return the physical <code>java.sql.Connection</code>
- */
- //GJCINT
- java.sql.Connection getActualConnection() throws ResourceException {
- //GJCINT
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- try {
- if(actualConnection == null) {
- actualConnection = pc.getConnection();
- }
-
- } catch(SQLException sqle) {
- sqle.printStackTrace();
- throw new ResourceException(sqle.getMessage());
- }
- }
- return actualConnection;
- }
-
- /**
- * Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
- *
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
- */
- PasswordCredential getPasswordCredential() {
- return passwdCredential;
- }
-
- /**
- * Checks if this <code>ManagedConnection</code> is valid or not and throws an
- * exception if it is not valid. A <code>ManagedConnection</code> is not valid if
- * destroy has not been called and no physical connection error has
- * occurred rendering the physical connection unusable.
- *
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
- */
- //GJCINT
- void checkIfValid() throws ResourceException {
- if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
- "connection is not usable.");
- }
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when its close method is
- * called. This <code>ManagedConnection</code> instance invalidates the connection handle
- * and sends a CONNECTION_CLOSED event to all the registered event listeners.
- *
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
- */
- void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
- connHolderObject.invalidate();
-
- activeConnectionHandle = null;
-
- ce.setConnectionHandle(connHolderObject);
- listener.connectionClosed(ce);
-
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when it detects a connecion
- * related error.
- *
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
- */
- void connectionErrorOccurred(Exception e,
- com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
- ConnectionEventListener cel = this.listener;
- ConnectionEvent ce = null;
- ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
- : new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
- if (connHolderObject != null) {
- ce.setConnectionHandle(connHolderObject);
- }
-
- cel.connectionErrorOccurred(ce);
- isUsable = false;
- }
-
-
-
- /**
- * This method is called by the <code>XAResource</code> object when its start method
- * has been invoked.
- *
- */
- void XAStartOccurred() {
- try {
- actualConnection.setAutoCommit(false);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by the <code>XAResource</code> object when its end method
- * has been invoked.
- *
- */
- void XAEndOccurred() {
- try {
- actualConnection.setAutoCommit(true);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by a Connection Handle to check if it is
- * the active Connection Handle. If it is not the active Connection
- * Handle, this method throws an SQLException. Else, it
- * returns setting the active Connection Handle to the calling
- * Connection Handle object to this object if the active Connection
- * Handle is null.
- *
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
- */
-
- void checkIfActive(ConnectionHolder ch) throws SQLException {
- if(isDestroyed == true || isUsable == false) {
- throw new SQLException("The physical connection is not usable");
- }
-
- if(activeConnectionHandle == null) {
- activeConnectionHandle = ch;
- ch.setActive(true);
- return;
- }
-
- if(activeConnectionHandle != ch) {
- throw new SQLException("The connection handle cannot be used as another connection is currently active");
- }
- }
-
- /**
- * sets the connection type of this connection. This method is called
- * by the MCF while creating this ManagedConnection. Saves us a costly
- * instanceof operation in the getConnectionType
- */
- public void initializeConnectionType( int _connectionType ) {
- connectionType = _connectionType;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
deleted file mode 100755
index 5ec326c..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import java.sql.SQLException;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
-
- private java.sql.DatabaseMetaData dmd = null;
- private ManagedConnection mc;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Constructor for <code>ManagedConnectionMetaData</code>
- *
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
- */
- public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
- try {
- this.mc = mc;
- dmd = mc.getActualConnection().getMetaData();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product name of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductName() throws ResourceException {
- try {
- return dmd.getDatabaseProductName();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product version of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductVersion() throws ResourceException {
- try {
- return dmd.getDatabaseProductVersion();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
- throw new ResourceException(sqle.getMessage(), sqle.getMessage());
- }
- }
-
- /**
- * Returns maximum limit on number of active concurrent connections
- * that an EIS instance can support across client processes.
- *
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
- */
- public int getMaxConnections() throws ResourceException {
- try {
- return dmd.getMaxConnections();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns name of the user associated with the ManagedConnection instance. The name
- * corresponds to the resource principal under whose whose security context, a connection
- * to the EIS instance has been established.
- *
- * @return name of the user
- * @throws <code>ResourceException</code>
- */
- public String getUserName() throws ResourceException {
- jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
- if(pc != null) {
- return pc.getUserName();
- }
-
- return mc.getManagedConnectionFactory().getUser();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
deleted file mode 100755
index f0ba663..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.transaction.xa.Xid;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import com.sun.jdbcra.spi.ManagedConnection;
-
-/**
- * <code>XAResource</code> wrapper for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
- */
-public class XAResourceImpl implements XAResource {
-
- XAResource xar;
- ManagedConnection mc;
-
- /**
- * Constructor for XAResourceImpl
- *
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
- */
- public XAResourceImpl(XAResource xar, ManagedConnection mc) {
- this.xar = xar;
- this.mc = mc;
- }
-
- /**
- * Commit the global transaction specified by xid.
- *
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
- */
- public void commit(Xid xid, boolean onePhase) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.commit(xid, onePhase);
- }
-
- /**
- * Ends the work performed on behalf of a transaction branch.
- *
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
- */
- public void end(Xid xid, int flags) throws XAException {
- xar.end(xid, flags);
- //GJCINT
- //mc.transactionCompleted();
- }
-
- /**
- * Tell the resource manager to forget about a heuristically completed transaction branch.
- *
- * @param xid A global transaction identifier
- */
- public void forget(Xid xid) throws XAException {
- xar.forget(xid);
- }
-
- /**
- * Obtain the current transaction timeout value set for this
- * <code>XAResource</code> instance.
- *
- * @return the transaction timeout value in seconds
- */
- public int getTransactionTimeout() throws XAException {
- return xar.getTransactionTimeout();
- }
-
- /**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
- * instance represented by the parameter xares.
- *
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
- */
- public boolean isSameRM(XAResource xares) throws XAException {
- return xar.isSameRM(xares);
- }
-
- /**
- * Ask the resource manager to prepare for a transaction commit
- * of the transaction specified in xid.
- *
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
- */
- public int prepare(Xid xid) throws XAException {
- return xar.prepare(xid);
- }
-
- /**
- * Obtain a list of prepared transaction branches from a resource manager.
- *
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
- */
- public Xid[] recover(int flag) throws XAException {
- return xar.recover(flag);
- }
-
- /**
- * Inform the resource manager to roll back work done on behalf of a transaction branch
- *
- * @param xid A global transaction identifier
- */
- public void rollback(Xid xid) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.rollback(xid);
- }
-
- /**
- * Set the current transaction timeout value for this <code>XAResource</code> instance.
- *
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
- */
- public boolean setTransactionTimeout(int seconds) throws XAException {
- return xar.setTransactionTimeout(seconds);
- }
-
- /**
- * Start work on behalf of a transaction branch specified in xid.
- *
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
- */
- public void start(Xid xid, int flags) throws XAException {
- //GJCINT
- mc.transactionStarted();
- xar.start(xid, flags);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/build.xml
deleted file mode 100755
index 7ca9cfb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/spi/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile13">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="build13" depends="compile13">
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="build14" depends="compile14"/>
-
- <target name="build" depends="build13, build14"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/MethodExecutor.java
deleted file mode 100755
index de4a961..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Vector;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Execute the methods based on the parameters.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class MethodExecutor implements java.io.Serializable{
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Exceute a simple set Method.
- *
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Executes the method.
- *
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Converts the type from String to the Class type.
- *
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
-
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
- }
-
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/SecurityUtils.java
deleted file mode 100755
index bed9dd7..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import javax.security.auth.Subject;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import jakarta.resource.spi.security.PasswordCredential;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.*;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import java.util.Set;
-import java.util.Iterator;
-
-/**
- * SecurityUtils for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class SecurityUtils {
-
- /**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
- * it constructs a <code>PasswordCredential</code> object with
- * the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
- * the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
- * <code>ManagedConnectionFactory</code>, instance equivalent
- * to the <code>ManagedConnectionFactory</code>, parameter.
- *
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
- */
- public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
- final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
-
- if (info == null) {
- if (subject == null) {
- return null;
- } else {
- PasswordCredential pc = (PasswordCredential) AccessController.doPrivileged
- (new PrivilegedAction() {
- public Object run() {
- Set passwdCredentialSet = subject.getPrivateCredentials(PasswordCredential.class);
- Iterator iter = passwdCredentialSet.iterator();
- while (iter.hasNext()) {
- PasswordCredential temp = (PasswordCredential) iter.next();
- if (temp.getManagedConnectionFactory().equals(mcf)) {
- return temp;
- }
- }
- return null;
- }
- });
- if (pc == null) {
- throw new jakarta.resource.spi.SecurityException("No PasswordCredential found");
- } else {
- return pc;
- }
- }
- } else {
- com.sun.jdbcra.spi.ConnectionRequestInfo cxReqInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) info;
- PasswordCredential pc = new PasswordCredential(cxReqInfo.getUser(), cxReqInfo.getPassword().toCharArray());
- pc.setManagedConnectionFactory(mcf);
- return pc;
- }
- }
-
- /**
- * Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
- */
- static private boolean isEqual(String str1, String str2) {
- if (str1 == null) {
- return (str2 == null);
- } else {
- return str1.equals(str2);
- }
- }
-
- /**
- * Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
- *
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
- */
- static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
- if (pC1 == pC2)
- return true;
- if(pC1 == null || pC2 == null)
- return (pC1 == pC2);
- if (!isEqual(pC1.getUserName(), pC2.getUserName())) {
- return false;
- }
- String p1 = null;
- String p2 = null;
- if (pC1.getPassword() != null) {
- p1 = new String(pC1.getPassword());
- }
- if (pC2.getPassword() != null) {
- p2 = new String(pC2.getPassword());
- }
- return (isEqual(p1, p2));
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/build.xml
deleted file mode 100755
index f060e7d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ra/src/com/sun/jdbcra/util/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/util"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml
index 6b3412f..05c8e32 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/build.xml
@@ -33,242 +33,219 @@
&commonRun;
&testproperties;
-<!--
- <target name="all" depends="build,setup,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear, unsetup"/>
+ <target name="all"
+ depends="clean, disable-resource-validation, build, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"
+ />
+ <target name="all-ext"
+ depends="clean, disable-resource-validation, build, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"
+ />
- <target name="run-test" depends="build,deploy-war, run-war, undeploy-war, deploy-ear, run-ear, undeploy-ear"/>
--->
- <target name="all" depends="clean, disable-resource-validation, build-ra, build, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
- <target name="all-ext" depends="clean, disable-resource-validation, build-ra-with-extension, build, deploy-ear, setup, run-ear, unsetup, undeploy-ear, enable-resource-validation"/>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
-<!--
- <antcall target="build"/>
- <antcall target="setup"/>
- <antcall target="deploy-war"/>
- <antcall target="run-war"/>
- <antcall target="undeploy-war"/>
- <antcall target="deploy-ear"/>
- <antcall target="run-ear"/>
- <antcall target="undeploy-ear"/>
- <antcall target="unsetup"/>
- </target>
--->
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="setup">
+ <target name="setup">
<antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/simpleBank.sql"/>
+ <param name="sql.file" value="sql/simpleBank.sql" />
</antcall>
- <antcall target="create-pool"/>
- <antcall target="create-resource"/>
- <antcall target="create-admin-object"/>
+ <antcall target="create-pool" />
+ <antcall target="create-resource" />
+ <antcall target="create-admin-object" />
- </target>
- <target name="create-pool">
- <antcall target="create-connector-connpool-common">
- <param name="ra.name" value="${appname}App#jdbcra"/>
- <param name="connection.defname" value="javax.sql.DataSource"/>
- <param name="extra-params" value="--matchconnections=false"/>
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- </antcall>
- <antcall target="set-oracle-props">
- <param name="pool.type" value="connector"/>
- <param name="conpool.name" value="embedded-ra-pool"/>
- </antcall>
- </target>
- <target name="create-resource">
- <antcall target="create-connector-resource-common">
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- <param name="connector.jndi.name" value="jdbc/ejb-installed-libraries-embedded"/>
- </antcall>
- </target>
+ </target>
+ <target name="create-pool">
+ <antcall target="create-connector-connpool-common">
+ <param name="ra.name" value="${appname}App#connectors-ra-redeploy-rars" />
+ <param name="connection.defname" value="javax.sql.DataSource" />
+ <param name="extra-params" value="--matchconnections=false" />
+ <param name="connector.conpool.name" value="embedded-ra-pool" />
+ </antcall>
+ <antcall target="set-oracle-props">
+ <param name="pool.type" value="connector" />
+ <param name="conpool.name" value="embedded-ra-pool" />
+ </antcall>
+ </target>
+ <target name="create-resource">
+ <antcall target="create-connector-resource-common">
+ <param name="connector.conpool.name" value="embedded-ra-pool" />
+ <param name="connector.jndi.name" value="jdbc/ejb-installed-libraries-embedded" />
+ </antcall>
+ </target>
- <target name="disable-resource-validation">
- <antcall target="create-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="disable-resource-validation">
+ <antcall target="create-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false" />
+ </antcall>
+ <antcall target="restart-server" />
+ </target>
- <target name="enable-resource-validation">
- <antcall target="delete-jvm-options">
- <param name="option" value="-Ddeployment.resource.validation=false"/>
- </antcall>
- <antcall target="restart-server"/>
- </target>
+ <target name="enable-resource-validation">
+ <antcall target="delete-jvm-options">
+ <param name="option" value="-Ddeployment.resource.validation=false" />
+ </antcall>
+ <antcall target="restart-server" />
+ </target>
- <target name="create-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#jdbcra --property TableName=customer2:JndiName=jdbc/ejb-installed-libraries-embedded:SchemaName=DBUSER:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
- </antcall>
- </target>
+ <target name="create-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command"
+ value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname ${appname}App#connectors-ra-redeploy-rars --property TableName=customer2:JndiName=jdbc/ejb-installed-libraries-embedded:SchemaName=DBUSER:NoOfRows=1"
+ />
+ <param name="operand.props" value="eis/jdbcAdmin" />
+ </antcall>
+ </target>
- <target name="delete-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
- </target>
+ <target name="delete-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-admin-object" />
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin" />
+ </antcall>
+ </target>
- <target name="restart">
- <antcall target="restart-server-instance-common"/>
- </target>
+ <target name="restart">
+ <antcall target="restart-server-instance-common" />
+ </target>
- <target name="create-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- </target>
+ <target name="create-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command"
+ value="create-resource-adapter-config --property RAProperty=VALID"
+ />
+ <param name="operand.props" value="${appname}App#connectors-ra-redeploy-rars" />
+ </antcall>
+ </target>
- <target name="delete-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="${appname}App#jdbcra"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
- </target>
+ <target name="delete-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-resource-adapter-config" />
+ <param name="operand.props" value="${appname}App#connectors-ra-redeploy-rars" />
+ </antcall>
+ </target>
- <target name="unsetup">
+ <target name="unsetup">
<antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/dropBankTables.sql"/>
- </antcall>
+ <param name="sql.file" value="sql/dropBankTables.sql" />
+ </antcall>
- <antcall target="delete-resource"/>
- <antcall target="delete-pool"/>
- <antcall target="delete-admin-object"/>
- </target>
+ <antcall target="delete-resource" />
+ <antcall target="delete-pool" />
+ <antcall target="delete-admin-object" />
+ </target>
- <target name="delete-pool">
- <antcall target="delete-connector-connpool-common">
- <param name="connector.conpool.name" value="embedded-ra-pool"/>
- </antcall>
- </target>
+ <target name="delete-pool">
+ <antcall target="delete-connector-connpool-common">
+ <param name="connector.conpool.name" value="embedded-ra-pool" />
+ </antcall>
+ </target>
- <target name="delete-resource">
- <antcall target="delete-connector-resource-common">
- <param name="connector.jndi.name" value="jdbc/ejb-installed-libraries-embedded"/>
- </antcall>
- </target>
+ <target name="delete-resource">
+ <antcall target="delete-connector-resource-common">
+ <param name="connector.jndi.name" value="jdbc/ejb-installed-libraries-embedded" />
+ </antcall>
+ </target>
- <target name="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-servlet" />
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="ejb" />
+ </antcall>
+ <antcall target="compile-servlet" />
+ </target>
- <target name="compile-servlet" depends="init-common">
- <mkdir dir="${build.classes.dir}"/>
- <echo message="common.xml: Compiling test source files" level="verbose"/>
- <javac srcdir="servlet"
- destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
- debug="on"
- failonerror="true"/>
- </target>
+ <target name="compile-servlet" depends="init-common">
+ <mkdir dir="${build.classes.dir}" />
+ <echo message="common.xml: Compiling test source files" level="verbose" />
+ <javac srcdir="servlet"
+ destdir="${build.classes.dir}"
+ classpath="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
+ debug="on"
+ failonerror="true"
+ />
+ </target>
- <target name="build-ra-with-extension">
- <ant dir="ra" target="build">
- <property name="jar.mf" value="${jar.ext}"/>
- <property name="rar.mf" value="${rar.ext}"/>
- </ant>
- </target>
-
- <target name="build-ra">
- <ant dir="ra" target="build">
- <property name="jar.mf" value="${jar.no.ext}"/>
- <property name="rar.mf" value="${rar.no.ext}"/>
- </ant>
- </target>
-
- <target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <target name="build" depends="compile">
+ <property name="hasWebclient" value="yes" />
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="hasWebclient" value="yes" />
+ <param name="webclient.war.classes" value="**/*.class" />
</antcall>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="**/*.class"/>
+ <param name="ejbjar.classes" value="**/*.class" />
</antcall>
- <delete file="${assemble.dir}/${appname}.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
- appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="ra/publish/lib">
- <include name="*.rar"/>
- </fileset>
+ <delete file="${assemble.dir}/${appname}.ear" />
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <copy file="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars-nojar.rar"
+ tofile="${assemble.dir}/connectors-ra-redeploy-rars.rar"
+ />
+ <ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar" />
+ <include name="*.war" />
+ </fileset>
+ <fileset dir="${assemble.dir}">
+ <include name="connectors-ra-redeploy-rars.rar" />
+ </fileset>
</ear>
- </target>
+ </target>
- <target name="install-library">
- <echo message="copying file [jdbc.jar] to applibs"/>
- <copy todir="${env.S1AS_HOME}/domains/domain1/lib/applibs" file="ra/publish/lib/jdbc.jar"/>
- <antcall target="restart-server"/>
- </target>
+ <target name="install-library">
+ <echo message="copying file [jdbc.jar] to applibs" />
+ <copy todir="${env.S1AS_HOME}/domains/domain1/lib/applibs" file="${env.APS_HOME}/connectors-ra-redeploy/jars/target/connectors-ra-redeploy-jars.jar" />
+ <antcall target="restart-server" />
+ </target>
- <target name="uninstall-library">
- <echo message="deleting file [jdbc.jar] from applibs"/>
- <delete file="${env.S1AS_HOME}/domains/domain1/lib/applibs/jdbc.jar"/>
- <antcall target="restart-server"/>
- </target>
+ <target name="uninstall-library">
+ <echo message="deleting file [jdbc.jar] from applibs" />
+ <delete file="${env.S1AS_HOME}/domains/domain1/lib/applibs/connectors-ra-redeploy-jars.jar" />
+ <antcall target="restart-server" />
+ </target>
- <target name="deploy-ear" depends="init-common">
- <antcall target="install-library"/>
- <antcall target="create-ra-config"/>
- <antcall target="deploy-common">
- <param name="libraries" value="jdbc.jar"/>
- </antcall>
- </target>
+ <target name="deploy-ear" depends="init-common">
+ <antcall target="install-library" />
+ <antcall target="create-ra-config" />
+ <antcall target="deploy-common">
+ <param name="libraries" value="connectors-ra-redeploy-jars.jar" />
+ </antcall>
+ </target>
- <target name="deploy-ear-with-ext" depends="init-common">
- <antcall target="install-library"/>
- <antcall target="create-ra-config"/>
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear-with-ext" depends="init-common">
+ <antcall target="install-library" />
+ <antcall target="create-ra-config" />
+ <antcall target="deploy-common" />
+ </target>
- <target name="deploy-war" depends="init-common">
- <antcall target="deploy-war-common"/>
- </target>
+ <target name="deploy-war" depends="init-common">
+ <antcall target="deploy-war-common" />
+ </target>
- <target name="run-war" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="installed-libraries-embedded (stand-alone war based)"/>
- </antcall>
- </target>
+ <target name="run-war" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="installed-libraries-embedded (stand-alone war based)" />
+ </antcall>
+ </target>
- <target name="run-ear" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="installed-libraries-embedded (ear based)"/>
- </antcall>
- </target>
+ <target name="run-ear" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="installed-libraries-embedded (ear based)" />
+ </antcall>
+ </target>
- <target name="undeploy-ear" depends="init-common">
- <antcall target="delete-ra-config"/>
- <antcall target="undeploy-common"/>
- <antcall target="uninstall-library"/>
- </target>
+ <target name="undeploy-ear" depends="init-common">
+ <antcall target="delete-ra-config" />
+ <antcall target="undeploy-common" />
+ <antcall target="uninstall-library" />
+ </target>
- <target name="undeploy-war" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy-war" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <target name="usage">
+ <antcall target="usage-common" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/descriptor/application.xml
index 14d9b82..d71f857 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/descriptor/application.xml
@@ -25,7 +25,7 @@
</module>
<module>
- <connector>jdbcra.rar</connector>
+ <connector>connectors-ra-redeploy-rars.rar</connector>
</module>
<module>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.properties
deleted file mode 100755
index fd21c3d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0, which is available at
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-
-### Component Properties ###
-src.dir=src
-component.publish.home=.
-component.classes.dir=${component.publish.home}/internal/classes
-component.lib.home=${component.publish.home}/lib
-component.publish.home=publish
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.xml
deleted file mode 100755
index af20916..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE project [
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
- <!ENTITY common SYSTEM "../../../../../config/common.xml">
- <!ENTITY testcommon SYSTEM "../../../../../config/properties.xml">
-]>
-
-<project name="JDBCConnector top level" default="build">
- <property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
- &common;
- &testcommon;
- <property file="./build.properties"/>
-
- <target name="build" depends="clean,compile,assemble"/>
-
-
- <!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
- <target name="init" description="${component.name} initialization">
- <tstamp>
- <format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
- <echo message="Building component ${component.name}"/>
- <mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
- </target>
- <!-- compile -->
- <target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
- <!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
- destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- <include name="com/sun/jdbcra/**"/>
- <include name="com/sun/appserv/**"/>
- </javac>
- </target>
-
- <target name="all" depends="build"/>
-
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar" manifest="${jar.mf}"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" manifest="${rar.mf}" excludes="jdbc.jar">
-
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete file="${component.lib.home}/ra.xml"/>
-
- </target>
-
- <target name="clean" description="Clean the build">
- <delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${component.classes.dir}"/>
- <fileset dir="${component.lib.home}"/>
- </delete>
- </target>
-
-</project>
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.jar.MANIFEST.MF b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.jar.MANIFEST.MF
deleted file mode 100644
index 9dd0ea6..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.jar.MANIFEST.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
-Created-By: 16.0-b08 (Sun Microsystems Inc.)
-Extension-Name: jdbc.jar
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.jar.no-ext.MANIFEST.MF b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.jar.no-ext.MANIFEST.MF
deleted file mode 100644
index 1ab48ca..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.jar.no-ext.MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
-Created-By: 16.0-b08 (Sun Microsystems Inc.)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.rar.MANIFEST.MF b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.rar.MANIFEST.MF
deleted file mode 100644
index f45c239..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.rar.MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
-Created-By: 16.0-b08 (Sun Microsystems Inc.)
-Extension-List: jdbc
-jdbc-Extension-Name: jdbc.jar
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.rar.no-ext.MANIFEST.MF b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.rar.no-ext.MANIFEST.MF
deleted file mode 100644
index 1ab48ca..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/jdbc.rar.no-ext.MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
-Created-By: 16.0-b08 (Sun Microsystems Inc.)
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/appserv/jdbcra/DataSource.java
deleted file mode 100755
index b6ef30b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.appserv.jdbcra;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
- * server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
- * application server.
- * <p>A sample code for getting driver's connection implementation would like
- * the following.
- * <pre>
- InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
- Connection con = ds.getConnection();
- Connection drivercon = ds.getConnection(con);
-
- // Do db operations.
-
- con.close();
- </pre>
- *
- * @author Binod P.G
- */
-public interface DataSource extends javax.sql.DataSource {
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
deleted file mode 100755
index 8c55d51..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.StringTokenizer;
-import java.util.Enumeration;
-import com.sun.jdbcra.util.MethodExecutor;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Utility class, which would create necessary Datasource object according to the
- * specification.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
- */
-public class DataSourceObjectBuilder implements java.io.Serializable{
-
- private DataSourceSpec spec;
-
- private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
- */
- public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
- }
-
- /**
- * Construct the DataSource Object from the spec.
- *
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
- */
- public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
- Object dataSourceObject = getDataSourceObject();
- System.out.println("V3-TEST : " + dataSourceObject);
- Method[] methods = dataSourceObject.getClass().getMethods();
- for (int i=0; i < methods.length; i++) {
- String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
- }
- return dataSourceObject;
- }
-
- /**
- * Get the extra driver properties from the DataSourceSpec object and
- * parse them to a set of methodName and parameters. Prepare a hashtable
- * containing these details and return.
- *
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
- */
- private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
-
- String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
- }
-
- /**
- * Creates a Datasource object according to the spec.
- *
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
- */
- private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
- Class dataSourceClass = Class.forName(className);
- Object dataSourceObject = dataSourceClass.newInstance();
- System.out.println("V3-TEST : " + dataSourceObject);
- return dataSourceObject;
- } catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
- throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
- } catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
- throw new ResourceException("Error in instantiating" + className);
- } catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
- throw new ResourceException("Access Error in instantiating" + className);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
deleted file mode 100755
index 1c4b072..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.util.Hashtable;
-
-/**
- * Encapsulate the DataSource object details obtained from
- * ManagedConnectionFactory.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class DataSourceSpec implements java.io.Serializable{
-
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
- private Hashtable details = new Hashtable();
-
- /**
- * Set the property.
- *
- * @param property Property Name to be set.
- * @param value Value of property to be set.
- */
- public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
- }
-
- /**
- * Get the value of property
- *
- * @return Value of the property.
- */
- public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
- }
-
- /**
- * Checks whether two <code>DataSourceSpec</code> objects
- * are equal or not.
- *
- * @param obj Instance of <code>DataSourceSpec</code> object.
- */
- public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
- }
-
- /**
- * Retrieves the hashCode of this <code>DataSourceSpec</code> object.
- *
- * @return hashCode of this object.
- */
- public int hashCode() {
- return this.details.hashCode();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/build.xml
deleted file mode 100755
index 3b4faeb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/common/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/common"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/common.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
deleted file mode 100755
index c6e2b60..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ /dev/null
@@ -1,677 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.sql.*;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-
-/**
- * Holds the java.sql.Connection object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class ConnectionHolder implements Connection{
-
- private Connection con;
-
- private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
- private boolean isClosed = false;
-
- private boolean valid = true;
-
- private boolean active = false;
- /**
- * The active flag is false when the connection handle is
- * created. When a method is invoked on this object, it asks
- * the ManagedConnection if it can be the active connection
- * handle out of the multiple connection handles. If the
- * ManagedConnection reports that this connection handle
- * can be active by setting this flag to true via the setActive
- * function, the above method invocation succeeds; otherwise
- * an exception is thrown.
- */
-
- /**
- * Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
- */
- public ConnectionHolder(Connection con, ManagedConnection mc) {
- this.con = con;
- this.mc = mc;
- }
-
- /**
- * Returns the actual connection in this holder object.
- *
- * @return Connection object.
- */
- Connection getConnection() {
- return con;
- }
-
- /**
- * Sets the flag to indicate that, the connection is wrapped already or not.
- *
- * @param wrapFlag
- */
- void wrapped(boolean wrapFlag){
- this.wrappedAlready = wrapFlag;
- }
-
- /**
- * Returns whether it is wrapped already or not.
- *
- * @return wrapped flag.
- */
- boolean isWrapped(){
- return wrappedAlready;
- }
-
- /**
- * Returns the <code>ManagedConnection</code> instance responsible
- * for this connection.
- *
- * @return <code>ManagedConnection</code> instance.
- */
- ManagedConnection getManagedConnection() {
- return mc;
- }
-
- /**
- * Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
- *
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
- */
- void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
- }
-
- /**
- * Clears all warnings reported for the underlying connection object.
- *
- * @throws SQLException In case of a database error.
- */
- public void clearWarnings() throws SQLException{
- checkValidity();
- con.clearWarnings();
- }
-
- /**
- * Closes the logical connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void close() throws SQLException{
- isClosed = true;
- mc.connectionClosed(null, this);
- }
-
- /**
- * Invalidates this object.
- */
- public void invalidate() {
- valid = false;
- }
-
- /**
- * Closes the physical connection involved in this.
- *
- * @throws SQLException In case of a database error.
- */
- void actualClose() throws SQLException{
- con.close();
- }
-
- /**
- * Commit the changes in the underlying Connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void commit() throws SQLException {
- checkValidity();
- con.commit();
- }
-
- /**
- * Creates a statement from the underlying Connection
- *
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement() throws SQLException {
- checkValidity();
- return con.createStatement();
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
- *
- * @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
- /**
- * Retrieves the underlying <code>Connection</code> object's catalog name.
- *
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
- */
- public String getCatalog() throws SQLException {
- checkValidity();
- return con.getCatalog();
- }
-
- /**
- * Retrieves the current holdability of <code>ResultSet</code> objects created
- * using this connection object.
- *
- * @return holdability value.
- * @throws SQLException In case of a database error.
- */
- public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
- }
-
- /**
- * Retrieves the <code>DatabaseMetaData</code>object from the underlying
- * <code> Connection </code> object.
- *
- * @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
- */
- public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
- }
-
- /**
- * Retrieves this <code>Connection</code> object's current transaction isolation level.
- *
- * @return Transaction level
- * @throws SQLException In case of a database error.
- */
- public int getTransactionIsolation() throws SQLException {
- checkValidity();
- return con.getTransactionIsolation();
- }
-
- /**
- * Retrieves the <code>Map</code> object associated with
- * <code> Connection</code> Object.
- *
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
- */
- public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
- }
-
-/*
- public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-*/
-
- /**
- * Retrieves the the first warning reported by calls on the underlying
- * <code>Connection</code> object.
- *
- * @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
- */
- public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
- }
-
- /**
- * Retrieves whether underlying <code>Connection</code> object is closed.
- *
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
- */
- public boolean isClosed() throws SQLException {
- return isClosed;
- }
-
- /**
- * Retrieves whether this <code>Connection</code> object is read-only.
- *
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
- */
- public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
- }
-
- /**
- * Converts the given SQL statement into the system's native SQL grammer.
- *
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
- */
- public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
- }
-
- public Clob createClob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Blob createBlob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public NClob createNClob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public SQLXML createSQLXML() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isValid(int timeout) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void setClientInfo(String name, String value) throws SQLClientInfoException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void setClientInfo(Properties properties) throws SQLClientInfoException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public String getClientInfo(String name) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Properties getClientInfo() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- /**
- * Removes the given <code>Savepoint</code> object from the current transaction.
- *
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
- */
- public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
- /**
- * Rolls back the changes made in the current transaction.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
- }
-
- /**
- * Rolls back the changes made after the savepoint.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
- }
-
- /**
- * Sets the auto-commmit mode of the <code>Connection</code> object.
- *
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
- }
-
- /**
- * Sets the catalog name to the <code>Connection</code> object
- *
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
- */
- public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
- }
-
- /**
- * Sets the holdability of <code>ResultSet</code> objects created
- * using this <code>Connection</code> object.
- *
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
- */
- public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
- }
-
- /**
- * Puts the connection in read-only mode as a hint to the driver to
- * perform database optimizations.
- *
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
- */
- public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
- }
-
- /**
- * Creates and unnamed savepoint and returns an object corresponding to that.
- *
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
- }
-
- /**
- * Creates a savepoint with the name and returns an object corresponding to that.
- *
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
- /**
- * Creates the transaction isolation level.
- *
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
- */
- public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
- /**
- * Installs the given <code>Map</code> object as the tyoe map for this
- * <code> Connection </code> object.
- *
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
- */
- public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
- }
-
- public int getNetworkTimeout() throws SQLException {
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void abort(Executor executor) throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public String getSchema() throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void setSchema(String schema) throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
-
- /**
- * Checks the validity of this object
- */
- private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
- }
-
- /**
- * Sets the active flag to true
- *
- * @param actv boolean
- */
- void setActive(boolean actv) {
- active = actv;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
deleted file mode 100755
index fb0fdab..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import java.sql.DriverManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import java.sql.SQLException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- * This class is extended by the DataSource specific <code>ManagedConnection</code> factories
- * and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
- java.io.Serializable {
-
- protected DataSourceSpec spec = new DataSourceSpec();
- protected transient DataSourceObjectBuilder dsObjBuilder;
-
- protected java.io.PrintWriter logWriter = null;
- protected jakarta.resource.spi.ResourceAdapter ra = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory() {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory()");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
- return cf;
- }
-
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager)");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
- }
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public abstract boolean equals(Object other);
-
- /**
- * Get the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
- */
- public java.io.PrintWriter getLogWriter() {
- return logWriter;
- }
-
- /**
- * Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
- */
- public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
- if(logWriter != null) {
- logWriter.println("In getResourceAdapter");
- }
- return ra;
- }
-
- /**
- * Returns the hash code for this <code>ManagedConnectionFactory</code>.
- *
- * @return hash code for this <code>ManagedConnectionFactory</code>
- */
- public int hashCode(){
- if(logWriter != null) {
- logWriter.println("In hashCode");
- }
- return spec.hashCode();
- }
-
- /**
- * Returns a matched <code>ManagedConnection</code> from the candidate
- * set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- */
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
- javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In matchManagedConnections");
- }
-
- if(connectionSet == null) {
- return null;
- }
-
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- java.util.Iterator iter = connectionSet.iterator();
- com.sun.jdbcra.spi.ManagedConnection mc = null;
- while(iter.hasNext()) {
- try {
- mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
- } catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
- throw new ResourceException(nsee.getMessage());
- }
- if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
- mc.connectionErrorOccurred(re, null);
- }
- } else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
- mc.connectionErrorOccurred(re, null);
- }
- }
- }
- return null;
- }
-
- //GJCINT
- /**
- * Checks if a <code>ManagedConnection</code> is to be validated or not
- * and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
- */
- void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- if(mc.isTransactionInProgress()) {
- return;
- }
-
- boolean connectionValidationRequired =
- (new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
- if( connectionValidationRequired == false || mc == null) {
- return;
- }
-
-
- String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
- mc.checkIfValid();
- /**
- * The above call checks if the actual physical connection
- * is usable or not.
- */
- java.sql.Connection con = mc.getActualConnection();
-
- if(validationMethod.equals("auto-commit") == true) {
- isValidByAutoCommit(con);
- } else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
- isValidByMetaData(con);
- } else if(validationMethod.equalsIgnoreCase("table") == true) {
- isValidByTableQuery(con, spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME));
- } else {
- throw new ResourceException("The validation method is not proper");
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- // Notice that using something like
- // dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
- // some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
- // Also notice that some XA data sources will throw and exception if
- // you try to call setAutoCommit, for them this method is not recommended
-
- boolean ac = con.getAutoCommit();
- if (ac) {
- con.setAutoCommit(false);
- } else {
- con.rollback(); // prevents uncompleted transaction exceptions
- con.setAutoCommit(true);
- }
-
- con.setAutoCommit(ac);
-
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.DatabaseMetaData dmd = con.getMetaData();
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException("The connection is not valid as "
- + "getting the meta data failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByTableQuery(java.sql.Connection con,
- String tableName) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.Statement stmt = con.createStatement();
- java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
- throw new ResourceException("The connection is not valid as "
- + "querying the table " + tableName + " failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
- * for the <code>ManagedConnection</code> passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
- }
-
- /**
- * Resets the isolation level for the <code>ManagedConnection</code> passed.
- * If the transaction level is to be guaranteed to be the same as the one
- * present when this <code>ManagedConnection</code> was created, as specified
- * by the <code>ConnectionRequestInfo</code> passed, it sets the transaction
- * isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
- * it sets it to the transaction isolation passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
- }
-
- /**
- * Gets the integer equivalent of the string specifying
- * the transaction isolation.
- *
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
- */
- private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
- }
-
- /**
- * Set the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(java.io.PrintWriter out) {
- logWriter = out;
- }
-
- /**
- * Set the associated <code>ResourceAdapter</code> JavaBean.
- *
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
- */
- public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setUser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getUser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setuser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getuser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setPassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getPassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setpassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getpassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setClassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getClassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setclassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getclassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setConnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getConnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setconnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getconnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setValidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getValidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setvalidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getvalidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setValidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getValidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setvalidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getvalidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void setTransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String getTransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void settransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String gettransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getGuaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setguaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getguaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
deleted file mode 100755
index 5d5f989..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.endpoint.MessageEndpointFactory;
-import jakarta.resource.NotSupportedException;
-import javax.transaction.xa.XAResource;
-import jakarta.resource.spi.*;
-
-/**
- * <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
- */
-@Connector(
- description = "Resource adapter wrapping Datasource implementation of driver",
- displayName = "DataSource Resource Adapter",
- vendorName = "Sun Microsystems",
- eisType = "Database",
- version = "1.0",
- licenseRequired = false,
- transactionSupport = TransactionSupport.TransactionSupportLevel.LocalTransaction,
- authMechanisms = { @AuthenticationMechanism(
- authMechanism = "BasicPassword",
- credentialInterface = AuthenticationMechanism.CredentialInterface.PasswordCredential
- )},
- reauthenticationSupport = false
-)
-public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
-
- public String raProp = null;
-
- /**
- * Empty method implementation for endpointActivation
- * which just throws <code>NotSupportedException</code>
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
- */
- public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty method implementation for endpointDeactivation
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- */
- public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
- }
-
- /**
- * Empty method implementation for getXAResources
- * which just throws <code>NotSupportedException</code>
- *
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
- */
- public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty implementation of start method
- *
- * @param ctx <code>BootstrapContext</code>
- */
- public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
- System.out.println("Resource Adapter is starting with configuration :" + raProp);
- if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
- }
-
- /**
- * Empty implementation of stop method
- */
- public void stop() {
-
- }
-
- public void setRAProperty(String s) {
- raProp = s;
- }
-
- public String getRAProperty() {
- return raProp;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/build.xml
deleted file mode 100755
index e006b1d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
- </target>
-
- <target name="build14" depends="compile14, package14"/>
- <target name="build13"/>
- <target name="build" depends="build14, build13"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
deleted file mode 100755
index 09ce63d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<connector xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- metadata-complete="false" version="1.6" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/connector_1_6.xsd">
-
- <vendor-name>Sun Microsystems</vendor-name>
- <eis-type>Database</eis-type>
- <resourceadapter-version>1.0</resourceadapter-version>
-
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
- <!-- There can be any number of these elements including 0 -->
- <config-property>
- <config-property-name>User</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbuser</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>UserName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbuser</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Password</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbpassword</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DatabaseName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>testdb</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>URL</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Description</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>Oracle thin driver Datasource</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ClassName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ConnectionAttributes</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>;create=true</config-property-value>
- </config-property>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
- <connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
- <connection-interface>java.sql.Connection</connection-interface>
-
- <connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
- </connection-definition>
-
- <transaction-support>LocalTransaction</transaction-support>
- <authentication-mechanism>
- <!-- There can be any number of "description" elements including 0 -->
- <!-- Not including the "description" element -->
-
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
-
- <reauthentication-support>false</reauthentication-support>
-
- </outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- </adminobject>
- </resourceadapter>
-</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
deleted file mode 100755
index 2ee36c5..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-
-/**
- * ConnectionManager implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
-
- /**
- * Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
- *
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
- */
- public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
- }
-
- /*
- * This class could effectively implement Connection pooling also.
- * Could be done for FCS.
- */
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
deleted file mode 100755
index ddd0a28..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-/**
- * ConnectionRequestInfo implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
-
- private String user;
- private String password;
-
- /**
- * Constructs a new <code>ConnectionRequestInfo</code> object
- *
- * @param user User Name.
- * @param password Password
- */
- public ConnectionRequestInfo(String user, String password) {
- this.user = user;
- this.password = password;
- }
-
- /**
- * Retrieves the user name of the ConnectionRequestInfo.
- *
- * @return User name of ConnectionRequestInfo.
- */
- public String getUser() {
- return user;
- }
-
- /**
- * Retrieves the password of the ConnectionRequestInfo.
- *
- * @return Password of ConnectionRequestInfo.
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Verify whether two ConnectionRequestInfos are equal.
- *
- * @return True, if they are equal and false otherwise.
- */
- public boolean equals(Object obj) {
- if (obj == null) return false;
- if (obj instanceof ConnectionRequestInfo) {
- ConnectionRequestInfo other = (ConnectionRequestInfo) obj;
- return (isEqual(this.user, other.user) &&
- isEqual(this.password, other.password));
- } else {
- return false;
- }
- }
-
- /**
- * Retrieves the hashcode of the object.
- *
- * @return hashCode.
- */
- public int hashCode() {
- String result = "" + user + password;
- return result.hashCode();
- }
-
- /**
- * Compares two objects.
- *
- * @param o1 First object.
- * @param o2 Second object.
- */
- private boolean isEqual(Object o1, Object o2) {
- if (o1 == null) {
- return (o2 == null);
- } else {
- return o1.equals(o2);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DataSource.java
deleted file mode 100755
index 4436215..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ConnectionManager;
-import jakarta.resource.ResourceException;
-import javax.naming.Reference;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
- private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
- private int loginTimeout;
- private PrintWriter logWriter;
- private String description;
- private Reference reference;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Constructs <code>DataSource</code> object. This is created by the
- * <code>ManagedConnectionFactory</code> object.
- *
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
- */
- public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- re.printStackTrace();
- throw new SQLException (re.getMessage());
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException {
-
- Connection driverCon = con;
- if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
-
- return driverCon;
- }
-
- /**
- * Get the login timeout
- *
- * @return login timeout.
- * @throws SQLException If a database error occurs.
- */
- public int getLoginTimeout() throws SQLException{
- return loginTimeout;
- }
-
- /**
- * Set the login timeout
- *
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
- */
- public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
- }
-
- /**
- * Get the logwriter object.
- *
- * @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
- */
- public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
- }
-
- /**
- * Set the logwriter on this object.
- *
- * @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
- */
- public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
- public Logger getParentLogger() throws SQLFeatureNotSupportedException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
- }
- /**
- * Retrieves the description.
- *
- * @return Description about the DataSource.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Set the description.
- *
- * @param description Description about the DataSource.
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Get the reference.
- *
- * @return <code>Reference</code>object.
- */
- public Reference getReference() {
- return reference;
- }
-
- /**
- * Get the reference.
- *
- * @param reference <code>Reference</code> object.
- */
- public void setReference(Reference reference) {
- this.reference = reference;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
deleted file mode 100755
index bec0d6b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-public interface JdbcSetupAdmin {
-
- public void setTableName(String db);
-
- public String getTableName();
-
- public void setJndiName(String name);
-
- public String getJndiName();
-
- public void setSchemaName(String name);
-
- public String getSchemaName();
-
- public void setNoOfRows(Integer i);
-
- public Integer getNoOfRows();
-
- public boolean checkSetup();
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
deleted file mode 100755
index 0ade38f..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.naming.*;
-import javax.sql.*;
-import jakarta.resource.spi.Activation;
-import jakarta.resource.spi.AdministeredObject;
-import jakarta.resource.spi.ConfigProperty;
-import java.sql.*;
-// import javax.sql.DataSource;
-@AdministeredObject(
- adminObjectInterfaces = {com.sun.jdbcra.spi.JdbcSetupAdmin.class}
-)
-public class JdbcSetupAdminImpl implements JdbcSetupAdmin {
-
- private String tableName;
-
- private String jndiName;
-
- private String schemaName;
-
- private Integer noOfRows;
-
- @ConfigProperty(
- type = java.lang.String.class
- )
- public void setTableName(String db) {
- tableName = db;
- }
-
- public String getTableName(){
- return tableName;
- }
-
- @ConfigProperty(
- type = java.lang.String.class
- )
- public void setJndiName(String name){
- jndiName = name;
- }
-
- public String getJndiName() {
- return jndiName;
- }
-
- @ConfigProperty(
- type = java.lang.String.class
- )
- public void setSchemaName(String name){
- schemaName = name;
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- @ConfigProperty(
- type = java.lang.Integer.class,
- defaultValue = "0"
- )
- public void setNoOfRows(Integer i) {
- System.out.println("Setting no of rows :" + i);
- noOfRows = i;
- }
-
- public Integer getNoOfRows() {
- return noOfRows;
- }
-
-private void printHierarchy(ClassLoader cl, int cnt){
-while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
-}
-}
-
-private void compareHierarchy(ClassLoader cl1, ClassLoader cl2 , int cnt){
-while(cl1 != null || cl2 != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
- cl1 = cl1.getParent();
- cl2 = cl2.getParent();
- cnt += 3;
-}
-}
-
-
- public boolean checkSetup(){
-
- if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
-
- if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
-
- Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
- try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
-/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
-
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
-
- System.out.println("Before lookup");
-*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
-
- DataSource ds = (DataSource)o ;
-/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-*/
- con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
-
- System.out.println("Executing query :" + qry);
-
- s = con.createStatement();
- rs = s.executeQuery(qry);
-
- int i = 0;
- if (rs.next()) {
- i++;
- }
-
- System.out.println("No of rows found:" + i);
- System.out.println("No of rows expected:" + noOfRows);
-
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
- } catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
deleted file mode 100755
index ce8635b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.LocalTransactionException;
-
-/**
- * <code>LocalTransaction</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
- private ManagedConnection mc;
-
- /**
- * Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
- */
- public LocalTransaction(ManagedConnection mc) {
- this.mc = mc;
- }
-
- /**
- * Begin a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
- */
- public void begin() throws ResourceException {
- //GJCINT
- mc.transactionStarted();
- try {
- mc.getActualConnection().setAutoCommit(false);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- }
-
- /**
- * Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
- */
- public void commit() throws ResourceException {
- Exception e = null;
- try {
- mc.getActualConnection().commit();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
- /**
- * Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
- */
- public void rollback() throws ResourceException {
- try {
- mc.getActualConnection().rollback();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
deleted file mode 100755
index f0443d0..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.*;
-import jakarta.resource.*;
-import javax.security.auth.Subject;
-import java.io.PrintWriter;
-import javax.transaction.xa.XAResource;
-import java.util.Set;
-import java.util.Hashtable;
-import java.util.Iterator;
-import javax.sql.PooledConnection;
-import javax.sql.XAConnection;
-import java.sql.Connection;
-import java.sql.SQLException;
-import jakarta.resource.NotSupportedException;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.LocalTransaction;
-import com.sun.jdbcra.spi.ManagedConnectionMetaData;
-import com.sun.jdbcra.util.SecurityUtils;
-import com.sun.jdbcra.spi.ConnectionHolder;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * <code>ManagedConnection</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
-
- public static final int ISNOTAPOOLEDCONNECTION = 0;
- public static final int ISPOOLEDCONNECTION = 1;
- public static final int ISXACONNECTION = 2;
-
- private boolean isDestroyed = false;
- private boolean isUsable = true;
-
- private int connectionType = ISNOTAPOOLEDCONNECTION;
- private PooledConnection pc = null;
- private java.sql.Connection actualConnection = null;
- private Hashtable connectionHandles;
- private PrintWriter logWriter;
- private PasswordCredential passwdCredential;
- private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
- private XAResource xar = null;
- public ConnectionHolder activeConnectionHandle;
-
- //GJCINT
- private int isolationLevelWhenCleaned;
- private boolean isClean = false;
-
- private boolean transactionInProgress = false;
-
- private ConnectionEventListener listener = null;
-
- private ConnectionEvent ce = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
-
- /**
- * Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
- * pooledConn parameter is expected to be non null and sqlConn parameter
- * is expected to be null in the case where the datasource object is a
- * connection pool datasource or an xa datasource.
- *
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
- */
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
- PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
- if(pooledConn == null && sqlConn == null) {
- throw new ResourceException("Connection object cannot be null");
- }
-
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
-
- pc = pooledConn;
- connectionHandles = new Hashtable();
- passwdCredential = passwdCred;
- this.mcf = mcf;
- if(passwdCredential != null &&
- this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
- "ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
- " the PasswordCredential for this ManagedConnection");
- }
- logWriter = mcf.getLogWriter();
- activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
- }
-
- /**
- * Adds a connection event listener to the ManagedConnection instance.
- *
- * @param listener <code>ConnectionEventListener</code>
- * @see <code>removeConnectionEventListener</code>
- */
- public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
- }
-
- /**
- * Used by the container to change the association of an application-level
- * connection handle with a <code>ManagedConnection</code> instance.
- *
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
- */
- public void associateConnection(Object connection) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In associateConnection");
- }
- checkIfValid();
- if(connection == null) {
- throw new ResourceException("Connection handle cannot be null");
- }
- ConnectionHolder ch = (ConnectionHolder) connection;
-
- com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
- ch.associateConnection(actualConnection, this);
- /**
- * The expectation from the above method is that the connection holder
- * replaces the actual sql connection it holds with the sql connection
- * handle being passed in this method call. Also, it replaces the reference
- * to the ManagedConnection instance with this ManagedConnection instance.
- * Any previous statements and result sets also need to be removed.
- */
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- ch.setActive(true);
- activeConnectionHandle = ch;
- }
-
- /**
- * Application server calls this method to force any cleanup on the
- * <code>ManagedConnection</code> instance. This method calls the invalidate
- * method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
- */
- public void cleanup() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In cleanup");
- }
- checkIfValid();
-
- /**
- * may need to set the autocommit to true for the non-pooled case.
- */
- //GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- throw new ResourceException("The isolation level for the physical connection "
- + "could not be retrieved");
- }
- }
- isClean = true;
-
- activeConnectionHandle = null;
- }
-
- /**
- * This method removes all the connection handles from the table
- * of connection handles and invalidates all of them so that any
- * operation on those connection handles throws an exception.
- *
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
- */
- private void invalidateAllConnectionHandles() throws ResourceException {
- Set handles = connectionHandles.keySet();
- Iterator iter = handles.iterator();
- try {
- while(iter.hasNext()) {
- ConnectionHolder ch = (ConnectionHolder)iter.next();
- ch.invalidate();
- }
- } catch(java.util.NoSuchElementException nsee) {
- throw new ResourceException("Could not find the connection handle: "+ nsee.getMessage());
- }
- connectionHandles.clear();
- }
-
- /**
- * Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
- */
- public void destroy() throws ResourceException{
- if(logWriter != null) {
- logWriter.println("In destroy");
- }
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
-
- activeConnectionHandle = null;
- try {
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- pc.close();
- pc = null;
- actualConnection = null;
- } else {
- actualConnection.close();
- actualConnection = null;
- }
- } catch(SQLException sqle) {
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
- + sqle.getMessage());
- }
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- }
-
- /**
- * Creates a new connection handle for the underlying physical
- * connection represented by the <code>ManagedConnection</code> instance.
- *
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
- */
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
- throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getConnection");
- }
- checkIfValid();
- com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
- PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
- if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
- throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
- }
-
- //GJCINT
- getActualConnection();
-
- /**
- * The following code in the if statement first checks if this ManagedConnection
- * is clean or not. If it is, it resets the transaction isolation level to what
- * it was when it was when this ManagedConnection was cleaned up depending on the
- * ConnectionRequestInfo passed.
- */
- if(isClean) {
- ((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
- }
-
-
- ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- connHolderObject.setActive(true);
- activeConnectionHandle = connHolderObject;
-
- return connHolderObject;
-
- }
-
- /**
- * Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
- *
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLocalTransaction");
- }
- checkIfValid();
- return new com.sun.jdbcra.spi.LocalTransaction(this);
- }
-
- /**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>setLogWriter</code>
- */
- public PrintWriter getLogWriter() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLogWriter");
- }
- checkIfValid();
-
- return logWriter;
- }
-
- /**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
- *
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getMetaData");
- }
- checkIfValid();
-
- return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
- }
-
- /**
- * Returns an <code>XAResource</code> instance.
- *
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
- */
- public XAResource getXAResource() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getXAResource");
- }
- checkIfValid();
-
- if(connectionType == ISXACONNECTION) {
- try {
- if(xar == null) {
- /**
- * Using the wrapper XAResource.
- */
- xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
- }
- return xar;
- } catch(SQLException sqle) {
- throw new ResourceException(sqle.getMessage());
- }
- } else {
- throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
- }
- }
-
- /**
- * Removes an already registered connection event listener from the
- * <code>ManagedConnection</code> instance.
- *
- * @param listener <code>ConnectionEventListener</code> to be removed
- * @see <code>addConnectionEventListener</code>
- */
- public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.start() has been called or from
- * LocalTransaction object when its begin() method is called.
- */
- void transactionStarted() {
- transactionInProgress = true;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.end() has been called or from
- * LocalTransaction object when its end() method is called.
- */
- void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
- }
-
- try {
- actualConnection.close();
- actualConnection = null;
- } catch(SQLException sqle) {
- actualConnection = null;
- }
- }
-
-
- isClean = true;
-
- activeConnectionHandle = null;
-
- }
-
- /**
- * Checks if a this ManagedConnection is involved in a transaction
- * or not.
- */
- public boolean isTransactionInProgress() {
- return transactionInProgress;
- }
-
- /**
- * Sets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(PrintWriter out) throws ResourceException {
- checkIfValid();
- logWriter = out;
- }
-
- /**
- * This method determines the type of the connection being held
- * in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
- */
- private int getConnectionType(PooledConnection pooledConn) {
- if(pooledConn == null) {
- return ISNOTAPOOLEDCONNECTION;
- } else if(pooledConn instanceof XAConnection) {
- return ISXACONNECTION;
- } else {
- return ISPOOLEDCONNECTION;
- }
- }
-
- /**
- * Returns the <code>ManagedConnectionFactory</code> instance that
- * created this <code>ManagedConnection</code> instance.
- *
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
- */
- ManagedConnectionFactory getManagedConnectionFactory() {
- return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
- }
-
- /**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
- *
- * @return the physical <code>java.sql.Connection</code>
- */
- //GJCINT
- java.sql.Connection getActualConnection() throws ResourceException {
- //GJCINT
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- try {
- if(actualConnection == null) {
- actualConnection = pc.getConnection();
- }
-
- } catch(SQLException sqle) {
- sqle.printStackTrace();
- throw new ResourceException(sqle.getMessage());
- }
- }
- return actualConnection;
- }
-
- /**
- * Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
- *
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
- */
- PasswordCredential getPasswordCredential() {
- return passwdCredential;
- }
-
- /**
- * Checks if this <code>ManagedConnection</code> is valid or not and throws an
- * exception if it is not valid. A <code>ManagedConnection</code> is not valid if
- * destroy has not been called and no physical connection error has
- * occurred rendering the physical connection unusable.
- *
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
- */
- //GJCINT
- void checkIfValid() throws ResourceException {
- if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
- "connection is not usable.");
- }
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when its close method is
- * called. This <code>ManagedConnection</code> instance invalidates the connection handle
- * and sends a CONNECTION_CLOSED event to all the registered event listeners.
- *
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
- */
- void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
- connHolderObject.invalidate();
-
- activeConnectionHandle = null;
-
- ce.setConnectionHandle(connHolderObject);
- listener.connectionClosed(ce);
-
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when it detects a connecion
- * related error.
- *
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
- */
- void connectionErrorOccurred(Exception e,
- com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
- ConnectionEventListener cel = this.listener;
- ConnectionEvent ce = null;
- ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
- : new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
- if (connHolderObject != null) {
- ce.setConnectionHandle(connHolderObject);
- }
-
- cel.connectionErrorOccurred(ce);
- isUsable = false;
- }
-
-
-
- /**
- * This method is called by the <code>XAResource</code> object when its start method
- * has been invoked.
- *
- */
- void XAStartOccurred() {
- try {
- actualConnection.setAutoCommit(false);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by the <code>XAResource</code> object when its end method
- * has been invoked.
- *
- */
- void XAEndOccurred() {
- try {
- actualConnection.setAutoCommit(true);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by a Connection Handle to check if it is
- * the active Connection Handle. If it is not the active Connection
- * Handle, this method throws an SQLException. Else, it
- * returns setting the active Connection Handle to the calling
- * Connection Handle object to this object if the active Connection
- * Handle is null.
- *
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
- */
-
- void checkIfActive(ConnectionHolder ch) throws SQLException {
- if(isDestroyed == true || isUsable == false) {
- throw new SQLException("The physical connection is not usable");
- }
-
- if(activeConnectionHandle == null) {
- activeConnectionHandle = ch;
- ch.setActive(true);
- return;
- }
-
- if(activeConnectionHandle != ch) {
- throw new SQLException("The connection handle cannot be used as another connection is currently active");
- }
- }
-
- /**
- * sets the connection type of this connection. This method is called
- * by the MCF while creating this ManagedConnection. Saves us a costly
- * instanceof operation in the getConnectionType
- */
- public void initializeConnectionType( int _connectionType ) {
- connectionType = _connectionType;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
deleted file mode 100755
index 5ec326c..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import java.sql.SQLException;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
-
- private java.sql.DatabaseMetaData dmd = null;
- private ManagedConnection mc;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Constructor for <code>ManagedConnectionMetaData</code>
- *
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
- */
- public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
- try {
- this.mc = mc;
- dmd = mc.getActualConnection().getMetaData();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product name of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductName() throws ResourceException {
- try {
- return dmd.getDatabaseProductName();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product version of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductVersion() throws ResourceException {
- try {
- return dmd.getDatabaseProductVersion();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
- throw new ResourceException(sqle.getMessage(), sqle.getMessage());
- }
- }
-
- /**
- * Returns maximum limit on number of active concurrent connections
- * that an EIS instance can support across client processes.
- *
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
- */
- public int getMaxConnections() throws ResourceException {
- try {
- return dmd.getMaxConnections();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns name of the user associated with the ManagedConnection instance. The name
- * corresponds to the resource principal under whose whose security context, a connection
- * to the EIS instance has been established.
- *
- * @return name of the user
- * @throws <code>ResourceException</code>
- */
- public String getUserName() throws ResourceException {
- jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
- if(pc != null) {
- return pc.getUserName();
- }
-
- return mc.getManagedConnectionFactory().getUser();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
deleted file mode 100755
index f0ba663..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.transaction.xa.Xid;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import com.sun.jdbcra.spi.ManagedConnection;
-
-/**
- * <code>XAResource</code> wrapper for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
- */
-public class XAResourceImpl implements XAResource {
-
- XAResource xar;
- ManagedConnection mc;
-
- /**
- * Constructor for XAResourceImpl
- *
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
- */
- public XAResourceImpl(XAResource xar, ManagedConnection mc) {
- this.xar = xar;
- this.mc = mc;
- }
-
- /**
- * Commit the global transaction specified by xid.
- *
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
- */
- public void commit(Xid xid, boolean onePhase) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.commit(xid, onePhase);
- }
-
- /**
- * Ends the work performed on behalf of a transaction branch.
- *
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
- */
- public void end(Xid xid, int flags) throws XAException {
- xar.end(xid, flags);
- //GJCINT
- //mc.transactionCompleted();
- }
-
- /**
- * Tell the resource manager to forget about a heuristically completed transaction branch.
- *
- * @param xid A global transaction identifier
- */
- public void forget(Xid xid) throws XAException {
- xar.forget(xid);
- }
-
- /**
- * Obtain the current transaction timeout value set for this
- * <code>XAResource</code> instance.
- *
- * @return the transaction timeout value in seconds
- */
- public int getTransactionTimeout() throws XAException {
- return xar.getTransactionTimeout();
- }
-
- /**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
- * instance represented by the parameter xares.
- *
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
- */
- public boolean isSameRM(XAResource xares) throws XAException {
- return xar.isSameRM(xares);
- }
-
- /**
- * Ask the resource manager to prepare for a transaction commit
- * of the transaction specified in xid.
- *
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
- */
- public int prepare(Xid xid) throws XAException {
- return xar.prepare(xid);
- }
-
- /**
- * Obtain a list of prepared transaction branches from a resource manager.
- *
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
- */
- public Xid[] recover(int flag) throws XAException {
- return xar.recover(flag);
- }
-
- /**
- * Inform the resource manager to roll back work done on behalf of a transaction branch
- *
- * @param xid A global transaction identifier
- */
- public void rollback(Xid xid) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.rollback(xid);
- }
-
- /**
- * Set the current transaction timeout value for this <code>XAResource</code> instance.
- *
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
- */
- public boolean setTransactionTimeout(int seconds) throws XAException {
- return xar.setTransactionTimeout(seconds);
- }
-
- /**
- * Start work on behalf of a transaction branch specified in xid.
- *
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
- */
- public void start(Xid xid, int flags) throws XAException {
- //GJCINT
- mc.transactionStarted();
- xar.start(xid, flags);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/build.xml
deleted file mode 100755
index 7ca9cfb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/spi/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile13">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="build13" depends="compile13">
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="build14" depends="compile14"/>
-
- <target name="build" depends="build13, build14"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/MethodExecutor.java
deleted file mode 100755
index de4a961..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Vector;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Execute the methods based on the parameters.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class MethodExecutor implements java.io.Serializable{
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Exceute a simple set Method.
- *
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Executes the method.
- *
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Converts the type from String to the Class type.
- *
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
-
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
- }
-
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/SecurityUtils.java
deleted file mode 100755
index bed9dd7..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import javax.security.auth.Subject;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import jakarta.resource.spi.security.PasswordCredential;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.*;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import java.util.Set;
-import java.util.Iterator;
-
-/**
- * SecurityUtils for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class SecurityUtils {
-
- /**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
- * it constructs a <code>PasswordCredential</code> object with
- * the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
- * the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
- * <code>ManagedConnectionFactory</code>, instance equivalent
- * to the <code>ManagedConnectionFactory</code>, parameter.
- *
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
- */
- public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
- final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
-
- if (info == null) {
- if (subject == null) {
- return null;
- } else {
- PasswordCredential pc = (PasswordCredential) AccessController.doPrivileged
- (new PrivilegedAction() {
- public Object run() {
- Set passwdCredentialSet = subject.getPrivateCredentials(PasswordCredential.class);
- Iterator iter = passwdCredentialSet.iterator();
- while (iter.hasNext()) {
- PasswordCredential temp = (PasswordCredential) iter.next();
- if (temp.getManagedConnectionFactory().equals(mcf)) {
- return temp;
- }
- }
- return null;
- }
- });
- if (pc == null) {
- throw new jakarta.resource.spi.SecurityException("No PasswordCredential found");
- } else {
- return pc;
- }
- }
- } else {
- com.sun.jdbcra.spi.ConnectionRequestInfo cxReqInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) info;
- PasswordCredential pc = new PasswordCredential(cxReqInfo.getUser(), cxReqInfo.getPassword().toCharArray());
- pc.setManagedConnectionFactory(mcf);
- return pc;
- }
- }
-
- /**
- * Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
- */
- static private boolean isEqual(String str1, String str2) {
- if (str1 == null) {
- return (str2 == null);
- } else {
- return str1.equals(str2);
- }
- }
-
- /**
- * Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
- *
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
- */
- static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
- if (pC1 == pC2)
- return true;
- if(pC1 == null || pC2 == null)
- return (pC1 == pC2);
- if (!isEqual(pC1.getUserName(), pC2.getUserName())) {
- return false;
- }
- String p1 = null;
- String p2 = null;
- if (pC1.getPassword() != null) {
- p1 = new String(pC1.getPassword());
- }
- if (pC2.getPassword() != null) {
- p2 = new String(pC2.getPassword());
- }
- return (isEqual(p1, p2));
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/build.xml
deleted file mode 100755
index f060e7d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ra/src/com/sun/jdbcra/util/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/util"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/descriptor/blackbox-tx.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/descriptor/blackbox-tx.xml
index 44d53da..1e17b6f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/descriptor/blackbox-tx.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/descriptor/blackbox-tx.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,13 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
-
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>BlackBoxLocalTx</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>JDBC Database</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/tmp-tx/ra.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/tmp-tx/ra.xml
index 44d53da..1e17b6f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/tmp-tx/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/rar/src/tmp-tx/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,13 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
-
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>BlackBoxLocalTx</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>JDBC Database</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/descriptor/blackbox-tx.xml b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/descriptor/blackbox-tx.xml
index 44d53da..1e17b6f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/descriptor/blackbox-tx.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/rar/descriptor/blackbox-tx.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,13 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
-
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>BlackBoxLocalTx</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>JDBC Database</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
index 4ecaf4c..ae6f587 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,9 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<!-- There can be any number of "description" elements including 0 -->
<!-- This field can be optionally used by the driver vendor to provide a
@@ -252,7 +257,7 @@
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ <credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
<reauthentication-support>false</reauthentication-support>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/descriptor/blackbox-tx.xml b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/descriptor/blackbox-tx.xml
index 44d53da..1e17b6f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/descriptor/blackbox-tx.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/rar/descriptor/blackbox-tx.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,13 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
-
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>BlackBoxLocalTx</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>JDBC Database</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/build.xml
index bfdafb2..b17857a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/build.xml
@@ -32,12 +32,12 @@
<target name="all" depends="init-common">
<antcall target="compile-common">
<param name="src" value="." />
- <param name="s1astest.classpath" value="${s1astest.classpath}:../versions/version1/test/testjdbcra.rar:../../ra/publish/internal/classes" />
+ <param name="s1astest.classpath" value="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes" />
</antcall>
<antcall target="ejb-jar-common">
<param name="ejb-jar.xml" value="META-INF/ejb-jar.xml" />
- <param name="ejbjar.classes" value=" beans/*.class, ../../ra/publish/internal/classes/**/*.class " />
+ <param name="ejbjar.classes" value=" beans/*.class, ${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes/**/*.class " />
<param name="sun-ejb-jar.xml" value="META-INF/sun-ejb-jar.xml" />
<param name="appname" value="generic-embedded" />
</antcall>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.xml
index 7d4c55a..0aa603b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/build.xml
@@ -24,7 +24,7 @@
<!ENTITY testproperties SYSTEM "./build.properties">
]>
-<project name="redeploy-rar" default="usage" basedir=".">
+<project name="redeploy-rar" default="all" basedir=".">
&commonSetup;
&commonBuild;
@@ -44,7 +44,7 @@
<antcall target="compile-common">
<param name="src" value="ejb"/>
- <param name="s1astest.classpath" value="${s1astest.classpath}:./ra/publish/internal/classes/"/>
+ <param name="s1astest.classpath" value="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"/>
</antcall>
<antcall target="compile-common">
<param name="src" value="client"/>
@@ -85,7 +85,7 @@
<target name="setupone" depends="init-common">
<antcall target="create-ra-config"/>
<antcall target="deploy-rar-common">
- <param name="rarfile" value="versions/ver1/testjdbcra.rar"/>
+ <param name="rarfile" value="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar"/>
</antcall>
<antcall target="create-admin-object"/>
<antcall target="deploy"/>
@@ -93,8 +93,10 @@
<target name="setuptwo" depends="init-common">
<antcall target="create-ra-config"/>
+ <!-- Applications must have the same filename, which is used as an application name -->
+ <copy file="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars-v2.rar" tofile="connectors-ra-redeploy-rars.rar"/>
<antcall target="deploy-rar-common">
- <param name="rarfile" value="versions/ver2/testjdbcra.rar"/>
+ <param name="rarfile" value="connectors-ra-redeploy-rars.rar"/>
</antcall>
<antcall target="create-admin-object"/>
<antcall target="deploy"/>
@@ -111,40 +113,7 @@
<antcall target="runCycle"/>
</target>
- <!--
- <target name="runCycle" depends="init-common">
-
- <antcall target="setupone"/>
- <exec executable="${APPCLIENT}" failonerror="true">
- <env key="APPCPATH" value="${env.S1AS_HOME}/pointbase/lib/pbclient.jar"/>
- <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
- <arg line="-name ${appname}Client"/>
- <arg line="-textauth"/>
- <arg line="-user j2ee"/>
- <arg line="-password j2ee"/>
- <arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
- <arg line= " 1 " />
- </exec>
- <antcall target="unsetup"/>
- <antcall target="setuptwo"/>
- <exec executable="${APPCLIENT}" failonerror="true">
- <env key="APPCPATH" value="${env.S1AS_HOME}/pointbase/lib/pbclient.jar"/>
- <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
- <arg line="-name ${appname}Client"/>
- <arg line="-textauth"/>
- <arg line="-user j2ee"/>
- <arg line="-password j2ee"/>
- <arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
- <arg line= " 2 " />
- </exec>
- <antcall target="unsetup"/>
-
- </target>
- -->
-
-
<target name="runCycle" depends="init-common">
-
<antcall target="setupone"/>
<java classname="client.WebTest">
<arg value="${http.host}"/>
@@ -172,8 +141,6 @@
</classpath>
</java>
<antcall target="unsetup"/>
-
-
</target>
@@ -186,7 +153,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
<antcall target="undeploy-rar-common">
- <param name="undeployrar" value="testjdbcra"/>
+ <param name="undeployrar" value="connectors-ra-redeploy-rars"/>
</antcall>
</target>
@@ -197,7 +164,7 @@
<target name="create-pool">
<antcall target="create-connector-connpool-common">
- <param name="ra.name" value="testjdbcra"/>
+ <param name="ra.name" value="connectors-ra-redeploy-rars"/>
<param name="connection.defname" value="javax.sql.DataSource"/>
<param name="connector.conpool.name" value="versiontest-ra-pool"/>
</antcall>
@@ -217,7 +184,7 @@
<target name="create-admin-object" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command"
- value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname testjdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=connector:NoOfRows=1"/>
+ value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname connectors-ra-redeploy-rars --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=connector:NoOfRows=1"/>
<param name="operand.props" value="eis/testAdmin"/>
</antcall>
</target>
@@ -246,13 +213,13 @@
<target name="create-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="testjdbcra"/>
+ <param name="operand.props" value="connectors-ra-redeploy-rars"/>
</antcall>
</target>
<target name="delete-ra-config" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="testjdbcra"/>
+ <param name="operand.props" value="connectors-ra-redeploy-rars"/>
</antcall>
<!--<antcall target="reconfig-common"/>-->
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.properties
deleted file mode 100755
index fd21c3d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0, which is available at
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-
-### Component Properties ###
-src.dir=src
-component.publish.home=.
-component.classes.dir=${component.publish.home}/internal/classes
-component.lib.home=${component.publish.home}/lib
-component.publish.home=publish
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.xml
deleted file mode 100755
index d45c6ef..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE project [
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
- <!ENTITY common SYSTEM "../../../../../config/common.xml">
- <!ENTITY testcommon SYSTEM "../../../../../config/properties.xml">
-]>
-
-<project name="JDBCConnector top level" default="build">
- <property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
- &common;
- &testcommon;
- <property file="./build.properties"/>
-
- <target name="build" depends="compile,assemble" />
-
-
- <!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
- <target name="init" description="${component.name} initialization">
- <tstamp>
- <format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
- <echo message="Building component ${component.name}"/>
- <mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
- </target>
- <!-- compile -->
- <target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
- <!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
- destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- <include name="com/sun/jdbcra/**"/>
- <include name="com/sun/appserv/**"/>
- </javac>
- </target>
-
- <target name="all" depends="build"/>
-
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${component.lib.home}/testjdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
-
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete file="${component.lib.home}/ra.xml"/>
-
- </target>
-
- <target name="clean" description="Clean the build">
- <delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${component.classes.dir}"/>
- <fileset dir="${component.lib.home}"/>
- </delete>
- </target>
-
-</project>
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/appserv/jdbcra/DataSource.java
deleted file mode 100755
index b6ef30b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.appserv.jdbcra;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
- * server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
- * application server.
- * <p>A sample code for getting driver's connection implementation would like
- * the following.
- * <pre>
- InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
- Connection con = ds.getConnection();
- Connection drivercon = ds.getConnection(con);
-
- // Do db operations.
-
- con.close();
- </pre>
- *
- * @author Binod P.G
- */
-public interface DataSource extends javax.sql.DataSource {
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
deleted file mode 100755
index 88a0950..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.StringTokenizer;
-import java.util.Enumeration;
-import com.sun.jdbcra.util.MethodExecutor;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Utility class, which would create necessary Datasource object according to the
- * specification.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
- */
-public class DataSourceObjectBuilder implements java.io.Serializable{
-
- private DataSourceSpec spec;
-
- private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
- */
- public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
- }
-
- /**
- * Construct the DataSource Object from the spec.
- *
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
- */
- public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
- Object dataSourceObject = getDataSourceObject();
- Method[] methods = dataSourceObject.getClass().getMethods();
- for (int i=0; i < methods.length; i++) {
- String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
- }
- return dataSourceObject;
- }
-
- /**
- * Get the extra driver properties from the DataSourceSpec object and
- * parse them to a set of methodName and parameters. Prepare a hashtable
- * containing these details and return.
- *
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
- */
- private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
-
- String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
- }
-
- /**
- * Creates a Datasource object according to the spec.
- *
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
- */
- private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
- Class dataSourceClass = Class.forName(className);
- Object dataSourceObject = dataSourceClass.newInstance();
- return dataSourceObject;
- } catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
- throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
- } catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
- throw new ResourceException("Error in instantiating" + className);
- } catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
- throw new ResourceException("Access Error in instantiating" + className);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
deleted file mode 100755
index 1c4b072..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.util.Hashtable;
-
-/**
- * Encapsulate the DataSource object details obtained from
- * ManagedConnectionFactory.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class DataSourceSpec implements java.io.Serializable{
-
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
- private Hashtable details = new Hashtable();
-
- /**
- * Set the property.
- *
- * @param property Property Name to be set.
- * @param value Value of property to be set.
- */
- public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
- }
-
- /**
- * Get the value of property
- *
- * @return Value of the property.
- */
- public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
- }
-
- /**
- * Checks whether two <code>DataSourceSpec</code> objects
- * are equal or not.
- *
- * @param obj Instance of <code>DataSourceSpec</code> object.
- */
- public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
- }
-
- /**
- * Retrieves the hashCode of this <code>DataSourceSpec</code> object.
- *
- * @return hashCode of this object.
- */
- public int hashCode() {
- return this.details.hashCode();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/build.xml
deleted file mode 100755
index 3b4faeb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/common/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/common"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/common.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
deleted file mode 100755
index 55dedad..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ /dev/null
@@ -1,671 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.sql.*;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-
-/**
- * Holds the java.sql.Connection object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class ConnectionHolder implements Connection{
-
- private Connection con;
-
- private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
- private boolean isClosed = false;
-
- private boolean valid = true;
-
- private boolean active = false;
- /**
- * The active flag is false when the connection handle is
- * created. When a method is invoked on this object, it asks
- * the ManagedConnection if it can be the active connection
- * handle out of the multiple connection handles. If the
- * ManagedConnection reports that this connection handle
- * can be active by setting this flag to true via the setActive
- * function, the above method invocation succeeds; otherwise
- * an exception is thrown.
- */
-
- /**
- * Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
- */
- public ConnectionHolder(Connection con, ManagedConnection mc) {
- this.con = con;
- this.mc = mc;
- }
-
- /**
- * Returns the actual connection in this holder object.
- *
- * @return Connection object.
- */
- Connection getConnection() {
- return con;
- }
-
- /**
- * Sets the flag to indicate that, the connection is wrapped already or not.
- *
- * @param wrapFlag
- */
- void wrapped(boolean wrapFlag){
- this.wrappedAlready = wrapFlag;
- }
-
- /**
- * Returns whether it is wrapped already or not.
- *
- * @return wrapped flag.
- */
- boolean isWrapped(){
- return wrappedAlready;
- }
-
- /**
- * Returns the <code>ManagedConnection</code> instance responsible
- * for this connection.
- *
- * @return <code>ManagedConnection</code> instance.
- */
- ManagedConnection getManagedConnection() {
- return mc;
- }
-
- /**
- * Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
- *
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
- */
- void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
- }
-
- /**
- * Clears all warnings reported for the underlying connection object.
- *
- * @throws SQLException In case of a database error.
- */
- public void clearWarnings() throws SQLException{
- checkValidity();
- con.clearWarnings();
- }
-
- /**
- * Closes the logical connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void close() throws SQLException{
- isClosed = true;
- mc.connectionClosed(null, this);
- }
-
- /**
- * Invalidates this object.
- */
- public void invalidate() {
- valid = false;
- }
-
- /**
- * Closes the physical connection involved in this.
- *
- * @throws SQLException In case of a database error.
- */
- void actualClose() throws SQLException{
- con.close();
- }
-
- /**
- * Commit the changes in the underlying Connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void commit() throws SQLException {
- checkValidity();
- con.commit();
- }
-
- /**
- * Creates a statement from the underlying Connection
- *
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement() throws SQLException {
- checkValidity();
- return con.createStatement();
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
- *
- * @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
- /**
- * Retrieves the underlying <code>Connection</code> object's catalog name.
- *
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
- */
- public String getCatalog() throws SQLException {
- checkValidity();
- return con.getCatalog();
- }
-
- /**
- * Retrieves the current holdability of <code>ResultSet</code> objects created
- * using this connection object.
- *
- * @return holdability value.
- * @throws SQLException In case of a database error.
- */
- public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
- }
-
- /**
- * Retrieves the <code>DatabaseMetaData</code>object from the underlying
- * <code> Connection </code> object.
- *
- * @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
- */
- public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
- }
-
- /**
- * Retrieves this <code>Connection</code> object's current transaction isolation level.
- *
- * @return Transaction level
- * @throws SQLException In case of a database error.
- */
- public int getTransactionIsolation() throws SQLException {
- checkValidity();
- return con.getTransactionIsolation();
- }
-
- /**
- * Retrieves the <code>Map</code> object associated with
- * <code> Connection</code> Object.
- *
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
- */
- public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
- }
-
- /**
- * Retrieves the the first warning reported by calls on the underlying
- * <code>Connection</code> object.
- *
- * @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
- */
- public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
- }
-
- /**
- * Retrieves whether underlying <code>Connection</code> object is closed.
- *
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
- */
- public boolean isClosed() throws SQLException {
- return isClosed;
- }
-
- /**
- * Retrieves whether this <code>Connection</code> object is read-only.
- *
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
- */
- public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
- }
-
- /**
- * Converts the given SQL statement into the system's native SQL grammer.
- *
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
- */
- public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
- }
-
- public Clob createClob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Blob createBlob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public NClob createNClob() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public SQLXML createSQLXML() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isValid(int timeout) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void setClientInfo(String name, String value) throws SQLClientInfoException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void setClientInfo(Properties properties) throws SQLClientInfoException {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public String getClientInfo(String name) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Properties getClientInfo() throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- /**
- * Removes the given <code>Savepoint</code> object from the current transaction.
- *
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
- */
- public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
- /**
- * Rolls back the changes made in the current transaction.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
- }
-
- /**
- * Rolls back the changes made after the savepoint.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
- }
-
- /**
- * Sets the auto-commmit mode of the <code>Connection</code> object.
- *
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
- }
-
- /**
- * Sets the catalog name to the <code>Connection</code> object
- *
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
- */
- public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
- }
-
- /**
- * Sets the holdability of <code>ResultSet</code> objects created
- * using this <code>Connection</code> object.
- *
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
- */
- public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
- }
-
- /**
- * Puts the connection in read-only mode as a hint to the driver to
- * perform database optimizations.
- *
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
- */
- public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
- }
-
- /**
- * Creates and unnamed savepoint and returns an object corresponding to that.
- *
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
- }
-
- /**
- * Creates a savepoint with the name and returns an object corresponding to that.
- *
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
- /**
- * Creates the transaction isolation level.
- *
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
- */
- public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
- /**
- * Installs the given <code>Map</code> object as the tyoe map for this
- * <code> Connection </code> object.
- *
- * @param map <code>Map</code> a Map object to install.
- * @throws SQLException In case of a database error.
- */
- public void setTypeMap(Map map) throws SQLException {
- checkValidity();
- con.setTypeMap(map);
- }
-
- public int getNetworkTimeout() throws SQLException {
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void abort(Executor executor) throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public String getSchema() throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void setSchema(String schema) throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
-
- /**
- * Checks the validity of this object
- */
- private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
- }
-
- /**
- * Sets the active flag to true
- *
- * @param actv boolean
- */
- void setActive(boolean actv) {
- active = actv;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
deleted file mode 100755
index fb0fdab..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import java.sql.DriverManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import java.sql.SQLException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- * This class is extended by the DataSource specific <code>ManagedConnection</code> factories
- * and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
- java.io.Serializable {
-
- protected DataSourceSpec spec = new DataSourceSpec();
- protected transient DataSourceObjectBuilder dsObjBuilder;
-
- protected java.io.PrintWriter logWriter = null;
- protected jakarta.resource.spi.ResourceAdapter ra = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory() {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory()");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
- return cf;
- }
-
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager)");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
- }
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public abstract boolean equals(Object other);
-
- /**
- * Get the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
- */
- public java.io.PrintWriter getLogWriter() {
- return logWriter;
- }
-
- /**
- * Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
- */
- public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
- if(logWriter != null) {
- logWriter.println("In getResourceAdapter");
- }
- return ra;
- }
-
- /**
- * Returns the hash code for this <code>ManagedConnectionFactory</code>.
- *
- * @return hash code for this <code>ManagedConnectionFactory</code>
- */
- public int hashCode(){
- if(logWriter != null) {
- logWriter.println("In hashCode");
- }
- return spec.hashCode();
- }
-
- /**
- * Returns a matched <code>ManagedConnection</code> from the candidate
- * set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- */
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
- javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In matchManagedConnections");
- }
-
- if(connectionSet == null) {
- return null;
- }
-
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- java.util.Iterator iter = connectionSet.iterator();
- com.sun.jdbcra.spi.ManagedConnection mc = null;
- while(iter.hasNext()) {
- try {
- mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
- } catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
- throw new ResourceException(nsee.getMessage());
- }
- if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
- mc.connectionErrorOccurred(re, null);
- }
- } else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
- mc.connectionErrorOccurred(re, null);
- }
- }
- }
- return null;
- }
-
- //GJCINT
- /**
- * Checks if a <code>ManagedConnection</code> is to be validated or not
- * and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
- */
- void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- if(mc.isTransactionInProgress()) {
- return;
- }
-
- boolean connectionValidationRequired =
- (new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
- if( connectionValidationRequired == false || mc == null) {
- return;
- }
-
-
- String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
- mc.checkIfValid();
- /**
- * The above call checks if the actual physical connection
- * is usable or not.
- */
- java.sql.Connection con = mc.getActualConnection();
-
- if(validationMethod.equals("auto-commit") == true) {
- isValidByAutoCommit(con);
- } else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
- isValidByMetaData(con);
- } else if(validationMethod.equalsIgnoreCase("table") == true) {
- isValidByTableQuery(con, spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME));
- } else {
- throw new ResourceException("The validation method is not proper");
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- // Notice that using something like
- // dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
- // some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
- // Also notice that some XA data sources will throw and exception if
- // you try to call setAutoCommit, for them this method is not recommended
-
- boolean ac = con.getAutoCommit();
- if (ac) {
- con.setAutoCommit(false);
- } else {
- con.rollback(); // prevents uncompleted transaction exceptions
- con.setAutoCommit(true);
- }
-
- con.setAutoCommit(ac);
-
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.DatabaseMetaData dmd = con.getMetaData();
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException("The connection is not valid as "
- + "getting the meta data failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByTableQuery(java.sql.Connection con,
- String tableName) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.Statement stmt = con.createStatement();
- java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
- throw new ResourceException("The connection is not valid as "
- + "querying the table " + tableName + " failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
- * for the <code>ManagedConnection</code> passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
- }
-
- /**
- * Resets the isolation level for the <code>ManagedConnection</code> passed.
- * If the transaction level is to be guaranteed to be the same as the one
- * present when this <code>ManagedConnection</code> was created, as specified
- * by the <code>ConnectionRequestInfo</code> passed, it sets the transaction
- * isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
- * it sets it to the transaction isolation passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
- }
-
- /**
- * Gets the integer equivalent of the string specifying
- * the transaction isolation.
- *
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
- */
- private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
- }
-
- /**
- * Set the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(java.io.PrintWriter out) {
- logWriter = out;
- }
-
- /**
- * Set the associated <code>ResourceAdapter</code> JavaBean.
- *
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
- */
- public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setUser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getUser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setuser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getuser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setPassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getPassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setpassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getpassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setClassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getClassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setclassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getclassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setConnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getConnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setconnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getconnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setValidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getValidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setvalidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getvalidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setValidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getValidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setvalidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getvalidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void setTransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String getTransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void settransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String gettransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getGuaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setguaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getguaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
deleted file mode 100755
index 50c6e41..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.endpoint.MessageEndpointFactory;
-import jakarta.resource.spi.ActivationSpec;
-import jakarta.resource.NotSupportedException;
-import javax.transaction.xa.XAResource;
-import jakarta.resource.spi.BootstrapContext;
-import jakarta.resource.spi.ResourceAdapterInternalException;
-
-/**
- * <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
- */
-public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
-public static final int VERSION = 2;
- public String raProp = null;
-
- /**
- * Empty method implementation for endpointActivation
- * which just throws <code>NotSupportedException</code>
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
- */
- public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty method implementation for endpointDeactivation
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- */
- public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
- }
-
- /**
- * Empty method implementation for getXAResources
- * which just throws <code>NotSupportedException</code>
- *
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
- */
- public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty implementation of start method
- *
- * @param ctx <code>BootstrapContext</code>
- */
- public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
-/*
-NO NEED TO CHECK THIS AS THE TEST's PURPOSE IS TO CHECK THE VERSION ALONE
-
- System.out.println("Resource Adapter is starting with configuration :" + raProp);
- if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
-*/
- }
-
- /**
- * Empty implementation of stop method
- */
- public void stop() {
-
- }
-
- public void setRAProperty(String s) {
- raProp = s;
- }
-
- public String getRAProperty() {
- return raProp;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/build.xml
deleted file mode 100755
index e006b1d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
- </target>
-
- <target name="build14" depends="compile14, package14"/>
- <target name="build13"/>
- <target name="build" depends="build14, build13"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
deleted file mode 100755
index 65338d1..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
- <!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
- description for the resource adapter.
- -->
- <description>Resource adapter wrapping Datasource implementation of driver</description>
-
- <!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
- is intended to be displayed by tools.
- -->
- <display-name>DataSource Resource Adapter</display-name>
-
- <!-- There can be any number of "icon" elements including 0 -->
- <!-- The following is an example.
- <icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
- icon - JPEG or GIF image. The following is an example.
- <small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
- icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
- </icon>
- -->
- <icon>
- <small-icon></small-icon>
- <large-icon></large-icon>
- </icon>
-
- <!-- The "vendor-name" element should occur exactly once. -->
- <!-- This should specify the name of the driver vendor. The following is an example.
- <vendor-name>XYZ INC.</vendor-name>
- -->
- <vendor-name>Sun Microsystems</vendor-name>
-
- <!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
- the database independent of any version information. The following
- is an example.
- <eis-type>XYZ</eis-type>
- -->
- <eis-type>Database</eis-type>
-
- <!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
- the driver vendor. The default is being set as 1.0. The driver
- vendor can change it as required.
- -->
- <resourceadapter-version>1.0</resourceadapter-version>
-
- <!-- This "license" element can occur atmost once -->
- <!-- This specifies licensing requirements for the resource adapter module.
- The following is an example.
- <license>
- There can be any number of "description" elements including 0.
- <description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
- restrictions.
- </description>
-
- This specifies whether a license is required to deploy and use the resource adapter.
- Default is false.
- <license-required>false</license-required>
- </license>
- -->
- <license>
- <license-required>false</license-required>
- </license>
-
- <resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
- elements. The "description" elements are not being included
- in the "config-property" elements below. The driver vendor can
- add them as required.
- -->
-
- <resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
- <outbound-resourceadapter>
-
- <connection-definition>
-
- <managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
- <!-- There can be any number of these elements including 0 -->
- <config-property>
- <config-property-name>ServerName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>localhost</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>PortNumber</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>9092</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>User</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>DBUSER</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Password</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>DBPASSWORD</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DatabaseName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>jdbc:pointbase:server://localhost:9092/sqe-samples,new</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DataSourceName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Description</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>Oracle thin driver Datasource</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NetworkProtocol</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>RoleName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>LoginTimeOut</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DriverProperties</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>Delimiter</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>#</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ClassName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>com.pointbase.jdbc.jdbcDataSource</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
-
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
- <connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
- <connection-interface>java.sql.Connection</connection-interface>
-
- <connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
- </connection-definition>
-
- <transaction-support>LocalTransaction</transaction-support>
-
- <authentication-mechanism>
- <!-- There can be any number of "description" elements including 0 -->
- <!-- Not including the "description" element -->
-
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
-
- <reauthentication-support>false</reauthentication-support>
-
- </outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- </adminobject>
-
- </resourceadapter>
-
-</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
deleted file mode 100755
index 2ee36c5..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-
-/**
- * ConnectionManager implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
-
- /**
- * Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
- *
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
- */
- public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
- }
-
- /*
- * This class could effectively implement Connection pooling also.
- * Could be done for FCS.
- */
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
deleted file mode 100755
index ddd0a28..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-/**
- * ConnectionRequestInfo implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
-
- private String user;
- private String password;
-
- /**
- * Constructs a new <code>ConnectionRequestInfo</code> object
- *
- * @param user User Name.
- * @param password Password
- */
- public ConnectionRequestInfo(String user, String password) {
- this.user = user;
- this.password = password;
- }
-
- /**
- * Retrieves the user name of the ConnectionRequestInfo.
- *
- * @return User name of ConnectionRequestInfo.
- */
- public String getUser() {
- return user;
- }
-
- /**
- * Retrieves the password of the ConnectionRequestInfo.
- *
- * @return Password of ConnectionRequestInfo.
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Verify whether two ConnectionRequestInfos are equal.
- *
- * @return True, if they are equal and false otherwise.
- */
- public boolean equals(Object obj) {
- if (obj == null) return false;
- if (obj instanceof ConnectionRequestInfo) {
- ConnectionRequestInfo other = (ConnectionRequestInfo) obj;
- return (isEqual(this.user, other.user) &&
- isEqual(this.password, other.password));
- } else {
- return false;
- }
- }
-
- /**
- * Retrieves the hashcode of the object.
- *
- * @return hashCode.
- */
- public int hashCode() {
- String result = "" + user + password;
- return result.hashCode();
- }
-
- /**
- * Compares two objects.
- *
- * @param o1 First object.
- * @param o2 Second object.
- */
- private boolean isEqual(Object o1, Object o2) {
- if (o1 == null) {
- return (o2 == null);
- } else {
- return o1.equals(o2);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
deleted file mode 100755
index 614ffa9..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ManagedConnectionFactory;
-import com.sun.jdbcra.common.DataSourceSpec;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
- */
-
-public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
- private transient javax.sql.DataSource dataSourceObj;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In createManagedConnection");
- }
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- if(dataSourceObj == null) {
- if(dsObjBuilder == null) {
- dsObjBuilder = new DataSourceObjectBuilder(spec);
- }
-
- try {
- dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
- } catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
- throw new jakarta.resource.ResourceException(cce.getMessage());
- }
- }
-
- java.sql.Connection dsConn = null;
-
- try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
- sqle.getMessage());
- }
-
- com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
- //GJCINT
- setIsolation(mc);
- isValid(mc);
- return mc;
- }
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public boolean equals(Object other) {
- if(logWriter != null) {
- logWriter.println("In equals");
- }
- /**
- * The check below means that two ManagedConnectionFactory objects are equal
- * if and only if their properties are the same.
- */
- if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
- (com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
- return this.spec.equals(otherMCF.spec);
- }
- return false;
- }
-
- /**
- * Sets the server name.
- *
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
- */
- public void setserverName(String serverName) {
- spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
- }
-
- /**
- * Gets the server name.
- *
- * @return serverName
- * @see <code>setServerName</code>
- */
- public String getserverName() {
- return spec.getDetail(DataSourceSpec.SERVERNAME);
- }
-
- /**
- * Sets the server name.
- *
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
- */
- public void setServerName(String serverName) {
- spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
- }
-
- /**
- * Gets the server name.
- *
- * @return serverName
- * @see <code>setServerName</code>
- */
- public String getServerName() {
- return spec.getDetail(DataSourceSpec.SERVERNAME);
- }
-
- /**
- * Sets the port number.
- *
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
- */
- public void setportNumber(String portNumber) {
- spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
- }
-
- /**
- * Gets the port number.
- *
- * @return portNumber
- * @see <code>setPortNumber</code>
- */
- public String getportNumber() {
- return spec.getDetail(DataSourceSpec.PORTNUMBER);
- }
-
- /**
- * Sets the port number.
- *
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
- */
- public void setPortNumber(String portNumber) {
- spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
- }
-
- /**
- * Gets the port number.
- *
- * @return portNumber
- * @see <code>setPortNumber</code>
- */
- public String getPortNumber() {
- return spec.getDetail(DataSourceSpec.PORTNUMBER);
- }
-
- /**
- * Sets the database name.
- *
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
- */
- public void setdatabaseName(String databaseName) {
- spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
- }
-
- /**
- * Gets the database name.
- *
- * @return databaseName
- * @see <code>setDatabaseName</code>
- */
- public String getdatabaseName() {
- return spec.getDetail(DataSourceSpec.DATABASENAME);
- }
-
- /**
- * Sets the database name.
- *
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
- */
- public void setDatabaseName(String databaseName) {
- spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
- }
-
- /**
- * Gets the database name.
- *
- * @return databaseName
- * @see <code>setDatabaseName</code>
- */
- public String getDatabaseName() {
- return spec.getDetail(DataSourceSpec.DATABASENAME);
- }
-
- /**
- * Sets the data source name.
- *
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
- */
- public void setdataSourceName(String dsn) {
- spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
- }
-
- /**
- * Gets the data source name.
- *
- * @return dsn
- * @see <code>setDataSourceName</code>
- */
- public String getdataSourceName() {
- return spec.getDetail(DataSourceSpec.DATASOURCENAME);
- }
-
- /**
- * Sets the data source name.
- *
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
- */
- public void setDataSourceName(String dsn) {
- spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
- }
-
- /**
- * Gets the data source name.
- *
- * @return dsn
- * @see <code>setDataSourceName</code>
- */
- public String getDataSourceName() {
- return spec.getDetail(DataSourceSpec.DATASOURCENAME);
- }
-
- /**
- * Sets the description.
- *
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
- */
- public void setdescription(String desc) {
- spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
- }
-
- /**
- * Gets the description.
- *
- * @return desc
- * @see <code>setDescription</code>
- */
- public String getdescription() {
- return spec.getDetail(DataSourceSpec.DESCRIPTION);
- }
-
- /**
- * Sets the description.
- *
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
- */
- public void setDescription(String desc) {
- spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
- }
-
- /**
- * Gets the description.
- *
- * @return desc
- * @see <code>setDescription</code>
- */
- public String getDescription() {
- return spec.getDetail(DataSourceSpec.DESCRIPTION);
- }
-
- /**
- * Sets the network protocol.
- *
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
- */
- public void setnetworkProtocol(String nwProtocol) {
- spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
- }
-
- /**
- * Gets the network protocol.
- *
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
- */
- public String getnetworkProtocol() {
- return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
- }
-
- /**
- * Sets the network protocol.
- *
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
- */
- public void setNetworkProtocol(String nwProtocol) {
- spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
- }
-
- /**
- * Gets the network protocol.
- *
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
- */
- public String getNetworkProtocol() {
- return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
- }
-
- /**
- * Sets the role name.
- *
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
- */
- public void setroleName(String roleName) {
- spec.setDetail(DataSourceSpec.ROLENAME, roleName);
- }
-
- /**
- * Gets the role name.
- *
- * @return roleName
- * @see <code>setRoleName</code>
- */
- public String getroleName() {
- return spec.getDetail(DataSourceSpec.ROLENAME);
- }
-
- /**
- * Sets the role name.
- *
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
- */
- public void setRoleName(String roleName) {
- spec.setDetail(DataSourceSpec.ROLENAME, roleName);
- }
-
- /**
- * Gets the role name.
- *
- * @return roleName
- * @see <code>setRoleName</code>
- */
- public String getRoleName() {
- return spec.getDetail(DataSourceSpec.ROLENAME);
- }
-
-
- /**
- * Sets the login timeout.
- *
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
- */
- public void setloginTimeOut(String loginTimeOut) {
- spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
- }
-
- /**
- * Gets the login timeout.
- *
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
- */
- public String getloginTimeOut() {
- return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
- }
-
- /**
- * Sets the login timeout.
- *
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
- */
- public void setLoginTimeOut(String loginTimeOut) {
- spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
- }
-
- /**
- * Gets the login timeout.
- *
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
- */
- public String getLoginTimeOut() {
- return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
- }
-
- /**
- * Sets the delimiter.
- *
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
- */
- public void setdelimiter(String delim) {
- spec.setDetail(DataSourceSpec.DELIMITER, delim);
- }
-
- /**
- * Gets the delimiter.
- *
- * @return delim
- * @see <code>setDelimiter</code>
- */
- public String getdelimiter() {
- return spec.getDetail(DataSourceSpec.DELIMITER);
- }
-
- /**
- * Sets the delimiter.
- *
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
- */
- public void setDelimiter(String delim) {
- spec.setDetail(DataSourceSpec.DELIMITER, delim);
- }
-
- /**
- * Gets the delimiter.
- *
- * @return delim
- * @see <code>setDelimiter</code>
- */
- public String getDelimiter() {
- return spec.getDetail(DataSourceSpec.DELIMITER);
- }
-
- /**
- * Sets the driver specific properties.
- *
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
- */
- public void setdriverProperties(String driverProps) {
- spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
- }
-
- /**
- * Gets the driver specific properties.
- *
- * @return driverProps
- * @see <code>setDriverProperties</code>
- */
- public String getdriverProperties() {
- return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- }
-
- /**
- * Sets the driver specific properties.
- *
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
- */
- public void setDriverProperties(String driverProps) {
- spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
- }
-
- /**
- * Gets the driver specific properties.
- *
- * @return driverProps
- * @see <code>setDriverProperties</code>
- */
- public String getDriverProperties() {
- return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- }
-
- /*
- * Check if the PasswordCredential passed for this get connection
- * request is equal to the user/passwd of this connection pool.
- */
- private boolean isEqual( PasswordCredential pc, String user,
- String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
-
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DataSource.java
deleted file mode 100755
index f8f534e..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ConnectionManager;
-import jakarta.resource.ResourceException;
-import javax.naming.Reference;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
- private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
- private int loginTimeout;
- private PrintWriter logWriter;
- private String description;
- private Reference reference;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Constructs <code>DataSource</code> object. This is created by the
- * <code>ManagedConnectionFactory</code> object.
- *
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
- */
- public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re.getMessage());
- }
- }
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException {
-
- Connection driverCon = con;
- if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
-
- return driverCon;
- }
-
- /**
- * Get the login timeout
- *
- * @return login timeout.
- * @throws SQLException If a database error occurs.
- */
- public int getLoginTimeout() throws SQLException{
- return loginTimeout;
- }
-
- /**
- * Set the login timeout
- *
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
- */
- public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
- }
-
- /**
- * Get the logwriter object.
- *
- * @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
- */
- public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
- }
-
- /**
- * Set the logwriter on this object.
- *
- * @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
- */
- public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
- public Logger getParentLogger() throws SQLFeatureNotSupportedException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
- }
- /**
- * Retrieves the description.
- *
- * @return Description about the DataSource.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Set the description.
- *
- * @param description Description about the DataSource.
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Get the reference.
- *
- * @return <code>Reference</code>object.
- */
- public Reference getReference() {
- return reference;
- }
-
- /**
- * Get the reference.
- *
- * @param reference <code>Reference</code> object.
- */
- public void setReference(Reference reference) {
- this.reference = reference;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false; //To change body of implemented methods use File | Settings | File Templates.
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
deleted file mode 100755
index 824510d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-public interface JdbcSetupAdmin {
-
- public void setTableName(String db);
-
- public String getTableName();
-
- public void setJndiName(String name);
-
- public String getJndiName();
-
- public void setSchemaName(String name);
-
- public String getSchemaName();
-
- public void setNoOfRows(Integer i);
-
- public Integer getNoOfRows();
-
- public boolean checkSetup();
-
- public int getVersion();
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
deleted file mode 100755
index 44a8e60..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.naming.*;
-import javax.sql.*;
-import java.sql.*;
-
-public class JdbcSetupAdminImpl implements JdbcSetupAdmin {
-
- private String tableName;
-
- private String jndiName;
-
- private String schemaName;
-
- private Integer noOfRows;
-
- public void setTableName(String db) {
- tableName = db;
- }
-
- public String getTableName(){
- return tableName;
- }
-
- public void setJndiName(String name){
- jndiName = name;
- }
-
- public String getJndiName() {
- return jndiName;
- }
-
- public void setSchemaName(String name){
- schemaName = name;
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- public void setNoOfRows(Integer i) {
- System.out.println("Setting no of rows :" + i);
- noOfRows = i;
- }
-
- public Integer getNoOfRows() {
- return noOfRows;
- }
-
- public boolean checkSetup(){
-
- if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
-
- if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
-
- Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
- try {
- InitialContext ic = new InitialContext();
- DataSource ds = (DataSource) ic.lookup(jndiName);
- con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
-
- System.out.println("Executing query :" + qry);
-
- s = con.createStatement();
- rs = s.executeQuery(qry);
-
- int i = 0;
- if (rs.next()) {
- i++;
- }
-
- System.out.println("No of rows found:" + i);
- System.out.println("No of rows expected:" + noOfRows);
-
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
- } catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
- }
-
- public int getVersion(){
- return ResourceAdapter.VERSION;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
deleted file mode 100755
index ce8635b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.LocalTransactionException;
-
-/**
- * <code>LocalTransaction</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
- private ManagedConnection mc;
-
- /**
- * Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
- */
- public LocalTransaction(ManagedConnection mc) {
- this.mc = mc;
- }
-
- /**
- * Begin a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
- */
- public void begin() throws ResourceException {
- //GJCINT
- mc.transactionStarted();
- try {
- mc.getActualConnection().setAutoCommit(false);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- }
-
- /**
- * Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
- */
- public void commit() throws ResourceException {
- Exception e = null;
- try {
- mc.getActualConnection().commit();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
- /**
- * Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
- */
- public void rollback() throws ResourceException {
- try {
- mc.getActualConnection().rollback();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
deleted file mode 100755
index f0443d0..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.*;
-import jakarta.resource.*;
-import javax.security.auth.Subject;
-import java.io.PrintWriter;
-import javax.transaction.xa.XAResource;
-import java.util.Set;
-import java.util.Hashtable;
-import java.util.Iterator;
-import javax.sql.PooledConnection;
-import javax.sql.XAConnection;
-import java.sql.Connection;
-import java.sql.SQLException;
-import jakarta.resource.NotSupportedException;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.LocalTransaction;
-import com.sun.jdbcra.spi.ManagedConnectionMetaData;
-import com.sun.jdbcra.util.SecurityUtils;
-import com.sun.jdbcra.spi.ConnectionHolder;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * <code>ManagedConnection</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
-
- public static final int ISNOTAPOOLEDCONNECTION = 0;
- public static final int ISPOOLEDCONNECTION = 1;
- public static final int ISXACONNECTION = 2;
-
- private boolean isDestroyed = false;
- private boolean isUsable = true;
-
- private int connectionType = ISNOTAPOOLEDCONNECTION;
- private PooledConnection pc = null;
- private java.sql.Connection actualConnection = null;
- private Hashtable connectionHandles;
- private PrintWriter logWriter;
- private PasswordCredential passwdCredential;
- private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
- private XAResource xar = null;
- public ConnectionHolder activeConnectionHandle;
-
- //GJCINT
- private int isolationLevelWhenCleaned;
- private boolean isClean = false;
-
- private boolean transactionInProgress = false;
-
- private ConnectionEventListener listener = null;
-
- private ConnectionEvent ce = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
-
- /**
- * Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
- * pooledConn parameter is expected to be non null and sqlConn parameter
- * is expected to be null in the case where the datasource object is a
- * connection pool datasource or an xa datasource.
- *
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
- */
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
- PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
- if(pooledConn == null && sqlConn == null) {
- throw new ResourceException("Connection object cannot be null");
- }
-
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
-
- pc = pooledConn;
- connectionHandles = new Hashtable();
- passwdCredential = passwdCred;
- this.mcf = mcf;
- if(passwdCredential != null &&
- this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
- "ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
- " the PasswordCredential for this ManagedConnection");
- }
- logWriter = mcf.getLogWriter();
- activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
- }
-
- /**
- * Adds a connection event listener to the ManagedConnection instance.
- *
- * @param listener <code>ConnectionEventListener</code>
- * @see <code>removeConnectionEventListener</code>
- */
- public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
- }
-
- /**
- * Used by the container to change the association of an application-level
- * connection handle with a <code>ManagedConnection</code> instance.
- *
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
- */
- public void associateConnection(Object connection) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In associateConnection");
- }
- checkIfValid();
- if(connection == null) {
- throw new ResourceException("Connection handle cannot be null");
- }
- ConnectionHolder ch = (ConnectionHolder) connection;
-
- com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
- ch.associateConnection(actualConnection, this);
- /**
- * The expectation from the above method is that the connection holder
- * replaces the actual sql connection it holds with the sql connection
- * handle being passed in this method call. Also, it replaces the reference
- * to the ManagedConnection instance with this ManagedConnection instance.
- * Any previous statements and result sets also need to be removed.
- */
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- ch.setActive(true);
- activeConnectionHandle = ch;
- }
-
- /**
- * Application server calls this method to force any cleanup on the
- * <code>ManagedConnection</code> instance. This method calls the invalidate
- * method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
- */
- public void cleanup() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In cleanup");
- }
- checkIfValid();
-
- /**
- * may need to set the autocommit to true for the non-pooled case.
- */
- //GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- throw new ResourceException("The isolation level for the physical connection "
- + "could not be retrieved");
- }
- }
- isClean = true;
-
- activeConnectionHandle = null;
- }
-
- /**
- * This method removes all the connection handles from the table
- * of connection handles and invalidates all of them so that any
- * operation on those connection handles throws an exception.
- *
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
- */
- private void invalidateAllConnectionHandles() throws ResourceException {
- Set handles = connectionHandles.keySet();
- Iterator iter = handles.iterator();
- try {
- while(iter.hasNext()) {
- ConnectionHolder ch = (ConnectionHolder)iter.next();
- ch.invalidate();
- }
- } catch(java.util.NoSuchElementException nsee) {
- throw new ResourceException("Could not find the connection handle: "+ nsee.getMessage());
- }
- connectionHandles.clear();
- }
-
- /**
- * Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
- */
- public void destroy() throws ResourceException{
- if(logWriter != null) {
- logWriter.println("In destroy");
- }
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
-
- activeConnectionHandle = null;
- try {
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- pc.close();
- pc = null;
- actualConnection = null;
- } else {
- actualConnection.close();
- actualConnection = null;
- }
- } catch(SQLException sqle) {
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
- + sqle.getMessage());
- }
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- }
-
- /**
- * Creates a new connection handle for the underlying physical
- * connection represented by the <code>ManagedConnection</code> instance.
- *
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
- */
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
- throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getConnection");
- }
- checkIfValid();
- com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
- PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
- if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
- throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
- }
-
- //GJCINT
- getActualConnection();
-
- /**
- * The following code in the if statement first checks if this ManagedConnection
- * is clean or not. If it is, it resets the transaction isolation level to what
- * it was when it was when this ManagedConnection was cleaned up depending on the
- * ConnectionRequestInfo passed.
- */
- if(isClean) {
- ((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
- }
-
-
- ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- connHolderObject.setActive(true);
- activeConnectionHandle = connHolderObject;
-
- return connHolderObject;
-
- }
-
- /**
- * Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
- *
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLocalTransaction");
- }
- checkIfValid();
- return new com.sun.jdbcra.spi.LocalTransaction(this);
- }
-
- /**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>setLogWriter</code>
- */
- public PrintWriter getLogWriter() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLogWriter");
- }
- checkIfValid();
-
- return logWriter;
- }
-
- /**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
- *
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getMetaData");
- }
- checkIfValid();
-
- return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
- }
-
- /**
- * Returns an <code>XAResource</code> instance.
- *
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
- */
- public XAResource getXAResource() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getXAResource");
- }
- checkIfValid();
-
- if(connectionType == ISXACONNECTION) {
- try {
- if(xar == null) {
- /**
- * Using the wrapper XAResource.
- */
- xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
- }
- return xar;
- } catch(SQLException sqle) {
- throw new ResourceException(sqle.getMessage());
- }
- } else {
- throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
- }
- }
-
- /**
- * Removes an already registered connection event listener from the
- * <code>ManagedConnection</code> instance.
- *
- * @param listener <code>ConnectionEventListener</code> to be removed
- * @see <code>addConnectionEventListener</code>
- */
- public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.start() has been called or from
- * LocalTransaction object when its begin() method is called.
- */
- void transactionStarted() {
- transactionInProgress = true;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.end() has been called or from
- * LocalTransaction object when its end() method is called.
- */
- void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
- }
-
- try {
- actualConnection.close();
- actualConnection = null;
- } catch(SQLException sqle) {
- actualConnection = null;
- }
- }
-
-
- isClean = true;
-
- activeConnectionHandle = null;
-
- }
-
- /**
- * Checks if a this ManagedConnection is involved in a transaction
- * or not.
- */
- public boolean isTransactionInProgress() {
- return transactionInProgress;
- }
-
- /**
- * Sets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(PrintWriter out) throws ResourceException {
- checkIfValid();
- logWriter = out;
- }
-
- /**
- * This method determines the type of the connection being held
- * in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
- */
- private int getConnectionType(PooledConnection pooledConn) {
- if(pooledConn == null) {
- return ISNOTAPOOLEDCONNECTION;
- } else if(pooledConn instanceof XAConnection) {
- return ISXACONNECTION;
- } else {
- return ISPOOLEDCONNECTION;
- }
- }
-
- /**
- * Returns the <code>ManagedConnectionFactory</code> instance that
- * created this <code>ManagedConnection</code> instance.
- *
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
- */
- ManagedConnectionFactory getManagedConnectionFactory() {
- return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
- }
-
- /**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
- *
- * @return the physical <code>java.sql.Connection</code>
- */
- //GJCINT
- java.sql.Connection getActualConnection() throws ResourceException {
- //GJCINT
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- try {
- if(actualConnection == null) {
- actualConnection = pc.getConnection();
- }
-
- } catch(SQLException sqle) {
- sqle.printStackTrace();
- throw new ResourceException(sqle.getMessage());
- }
- }
- return actualConnection;
- }
-
- /**
- * Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
- *
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
- */
- PasswordCredential getPasswordCredential() {
- return passwdCredential;
- }
-
- /**
- * Checks if this <code>ManagedConnection</code> is valid or not and throws an
- * exception if it is not valid. A <code>ManagedConnection</code> is not valid if
- * destroy has not been called and no physical connection error has
- * occurred rendering the physical connection unusable.
- *
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
- */
- //GJCINT
- void checkIfValid() throws ResourceException {
- if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
- "connection is not usable.");
- }
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when its close method is
- * called. This <code>ManagedConnection</code> instance invalidates the connection handle
- * and sends a CONNECTION_CLOSED event to all the registered event listeners.
- *
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
- */
- void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
- connHolderObject.invalidate();
-
- activeConnectionHandle = null;
-
- ce.setConnectionHandle(connHolderObject);
- listener.connectionClosed(ce);
-
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when it detects a connecion
- * related error.
- *
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
- */
- void connectionErrorOccurred(Exception e,
- com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
- ConnectionEventListener cel = this.listener;
- ConnectionEvent ce = null;
- ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
- : new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
- if (connHolderObject != null) {
- ce.setConnectionHandle(connHolderObject);
- }
-
- cel.connectionErrorOccurred(ce);
- isUsable = false;
- }
-
-
-
- /**
- * This method is called by the <code>XAResource</code> object when its start method
- * has been invoked.
- *
- */
- void XAStartOccurred() {
- try {
- actualConnection.setAutoCommit(false);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by the <code>XAResource</code> object when its end method
- * has been invoked.
- *
- */
- void XAEndOccurred() {
- try {
- actualConnection.setAutoCommit(true);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by a Connection Handle to check if it is
- * the active Connection Handle. If it is not the active Connection
- * Handle, this method throws an SQLException. Else, it
- * returns setting the active Connection Handle to the calling
- * Connection Handle object to this object if the active Connection
- * Handle is null.
- *
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
- */
-
- void checkIfActive(ConnectionHolder ch) throws SQLException {
- if(isDestroyed == true || isUsable == false) {
- throw new SQLException("The physical connection is not usable");
- }
-
- if(activeConnectionHandle == null) {
- activeConnectionHandle = ch;
- ch.setActive(true);
- return;
- }
-
- if(activeConnectionHandle != ch) {
- throw new SQLException("The connection handle cannot be used as another connection is currently active");
- }
- }
-
- /**
- * sets the connection type of this connection. This method is called
- * by the MCF while creating this ManagedConnection. Saves us a costly
- * instanceof operation in the getConnectionType
- */
- public void initializeConnectionType( int _connectionType ) {
- connectionType = _connectionType;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
deleted file mode 100755
index 5ec326c..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import java.sql.SQLException;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
-
- private java.sql.DatabaseMetaData dmd = null;
- private ManagedConnection mc;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Constructor for <code>ManagedConnectionMetaData</code>
- *
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
- */
- public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
- try {
- this.mc = mc;
- dmd = mc.getActualConnection().getMetaData();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product name of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductName() throws ResourceException {
- try {
- return dmd.getDatabaseProductName();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product version of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductVersion() throws ResourceException {
- try {
- return dmd.getDatabaseProductVersion();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
- throw new ResourceException(sqle.getMessage(), sqle.getMessage());
- }
- }
-
- /**
- * Returns maximum limit on number of active concurrent connections
- * that an EIS instance can support across client processes.
- *
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
- */
- public int getMaxConnections() throws ResourceException {
- try {
- return dmd.getMaxConnections();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns name of the user associated with the ManagedConnection instance. The name
- * corresponds to the resource principal under whose whose security context, a connection
- * to the EIS instance has been established.
- *
- * @return name of the user
- * @throws <code>ResourceException</code>
- */
- public String getUserName() throws ResourceException {
- jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
- if(pc != null) {
- return pc.getUserName();
- }
-
- return mc.getManagedConnectionFactory().getUser();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
deleted file mode 100755
index f0ba663..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.transaction.xa.Xid;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import com.sun.jdbcra.spi.ManagedConnection;
-
-/**
- * <code>XAResource</code> wrapper for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
- */
-public class XAResourceImpl implements XAResource {
-
- XAResource xar;
- ManagedConnection mc;
-
- /**
- * Constructor for XAResourceImpl
- *
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
- */
- public XAResourceImpl(XAResource xar, ManagedConnection mc) {
- this.xar = xar;
- this.mc = mc;
- }
-
- /**
- * Commit the global transaction specified by xid.
- *
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
- */
- public void commit(Xid xid, boolean onePhase) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.commit(xid, onePhase);
- }
-
- /**
- * Ends the work performed on behalf of a transaction branch.
- *
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
- */
- public void end(Xid xid, int flags) throws XAException {
- xar.end(xid, flags);
- //GJCINT
- //mc.transactionCompleted();
- }
-
- /**
- * Tell the resource manager to forget about a heuristically completed transaction branch.
- *
- * @param xid A global transaction identifier
- */
- public void forget(Xid xid) throws XAException {
- xar.forget(xid);
- }
-
- /**
- * Obtain the current transaction timeout value set for this
- * <code>XAResource</code> instance.
- *
- * @return the transaction timeout value in seconds
- */
- public int getTransactionTimeout() throws XAException {
- return xar.getTransactionTimeout();
- }
-
- /**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
- * instance represented by the parameter xares.
- *
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
- */
- public boolean isSameRM(XAResource xares) throws XAException {
- return xar.isSameRM(xares);
- }
-
- /**
- * Ask the resource manager to prepare for a transaction commit
- * of the transaction specified in xid.
- *
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
- */
- public int prepare(Xid xid) throws XAException {
- return xar.prepare(xid);
- }
-
- /**
- * Obtain a list of prepared transaction branches from a resource manager.
- *
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
- */
- public Xid[] recover(int flag) throws XAException {
- return xar.recover(flag);
- }
-
- /**
- * Inform the resource manager to roll back work done on behalf of a transaction branch
- *
- * @param xid A global transaction identifier
- */
- public void rollback(Xid xid) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.rollback(xid);
- }
-
- /**
- * Set the current transaction timeout value for this <code>XAResource</code> instance.
- *
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
- */
- public boolean setTransactionTimeout(int seconds) throws XAException {
- return xar.setTransactionTimeout(seconds);
- }
-
- /**
- * Start work on behalf of a transaction branch specified in xid.
- *
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
- */
- public void start(Xid xid, int flags) throws XAException {
- //GJCINT
- mc.transactionStarted();
- xar.start(xid, flags);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/build.xml
deleted file mode 100755
index 7ca9cfb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/spi/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile13">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="build13" depends="compile13">
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="build14" depends="compile14"/>
-
- <target name="build" depends="build13, build14"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/MethodExecutor.java
deleted file mode 100755
index de4a961..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Vector;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Execute the methods based on the parameters.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class MethodExecutor implements java.io.Serializable{
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Exceute a simple set Method.
- *
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Executes the method.
- *
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Converts the type from String to the Class type.
- *
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
-
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
- }
-
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/SecurityUtils.java
deleted file mode 100755
index bed9dd7..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import javax.security.auth.Subject;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import jakarta.resource.spi.security.PasswordCredential;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.*;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import java.util.Set;
-import java.util.Iterator;
-
-/**
- * SecurityUtils for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class SecurityUtils {
-
- /**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
- * it constructs a <code>PasswordCredential</code> object with
- * the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
- * the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
- * <code>ManagedConnectionFactory</code>, instance equivalent
- * to the <code>ManagedConnectionFactory</code>, parameter.
- *
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
- */
- public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
- final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
-
- if (info == null) {
- if (subject == null) {
- return null;
- } else {
- PasswordCredential pc = (PasswordCredential) AccessController.doPrivileged
- (new PrivilegedAction() {
- public Object run() {
- Set passwdCredentialSet = subject.getPrivateCredentials(PasswordCredential.class);
- Iterator iter = passwdCredentialSet.iterator();
- while (iter.hasNext()) {
- PasswordCredential temp = (PasswordCredential) iter.next();
- if (temp.getManagedConnectionFactory().equals(mcf)) {
- return temp;
- }
- }
- return null;
- }
- });
- if (pc == null) {
- throw new jakarta.resource.spi.SecurityException("No PasswordCredential found");
- } else {
- return pc;
- }
- }
- } else {
- com.sun.jdbcra.spi.ConnectionRequestInfo cxReqInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) info;
- PasswordCredential pc = new PasswordCredential(cxReqInfo.getUser(), cxReqInfo.getPassword().toCharArray());
- pc.setManagedConnectionFactory(mcf);
- return pc;
- }
- }
-
- /**
- * Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
- */
- static private boolean isEqual(String str1, String str2) {
- if (str1 == null) {
- return (str2 == null);
- } else {
- return str1.equals(str2);
- }
- }
-
- /**
- * Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
- *
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
- */
- static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
- if (pC1 == pC2)
- return true;
- if(pC1 == null || pC2 == null)
- return (pC1 == pC2);
- if (!isEqual(pC1.getUserName(), pC2.getUserName())) {
- return false;
- }
- String p1 = null;
- String p2 = null;
- if (pC1.getPassword() != null) {
- p1 = new String(pC1.getPassword());
- }
- if (pC2.getPassword() != null) {
- p2 = new String(pC2.getPassword());
- }
- return (isEqual(p1, p2));
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/build.xml
deleted file mode 100755
index f060e7d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ra/src/com/sun/jdbcra/util/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/util"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/servlet/SimpleServlet.java
index c838d9d..cb52a17 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/servlet/SimpleServlet.java
@@ -61,11 +61,11 @@
//do not continue if one test failed
if (!pass) {
res = "SOME TESTS FAILED";
- System.out.println("Redeploy Connector 1.5 test - Version : "+ versionToTest + " FAIL");
+ System.out.println("Redeploy Connector test - Version : "+ versionToTest + " FAIL");
out.println("TEST:FAIL");
} else {
res = "ALL TESTS PASSED";
- System.out.println("Redeploy Connector 1.5 test - Version : "+ versionToTest + " PASS");
+ System.out.println("Redeploy Connector test - Version : "+ versionToTest + " PASS");
out.println("TEST:PASS");
}
} catch (Exception ex) {
@@ -73,7 +73,7 @@
ex.printStackTrace();
res = "TEST FAILED";
}finally{
- out.println("Redeploy Connector 1.5");
+ out.println("Redeploy Connector");
out.println("END_OF_TEST");
}
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/versions/ver1/testjdbcra.rar b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/versions/ver1/testjdbcra.rar
deleted file mode 100644
index fc2e8b0..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/versions/ver1/testjdbcra.rar
+++ /dev/null
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/versions/ver2/testjdbcra.rar b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/versions/ver2/testjdbcra.rar
deleted file mode 100644
index e85292a..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/versions/ver2/testjdbcra.rar
+++ /dev/null
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/descriptor/blackbox-tx.xml b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/descriptor/blackbox-tx.xml
index 97e8403..f89f869 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/descriptor/blackbox-tx.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/rar/descriptor/blackbox-tx.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,13 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
-
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<display-name>BlackBoxLocalTx</display-name>
<vendor-name>Java Software</vendor-name>
<eis-type>JDBC Database</eis-type>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
index f1b9f0a..5657ee7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
@@ -32,189 +32,187 @@
&commonRun;
&testproperties;
- <target name="all" depends="build, setup, deploy-ear, run-ear, undeploy-ear, unsetup"/>
+ <target name="all" depends="build, setup, deploy-ear, run-ear, undeploy-ear, unsetup" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <ant dir="ra" target="clean"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup">
- <antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/simpleBank.sql"/>
- </antcall>
+ <target name="setup">
+ <antcall target="execute-sql-connector">
+ <param name="sql.file" value="sql/simpleBank.sql" />
+ </antcall>
- <antcall target="create-ra-config"/>
+ <antcall target="create-ra-config" />
- <antcall target="deploy-rar-common">
- <param name="rarfile" value="ra/publish/lib/jdbcra.rar"/>
- </antcall>
- <antcall target="create-pool"/>
- <antcall target="create-resource"/>
- <antcall target="create-admin-object"/>
- </target>
+ <antcall target="deploy-rar-common">
+ <param name="rarfile"
+ value="${env.APS_HOME}/connectors-ra-redeploy/rars/target/connectors-ra-redeploy-rars.rar"
+ />
+ </antcall>
+ <antcall target="create-pool" />
+ <antcall target="create-resource" />
+ <antcall target="create-admin-object" />
+ </target>
- <!-- Standalone jdbcra resource adapter -->
- <target name="create-pool">
- <antcall target="create-connector-connpool-common">
- <param name="ra.name" value="jdbcra"/>
- <param name="connection.defname" value="javax.sql.DataSource"/>
- <param name="connector.conpool.name" value="standalone-ra-pool"/>
- <param name="extra-params" value="--matchconnections=false"/>
- </antcall>
- <antcall target="set-oracle-props">
- <param name="pool.type" value="connector"/>
- <param name="conpool.name" value="standalone-ra-pool"/>
- </antcall>
-</target>
+ <!-- Standalone connectors-ra-redeploy-rars resource adapter -->
+ <target name="create-pool">
+ <antcall target="create-connector-connpool-common">
+ <param name="ra.name" value="connectors-ra-redeploy-rars" />
+ <param name="connection.defname" value="javax.sql.DataSource" />
+ <param name="connector.conpool.name" value="standalone-ra-pool" />
+ <param name="extra-params" value="--matchconnections=false" />
+ </antcall>
+ <antcall target="set-oracle-props">
+ <param name="pool.type" value="connector" />
+ <param name="conpool.name" value="standalone-ra-pool" />
+ </antcall>
+ </target>
- <target name="create-resource">
- <antcall target="create-connector-resource-common">
- <param name="connector.conpool.name" value="standalone-ra-pool"/>
- <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
- </target>
+ <target name="create-resource">
+ <antcall target="create-connector-resource-common">
+ <param name="connector.conpool.name" value="standalone-ra-pool" />
+ <param name="connector.jndi.name" value="jdbc/ejb-subclassing" />
+ </antcall>
+ </target>
- <target name="create-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname jdbcra --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=DBUSER:NoOfRows=1"/>
- <param name="operand.props" value="eis/jdbcAdmin"/>
- </antcall>
- </target>
+ <target name="create-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command"
+ value="create-admin-object --target ${appserver.instance.name} --restype com.sun.jdbcra.spi.JdbcSetupAdmin --raname connectors-ra-redeploy-rars --property TableName=customer2:JndiName=jdbc/ejb-subclassing:SchemaName=DBUSER:NoOfRows=1"
+ />
+ <param name="operand.props" value="eis/jdbcAdmin" />
+ </antcall>
+ </target>
- <target name="delete-admin-object" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-admin-object"/>
- <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
- </target>
+ <target name="delete-admin-object" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-admin-object" />
+ <param name="operand.props" value="--target ${appserver.instance.name} eis/jdbcAdmin" />
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
+ </target>
- <target name="restart">
- <antcall target="restart-server-instance-common"/>
- </target>
+ <target name="restart">
+ <antcall target="restart-server-instance-common" />
+ </target>
- <target name="create-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-resource-adapter-config --property RAProperty=VALID"/>
- <param name="operand.props" value="jdbcra"/>
- </antcall>
- </target>
+ <target name="create-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command"
+ value="create-resource-adapter-config --property RAProperty=VALID"
+ />
+ <param name="operand.props" value="connectors-ra-redeploy-rars" />
+ </antcall>
+ </target>
- <target name="delete-ra-config" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-resource-adapter-config"/>
- <param name="operand.props" value="jdbcra"/>
- </antcall>
- <!--<antcall target="reconfig-common"/>-->
- </target>
+ <target name="delete-ra-config" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-resource-adapter-config" />
+ <param name="operand.props" value="connectors-ra-redeploy-rars" />
+ </antcall>
+ <!--<antcall target="reconfig-common"/>-->
+ </target>
- <target name="unsetup">
- <antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/dropBankTables.sql"/>
- </antcall>
+ <target name="unsetup">
+ <antcall target="execute-sql-connector">
+ <param name="sql.file" value="sql/dropBankTables.sql" />
+ </antcall>
- <antcall target="delete-resource"/>
- <antcall target="delete-pool"/>
- <antcall target="delete-admin-object"/>
- <antcall target="undeploy-rar-common">
- <param name="undeployrar" value="jdbcra"/>
- </antcall>
- </target>
+ <antcall target="delete-resource" />
+ <antcall target="delete-pool" />
+ <antcall target="delete-admin-object" />
+ <antcall target="undeploy-rar-common">
+ <param name="undeployrar" value="connectors-ra-redeploy-rars" />
+ </antcall>
+ </target>
- <target name="delete-pool">
- <antcall target="delete-connector-connpool-common">
- <param name="connector.conpool.name" value="standalone-ra-pool"/>
- </antcall>
- </target>
+ <target name="delete-pool">
+ <antcall target="delete-connector-connpool-common">
+ <param name="connector.conpool.name" value="standalone-ra-pool" />
+ </antcall>
+ </target>
- <target name="delete-resource">
- <antcall target="delete-connector-resource-common">
- <param name="connector.jndi.name" value="jdbc/ejb-subclassing"/>
- </antcall>
- </target>
+ <target name="delete-resource">
+ <antcall target="delete-connector-resource-common">
+ <param name="connector.jndi.name" value="jdbc/ejb-subclassing" />
+ </antcall>
+ </target>
- <target name="compile" depends="clean">
- <ant dir="ra" target="compile"/>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-servlet" />
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="ejb" />
+ </antcall>
+ <antcall target="compile-servlet" />
+ </target>
- <target name="compile-servlet" depends="init-common">
- <mkdir dir="${build.classes.dir}"/>
- <echo message="common.xml: Compiling test source files" level="verbose"/>
- <javac srcdir="servlet"
- destdir="${build.classes.dir}"
- classpath="${s1astest.classpath}:ra/publish/internal/classes"
- debug="on"
- failonerror="true"/>
- </target>
+ <target name="compile-servlet" depends="init-common">
+ <mkdir dir="${build.classes.dir}" />
+ <echo message="common.xml: Compiling test source files" level="verbose" />
+ <javac srcdir="servlet"
+ destdir="${build.classes.dir}"
+ classpath="${s1astest.classpath}:${env.APS_HOME}/connectors-ra-redeploy/jars/target/classes"
+ debug="on"
+ failonerror="true"
+ />
+ </target>
-
- <target name="build-ra">
- <ant dir="ra" target="build"/>
- </target>
-
- <target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
- <ant dir="ra" target="assemble"/>
+ <target name="build" depends="compile">
+ <property name="hasWebclient" value="yes" />
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="hasWebclient" value="yes" />
+ <param name="webclient.war.classes" value="**/*.class" />
</antcall>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="**/*.class"/>
+ <param name="ejbjar.classes" value="**/*.class" />
</antcall>
- <delete file="${assemble.dir}/${appname}.ear"/>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <ear earfile="${assemble.dir}/${appname}App.ear"
- appxml="${application.xml}">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
+ <delete file="${assemble.dir}/${appname}.ear" />
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <ear earfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar" />
+ <include name="*.war" />
+ </fileset>
</ear>
- </target>
+ </target>
- <target name="deploy-ear" depends="init-common">
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear" depends="init-common">
+ <antcall target="deploy-common" />
+ </target>
- <target name="deploy-war" depends="init-common">
- <antcall target="deploy-war-common"/>
- </target>
+ <target name="deploy-war" depends="init-common">
+ <antcall target="deploy-war-common" />
+ </target>
- <target name="run-war" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-connector (stand-alone war and rar based)"/>
- </antcall>
- </target>
+ <target name="run-war" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="web-to-connector (stand-alone war and rar based)" />
+ </antcall>
+ </target>
- <target name="run-ear" depends="init-common">
- <antcall target="runwebclient-common">
- <param name="testsuite.id" value="web-to-connector (ear based)"/>
- </antcall>
- </target>
+ <target name="run-ear" depends="init-common">
+ <antcall target="runwebclient-common">
+ <param name="testsuite.id" value="web-to-connector (ear based)" />
+ </antcall>
+ </target>
- <target name="undeploy-ear" depends="init-common">
-<antcall target="delete-ra-config"/>
- <antcall target="undeploy-common"/>
- </target>
+ <target name="undeploy-ear" depends="init-common">
+ <antcall target="delete-ra-config" />
+ <antcall target="undeploy-common" />
+ </target>
- <target name="undeploy-war" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy-war" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <target name="usage">
+ <antcall target="usage-common" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/descriptor/application.xml
index c3f91ac..68fd493 100755
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/descriptor/application.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/descriptor/application.xml
@@ -23,11 +23,6 @@
<module>
<ejb>web-subclassing-ejb.jar</ejb>
</module>
- <!--
- <module>
- <connector>jdbcra.rar</connector>
- </module>
- -->
<module>
<web>
<web-uri>web-subclassing-web.war</web-uri>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.properties b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.properties
deleted file mode 100644
index fd21c3d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0, which is available at
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-
-### Component Properties ###
-src.dir=src
-component.publish.home=.
-component.classes.dir=${component.publish.home}/internal/classes
-component.lib.home=${component.publish.home}/lib
-component.publish.home=publish
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.xml
deleted file mode 100644
index c50d290..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE project [
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
- <!ENTITY common SYSTEM "../../../../config/common.xml">
- <!ENTITY testcommon SYSTEM "../../../../config/properties.xml">
-]>
-
-<project name="JDBCConnector top level" default="build">
- <property name="pkg.dir" value="com/sun/jdbcra/spi"/>
-
- &common;
- &testcommon;
- <property file="./build.properties"/>
-
- <target name="build" depends="compile,assemble" />
-
-
- <!-- init. Initialization involves creating publishing directories and
- OS specific targets. -->
- <target name="init" description="${component.name} initialization">
- <tstamp>
- <format property="start.time" pattern="MM/dd/yyyy hh:mm aa"/>
- </tstamp>
- <echo message="Building component ${component.name}"/>
- <mkdir dir="${component.classes.dir}"/>
- <mkdir dir="${component.lib.home}"/>
- </target>
- <!-- compile -->
- <target name="compile" depends="init"
- description="Compile com/sun/* com/iplanet/* sources">
- <!--<echo message="Connector api resides in ${connector-api.jar}"/>-->
- <javac srcdir="${src.dir}"
- destdir="${component.classes.dir}"
- failonerror="true">
- <classpath>
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar" />
- </fileset>
- </classpath>
- <include name="com/sun/jdbcra/**"/>
- <include name="com/sun/appserv/**"/>
- </javac>
- </target>
-
- <target name="all" depends="build"/>
-
- <target name="assemble">
-
- <jar jarfile="${component.lib.home}/jdbc.jar"
- basedir="${component.classes.dir}" includes="${pkg.dir}/**/*,
- com/sun/appserv/**/*, com/sun/jdbcra/util/**/*, com/sun/jdbcra/common/**/*"/>
-
- <copy file="${src.dir}/com/sun/jdbcra/spi/1.4/ra-ds.xml"
- tofile="${component.lib.home}/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${component.lib.home}/jdbcra.rar"
- basedir="${component.lib.home}" includes="jdbc.jar">
-
- <metainf dir="${component.lib.home}">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete file="${component.lib.home}/ra.xml"/>
-
- </target>
-
- <target name="clean" description="Clean the build">
- <delete includeEmptyDirs="true" failonerror="false">
- <fileset dir="${component.classes.dir}"/>
- <fileset dir="${component.lib.home}"/>
- </delete>
- </target>
-
-</project>
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/appserv/jdbcra/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/appserv/jdbcra/DataSource.java
deleted file mode 100644
index b6ef30b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/appserv/jdbcra/DataSource.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.appserv.jdbcra;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * The <code>javax.sql.DataSource</code> implementation of SunONE application
- * server will implement this interface. An application program would be able
- * to use this interface to do the extended functionality exposed by SunONE
- * application server.
- * <p>A sample code for getting driver's connection implementation would like
- * the following.
- * <pre>
- InitialContext ic = new InitialContext();
- com.sun.appserv.DataSource ds = (com.sun.appserv.DataSOurce) ic.lookup("jdbc/PointBase");
- Connection con = ds.getConnection();
- Connection drivercon = ds.getConnection(con);
-
- // Do db operations.
-
- con.close();
- </pre>
- *
- * @author Binod P.G
- */
-public interface DataSource extends javax.sql.DataSource {
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
deleted file mode 100644
index 88a0950..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceObjectBuilder.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.StringTokenizer;
-import java.util.Enumeration;
-import com.sun.jdbcra.util.MethodExecutor;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Utility class, which would create necessary Datasource object according to the
- * specification.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- * @see com.sun.jdbcra.common.DataSourceSpec
- * @see com.sun.jdbcra.util.MethodExcecutor
- */
-public class DataSourceObjectBuilder implements java.io.Serializable{
-
- private DataSourceSpec spec;
-
- private Hashtable driverProperties = null;
-
- private MethodExecutor executor = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Construct a DataSource Object from the spec.
- *
- * @param spec <code> DataSourceSpec </code> object.
- */
- public DataSourceObjectBuilder(DataSourceSpec spec) {
- this.spec = spec;
- executor = new MethodExecutor();
- }
-
- /**
- * Construct the DataSource Object from the spec.
- *
- * @return Object constructed using the DataSourceSpec.
- * @throws <code>ResourceException</code> if the class is not found or some issue in executing
- * some method.
- */
- public Object constructDataSourceObject() throws ResourceException{
- driverProperties = parseDriverProperties(spec);
- Object dataSourceObject = getDataSourceObject();
- Method[] methods = dataSourceObject.getClass().getMethods();
- for (int i=0; i < methods.length; i++) {
- String methodName = methods[i].getName();
- if (methodName.equalsIgnoreCase("setUser")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.USERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPassword")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PASSWORD),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLoginTimeOut")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGINTIMEOUT),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setLogWriter")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.LOGWRITER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDatabaseName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATABASENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDataSourceName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DATASOURCENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setDescription")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.DESCRIPTION),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setNetworkProtocol")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.NETWORKPROTOCOL),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPortNumber")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PORTNUMBER),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setRoleName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.ROLENAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setServerName")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.SERVERNAME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxStatements")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXSTATEMENTS),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setInitialPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.INITIALPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMinPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MINPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxPoolSize")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXPOOLSIZE),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setMaxIdleTime")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.MAXIDLETIME),methods[i],dataSourceObject);
-
- } else if (methodName.equalsIgnoreCase("setPropertyCycle")){
- executor.runJavaBeanMethod(spec.getDetail(DataSourceSpec.PROPERTYCYCLE),methods[i],dataSourceObject);
-
- } else if (driverProperties.containsKey(methodName.toUpperCase())){
- Vector values = (Vector) driverProperties.get(methodName.toUpperCase());
- executor.runMethod(methods[i],dataSourceObject, values);
- }
- }
- return dataSourceObject;
- }
-
- /**
- * Get the extra driver properties from the DataSourceSpec object and
- * parse them to a set of methodName and parameters. Prepare a hashtable
- * containing these details and return.
- *
- * @param spec <code> DataSourceSpec </code> object.
- * @return Hashtable containing method names and parameters,
- * @throws ResourceException If delimiter is not provided and property string
- * is not null.
- */
- private Hashtable parseDriverProperties(DataSourceSpec spec) throws ResourceException{
- String delim = spec.getDetail(DataSourceSpec.DELIMITER);
-
- String prop = spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- if ( prop == null || prop.trim().equals("")) {
- return new Hashtable();
- } else if (delim == null || delim.equals("")) {
- throw new ResourceException ("Delimiter is not provided in the configuration");
- }
-
- Hashtable properties = new Hashtable();
- delim = delim.trim();
- String sep = delim+delim;
- int sepLen = sep.length();
- String cache = prop;
- Vector methods = new Vector();
-
- while (cache.indexOf(sep) != -1) {
- int index = cache.indexOf(sep);
- String name = cache.substring(0,index);
- if (name.trim() != "") {
- methods.add(name);
- cache = cache.substring(index+sepLen);
- }
- }
-
- Enumeration allMethods = methods.elements();
- while (allMethods.hasMoreElements()) {
- String oneMethod = (String) allMethods.nextElement();
- if (!oneMethod.trim().equals("")) {
- String methodName = null;
- Vector parms = new Vector();
- StringTokenizer methodDetails = new StringTokenizer(oneMethod,delim);
- for (int i=0; methodDetails.hasMoreTokens();i++ ) {
- String token = (String) methodDetails.nextToken();
- if (i==0) {
- methodName = token.toUpperCase();
- } else {
- parms.add(token);
- }
- }
- properties.put(methodName,parms);
- }
- }
- return properties;
- }
-
- /**
- * Creates a Datasource object according to the spec.
- *
- * @return Initial DataSource Object instance.
- * @throws <code>ResourceException</code> If class name is wrong or classpath is not set
- * properly.
- */
- private Object getDataSourceObject() throws ResourceException{
- String className = spec.getDetail(DataSourceSpec.CLASSNAME);
- try {
- Class dataSourceClass = Class.forName(className);
- Object dataSourceObject = dataSourceClass.newInstance();
- return dataSourceObject;
- } catch(ClassNotFoundException cfne){
- _logger.log(Level.SEVERE, "jdbc.exc_cnfe_ds", cfne);
-
- throw new ResourceException("Class Name is wrong or Class path is not set for :" + className);
- } catch(InstantiationException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_inst", className);
- throw new ResourceException("Error in instantiating" + className);
- } catch(IllegalAccessException ce) {
- _logger.log(Level.SEVERE, "jdbc.exc_acc_inst", className);
- throw new ResourceException("Access Error in instantiating" + className);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceSpec.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
deleted file mode 100644
index 1c4b072..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/DataSourceSpec.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.common;
-
-import java.util.Hashtable;
-
-/**
- * Encapsulate the DataSource object details obtained from
- * ManagedConnectionFactory.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class DataSourceSpec implements java.io.Serializable{
-
- public static final int USERNAME = 1;
- public static final int PASSWORD = 2;
- public static final int URL = 3;
- public static final int LOGINTIMEOUT = 4;
- public static final int LOGWRITER = 5;
- public static final int DATABASENAME = 6;
- public static final int DATASOURCENAME = 7;
- public static final int DESCRIPTION = 8;
- public static final int NETWORKPROTOCOL = 9;
- public static final int PORTNUMBER = 10;
- public static final int ROLENAME = 11;
- public static final int SERVERNAME = 12;
- public static final int MAXSTATEMENTS = 13;
- public static final int INITIALPOOLSIZE = 14;
- public static final int MINPOOLSIZE = 15;
- public static final int MAXPOOLSIZE = 16;
- public static final int MAXIDLETIME = 17;
- public static final int PROPERTYCYCLE = 18;
- public static final int DRIVERPROPERTIES = 19;
- public static final int CLASSNAME = 20;
- public static final int DELIMITER = 21;
-
- public static final int XADATASOURCE = 22;
- public static final int DATASOURCE = 23;
- public static final int CONNECTIONPOOLDATASOURCE = 24;
-
- //GJCINT
- public static final int CONNECTIONVALIDATIONREQUIRED = 25;
- public static final int VALIDATIONMETHOD = 26;
- public static final int VALIDATIONTABLENAME = 27;
-
- public static final int TRANSACTIONISOLATION = 28;
- public static final int GUARANTEEISOLATIONLEVEL = 29;
-
- private Hashtable details = new Hashtable();
-
- /**
- * Set the property.
- *
- * @param property Property Name to be set.
- * @param value Value of property to be set.
- */
- public void setDetail(int property, String value) {
- details.put(new Integer(property),value);
- }
-
- /**
- * Get the value of property
- *
- * @return Value of the property.
- */
- public String getDetail(int property) {
- if (details.containsKey(new Integer(property))) {
- return (String) details.get(new Integer(property));
- } else {
- return null;
- }
- }
-
- /**
- * Checks whether two <code>DataSourceSpec</code> objects
- * are equal or not.
- *
- * @param obj Instance of <code>DataSourceSpec</code> object.
- */
- public boolean equals(Object obj) {
- if (obj instanceof DataSourceSpec) {
- return this.details.equals(((DataSourceSpec)obj).details);
- }
- return false;
- }
-
- /**
- * Retrieves the hashCode of this <code>DataSourceSpec</code> object.
- *
- * @return hashCode of this object.
- */
- public int hashCode() {
- return this.details.hashCode();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/build.xml
deleted file mode 100644
index 3b4faeb..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/common/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/common"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile13"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/common.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
deleted file mode 100644
index 0eb4fa4..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ConnectionHolder.java
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.sql.*;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.concurrent.Executor;
-
-/**
- * Holds the java.sql.Connection object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class ConnectionHolder implements Connection{
-
- private Connection con;
-
- private ManagedConnection mc;
-
- private boolean wrappedAlready = false;
-
- private boolean isClosed = false;
-
- private boolean valid = true;
-
- private boolean active = false;
- /**
- * The active flag is false when the connection handle is
- * created. When a method is invoked on this object, it asks
- * the ManagedConnection if it can be the active connection
- * handle out of the multiple connection handles. If the
- * ManagedConnection reports that this connection handle
- * can be active by setting this flag to true via the setActive
- * function, the above method invocation succeeds; otherwise
- * an exception is thrown.
- */
-
- /**
- * Constructs a Connection holder.
- *
- * @param con <code>java.sql.Connection</code> object.
- */
- public ConnectionHolder(Connection con, ManagedConnection mc) {
- this.con = con;
- this.mc = mc;
- }
-
- /**
- * Returns the actual connection in this holder object.
- *
- * @return Connection object.
- */
- Connection getConnection() {
- return con;
- }
-
- /**
- * Sets the flag to indicate that, the connection is wrapped already or not.
- *
- * @param wrapFlag
- */
- void wrapped(boolean wrapFlag){
- this.wrappedAlready = wrapFlag;
- }
-
- /**
- * Returns whether it is wrapped already or not.
- *
- * @return wrapped flag.
- */
- boolean isWrapped(){
- return wrappedAlready;
- }
-
- /**
- * Returns the <code>ManagedConnection</code> instance responsible
- * for this connection.
- *
- * @return <code>ManagedConnection</code> instance.
- */
- ManagedConnection getManagedConnection() {
- return mc;
- }
-
- /**
- * Replace the actual <code>java.sql.Connection</code> object with the one
- * supplied. Also replace <code>ManagedConnection</code> link.
- *
- * @param con <code>Connection</code> object.
- * @param mc <code> ManagedConnection</code> object.
- */
- void associateConnection(Connection con, ManagedConnection mc) {
- this.mc = mc;
- this.con = con;
- }
-
- /**
- * Clears all warnings reported for the underlying connection object.
- *
- * @throws SQLException In case of a database error.
- */
- public void clearWarnings() throws SQLException{
- checkValidity();
- con.clearWarnings();
- }
-
- /**
- * Closes the logical connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void close() throws SQLException{
- isClosed = true;
- mc.connectionClosed(null, this);
- }
-
- /**
- * Invalidates this object.
- */
- public void invalidate() {
- valid = false;
- }
-
- /**
- * Closes the physical connection involved in this.
- *
- * @throws SQLException In case of a database error.
- */
- void actualClose() throws SQLException{
- con.close();
- }
-
- /**
- * Commit the changes in the underlying Connection.
- *
- * @throws SQLException In case of a database error.
- */
- public void commit() throws SQLException {
- checkValidity();
- con.commit();
- }
-
- /**
- * Creates a statement from the underlying Connection
- *
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement() throws SQLException {
- checkValidity();
- return con.createStatement();
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a statement from the underlying Connection.
- *
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code>Statement</code> object.
- * @throws SQLException In case of a database error.
- */
- public Statement createStatement(int resultSetType, int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.createStatement(resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Retrieves the current auto-commit mode for the underlying <code> Connection</code>.
- *
- * @return The current state of connection's auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public boolean getAutoCommit() throws SQLException {
- checkValidity();
- return con.getAutoCommit();
- }
-
- /**
- * Retrieves the underlying <code>Connection</code> object's catalog name.
- *
- * @return Catalog Name.
- * @throws SQLException In case of a database error.
- */
- public String getCatalog() throws SQLException {
- checkValidity();
- return con.getCatalog();
- }
-
- /**
- * Retrieves the current holdability of <code>ResultSet</code> objects created
- * using this connection object.
- *
- * @return holdability value.
- * @throws SQLException In case of a database error.
- */
- public int getHoldability() throws SQLException {
- checkValidity();
- return con.getHoldability();
- }
-
- /**
- * Retrieves the <code>DatabaseMetaData</code>object from the underlying
- * <code> Connection </code> object.
- *
- * @return <code>DatabaseMetaData</code> object.
- * @throws SQLException In case of a database error.
- */
- public DatabaseMetaData getMetaData() throws SQLException {
- checkValidity();
- return con.getMetaData();
- }
-
- /**
- * Retrieves this <code>Connection</code> object's current transaction isolation level.
- *
- * @return Transaction level
- * @throws SQLException In case of a database error.
- */
- public int getTransactionIsolation() throws SQLException {
- checkValidity();
- return con.getTransactionIsolation();
- }
-
- /**
- * Retrieves the <code>Map</code> object associated with
- * <code> Connection</code> Object.
- *
- * @return TypeMap set in this object.
- * @throws SQLException In case of a database error.
- */
- public Map getTypeMap() throws SQLException {
- checkValidity();
- return con.getTypeMap();
- }
-
- public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
- con.setTypeMap(map);
- }
-
- /**
- * Retrieves the the first warning reported by calls on the underlying
- * <code>Connection</code> object.
- *
- * @return First <code> SQLWarning</code> Object or null.
- * @throws SQLException In case of a database error.
- */
- public SQLWarning getWarnings() throws SQLException {
- checkValidity();
- return con.getWarnings();
- }
-
- /**
- * Retrieves whether underlying <code>Connection</code> object is closed.
- *
- * @return true if <code>Connection</code> object is closed, false
- * if it is closed.
- * @throws SQLException In case of a database error.
- */
- public boolean isClosed() throws SQLException {
- return isClosed;
- }
-
- /**
- * Retrieves whether this <code>Connection</code> object is read-only.
- *
- * @return true if <code> Connection </code> is read-only, false other-wise
- * @throws SQLException In case of a database error.
- */
- public boolean isReadOnly() throws SQLException {
- checkValidity();
- return con.isReadOnly();
- }
-
- /**
- * Converts the given SQL statement into the system's native SQL grammer.
- *
- * @param sql SQL statement , to be converted.
- * @return Converted SQL string.
- * @throws SQLException In case of a database error.
- */
- public String nativeSQL(String sql) throws SQLException {
- checkValidity();
- return con.nativeSQL(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql) throws SQLException {
- checkValidity();
- return con.prepareCall(sql);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> CallableStatement </code> object for calling database
- * stored procedures.
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> CallableStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public CallableStatement prepareCall(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException{
- checkValidity();
- return con.prepareCall(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param autoGeneratedKeys a flag indicating AutoGeneratedKeys need to be returned.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,autoGeneratedKeys);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnIndexes an array of column indexes indicating the columns that should be
- * returned from the inserted row or rows.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnIndexes);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql,int resultSetType,
- int resultSetConcurrency) throws SQLException{
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param resultSetType Type of the ResultSet
- * @param resultSetConcurrency ResultSet Concurrency.
- * @param resultSetHoldability ResultSet Holdability.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, int resultSetType,
- int resultSetConcurrency,
- int resultSetHoldabilty) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql, resultSetType, resultSetConcurrency,
- resultSetHoldabilty);
- }
-
- /**
- * Creates a <code> PreparedStatement </code> object for sending
- * paramterized SQL statements to database
- *
- * @param sql SQL Statement
- * @param columnNames Name of bound columns.
- * @return <code> PreparedStatement</code> object.
- * @throws SQLException In case of a database error.
- */
- public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- checkValidity();
- return con.prepareStatement(sql,columnNames);
- }
-
- public Clob createClob() throws SQLException {
- return con.createClob();
- }
-
- public Blob createBlob() throws SQLException {
- return con.createBlob();
- }
-
- public NClob createNClob() throws SQLException {
- return con.createNClob();
- }
-
- public SQLXML createSQLXML() throws SQLException {
- return con.createSQLXML();
- }
-
- public boolean isValid(int timeout) throws SQLException {
- return con.isValid(timeout);
- }
-
- public void setClientInfo(String name, String value) throws SQLClientInfoException {
- con.setClientInfo(name, value);
- }
-
- public void setClientInfo(Properties properties) throws SQLClientInfoException {
- con.setClientInfo(properties);
- }
-
- public String getClientInfo(String name) throws SQLException {
- return con.getClientInfo(name);
- }
-
- public Properties getClientInfo() throws SQLException {
- return getClientInfo();
- }
-
- public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
- return createArrayOf(typeName, elements);
- }
-
- public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
- return createStruct(typeName, attributes);
- }
-
- /**
- * Removes the given <code>Savepoint</code> object from the current transaction.
- *
- * @param savepoint <code>Savepoint</code> object
- * @throws SQLException In case of a database error.
- */
- public void releaseSavepoint(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.releaseSavepoint(savepoint);
- }
-
- /**
- * Rolls back the changes made in the current transaction.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback() throws SQLException {
- checkValidity();
- con.rollback();
- }
-
- /**
- * Rolls back the changes made after the savepoint.
- *
- * @throws SQLException In case of a database error.
- */
- public void rollback(Savepoint savepoint) throws SQLException {
- checkValidity();
- con.rollback(savepoint);
- }
-
- /**
- * Sets the auto-commmit mode of the <code>Connection</code> object.
- *
- * @param autoCommit boolean value indicating the auto-commit mode.
- * @throws SQLException In case of a database error.
- */
- public void setAutoCommit(boolean autoCommit) throws SQLException {
- checkValidity();
- con.setAutoCommit(autoCommit);
- }
-
- /**
- * Sets the catalog name to the <code>Connection</code> object
- *
- * @param catalog Catalog name.
- * @throws SQLException In case of a database error.
- */
- public void setCatalog(String catalog) throws SQLException {
- checkValidity();
- con.setCatalog(catalog);
- }
-
- /**
- * Sets the holdability of <code>ResultSet</code> objects created
- * using this <code>Connection</code> object.
- *
- * @param holdability A <code>ResultSet</code> holdability constant
- * @throws SQLException In case of a database error.
- */
- public void setHoldability(int holdability) throws SQLException {
- checkValidity();
- con.setHoldability(holdability);
- }
-
- /**
- * Puts the connection in read-only mode as a hint to the driver to
- * perform database optimizations.
- *
- * @param readOnly true enables read-only mode, false disables it.
- * @throws SQLException In case of a database error.
- */
- public void setReadOnly(boolean readOnly) throws SQLException {
- checkValidity();
- con.setReadOnly(readOnly);
- }
-
- /**
- * Creates and unnamed savepoint and returns an object corresponding to that.
- *
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint() throws SQLException {
- checkValidity();
- return con.setSavepoint();
- }
-
- /**
- * Creates a savepoint with the name and returns an object corresponding to that.
- *
- * @param name Name of the savepoint.
- * @return <code>Savepoint</code> object.
- * @throws SQLException In case of a database error.
- */
- public Savepoint setSavepoint(String name) throws SQLException {
- checkValidity();
- return con.setSavepoint(name);
- }
-
- /**
- * Creates the transaction isolation level.
- *
- * @param level transaction isolation level.
- * @throws SQLException In case of a database error.
- */
- public void setTransactionIsolation(int level) throws SQLException {
- checkValidity();
- con.setTransactionIsolation(level);
- }
-
- public int getNetworkTimeout() throws SQLException {
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void abort(Executor executor) throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public String getSchema() throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
- public void setSchema(String schema) throws SQLException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 new feature.");
- }
-
-
- /**
- * Checks the validity of this object
- */
- private void checkValidity() throws SQLException {
- if (isClosed) throw new SQLException ("Connection closed");
- if (!valid) throw new SQLException ("Invalid Connection");
- if(active == false) {
- mc.checkIfActive(this);
- }
- }
-
- /**
- * Sets the active flag to true
- *
- * @param actv boolean
- */
- void setActive(boolean actv) {
- active = actv;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return con.unwrap(iface);
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return con.isWrapperFor(iface);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
deleted file mode 100644
index fb0fdab..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ManagedConnectionFactory.java
+++ /dev/null
@@ -1,754 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import java.sql.DriverManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import java.sql.SQLException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- * This class is extended by the DataSource specific <code>ManagedConnection</code> factories
- * and the <code>ManagedConnectionFactory</code> for the <code>DriverManager</code>.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-
-public abstract class ManagedConnectionFactory implements jakarta.resource.spi.ManagedConnectionFactory,
- java.io.Serializable {
-
- protected DataSourceSpec spec = new DataSourceSpec();
- protected transient DataSourceObjectBuilder dsObjBuilder;
-
- protected java.io.PrintWriter logWriter = null;
- protected jakarta.resource.spi.ResourceAdapter ra = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the resource adapter is used here.
- *
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory() {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory()");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, null);
-
- return cf;
- }
-
- /**
- * Creates a Connection Factory instance. The <code>ConnectionManager</code> implementation
- * of the application server is used here.
- *
- * @param cxManager <code>ConnectionManager</code> passed by the application server
- * @return Generic JDBC Connector implementation of <code>javax.sql.DataSource</code>
- */
- public Object createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager) {
- if(logWriter != null) {
- logWriter.println("In createConnectionFactory(jakarta.resource.spi.ConnectionManager cxManager)");
- }
- com.sun.jdbcra.spi.DataSource cf = new com.sun.jdbcra.spi.DataSource(
- (jakarta.resource.spi.ManagedConnectionFactory)this, cxManager);
- return cf;
- }
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public abstract jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException;
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public abstract boolean equals(Object other);
-
- /**
- * Get the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>PrintWriter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setLogWriter</code>
- */
- public java.io.PrintWriter getLogWriter() {
- return logWriter;
- }
-
- /**
- * Get the <code>ResourceAdapter</code> for this <code>ManagedConnectionFactory</code> instance.
- *
- * @return <code>ResourceAdapter</code> associated with this <code>ManagedConnectionFactory</code> instance
- * @see <code>setResourceAdapter</code>
- */
- public jakarta.resource.spi.ResourceAdapter getResourceAdapter() {
- if(logWriter != null) {
- logWriter.println("In getResourceAdapter");
- }
- return ra;
- }
-
- /**
- * Returns the hash code for this <code>ManagedConnectionFactory</code>.
- *
- * @return hash code for this <code>ManagedConnectionFactory</code>
- */
- public int hashCode(){
- if(logWriter != null) {
- logWriter.println("In hashCode");
- }
- return spec.hashCode();
- }
-
- /**
- * Returns a matched <code>ManagedConnection</code> from the candidate
- * set of <code>ManagedConnection</code> objects.
- *
- * @param connectionSet <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- * @param subject passed by the application server
- * for retrieving information required for matching
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> passed by the application server
- * for retrieving information required for matching
- * @return <code>ManagedConnection</code> that is the best match satisfying this request
- * @throws ResourceException if there is an error accessing the <code>Subject</code>
- * parameter or the <code>Set</code> of <code>ManagedConnection</code>
- * objects passed by the application server
- */
- public jakarta.resource.spi.ManagedConnection matchManagedConnections(java.util.Set connectionSet,
- javax.security.auth.Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In matchManagedConnections");
- }
-
- if(connectionSet == null) {
- return null;
- }
-
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- java.util.Iterator iter = connectionSet.iterator();
- com.sun.jdbcra.spi.ManagedConnection mc = null;
- while(iter.hasNext()) {
- try {
- mc = (com.sun.jdbcra.spi.ManagedConnection) iter.next();
- } catch(java.util.NoSuchElementException nsee) {
- _logger.log(Level.SEVERE, "jdbc.exc_iter");
- throw new ResourceException(nsee.getMessage());
- }
- if(pc == null && this.equals(mc.getManagedConnectionFactory())) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.exc_re", re);
- mc.connectionErrorOccurred(re, null);
- }
- } else if(SecurityUtils.isPasswordCredentialEqual(pc, mc.getPasswordCredential()) == true) {
- //GJCINT
- try {
- isValid(mc);
- return mc;
- } catch(ResourceException re) {
- _logger.log(Level.SEVERE, "jdbc.re");
- mc.connectionErrorOccurred(re, null);
- }
- }
- }
- return null;
- }
-
- //GJCINT
- /**
- * Checks if a <code>ManagedConnection</code> is to be validated or not
- * and validates it or returns.
- *
- * @param mc <code>ManagedConnection</code> to be validated
- * @throws ResourceException if the connection is not valid or
- * if validation method is not proper
- */
- void isValid(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- if(mc.isTransactionInProgress()) {
- return;
- }
-
- boolean connectionValidationRequired =
- (new Boolean(spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED).toLowerCase())).booleanValue();
- if( connectionValidationRequired == false || mc == null) {
- return;
- }
-
-
- String validationMethod = spec.getDetail(DataSourceSpec.VALIDATIONMETHOD).toLowerCase();
-
- mc.checkIfValid();
- /**
- * The above call checks if the actual physical connection
- * is usable or not.
- */
- java.sql.Connection con = mc.getActualConnection();
-
- if(validationMethod.equals("auto-commit") == true) {
- isValidByAutoCommit(con);
- } else if(validationMethod.equalsIgnoreCase("meta-data") == true) {
- isValidByMetaData(con);
- } else if(validationMethod.equalsIgnoreCase("table") == true) {
- isValidByTableQuery(con, spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME));
- } else {
- throw new ResourceException("The validation method is not proper");
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its auto commit property.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByAutoCommit(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- // Notice that using something like
- // dbCon.setAutoCommit(dbCon.getAutoCommit()) will cause problems with
- // some drivers like sybase
- // We do not validate connections that are already enlisted
- //in a transaction
- // We cycle autocommit to true and false to by-pass drivers that
- // might cache the call to set autocomitt
- // Also notice that some XA data sources will throw and exception if
- // you try to call setAutoCommit, for them this method is not recommended
-
- boolean ac = con.getAutoCommit();
- if (ac) {
- con.setAutoCommit(false);
- } else {
- con.rollback(); // prevents uncompleted transaction exceptions
- con.setAutoCommit(true);
- }
-
- con.setAutoCommit(ac);
-
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_autocommit");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by checking its meta data.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByMetaData(java.sql.Connection con) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.DatabaseMetaData dmd = con.getMetaData();
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException("The connection is not valid as "
- + "getting the meta data failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Checks if a <code>java.sql.Connection</code> is valid or not
- * by querying a table.
- *
- * @param con <code>java.sql.Connection</code> to be validated
- * @param tableName table which should be queried
- * @throws ResourceException if the connection is not valid
- */
- protected void isValidByTableQuery(java.sql.Connection con,
- String tableName) throws ResourceException {
- if(con == null) {
- throw new ResourceException("The connection is not valid as "
- + "the connection is null");
- }
-
- try {
- java.sql.Statement stmt = con.createStatement();
- java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName);
- } catch(Exception sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_execute");
- throw new ResourceException("The connection is not valid as "
- + "querying the table " + tableName + " failed: " + sqle.getMessage());
- }
- }
-
- /**
- * Sets the isolation level specified in the <code>ConnectionRequestInfo</code>
- * for the <code>ManagedConnection</code> passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- protected void setIsolation(com.sun.jdbcra.spi.ManagedConnection mc) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- con.setTransactionIsolation(tranIsolationInt);
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The transaction isolation could "
- + "not be set: " + sqle.getMessage());
- }
- }
- }
-
- /**
- * Resets the isolation level for the <code>ManagedConnection</code> passed.
- * If the transaction level is to be guaranteed to be the same as the one
- * present when this <code>ManagedConnection</code> was created, as specified
- * by the <code>ConnectionRequestInfo</code> passed, it sets the transaction
- * isolation level from the <code>ConnectionRequestInfo</code> passed. Else,
- * it sets it to the transaction isolation passed.
- *
- * @param mc <code>ManagedConnection</code>
- * @param tranIsol int
- * @throws ResourceException if the isolation property is invalid
- * or if the isolation cannot be set over the connection
- */
- void resetIsolation(com.sun.jdbcra.spi.ManagedConnection mc, int tranIsol) throws ResourceException {
-
- java.sql.Connection con = mc.getActualConnection();
- if(con == null) {
- return;
- }
-
- String tranIsolation = spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- if(tranIsolation != null && tranIsolation.equals("") == false) {
- String guaranteeIsolationLevel = spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
-
- if(guaranteeIsolationLevel != null && guaranteeIsolationLevel.equals("") == false) {
- boolean guarantee = (new Boolean(guaranteeIsolationLevel.toLowerCase())).booleanValue();
-
- if(guarantee) {
- int tranIsolationInt = getTransactionIsolationInt(tranIsolation);
- try {
- if(tranIsolationInt != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsolationInt);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- } else {
- try {
- if(tranIsol != con.getTransactionIsolation()) {
- con.setTransactionIsolation(tranIsol);
- }
- } catch(java.sql.SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_tx_level");
- throw new ResourceException("The isolation level could not be set: "
- + sqle.getMessage());
- }
- }
- }
- }
- }
-
- /**
- * Gets the integer equivalent of the string specifying
- * the transaction isolation.
- *
- * @param tranIsolation string specifying the isolation level
- * @return tranIsolationInt the <code>java.sql.Connection</code> constant
- * for the string specifying the isolation.
- */
- private int getTransactionIsolationInt(String tranIsolation) throws ResourceException {
- if(tranIsolation.equalsIgnoreCase("read-uncommitted")) {
- return java.sql.Connection.TRANSACTION_READ_UNCOMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("read-committed")) {
- return java.sql.Connection.TRANSACTION_READ_COMMITTED;
- } else if(tranIsolation.equalsIgnoreCase("repeatable-read")) {
- return java.sql.Connection.TRANSACTION_REPEATABLE_READ;
- } else if(tranIsolation.equalsIgnoreCase("serializable")) {
- return java.sql.Connection.TRANSACTION_SERIALIZABLE;
- } else {
- throw new ResourceException("Invalid transaction isolation; the transaction "
- + "isolation level can be empty or any of the following: "
- + "read-uncommitted, read-committed, repeatable-read, serializable");
- }
- }
-
- /**
- * Set the log writer for this <code>ManagedConnectionFactory</code> instance.
- *
- * @param out <code>PrintWriter</code> passed by the application server
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(java.io.PrintWriter out) {
- logWriter = out;
- }
-
- /**
- * Set the associated <code>ResourceAdapter</code> JavaBean.
- *
- * @param ra <code>ResourceAdapter</code> associated with this
- * <code>ManagedConnectionFactory</code> instance
- * @see <code>getResourceAdapter</code>
- */
- public void setResourceAdapter(jakarta.resource.spi.ResourceAdapter ra) {
- this.ra = ra;
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setUser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getUser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the user name
- *
- * @param user <code>String</code>
- */
- public void setuser(String user) {
- spec.setDetail(DataSourceSpec.USERNAME, user);
- }
-
- /**
- * Gets the user name
- *
- * @return user
- */
- public String getuser() {
- return spec.getDetail(DataSourceSpec.USERNAME);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setPassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getPassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the password
- *
- * @param passwd <code>String</code>
- */
- public void setpassword(String passwd) {
- spec.setDetail(DataSourceSpec.PASSWORD, passwd);
- }
-
- /**
- * Gets the password
- *
- * @return passwd
- */
- public String getpassword() {
- return spec.getDetail(DataSourceSpec.PASSWORD);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setClassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getClassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets the class name of the data source
- *
- * @param className <code>String</code>
- */
- public void setclassName(String className) {
- spec.setDetail(DataSourceSpec.CLASSNAME, className);
- }
-
- /**
- * Gets the class name of the data source
- *
- * @return className
- */
- public String getclassName() {
- return spec.getDetail(DataSourceSpec.CLASSNAME);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setConnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getConnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets if connection validation is required or not
- *
- * @param conVldReq <code>String</code>
- */
- public void setconnectionValidationRequired(String conVldReq) {
- spec.setDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED, conVldReq);
- }
-
- /**
- * Returns if connection validation is required or not
- *
- * @return connection validation requirement
- */
- public String getconnectionValidationRequired() {
- return spec.getDetail(DataSourceSpec.CONNECTIONVALIDATIONREQUIRED);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setValidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getValidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the validation method required
- *
- * @param validationMethod <code>String</code>
- */
- public void setvalidationMethod(String validationMethod) {
- spec.setDetail(DataSourceSpec.VALIDATIONMETHOD, validationMethod);
- }
-
- /**
- * Returns the connection validation method type
- *
- * @return validation method
- */
- public String getvalidationMethod() {
- return spec.getDetail(DataSourceSpec.VALIDATIONMETHOD);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setValidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getValidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the table checked for during validation
- *
- * @param table <code>String</code>
- */
- public void setvalidationTableName(String table) {
- spec.setDetail(DataSourceSpec.VALIDATIONTABLENAME, table);
- }
-
- /**
- * Returns the table checked for during validation
- *
- * @return table
- */
- public String getvalidationTableName() {
- return spec.getDetail(DataSourceSpec.VALIDATIONTABLENAME);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void setTransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String getTransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets the transaction isolation level
- *
- * @param trnIsolation <code>String</code>
- */
- public void settransactionIsolation(String trnIsolation) {
- spec.setDetail(DataSourceSpec.TRANSACTIONISOLATION, trnIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return transaction isolation level
- */
- public String gettransactionIsolation() {
- return spec.getDetail(DataSourceSpec.TRANSACTIONISOLATION);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setGuaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getGuaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
- /**
- * Sets if the transaction isolation level is to be guaranteed
- *
- * @param guaranteeIsolation <code>String</code>
- */
- public void setguaranteeIsolationLevel(String guaranteeIsolation) {
- spec.setDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL, guaranteeIsolation);
- }
-
- /**
- * Returns the transaction isolation level
- *
- * @return isolation level guarantee
- */
- public String getguaranteeIsolationLevel() {
- return spec.getDetail(DataSourceSpec.GUARANTEEISOLATIONLEVEL);
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
deleted file mode 100644
index e2840ea..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ResourceAdapter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.endpoint.MessageEndpointFactory;
-import jakarta.resource.spi.ActivationSpec;
-import jakarta.resource.NotSupportedException;
-import javax.transaction.xa.XAResource;
-import jakarta.resource.spi.BootstrapContext;
-import jakarta.resource.spi.ResourceAdapterInternalException;
-
-/**
- * <code>ResourceAdapter</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/05
- * @author Evani Sai Surya Kiran
- */
-public class ResourceAdapter implements jakarta.resource.spi.ResourceAdapter {
-
- public String raProp = null;
-
- /**
- * Empty method implementation for endpointActivation
- * which just throws <code>NotSupportedException</code>
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- * @throws <code>NotSupportedException</code>
- */
- public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty method implementation for endpointDeactivation
- *
- * @param mef <code>MessageEndpointFactory</code>
- * @param as <code>ActivationSpec</code>
- */
- public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
- }
-
- /**
- * Empty method implementation for getXAResources
- * which just throws <code>NotSupportedException</code>
- *
- * @param specs <code>ActivationSpec</code> array
- * @throws <code>NotSupportedException</code>
- */
- public XAResource[] getXAResources(ActivationSpec[] specs) throws NotSupportedException {
- throw new NotSupportedException("This method is not supported for this JDBC connector");
- }
-
- /**
- * Empty implementation of start method
- *
- * @param ctx <code>BootstrapContext</code>
- */
- public void start(BootstrapContext ctx) throws ResourceAdapterInternalException {
- System.out.println("Resource Adapter is starting with configuration :" + raProp);
- if (raProp == null || !raProp.equals("VALID")) {
- throw new ResourceAdapterInternalException("Resource adapter cannot start. It is configured as : " + raProp);
- }
- }
-
- /**
- * Empty implementation of stop method
- */
- public void stop() {
-
- }
-
- public void setRAProperty(String s) {
- raProp = s;
- }
-
- public String getRAProperty() {
- return raProp;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/build.xml
deleted file mode 100644
index e006b1d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="${gjc.home}" default="build">
- <property name="pkg.dir" value="com/sun/gjc/spi"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile14">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile14"/>
- </target>
-
- <target name="package14">
-
- <mkdir dir="${gjc.home}/dist/spi/1.5"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/jdbc.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*, com/sun/gjc/util/**/*, com/sun/gjc/common/**/*" excludes="com/sun/gjc/cci/**/*,com/sun/gjc/spi/1.4/**/*"/>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-cp.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__cp.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-xa.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__xa.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-dm.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__dm.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" basedir="${gjc.home}/dist/spi/1.5" includes="jdbc.jar"/>
- <copy file="${gjc.home}/src/com/sun/gjc/spi/1.4/ra-ds.xml" tofile="${gjc.home}/dist/spi/1.5/ra.xml" overwrite="yes">
- </copy>
- <jar jarfile="${gjc.home}/dist/spi/1.5/__ds.rar" update="yes">
- <metainf dir="${gjc.home}/dist/spi/1.5">
- <include name="ra.xml"/>
- </metainf>
- </jar>
-
- <delete dir="${gjc.home}/dist/com"/>
- <delete file="${gjc.home}/dist/spi/1.5/jdbc.jar"/>
- <delete file="${gjc.home}/dist/spi/1.5/ra.xml"/>
-
- </target>
-
- <target name="build14" depends="compile14, package14"/>
- <target name="build13"/>
- <target name="build" depends="build14, build13"/>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
deleted file mode 100644
index f404cfe..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/1.4/ra-ds.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
- <!-- There can be any number of "description" elements including 0 -->
- <!-- This field can be optionally used by the driver vendor to provide a
- description for the resource adapter.
- -->
- <description>Resource adapter wrapping Datasource implementation of driver</description>
-
- <!-- There can be any number of "display-name" elements including 0 -->
- <!-- The field can be optionally used by the driver vendor to provide a name that
- is intended to be displayed by tools.
- -->
- <display-name>DataSource Resource Adapter</display-name>
-
- <!-- There can be any number of "icon" elements including 0 -->
- <!-- The following is an example.
- <icon>
- This "small-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (16 x 16)
- icon - JPEG or GIF image. The following is an example.
- <small-icon>smallicon.jpg</small-icon>
-
- This "large-icon" element can occur atmost once. This should specify the
- absolute or the relative path name of a file containing a small (32 x 32)
- icon - JPEG or GIF image. The following is an example.
- <large-icon>largeicon.jpg</large-icon>
- </icon>
- -->
- <icon>
- <small-icon></small-icon>
- <large-icon></large-icon>
- </icon>
-
- <!-- The "vendor-name" element should occur exactly once. -->
- <!-- This should specify the name of the driver vendor. The following is an example.
- <vendor-name>XYZ INC.</vendor-name>
- -->
- <vendor-name>Sun Microsystems</vendor-name>
-
- <!-- The "eis-type" element should occur exactly once. -->
- <!-- This should specify the database, for example the product name of
- the database independent of any version information. The following
- is an example.
- <eis-type>XYZ</eis-type>
- -->
- <eis-type>Database</eis-type>
-
- <!-- The "resourceadapter-version" element should occur exactly once. -->
- <!-- This specifies a string based version of the resource adapter from
- the driver vendor. The default is being set as 1.0. The driver
- vendor can change it as required.
- -->
- <resourceadapter-version>1.0</resourceadapter-version>
-
- <!-- This "license" element can occur atmost once -->
- <!-- This specifies licensing requirements for the resource adapter module.
- The following is an example.
- <license>
- There can be any number of "description" elements including 0.
- <description>
- This field can be optionally used by the driver vendor to
- provide a description for the licensing requirements of the
- resource adapter like duration of license, numberof connection
- restrictions.
- </description>
-
- This specifies whether a license is required to deploy and use the resource adapter.
- Default is false.
- <license-required>false</license-required>
- </license>
- -->
- <license>
- <license-required>false</license-required>
- </license>
-
- <resourceadapter>
-
- <!--
- The "config-property" elements can have zero or more "description"
- elements. The "description" elements are not being included
- in the "config-property" elements below. The driver vendor can
- add them as required.
- -->
-
- <resourceadapter-class>com.sun.jdbcra.spi.ResourceAdapter</resourceadapter-class>
-
- <outbound-resourceadapter>
-
- <connection-definition>
-
- <managedconnectionfactory-class>com.sun.jdbcra.spi.DSManagedConnectionFactory</managedconnectionfactory-class>
-
- <!-- There can be any number of these elements including 0 -->
- <config-property>
- <config-property-name>ServerName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>localhost</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>PortNumber</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>1527</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>databaseName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>testdb</config-property-value>
- </config-property>
-
- <config-property>
- <config-property-name>User</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbuser</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>UserName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbuser</config-property-value>
- </config-property>
-
- <config-property>
- <config-property-name>Password</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>dbpassword</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>URL</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>jdbc:derby://localhost:1527/testdb;create=true</config-property-value>
- </config-property>
- <!--<config-property>
- <config-property-name>DataSourceName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>-->
- <config-property>
- <config-property-name>Description</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>Oracle thin driver Datasource</config-property-value>
- </config-property>
-<!--
- <config-property>
- <config-property-name>NetworkProtocol</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>RoleName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>LoginTimeOut</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>DriverProperties</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
--->
- <config-property>
- <config-property-name>Delimiter</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>#</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ClassName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>org.apache.derby.jdbc.ClientDataSource40</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ConnectionAttributes</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>;create=true</config-property-value>
- </config-property>
-
-<!--
- <config-property>
- <config-property-name>ConnectionValidationRequired</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>false</config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationMethod</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>ValidationTableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>TransactionIsolation</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>GuaranteeIsolationLevel</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
--->
-
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-
- <connectionfactory-impl-class>com.sun.jdbcra.spi.DataSource</connectionfactory-impl-class>
-
- <connection-interface>java.sql.Connection</connection-interface>
-
- <connection-impl-class>com.sun.jdbcra.spi.ConnectionHolder</connection-impl-class>
-
- </connection-definition>
-
- <transaction-support>LocalTransaction</transaction-support>
-
- <authentication-mechanism>
- <!-- There can be any number of "description" elements including 0 -->
- <!-- Not including the "description" element -->
-
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
-
- <credential-interface>jakarta.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
-
- <reauthentication-support>false</reauthentication-support>
-
- </outbound-resourceadapter>
- <adminobject>
- <adminobject-interface>com.sun.jdbcra.spi.JdbcSetupAdmin</adminobject-interface>
- <adminobject-class>com.sun.jdbcra.spi.JdbcSetupAdminImpl</adminobject-class>
- <config-property>
- <config-property-name>TableName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>SchemaName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>JndiName</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <config-property-name>NoOfRows</config-property-name>
- <config-property-type>java.lang.Integer</config-property-type>
- <config-property-value>0</config-property-value>
- </config-property>
- </adminobject>
-
- </resourceadapter>
-
-</connector>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionManager.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
deleted file mode 100644
index 2ee36c5..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionManager.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-
-/**
- * ConnectionManager implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionManager implements jakarta.resource.spi.ConnectionManager{
-
- /**
- * Returns a <code>Connection </code> object to the <code>ConnectionFactory</code>
- *
- * @param mcf <code>ManagedConnectionFactory</code> object.
- * @param info <code>ConnectionRequestInfo</code> object.
- * @return A <code>Connection</code> Object.
- * @throws ResourceException In case of an error in getting the <code>Connection</code>.
- */
- public Object allocateConnection(ManagedConnectionFactory mcf,
- ConnectionRequestInfo info)
- throws ResourceException {
- ManagedConnection mc = mcf.createManagedConnection(null, info);
- return mc.getConnection(null, info);
- }
-
- /*
- * This class could effectively implement Connection pooling also.
- * Could be done for FCS.
- */
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
deleted file mode 100644
index ddd0a28..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ConnectionRequestInfo.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-/**
- * ConnectionRequestInfo implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class ConnectionRequestInfo implements jakarta.resource.spi.ConnectionRequestInfo{
-
- private String user;
- private String password;
-
- /**
- * Constructs a new <code>ConnectionRequestInfo</code> object
- *
- * @param user User Name.
- * @param password Password
- */
- public ConnectionRequestInfo(String user, String password) {
- this.user = user;
- this.password = password;
- }
-
- /**
- * Retrieves the user name of the ConnectionRequestInfo.
- *
- * @return User name of ConnectionRequestInfo.
- */
- public String getUser() {
- return user;
- }
-
- /**
- * Retrieves the password of the ConnectionRequestInfo.
- *
- * @return Password of ConnectionRequestInfo.
- */
- public String getPassword() {
- return password;
- }
-
- /**
- * Verify whether two ConnectionRequestInfos are equal.
- *
- * @return True, if they are equal and false otherwise.
- */
- public boolean equals(Object obj) {
- if (obj == null) return false;
- if (obj instanceof ConnectionRequestInfo) {
- ConnectionRequestInfo other = (ConnectionRequestInfo) obj;
- return (isEqual(this.user, other.user) &&
- isEqual(this.password, other.password));
- } else {
- return false;
- }
- }
-
- /**
- * Retrieves the hashcode of the object.
- *
- * @return hashCode.
- */
- public int hashCode() {
- String result = "" + user + password;
- return result.hashCode();
- }
-
- /**
- * Compares two objects.
- *
- * @param o1 First object.
- * @param o2 Second object.
- */
- private boolean isEqual(Object o1, Object o2) {
- if (o1 == null) {
- return (o2 == null);
- } else {
- return o1.equals(o2);
- }
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
deleted file mode 100644
index 97e2474..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DSManagedConnectionFactory.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.ConnectionManager;
-import com.sun.jdbcra.common.DataSourceSpec;
-import com.sun.jdbcra.common.DataSourceObjectBuilder;
-import com.sun.jdbcra.util.SecurityUtils;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ManagedConnectionFactory;
-import com.sun.jdbcra.common.DataSourceSpec;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * Data Source <code>ManagedConnectionFactory</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/30
- * @author Evani Sai Surya Kiran
- */
-
-public class DSManagedConnectionFactory extends ManagedConnectionFactory {
-
- private transient javax.sql.DataSource dataSourceObj;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Creates a new physical connection to the underlying EIS resource
- * manager.
- *
- * @param subject <code>Subject</code> instance passed by the application server
- * @param cxRequestInfo <code>ConnectionRequestInfo</code> which may be created
- * as a result of the invocation <code>getConnection(user, password)</code>
- * on the <code>DataSource</code> object
- * @return <code>ManagedConnection</code> object created
- * @throws ResourceException if there is an error in instantiating the
- * <code>DataSource</code> object used for the
- * creation of the <code>ManagedConnection</code> object
- * @throws SecurityException if there ino <code>PasswordCredential</code> object
- * satisfying this request
- * @throws ResourceAllocationException if there is an error in allocating the
- * physical connection
- */
- public jakarta.resource.spi.ManagedConnection createManagedConnection(javax.security.auth.Subject subject,
- ConnectionRequestInfo cxRequestInfo) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In createManagedConnection");
- }
- PasswordCredential pc = SecurityUtils.getPasswordCredential(this, subject, cxRequestInfo);
-
- if(dataSourceObj == null) {
- if(dsObjBuilder == null) {
- dsObjBuilder = new DataSourceObjectBuilder(spec);
- }
-
- try {
- dataSourceObj = (javax.sql.DataSource) dsObjBuilder.constructDataSourceObject();
- } catch(ClassCastException cce) {
- _logger.log(Level.SEVERE, "jdbc.exc_cce", cce);
- throw new jakarta.resource.ResourceException(cce.getMessage());
- }
- }
-
- java.sql.Connection dsConn = null;
-
- try {
- /* For the case where the user/passwd of the connection pool is
- * equal to the PasswordCredential for the connection request
- * get a connection from this pool directly.
- * for all other conditions go create a new connection
- */
- if ( isEqual( pc, getUser(), getPassword() ) ) {
- dsConn = dataSourceObj.getConnection();
- } else {
- dsConn = dataSourceObj.getConnection(pc.getUserName(),
- new String(pc.getPassword()));
- }
- } catch(java.sql.SQLException sqle) {
- sqle.printStackTrace();
- _logger.log(Level.WARNING, "jdbc.exc_create_conn", sqle);
- throw new jakarta.resource.spi.ResourceAllocationException("The connection could not be allocated: " +
- sqle.getMessage());
- } catch(Exception e){
- e.printStackTrace();
- }
-
- com.sun.jdbcra.spi.ManagedConnection mc = new com.sun.jdbcra.spi.ManagedConnection(null, dsConn, pc, this);
- //GJCINT
- /*setIsolation(mc);
- isValid(mc); */
- return mc;
- }
-
- /**
- * Check if this <code>ManagedConnectionFactory</code> is equal to
- * another <code>ManagedConnectionFactory</code>.
- *
- * @param other <code>ManagedConnectionFactory</code> object for checking equality with
- * @return true if the property sets of both the
- * <code>ManagedConnectionFactory</code> objects are the same
- * false otherwise
- */
- public boolean equals(Object other) {
- if(logWriter != null) {
- logWriter.println("In equals");
- }
- /**
- * The check below means that two ManagedConnectionFactory objects are equal
- * if and only if their properties are the same.
- */
- if(other instanceof com.sun.jdbcra.spi.DSManagedConnectionFactory) {
- com.sun.jdbcra.spi.DSManagedConnectionFactory otherMCF =
- (com.sun.jdbcra.spi.DSManagedConnectionFactory) other;
- return this.spec.equals(otherMCF.spec);
- }
- return false;
- }
-
- /**
- * Sets the server name.
- *
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
- */
- public void setserverName(String serverName) {
- spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
- }
-
- /**
- * Gets the server name.
- *
- * @return serverName
- * @see <code>setServerName</code>
- */
- public String getserverName() {
- return spec.getDetail(DataSourceSpec.SERVERNAME);
- }
-
- /**
- * Sets the server name.
- *
- * @param serverName <code>String</code>
- * @see <code>getServerName</code>
- */
- public void setServerName(String serverName) {
- spec.setDetail(DataSourceSpec.SERVERNAME, serverName);
- }
-
- /**
- * Gets the server name.
- *
- * @return serverName
- * @see <code>setServerName</code>
- */
- public String getServerName() {
- return spec.getDetail(DataSourceSpec.SERVERNAME);
- }
-
- /**
- * Sets the port number.
- *
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
- */
- public void setportNumber(String portNumber) {
- spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
- }
-
- /**
- * Gets the port number.
- *
- * @return portNumber
- * @see <code>setPortNumber</code>
- */
- public String getportNumber() {
- return spec.getDetail(DataSourceSpec.PORTNUMBER);
- }
-
- /**
- * Sets the port number.
- *
- * @param portNumber <code>String</code>
- * @see <code>getPortNumber</code>
- */
- public void setPortNumber(String portNumber) {
- spec.setDetail(DataSourceSpec.PORTNUMBER, portNumber);
- }
-
- /**
- * Gets the port number.
- *
- * @return portNumber
- * @see <code>setPortNumber</code>
- */
- public String getPortNumber() {
- return spec.getDetail(DataSourceSpec.PORTNUMBER);
- }
-
- /**
- * Sets the database name.
- *
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
- */
- public void setdatabaseName(String databaseName) {
- spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
- }
-
- /**
- * Gets the database name.
- *
- * @return databaseName
- * @see <code>setDatabaseName</code>
- */
- public String getdatabaseName() {
- return spec.getDetail(DataSourceSpec.DATABASENAME);
- }
-
- /**
- * Sets the database name.
- *
- * @param databaseName <code>String</code>
- * @see <code>getDatabaseName</code>
- */
- public void setDatabaseName(String databaseName) {
- spec.setDetail(DataSourceSpec.DATABASENAME, databaseName);
- }
-
- /**
- * Gets the database name.
- *
- * @return databaseName
- * @see <code>setDatabaseName</code>
- */
- public String getDatabaseName() {
- return spec.getDetail(DataSourceSpec.DATABASENAME);
- }
-
- /**
- * Sets the data source name.
- *
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
- */
- public void setdataSourceName(String dsn) {
- spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
- }
-
- /**
- * Gets the data source name.
- *
- * @return dsn
- * @see <code>setDataSourceName</code>
- */
- public String getdataSourceName() {
- return spec.getDetail(DataSourceSpec.DATASOURCENAME);
- }
-
- /**
- * Sets the data source name.
- *
- * @param dsn <code>String</code>
- * @see <code>getDataSourceName</code>
- */
- public void setDataSourceName(String dsn) {
- spec.setDetail(DataSourceSpec.DATASOURCENAME, dsn);
- }
-
- /**
- * Gets the data source name.
- *
- * @return dsn
- * @see <code>setDataSourceName</code>
- */
- public String getDataSourceName() {
- return spec.getDetail(DataSourceSpec.DATASOURCENAME);
- }
-
- /**
- * Sets the description.
- *
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
- */
- public void setdescription(String desc) {
- spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
- }
-
- /**
- * Gets the description.
- *
- * @return desc
- * @see <code>setDescription</code>
- */
- public String getdescription() {
- return spec.getDetail(DataSourceSpec.DESCRIPTION);
- }
-
- /**
- * Sets the description.
- *
- * @param desc <code>String</code>
- * @see <code>getDescription</code>
- */
- public void setDescription(String desc) {
- spec.setDetail(DataSourceSpec.DESCRIPTION, desc);
- }
-
- /**
- * Gets the description.
- *
- * @return desc
- * @see <code>setDescription</code>
- */
- public String getDescription() {
- return spec.getDetail(DataSourceSpec.DESCRIPTION);
- }
-
- /**
- * Sets the network protocol.
- *
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
- */
- public void setnetworkProtocol(String nwProtocol) {
- spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
- }
-
- /**
- * Gets the network protocol.
- *
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
- */
- public String getnetworkProtocol() {
- return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
- }
-
- /**
- * Sets the network protocol.
- *
- * @param nwProtocol <code>String</code>
- * @see <code>getNetworkProtocol</code>
- */
- public void setNetworkProtocol(String nwProtocol) {
- spec.setDetail(DataSourceSpec.NETWORKPROTOCOL, nwProtocol);
- }
-
- /**
- * Gets the network protocol.
- *
- * @return nwProtocol
- * @see <code>setNetworkProtocol</code>
- */
- public String getNetworkProtocol() {
- return spec.getDetail(DataSourceSpec.NETWORKPROTOCOL);
- }
-
- /**
- * Sets the role name.
- *
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
- */
- public void setroleName(String roleName) {
- spec.setDetail(DataSourceSpec.ROLENAME, roleName);
- }
-
- /**
- * Gets the role name.
- *
- * @return roleName
- * @see <code>setRoleName</code>
- */
- public String getroleName() {
- return spec.getDetail(DataSourceSpec.ROLENAME);
- }
-
- /**
- * Sets the role name.
- *
- * @param roleName <code>String</code>
- * @see <code>getRoleName</code>
- */
- public void setRoleName(String roleName) {
- spec.setDetail(DataSourceSpec.ROLENAME, roleName);
- }
-
- /**
- * Gets the role name.
- *
- * @return roleName
- * @see <code>setRoleName</code>
- */
- public String getRoleName() {
- return spec.getDetail(DataSourceSpec.ROLENAME);
- }
-
-
- /**
- * Sets the login timeout.
- *
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
- */
- public void setloginTimeOut(String loginTimeOut) {
- spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
- }
-
- /**
- * Gets the login timeout.
- *
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
- */
- public String getloginTimeOut() {
- return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
- }
-
- /**
- * Sets the login timeout.
- *
- * @param loginTimeOut <code>String</code>
- * @see <code>getLoginTimeOut</code>
- */
- public void setLoginTimeOut(String loginTimeOut) {
- spec.setDetail(DataSourceSpec.LOGINTIMEOUT, loginTimeOut);
- }
-
- /**
- * Gets the login timeout.
- *
- * @return loginTimeout
- * @see <code>setLoginTimeOut</code>
- */
- public String getLoginTimeOut() {
- return spec.getDetail(DataSourceSpec.LOGINTIMEOUT);
- }
-
- /**
- * Sets the delimiter.
- *
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
- */
- public void setdelimiter(String delim) {
- spec.setDetail(DataSourceSpec.DELIMITER, delim);
- }
-
- /**
- * Gets the delimiter.
- *
- * @return delim
- * @see <code>setDelimiter</code>
- */
- public String getdelimiter() {
- return spec.getDetail(DataSourceSpec.DELIMITER);
- }
-
- /**
- * Sets the delimiter.
- *
- * @param delim <code>String</code>
- * @see <code>getDelimiter</code>
- */
- public void setDelimiter(String delim) {
- spec.setDetail(DataSourceSpec.DELIMITER, delim);
- }
-
- /**
- * Gets the delimiter.
- *
- * @return delim
- * @see <code>setDelimiter</code>
- */
- public String getDelimiter() {
- return spec.getDetail(DataSourceSpec.DELIMITER);
- }
-
- /**
- * Sets the driver specific properties.
- *
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
- */
- public void setdriverProperties(String driverProps) {
- spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
- }
-
- /**
- * Gets the driver specific properties.
- *
- * @return driverProps
- * @see <code>setDriverProperties</code>
- */
- public String getdriverProperties() {
- return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- }
-
- /**
- * Sets the driver specific properties.
- *
- * @param driverProps <code>String</code>
- * @see <code>getDriverProperties</code>
- */
- public void setDriverProperties(String driverProps) {
- spec.setDetail(DataSourceSpec.DRIVERPROPERTIES, driverProps);
- }
-
- /**
- * Gets the driver specific properties.
- *
- * @return driverProps
- * @see <code>setDriverProperties</code>
- */
- public String getDriverProperties() {
- return spec.getDetail(DataSourceSpec.DRIVERPROPERTIES);
- }
-
- /*
- * Check if the PasswordCredential passed for this get connection
- * request is equal to the user/passwd of this connection pool.
- */
- private boolean isEqual( PasswordCredential pc, String user,
- String password) {
-
- //if equal get direct connection else
- //get connection with user and password.
-
- if (user == null && pc == null) {
- return true;
- }
-
- if ( user == null && pc != null ) {
- return false;
- }
-
- if( pc == null ) {
- return true;
- }
-
- if ( user.equals( pc.getUserName() ) ) {
- if ( password == null && pc.getPassword() == null ) {
- return true;
- }
- }
-
- if ( user.equals(pc.getUserName()) && password.equals(pc.getPassword()) ) {
- return true;
- }
-
-
- return false;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DataSource.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DataSource.java
deleted file mode 100644
index 47c1b07..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/DataSource.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import jakarta.resource.spi.ManagedConnectionFactory;
-import jakarta.resource.spi.ConnectionManager;
-import jakarta.resource.ResourceException;
-import javax.naming.Reference;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Holds the <code>java.sql.Connection</code> object, which is to be
- * passed to the application program.
- *
- * @version 1.0, 02/07/31
- * @author Binod P.G
- */
-public class DataSource implements javax.sql.DataSource, java.io.Serializable,
- com.sun.appserv.jdbcra.DataSource, jakarta.resource.Referenceable{
-
- private ManagedConnectionFactory mcf;
- private ConnectionManager cm;
- private int loginTimeout;
- private PrintWriter logWriter;
- private String description;
- private Reference reference;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
-
- /**
- * Constructs <code>DataSource</code> object. This is created by the
- * <code>ManagedConnectionFactory</code> object.
- *
- * @param mcf <code>ManagedConnectionFactory</code> object
- * creating this object.
- * @param cm <code>ConnectionManager</code> object either associated
- * with Application server or Resource Adapter.
- */
- public DataSource (ManagedConnectionFactory mcf, ConnectionManager cm) {
- this.mcf = mcf;
- if (cm == null) {
- this.cm = (ConnectionManager) new com.sun.jdbcra.spi.ConnectionManager();
- } else {
- this.cm = cm;
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection() throws SQLException {
- try {
- return (Connection) cm.allocateConnection(mcf,null);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re);
- }
- }
-
- /**
- * Retrieves the <code> Connection </code> object.
- *
- * @param user User name for the Connection.
- * @param pwd Password for the Connection.
- * @return <code> Connection </code> object.
- * @throws SQLException In case of an error.
- */
- public Connection getConnection(String user, String pwd) throws SQLException {
- try {
- ConnectionRequestInfo info = new ConnectionRequestInfo (user, pwd);
- return (Connection) cm.allocateConnection(mcf,info);
- } catch (ResourceException re) {
-// This is temporary. This needs to be changed to SEVERE after TP
- _logger.log(Level.WARNING, "jdbc.exc_get_conn", re.getMessage());
- throw new SQLException (re);
- }
- }
-
- /**
- * Retrieves the actual SQLConnection from the Connection wrapper
- * implementation of SunONE application server. If an actual connection is
- * supplied as argument, then it will be just returned.
- *
- * @param con Connection obtained from <code>Datasource.getConnection()</code>
- * @return <code>java.sql.Connection</code> implementation of the driver.
- * @throws <code>java.sql.SQLException</code> If connection cannot be obtained.
- */
- public Connection getConnection(Connection con) throws SQLException {
-
- Connection driverCon = con;
- if (con instanceof com.sun.jdbcra.spi.ConnectionHolder) {
- driverCon = ((com.sun.jdbcra.spi.ConnectionHolder) con).getConnection();
- }
-
- return driverCon;
- }
-
- /**
- * Get the login timeout
- *
- * @return login timeout.
- * @throws SQLException If a database error occurs.
- */
- public int getLoginTimeout() throws SQLException{
- return loginTimeout;
- }
-
- /**
- * Set the login timeout
- *
- * @param loginTimeout Login timeout.
- * @throws SQLException If a database error occurs.
- */
- public void setLoginTimeout(int loginTimeout) throws SQLException{
- this.loginTimeout = loginTimeout;
- }
-
- /**
- * Get the logwriter object.
- *
- * @return <code> PrintWriter </code> object.
- * @throws SQLException If a database error occurs.
- */
- public PrintWriter getLogWriter() throws SQLException{
- return logWriter;
- }
-
- /**
- * Set the logwriter on this object.
- *
- * @param <code>PrintWriter</code> object.
- * @throws SQLException If a database error occurs.
- */
- public void setLogWriter(PrintWriter logWriter) throws SQLException{
- this.logWriter = logWriter;
- }
-
- public Logger getParentLogger() throws SQLFeatureNotSupportedException{
- throw new SQLFeatureNotSupportedException("Do not support Java 7 feature.");
- }
- /**
- * Retrieves the description.
- *
- * @return Description about the DataSource.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Set the description.
- *
- * @param description Description about the DataSource.
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Get the reference.
- *
- * @return <code>Reference</code>object.
- */
- public Reference getReference() {
- return reference;
- }
-
- /**
- * Get the reference.
- *
- * @param reference <code>Reference</code> object.
- */
- public void setReference(Reference reference) {
- this.reference = reference;
- }
-
- public <T> T unwrap(Class<T> iface) throws SQLException {
- return null;
- }
-
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return false;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
deleted file mode 100644
index bec0d6b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdmin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-public interface JdbcSetupAdmin {
-
- public void setTableName(String db);
-
- public String getTableName();
-
- public void setJndiName(String name);
-
- public String getJndiName();
-
- public void setSchemaName(String name);
-
- public String getSchemaName();
-
- public void setNoOfRows(Integer i);
-
- public Integer getNoOfRows();
-
- public boolean checkSetup();
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
deleted file mode 100644
index 82c50b5..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/JdbcSetupAdminImpl.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.naming.*;
-import javax.sql.*;
-import java.sql.*;
-// import javax.sql.DataSource;
-public class JdbcSetupAdminImpl implements JdbcSetupAdmin {
-
- private String tableName;
-
- private String jndiName;
-
- private String schemaName;
-
- private Integer noOfRows;
-
- public void setTableName(String db) {
- tableName = db;
- }
-
- public String getTableName(){
- return tableName;
- }
-
- public void setJndiName(String name){
- jndiName = name;
- }
-
- public String getJndiName() {
- return jndiName;
- }
-
- public void setSchemaName(String name){
- schemaName = name;
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- public void setNoOfRows(Integer i) {
- System.out.println("Setting no of rows :" + i);
- noOfRows = i;
- }
-
- public Integer getNoOfRows() {
- return noOfRows;
- }
-
-private void printHierarchy(ClassLoader cl, int cnt){
-while(cl != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT :" + cl);
- cl = cl.getParent();
- cnt += 3;
-}
-}
-
-private void compareHierarchy(ClassLoader cl1, ClassLoader cl2 , int cnt){
-while(cl1 != null || cl2 != null) {
- for(int i =0; i < cnt; i++)
- System.out.print(" " );
- System.out.println("PARENT of ClassLoader 1 :" + cl1);
- System.out.println("PARENT of ClassLoader 2 :" + cl2);
- System.out.println("EQUALS : " + (cl1 == cl2));
- cl1 = cl1.getParent();
- cl2 = cl2.getParent();
- cnt += 3;
-}
-}
-
-
- public boolean checkSetup(){
-
- if (jndiName== null || jndiName.trim().equals("")) {
- return false;
- }
-
- if (tableName== null || tableName.trim().equals("")) {
- return false;
- }
-
- Connection con = null;
- Statement s = null;
- ResultSet rs = null;
- boolean b = false;
- try {
- InitialContext ic = new InitialContext();
- //debug
- Class clz = DataSource.class;
-/*
- if(clz.getClassLoader() != null) {
- System.out.println("DataSource's clasxs : " + clz.getName() + " classloader " + clz.getClassLoader());
- printHierarchy(clz.getClassLoader().getParent(), 8);
- }
- Class cls = ic.lookup(jndiName).getClass();
- System.out.println("Looked up class's : " + cls.getPackage() + ":" + cls.getName() + " classloader " + cls.getClassLoader());
- printHierarchy(cls.getClassLoader().getParent(), 8);
-
- System.out.println("Classloaders equal ? " + (clz.getClassLoader() == cls.getClassLoader()));
- System.out.println("&*&*&*&* Comparing Hierachy DataSource vs lookedup");
- if(clz.getClassLoader() != null) {
- compareHierarchy(clz.getClassLoader(), cls.getClassLoader(), 8);
- }
-
- System.out.println("Before lookup");
-*/
- Object o = ic.lookup(jndiName);
-// System.out.println("after lookup lookup");
-
- DataSource ds = (DataSource)o ;
-/*
- System.out.println("after cast");
- System.out.println("---------- Trying our Stuff !!!");
- try {
- Class o1 = (Class.forName("com.sun.jdbcra.spi.DataSource"));
- ClassLoader cl1 = o1.getClassLoader();
- ClassLoader cl2 = DataSource.class.getClassLoader();
- System.out.println("Cl1 == Cl2" + (cl1 == cl2));
- System.out.println("Classes equal" + (DataSource.class == o1));
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-*/
- con = ds.getConnection();
- String fullTableName = tableName;
- if (schemaName != null && (!(schemaName.trim().equals("")))) {
- fullTableName = schemaName.trim() + "." + fullTableName;
- }
- String qry = "select * from " + fullTableName;
-
- System.out.println("Executing query :" + qry);
-
- s = con.createStatement();
- rs = s.executeQuery(qry);
-
- int i = 0;
- if (rs.next()) {
- i++;
- }
-
- System.out.println("No of rows found:" + i);
- System.out.println("No of rows expected:" + noOfRows);
-
- if (i == noOfRows.intValue()) {
- b = true;
- } else {
- b = false;
- }
- } catch(Exception e) {
- e.printStackTrace();
- b = false;
- } finally {
- try {
- if (rs != null) rs.close();
- if (s != null) s.close();
- if (con != null) con.close();
- } catch (Exception e) {
- }
- }
- System.out.println("Returning setup :" +b);
- return b;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
deleted file mode 100644
index ce8635b..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/LocalTransaction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.LocalTransactionException;
-
-/**
- * <code>LocalTransaction</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class LocalTransaction implements jakarta.resource.spi.LocalTransaction {
-
- private ManagedConnection mc;
-
- /**
- * Constructor for <code>LocalTransaction</code>.
- * @param mc <code>ManagedConnection</code> that returns
- * this <code>LocalTransaction</code> object as
- * a result of <code>getLocalTransaction</code>
- */
- public LocalTransaction(ManagedConnection mc) {
- this.mc = mc;
- }
-
- /**
- * Begin a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection
- */
- public void begin() throws ResourceException {
- //GJCINT
- mc.transactionStarted();
- try {
- mc.getActualConnection().setAutoCommit(false);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- }
-
- /**
- * Commit a local transaction.
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or committing the transaction
- */
- public void commit() throws ResourceException {
- Exception e = null;
- try {
- mc.getActualConnection().commit();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
- /**
- * Rollback a local transaction.
- *
- * @throws LocalTransactionException if there is an error in changing
- * the autocommit mode of the physical
- * connection or rolling back the transaction
- */
- public void rollback() throws ResourceException {
- try {
- mc.getActualConnection().rollback();
- mc.getActualConnection().setAutoCommit(true);
- } catch(java.sql.SQLException sqle) {
- throw new LocalTransactionException(sqle.getMessage());
- }
- //GJCINT
- mc.transactionCompleted();
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnection.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
deleted file mode 100644
index f0443d0..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnection.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import jakarta.resource.spi.*;
-import jakarta.resource.*;
-import javax.security.auth.Subject;
-import java.io.PrintWriter;
-import javax.transaction.xa.XAResource;
-import java.util.Set;
-import java.util.Hashtable;
-import java.util.Iterator;
-import javax.sql.PooledConnection;
-import javax.sql.XAConnection;
-import java.sql.Connection;
-import java.sql.SQLException;
-import jakarta.resource.NotSupportedException;
-import jakarta.resource.spi.security.PasswordCredential;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import com.sun.jdbcra.spi.LocalTransaction;
-import com.sun.jdbcra.spi.ManagedConnectionMetaData;
-import com.sun.jdbcra.util.SecurityUtils;
-import com.sun.jdbcra.spi.ConnectionHolder;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-
-/**
- * <code>ManagedConnection</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnection implements jakarta.resource.spi.ManagedConnection {
-
- public static final int ISNOTAPOOLEDCONNECTION = 0;
- public static final int ISPOOLEDCONNECTION = 1;
- public static final int ISXACONNECTION = 2;
-
- private boolean isDestroyed = false;
- private boolean isUsable = true;
-
- private int connectionType = ISNOTAPOOLEDCONNECTION;
- private PooledConnection pc = null;
- private java.sql.Connection actualConnection = null;
- private Hashtable connectionHandles;
- private PrintWriter logWriter;
- private PasswordCredential passwdCredential;
- private jakarta.resource.spi.ManagedConnectionFactory mcf = null;
- private XAResource xar = null;
- public ConnectionHolder activeConnectionHandle;
-
- //GJCINT
- private int isolationLevelWhenCleaned;
- private boolean isClean = false;
-
- private boolean transactionInProgress = false;
-
- private ConnectionEventListener listener = null;
-
- private ConnectionEvent ce = null;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
-
- /**
- * Constructor for <code>ManagedConnection</code>. The pooledConn parameter is expected
- * to be null and sqlConn parameter is the actual connection in case where
- * the actual connection is got from a non pooled datasource object. The
- * pooledConn parameter is expected to be non null and sqlConn parameter
- * is expected to be null in the case where the datasource object is a
- * connection pool datasource or an xa datasource.
- *
- * @param pooledConn <code>PooledConnection</code> object in case the
- * physical connection is to be obtained from a pooled
- * <code>DataSource</code>; null otherwise
- * @param sqlConn <code>java.sql.Connection</code> object in case the physical
- * connection is to be obtained from a non pooled <code>DataSource</code>;
- * null otherwise
- * @param passwdCred object conatining the
- * user and password for allocating the connection
- * @throws ResourceException if the <code>ManagedConnectionFactory</code> object
- * that created this <code>ManagedConnection</code> object
- * is not the same as returned by <code>PasswordCredential</code>
- * object passed
- */
- public ManagedConnection(PooledConnection pooledConn, java.sql.Connection sqlConn,
- PasswordCredential passwdCred, jakarta.resource.spi.ManagedConnectionFactory mcf) throws ResourceException {
- if(pooledConn == null && sqlConn == null) {
- throw new ResourceException("Connection object cannot be null");
- }
-
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- actualConnection = sqlConn;
- }
-
- pc = pooledConn;
- connectionHandles = new Hashtable();
- passwdCredential = passwdCred;
- this.mcf = mcf;
- if(passwdCredential != null &&
- this.mcf.equals(passwdCredential.getManagedConnectionFactory()) == false) {
- throw new ResourceException("The ManagedConnectionFactory that has created this " +
- "ManagedConnection is not the same as the ManagedConnectionFactory returned by" +
- " the PasswordCredential for this ManagedConnection");
- }
- logWriter = mcf.getLogWriter();
- activeConnectionHandle = null;
- ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
- }
-
- /**
- * Adds a connection event listener to the ManagedConnection instance.
- *
- * @param listener <code>ConnectionEventListener</code>
- * @see <code>removeConnectionEventListener</code>
- */
- public void addConnectionEventListener(ConnectionEventListener listener) {
- this.listener = listener;
- }
-
- /**
- * Used by the container to change the association of an application-level
- * connection handle with a <code>ManagedConnection</code> instance.
- *
- * @param connection <code>ConnectionHolder</code> to be associated with
- * this <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is no more
- * valid or the connection handle passed is null
- */
- public void associateConnection(Object connection) throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In associateConnection");
- }
- checkIfValid();
- if(connection == null) {
- throw new ResourceException("Connection handle cannot be null");
- }
- ConnectionHolder ch = (ConnectionHolder) connection;
-
- com.sun.jdbcra.spi.ManagedConnection mc = (com.sun.jdbcra.spi.ManagedConnection)ch.getManagedConnection();
- mc.activeConnectionHandle = null;
- isClean = false;
-
- ch.associateConnection(actualConnection, this);
- /**
- * The expectation from the above method is that the connection holder
- * replaces the actual sql connection it holds with the sql connection
- * handle being passed in this method call. Also, it replaces the reference
- * to the ManagedConnection instance with this ManagedConnection instance.
- * Any previous statements and result sets also need to be removed.
- */
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- ch.setActive(true);
- activeConnectionHandle = ch;
- }
-
- /**
- * Application server calls this method to force any cleanup on the
- * <code>ManagedConnection</code> instance. This method calls the invalidate
- * method on all ConnectionHandles associated with this <code>ManagedConnection</code>.
- *
- * @throws ResourceException if the physical connection is no more valid
- */
- public void cleanup() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In cleanup");
- }
- checkIfValid();
-
- /**
- * may need to set the autocommit to true for the non-pooled case.
- */
- //GJCINT
- //if (actualConnection != null) {
- if (connectionType == ISNOTAPOOLEDCONNECTION ) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- throw new ResourceException("The isolation level for the physical connection "
- + "could not be retrieved");
- }
- }
- isClean = true;
-
- activeConnectionHandle = null;
- }
-
- /**
- * This method removes all the connection handles from the table
- * of connection handles and invalidates all of them so that any
- * operation on those connection handles throws an exception.
- *
- * @throws ResourceException if there is a problem in retrieving
- * the connection handles
- */
- private void invalidateAllConnectionHandles() throws ResourceException {
- Set handles = connectionHandles.keySet();
- Iterator iter = handles.iterator();
- try {
- while(iter.hasNext()) {
- ConnectionHolder ch = (ConnectionHolder)iter.next();
- ch.invalidate();
- }
- } catch(java.util.NoSuchElementException nsee) {
- throw new ResourceException("Could not find the connection handle: "+ nsee.getMessage());
- }
- connectionHandles.clear();
- }
-
- /**
- * Destroys the physical connection to the underlying resource manager.
- *
- * @throws ResourceException if there is an error in closing the physical connection
- */
- public void destroy() throws ResourceException{
- if(logWriter != null) {
- logWriter.println("In destroy");
- }
- //GJCINT
- if(isDestroyed == true) {
- return;
- }
-
- activeConnectionHandle = null;
- try {
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- pc.close();
- pc = null;
- actualConnection = null;
- } else {
- actualConnection.close();
- actualConnection = null;
- }
- } catch(SQLException sqle) {
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- throw new ResourceException("The following exception has occured during destroy: "
- + sqle.getMessage());
- }
- isDestroyed = true;
- passwdCredential = null;
- connectionHandles = null;
- }
-
- /**
- * Creates a new connection handle for the underlying physical
- * connection represented by the <code>ManagedConnection</code> instance.
- *
- * @param subject <code>Subject</code> parameter needed for authentication
- * @param cxReqInfo <code>ConnectionRequestInfo</code> carries the user
- * and password required for getting this connection.
- * @return Connection the connection handle <code>Object</code>
- * @throws ResourceException if there is an error in allocating the
- * physical connection from the pooled connection
- * @throws SecurityException if there is a mismatch between the
- * password credentials or reauthentication is requested
- */
- public Object getConnection(Subject sub, jakarta.resource.spi.ConnectionRequestInfo cxReqInfo)
- throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getConnection");
- }
- checkIfValid();
- com.sun.jdbcra.spi.ConnectionRequestInfo cxRequestInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) cxReqInfo;
- PasswordCredential passwdCred = SecurityUtils.getPasswordCredential(this.mcf, sub, cxRequestInfo);
-
- if(SecurityUtils.isPasswordCredentialEqual(this.passwdCredential, passwdCred) == false) {
- throw new jakarta.resource.spi.SecurityException("Re-authentication not supported");
- }
-
- //GJCINT
- getActualConnection();
-
- /**
- * The following code in the if statement first checks if this ManagedConnection
- * is clean or not. If it is, it resets the transaction isolation level to what
- * it was when it was when this ManagedConnection was cleaned up depending on the
- * ConnectionRequestInfo passed.
- */
- if(isClean) {
- ((com.sun.jdbcra.spi.ManagedConnectionFactory)mcf).resetIsolation(this, isolationLevelWhenCleaned);
- }
-
-
- ConnectionHolder connHolderObject = new ConnectionHolder(actualConnection, this);
- isClean=false;
-
- if(activeConnectionHandle != null) {
- activeConnectionHandle.setActive(false);
- }
-
- connHolderObject.setActive(true);
- activeConnectionHandle = connHolderObject;
-
- return connHolderObject;
-
- }
-
- /**
- * Returns an <code>LocalTransaction</code> instance. The <code>LocalTransaction</code> interface
- * is used by the container to manage local transactions for a RM instance.
- *
- * @return <code>LocalTransaction</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.LocalTransaction getLocalTransaction() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLocalTransaction");
- }
- checkIfValid();
- return new com.sun.jdbcra.spi.LocalTransaction(this);
- }
-
- /**
- * Gets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @return <code>PrintWriter</code> instance associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>setLogWriter</code>
- */
- public PrintWriter getLogWriter() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getLogWriter");
- }
- checkIfValid();
-
- return logWriter;
- }
-
- /**
- * Gets the metadata information for this connection's underlying EIS
- * resource manager instance.
- *
- * @return <code>ManagedConnectionMetaData</code> instance
- * @throws ResourceException if the physical connection is not valid
- */
- public jakarta.resource.spi.ManagedConnectionMetaData getMetaData() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getMetaData");
- }
- checkIfValid();
-
- return new com.sun.jdbcra.spi.ManagedConnectionMetaData(this);
- }
-
- /**
- * Returns an <code>XAResource</code> instance.
- *
- * @return <code>XAResource</code> instance
- * @throws ResourceException if the physical connection is not valid or
- * there is an error in allocating the
- * <code>XAResource</code> instance
- * @throws NotSupportedException if underlying datasource is not an
- * <code>XADataSource</code>
- */
- public XAResource getXAResource() throws ResourceException {
- if(logWriter != null) {
- logWriter.println("In getXAResource");
- }
- checkIfValid();
-
- if(connectionType == ISXACONNECTION) {
- try {
- if(xar == null) {
- /**
- * Using the wrapper XAResource.
- */
- xar = new com.sun.jdbcra.spi.XAResourceImpl(((XAConnection)pc).getXAResource(), this);
- }
- return xar;
- } catch(SQLException sqle) {
- throw new ResourceException(sqle.getMessage());
- }
- } else {
- throw new NotSupportedException("Cannot get an XAResource from a non XA connection");
- }
- }
-
- /**
- * Removes an already registered connection event listener from the
- * <code>ManagedConnection</code> instance.
- *
- * @param listener <code>ConnectionEventListener</code> to be removed
- * @see <code>addConnectionEventListener</code>
- */
- public void removeConnectionEventListener(ConnectionEventListener listener) {
- listener = null;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.start() has been called or from
- * LocalTransaction object when its begin() method is called.
- */
- void transactionStarted() {
- transactionInProgress = true;
- }
-
- /**
- * This method is called from XAResource wrapper object
- * when its XAResource.end() has been called or from
- * LocalTransaction object when its end() method is called.
- */
- void transactionCompleted() {
- transactionInProgress = false;
- if(connectionType == ISPOOLEDCONNECTION || connectionType == ISXACONNECTION) {
- try {
- isolationLevelWhenCleaned = actualConnection.getTransactionIsolation();
- } catch(SQLException sqle) {
- //check what to do in this case!!
- _logger.log(Level.WARNING, "jdbc.notgot_tx_isolvl");
- }
-
- try {
- actualConnection.close();
- actualConnection = null;
- } catch(SQLException sqle) {
- actualConnection = null;
- }
- }
-
-
- isClean = true;
-
- activeConnectionHandle = null;
-
- }
-
- /**
- * Checks if a this ManagedConnection is involved in a transaction
- * or not.
- */
- public boolean isTransactionInProgress() {
- return transactionInProgress;
- }
-
- /**
- * Sets the log writer for this <code>ManagedConnection</code> instance.
- *
- * @param out <code>PrintWriter</code> to be associated with this
- * <code>ManagedConnection</code> instance
- * @throws ResourceException if the physical connection is not valid
- * @see <code>getLogWriter</code>
- */
- public void setLogWriter(PrintWriter out) throws ResourceException {
- checkIfValid();
- logWriter = out;
- }
-
- /**
- * This method determines the type of the connection being held
- * in this <code>ManagedConnection</code>.
- *
- * @param pooledConn <code>PooledConnection</code>
- * @return connection type
- */
- private int getConnectionType(PooledConnection pooledConn) {
- if(pooledConn == null) {
- return ISNOTAPOOLEDCONNECTION;
- } else if(pooledConn instanceof XAConnection) {
- return ISXACONNECTION;
- } else {
- return ISPOOLEDCONNECTION;
- }
- }
-
- /**
- * Returns the <code>ManagedConnectionFactory</code> instance that
- * created this <code>ManagedConnection</code> instance.
- *
- * @return <code>ManagedConnectionFactory</code> instance that created this
- * <code>ManagedConnection</code> instance
- */
- ManagedConnectionFactory getManagedConnectionFactory() {
- return (com.sun.jdbcra.spi.ManagedConnectionFactory)mcf;
- }
-
- /**
- * Returns the actual sql connection for this <code>ManagedConnection</code>.
- *
- * @return the physical <code>java.sql.Connection</code>
- */
- //GJCINT
- java.sql.Connection getActualConnection() throws ResourceException {
- //GJCINT
- if(connectionType == ISXACONNECTION || connectionType == ISPOOLEDCONNECTION) {
- try {
- if(actualConnection == null) {
- actualConnection = pc.getConnection();
- }
-
- } catch(SQLException sqle) {
- sqle.printStackTrace();
- throw new ResourceException(sqle.getMessage());
- }
- }
- return actualConnection;
- }
-
- /**
- * Returns the <code>PasswordCredential</code> object associated with this <code>ManagedConnection</code>.
- *
- * @return <code>PasswordCredential</code> associated with this
- * <code>ManagedConnection</code> instance
- */
- PasswordCredential getPasswordCredential() {
- return passwdCredential;
- }
-
- /**
- * Checks if this <code>ManagedConnection</code> is valid or not and throws an
- * exception if it is not valid. A <code>ManagedConnection</code> is not valid if
- * destroy has not been called and no physical connection error has
- * occurred rendering the physical connection unusable.
- *
- * @throws ResourceException if <code>destroy</code> has been called on this
- * <code>ManagedConnection</code> instance or if a
- * physical connection error occurred rendering it unusable
- */
- //GJCINT
- void checkIfValid() throws ResourceException {
- if(isDestroyed == true || isUsable == false) {
- throw new ResourceException("This ManagedConnection is not valid as the physical " +
- "connection is not usable.");
- }
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when its close method is
- * called. This <code>ManagedConnection</code> instance invalidates the connection handle
- * and sends a CONNECTION_CLOSED event to all the registered event listeners.
- *
- * @param e Exception that may have occured while closing the connection handle
- * @param connHolderObject <code>ConnectionHolder</code> that has been closed
- * @throws SQLException in case closing the sql connection got out of
- * <code>getConnection</code> on the underlying
- * <code>PooledConnection</code> throws an exception
- */
- void connectionClosed(Exception e, ConnectionHolder connHolderObject) throws SQLException {
- connHolderObject.invalidate();
-
- activeConnectionHandle = null;
-
- ce.setConnectionHandle(connHolderObject);
- listener.connectionClosed(ce);
-
- }
-
- /**
- * This method is called by the <code>ConnectionHolder</code> when it detects a connecion
- * related error.
- *
- * @param e Exception that has occurred during an operation on the physical connection
- * @param connHolderObject <code>ConnectionHolder</code> that detected the physical
- * connection error
- */
- void connectionErrorOccurred(Exception e,
- com.sun.jdbcra.spi.ConnectionHolder connHolderObject) {
-
- ConnectionEventListener cel = this.listener;
- ConnectionEvent ce = null;
- ce = e == null ? new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED)
- : new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
- if (connHolderObject != null) {
- ce.setConnectionHandle(connHolderObject);
- }
-
- cel.connectionErrorOccurred(ce);
- isUsable = false;
- }
-
-
-
- /**
- * This method is called by the <code>XAResource</code> object when its start method
- * has been invoked.
- *
- */
- void XAStartOccurred() {
- try {
- actualConnection.setAutoCommit(false);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by the <code>XAResource</code> object when its end method
- * has been invoked.
- *
- */
- void XAEndOccurred() {
- try {
- actualConnection.setAutoCommit(true);
- } catch(Exception e) {
- e.printStackTrace();
- connectionErrorOccurred(e, null);
- }
- }
-
- /**
- * This method is called by a Connection Handle to check if it is
- * the active Connection Handle. If it is not the active Connection
- * Handle, this method throws an SQLException. Else, it
- * returns setting the active Connection Handle to the calling
- * Connection Handle object to this object if the active Connection
- * Handle is null.
- *
- * @param ch <code>ConnectionHolder</code> that requests this
- * <code>ManagedConnection</code> instance whether
- * it can be active or not
- * @throws SQLException in case the physical is not valid or
- * there is already an active connection handle
- */
-
- void checkIfActive(ConnectionHolder ch) throws SQLException {
- if(isDestroyed == true || isUsable == false) {
- throw new SQLException("The physical connection is not usable");
- }
-
- if(activeConnectionHandle == null) {
- activeConnectionHandle = ch;
- ch.setActive(true);
- return;
- }
-
- if(activeConnectionHandle != ch) {
- throw new SQLException("The connection handle cannot be used as another connection is currently active");
- }
- }
-
- /**
- * sets the connection type of this connection. This method is called
- * by the MCF while creating this ManagedConnection. Saves us a costly
- * instanceof operation in the getConnectionType
- */
- public void initializeConnectionType( int _connectionType ) {
- connectionType = _connectionType;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
deleted file mode 100644
index 5ec326c..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/ManagedConnectionMetaData.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import com.sun.jdbcra.spi.ManagedConnection;
-import java.sql.SQLException;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * <code>ManagedConnectionMetaData</code> implementation for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/03
- * @author Evani Sai Surya Kiran
- */
-public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedConnectionMetaData {
-
- private java.sql.DatabaseMetaData dmd = null;
- private ManagedConnection mc;
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Constructor for <code>ManagedConnectionMetaData</code>
- *
- * @param mc <code>ManagedConnection</code>
- * @throws <code>ResourceException</code> if getting the DatabaseMetaData object fails
- */
- public ManagedConnectionMetaData(ManagedConnection mc) throws ResourceException {
- try {
- this.mc = mc;
- dmd = mc.getActualConnection().getMetaData();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_md");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product name of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product name of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductName() throws ResourceException {
- try {
- return dmd.getDatabaseProductName();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodname", sqle);
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns product version of the underlying EIS instance connected
- * through the ManagedConnection.
- *
- * @return Product version of the EIS instance
- * @throws <code>ResourceException</code>
- */
- public String getEISProductVersion() throws ResourceException {
- try {
- return dmd.getDatabaseProductVersion();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_prodvers", sqle);
- throw new ResourceException(sqle.getMessage(), sqle.getMessage());
- }
- }
-
- /**
- * Returns maximum limit on number of active concurrent connections
- * that an EIS instance can support across client processes.
- *
- * @return Maximum limit for number of active concurrent connections
- * @throws <code>ResourceException</code>
- */
- public int getMaxConnections() throws ResourceException {
- try {
- return dmd.getMaxConnections();
- } catch(SQLException sqle) {
- _logger.log(Level.SEVERE, "jdbc.exc_eis_maxconn");
- throw new ResourceException(sqle.getMessage());
- }
- }
-
- /**
- * Returns name of the user associated with the ManagedConnection instance. The name
- * corresponds to the resource principal under whose whose security context, a connection
- * to the EIS instance has been established.
- *
- * @return name of the user
- * @throws <code>ResourceException</code>
- */
- public String getUserName() throws ResourceException {
- jakarta.resource.spi.security.PasswordCredential pc = mc.getPasswordCredential();
- if(pc != null) {
- return pc.getUserName();
- }
-
- return mc.getManagedConnectionFactory().getUser();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
deleted file mode 100644
index f0ba663..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/spi/XAResourceImpl.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.spi;
-
-import javax.transaction.xa.Xid;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import com.sun.jdbcra.spi.ManagedConnection;
-
-/**
- * <code>XAResource</code> wrapper for Generic JDBC Connector.
- *
- * @version 1.0, 02/08/23
- * @author Evani Sai Surya Kiran
- */
-public class XAResourceImpl implements XAResource {
-
- XAResource xar;
- ManagedConnection mc;
-
- /**
- * Constructor for XAResourceImpl
- *
- * @param xar <code>XAResource</code>
- * @param mc <code>ManagedConnection</code>
- */
- public XAResourceImpl(XAResource xar, ManagedConnection mc) {
- this.xar = xar;
- this.mc = mc;
- }
-
- /**
- * Commit the global transaction specified by xid.
- *
- * @param xid A global transaction identifier
- * @param onePhase If true, the resource manager should use a one-phase commit
- * protocol to commit the work done on behalf of xid.
- */
- public void commit(Xid xid, boolean onePhase) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.commit(xid, onePhase);
- }
-
- /**
- * Ends the work performed on behalf of a transaction branch.
- *
- * @param xid A global transaction identifier that is the same as what
- * was used previously in the start method.
- * @param flags One of TMSUCCESS, TMFAIL, or TMSUSPEND
- */
- public void end(Xid xid, int flags) throws XAException {
- xar.end(xid, flags);
- //GJCINT
- //mc.transactionCompleted();
- }
-
- /**
- * Tell the resource manager to forget about a heuristically completed transaction branch.
- *
- * @param xid A global transaction identifier
- */
- public void forget(Xid xid) throws XAException {
- xar.forget(xid);
- }
-
- /**
- * Obtain the current transaction timeout value set for this
- * <code>XAResource</code> instance.
- *
- * @return the transaction timeout value in seconds
- */
- public int getTransactionTimeout() throws XAException {
- return xar.getTransactionTimeout();
- }
-
- /**
- * This method is called to determine if the resource manager instance
- * represented by the target object is the same as the resouce manager
- * instance represented by the parameter xares.
- *
- * @param xares An <code>XAResource</code> object whose resource manager
- * instance is to be compared with the resource
- * @return true if it's the same RM instance; otherwise false.
- */
- public boolean isSameRM(XAResource xares) throws XAException {
- return xar.isSameRM(xares);
- }
-
- /**
- * Ask the resource manager to prepare for a transaction commit
- * of the transaction specified in xid.
- *
- * @param xid A global transaction identifier
- * @return A value indicating the resource manager's vote on the
- * outcome of the transaction. The possible values
- * are: XA_RDONLY or XA_OK. If the resource manager wants
- * to roll back the transaction, it should do so
- * by raising an appropriate <code>XAException</code> in the prepare method.
- */
- public int prepare(Xid xid) throws XAException {
- return xar.prepare(xid);
- }
-
- /**
- * Obtain a list of prepared transaction branches from a resource manager.
- *
- * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS. TMNOFLAGS
- * must be used when no other flags are set in flags.
- * @return The resource manager returns zero or more XIDs for the transaction
- * branches that are currently in a prepared or heuristically
- * completed state. If an error occurs during the operation, the resource
- * manager should throw the appropriate <code>XAException</code>.
- */
- public Xid[] recover(int flag) throws XAException {
- return xar.recover(flag);
- }
-
- /**
- * Inform the resource manager to roll back work done on behalf of a transaction branch
- *
- * @param xid A global transaction identifier
- */
- public void rollback(Xid xid) throws XAException {
- //the mc.transactionCompleted call has come here becasue
- //the transaction *actually* completes after the flow
- //reaches here. the end() method might not really signal
- //completion of transaction in case the transaction is
- //suspended. In case of transaction suspension, the end
- //method is still called by the transaction manager
- mc.transactionCompleted();
- xar.rollback(xid);
- }
-
- /**
- * Set the current transaction timeout value for this <code>XAResource</code> instance.
- *
- * @param seconds the transaction timeout value in seconds.
- * @return true if transaction timeout value is set successfully; otherwise false.
- */
- public boolean setTransactionTimeout(int seconds) throws XAException {
- return xar.setTransactionTimeout(seconds);
- }
-
- /**
- * Start work on behalf of a transaction branch specified in xid.
- *
- * @param xid A global transaction identifier to be associated with the resource
- * @return flags One of TMNOFLAGS, TMJOIN, or TMRESUME
- */
- public void start(Xid xid, int flags) throws XAException {
- //GJCINT
- mc.transactionStarted();
- xar.start(xid, flags);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/MethodExecutor.java
deleted file mode 100644
index de4a961..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/MethodExecutor.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Vector;
-import jakarta.resource.ResourceException;
-
-import java.util.logging.Logger;
-import java.util.logging.Level;
-/**
- * Execute the methods based on the parameters.
- *
- * @version 1.0, 02/07/23
- * @author Binod P.G
- */
-public class MethodExecutor implements java.io.Serializable{
-
- private static Logger _logger;
- static {
- _logger = Logger.getAnonymousLogger();
- }
- private boolean debug = false;
- /**
- * Exceute a simple set Method.
- *
- * @param value Value to be set.
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runJavaBeanMethod(String value, Method method, Object obj) throws ResourceException{
- if (value==null || value.trim().equals("")) {
- return;
- }
- try {
- Class[] parameters = method.getParameterTypes();
- if ( parameters.length == 1) {
- Object[] values = new Object[1];
- values[0] = convertType(parameters[0], value);
- method.invoke(obj, values);
- }
- } catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Executes the method.
- *
- * @param method <code>Method</code> object.
- * @param obj Object on which the method to be executed.
- * @param values Parameter values for executing the method.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- public void runMethod(Method method, Object obj, Vector values) throws ResourceException{
- try {
- Class[] parameters = method.getParameterTypes();
- if (values.size() != parameters.length) {
- return;
- }
- Object[] actualValues = new Object[parameters.length];
- for (int i =0; i<parameters.length ; i++) {
- String val = (String) values.get(i);
- if (val.trim().equals("NULL")) {
- actualValues[i] = null;
- } else {
- actualValues[i] = convertType(parameters[i], val);
- }
- }
- method.invoke(obj, actualValues);
- }catch (IllegalAccessException iae) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", iae);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- } catch (IllegalArgumentException ie) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ie);
- throw new ResourceException("Arguments are wrong for the method :" + method.getName());
- } catch (InvocationTargetException ite) {
- _logger.log(Level.SEVERE, "jdbc.exc_jb_val", ite);
- throw new ResourceException("Access denied to execute the method :" + method.getName());
- }
- }
-
- /**
- * Converts the type from String to the Class type.
- *
- * @param type Class name to which the conversion is required.
- * @param parameter String value to be converted.
- * @return Converted value.
- * @throws <code>ResourceException</code>, in case of the mismatch of parameter values or
- * a security violation.
- */
- private Object convertType(Class type, String parameter) throws ResourceException{
- try {
- String typeName = type.getName();
- if ( typeName.equals("java.lang.String") || typeName.equals("java.lang.Object")) {
- return parameter;
- }
-
- if (typeName.equals("int") || typeName.equals("java.lang.Integer")) {
- return new Integer(parameter);
- }
-
- if (typeName.equals("short") || typeName.equals("java.lang.Short")) {
- return new Short(parameter);
- }
-
- if (typeName.equals("byte") || typeName.equals("java.lang.Byte")) {
- return new Byte(parameter);
- }
-
- if (typeName.equals("long") || typeName.equals("java.lang.Long")) {
- return new Long(parameter);
- }
-
- if (typeName.equals("float") || typeName.equals("java.lang.Float")) {
- return new Float(parameter);
- }
-
- if (typeName.equals("double") || typeName.equals("java.lang.Double")) {
- return new Double(parameter);
- }
-
- if (typeName.equals("java.math.BigDecimal")) {
- return new java.math.BigDecimal(parameter);
- }
-
- if (typeName.equals("java.math.BigInteger")) {
- return new java.math.BigInteger(parameter);
- }
-
- if (typeName.equals("boolean") || typeName.equals("java.lang.Boolean")) {
- return new Boolean(parameter);
- }
-
- return parameter;
- } catch (NumberFormatException nfe) {
- _logger.log(Level.SEVERE, "jdbc.exc_nfe", parameter);
- throw new ResourceException(parameter+": Not a valid value for this method ");
- }
- }
-
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/SecurityUtils.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/SecurityUtils.java
deleted file mode 100644
index bed9dd7..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/SecurityUtils.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.jdbcra.util;
-
-import javax.security.auth.Subject;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import jakarta.resource.spi.security.PasswordCredential;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.*;
-import com.sun.jdbcra.spi.ConnectionRequestInfo;
-import java.util.Set;
-import java.util.Iterator;
-
-/**
- * SecurityUtils for Generic JDBC Connector.
- *
- * @version 1.0, 02/07/22
- * @author Evani Sai Surya Kiran
- */
-public class SecurityUtils {
-
- /**
- * This method returns the <code>PasswordCredential</code> object, given
- * the <code>ManagedConnectionFactory</code>, subject and the
- * <code>ConnectionRequestInfo</code>. It first checks if the
- * <code>ConnectionRequestInfo</code> is null or not. If it is not null,
- * it constructs a <code>PasswordCredential</code> object with
- * the user and password fields from the <code>ConnectionRequestInfo</code> and returns this
- * <code>PasswordCredential</code> object. If the <code>ConnectionRequestInfo</code>
- * is null, it retrieves the <code>PasswordCredential</code> objects from
- * the <code>Subject</code> parameter and returns the first
- * <code>PasswordCredential</code> object which contains a
- * <code>ManagedConnectionFactory</code>, instance equivalent
- * to the <code>ManagedConnectionFactory</code>, parameter.
- *
- * @param mcf <code>ManagedConnectionFactory</code>
- * @param subject <code>Subject</code>
- * @param info <code>ConnectionRequestInfo</code>
- * @return <code>PasswordCredential</code>
- * @throws <code>ResourceException</code> generic exception if operation fails
- * @throws <code>SecurityException</code> if access to the <code>Subject</code> instance is denied
- */
- public static PasswordCredential getPasswordCredential(final ManagedConnectionFactory mcf,
- final Subject subject, jakarta.resource.spi.ConnectionRequestInfo info) throws ResourceException {
-
- if (info == null) {
- if (subject == null) {
- return null;
- } else {
- PasswordCredential pc = (PasswordCredential) AccessController.doPrivileged
- (new PrivilegedAction() {
- public Object run() {
- Set passwdCredentialSet = subject.getPrivateCredentials(PasswordCredential.class);
- Iterator iter = passwdCredentialSet.iterator();
- while (iter.hasNext()) {
- PasswordCredential temp = (PasswordCredential) iter.next();
- if (temp.getManagedConnectionFactory().equals(mcf)) {
- return temp;
- }
- }
- return null;
- }
- });
- if (pc == null) {
- throw new jakarta.resource.spi.SecurityException("No PasswordCredential found");
- } else {
- return pc;
- }
- }
- } else {
- com.sun.jdbcra.spi.ConnectionRequestInfo cxReqInfo = (com.sun.jdbcra.spi.ConnectionRequestInfo) info;
- PasswordCredential pc = new PasswordCredential(cxReqInfo.getUser(), cxReqInfo.getPassword().toCharArray());
- pc.setManagedConnectionFactory(mcf);
- return pc;
- }
- }
-
- /**
- * Returns true if two strings are equal; false otherwise
- *
- * @param str1 <code>String</code>
- * @param str2 <code>String</code>
- * @return true if the two strings are equal
- * false otherwise
- */
- static private boolean isEqual(String str1, String str2) {
- if (str1 == null) {
- return (str2 == null);
- } else {
- return str1.equals(str2);
- }
- }
-
- /**
- * Returns true if two <code>PasswordCredential</code> objects are equal; false otherwise
- *
- * @param pC1 <code>PasswordCredential</code>
- * @param pC2 <code>PasswordCredential</code>
- * @return true if the two PasswordCredentials are equal
- * false otherwise
- */
- static public boolean isPasswordCredentialEqual(PasswordCredential pC1, PasswordCredential pC2) {
- if (pC1 == pC2)
- return true;
- if(pC1 == null || pC2 == null)
- return (pC1 == pC2);
- if (!isEqual(pC1.getUserName(), pC2.getUserName())) {
- return false;
- }
- String p1 = null;
- String p2 = null;
- if (pC1.getPassword() != null) {
- p1 = new String(pC1.getPassword());
- }
- if (pC2.getPassword() != null) {
- p2 = new String(pC2.getPassword());
- }
- return (isEqual(p1, p2));
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/build.xml
deleted file mode 100644
index f060e7d..0000000
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ra/src/com/sun/jdbcra/util/build.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jdbc_connector" basedir="." default="build">
- <property name="pkg.dir" value="com/sun/gjc/util"/>
-
- <target name="clean">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="clean"/>
- </target>
-
- <target name="compile">
- <ant antfile="build.xml" dir="${gjc.home}/bin" target="compile"/>
- </target>
-
- <target name="package">
- <mkdir dir="${dist.dir}/${pkg.dir}"/>
- <jar jarfile="${dist.dir}/${pkg.dir}/util.jar" basedir="${class.dir}"
- includes="${pkg.dir}/**/*"/>
- </target>
-
- <target name="compile13" depends="compile"/>
- <target name="compile14" depends="compile"/>
-
- <target name="package13" depends="package"/>
- <target name="package14" depends="package"/>
-
- <target name="build13" depends="compile13, package13"/>
- <target name="build14" depends="compile14, package14"/>
-
- <target name="build" depends="build13, build14"/>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/rar/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/rar/META-INF/ra.xml
index 5959ba7..f0ab81a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/rar/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/rar/META-INF/ra.xml
@@ -2,6 +2,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,11 +18,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<description>1.5 validation test</description>
<display-name>Simple Resource Adapter</display-name>
<icon>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/META-INF/ra.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/META-INF/ra.xml
index f32f21d..e6f1bb1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/META-INF/ra.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ra/META-INF/ra.xml
@@ -1,6 +1,7 @@
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,12 +17,13 @@
-->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
-
+<connector xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd"
+ version="2.0"
+>
<description>Generic ResourceAdapter</description>
<display-name>Generic ResourceAdapter</display-name>
diff --git a/appserver/tests/appserv-tests/lib/README b/appserver/tests/appserv-tests/lib/README
index 0396a35..8973672 100644
--- a/appserver/tests/appserv-tests/lib/README
+++ b/appserver/tests/appserv-tests/lib/README
@@ -1 +1,4 @@
-SampleExternalMethods.class file is the class containig the code for stored procedures for Pointbase. It is generated by Connector:cci test. Due to harness constraints, we copied the class file into the lib directory and included it in the db.classpath variable, defined in config/properties.xml
+SampleExternalMethods.class file is the class containig the code for stored procedures for Pointbase.
+It is generated by Connector:cci test.
+Due to harness constraints, we copied the class file into the lib directory and included it
+in the db.classpath variable, defined in config/properties.xml
diff --git a/appserver/tests/appserv-tests/pom.xml b/appserver/tests/appserv-tests/pom.xml
new file mode 100644
index 0000000..2043cc4
--- /dev/null
+++ b/appserver/tests/appserv-tests/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.glassfish.main.tests</groupId>
+ <artifactId>tests</artifactId>
+ <version>6.2.5-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>ant-tests</artifactId>
+ <packaging>pom</packaging>
+ <name>GlassFish Ant Tests</name>
+
+ <modules>
+ <module>cciblackbox-tx</module>
+ <module>connectors-ra-redeploy</module>
+ </modules>
+</project>
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx.jar b/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx.jar
deleted file mode 100644
index 730b04d..0000000
--- a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx.jar
+++ /dev/null
Binary files differ
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnection.java b/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnection.java
deleted file mode 100644
index 230f184..0000000
--- a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciConnection.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.connector.cciblackbox;
-
-import java.sql.SQLException;
-
-import javax.naming.Context;
-import jakarta.resource.NotSupportedException;
-import jakarta.resource.ResourceException;
-import jakarta.resource.cci.ConnectionMetaData;
-import jakarta.resource.cci.Interaction;
-import jakarta.resource.cci.ResultSetInfo;
-import jakarta.resource.spi.ConnectionEvent;
-import jakarta.resource.spi.IllegalStateException;
-import javax.rmi.PortableRemoteObject;
-
-import wlstest.functional.connector.common.apps.ejb.test_proxy.ConnectorTest;
-import weblogic.jndi.Environment;
-
-/**
- * This implementation class represents an application level connection
- *handle that is used by a component to access an EIS instance.
- *
- * @author Sheetal Vartak
- */
-public class CciConnection implements jakarta.resource.cci.Connection {
-
- private boolean destroyed;
-
- private CciManagedConnection mc;
-
- // if mc is null, means connection is invalid
-
- CciConnection(CciManagedConnection mc) {
- this.mc = mc;
- }
-
- CciManagedConnection getManagedConnection() {
- return mc;
- }
-
- public Interaction createInteraction() throws ResourceException {
- return new CciSQLInteraction(this);
- }
-
- public jakarta.resource.cci.LocalTransaction getLocalTransaction() throws ResourceException {
- try {
- java.sql.Connection con = getJdbcConnection();
- if (con.getTransactionIsolation() == con.TRANSACTION_NONE) {
- throw new ResourceException("Local Transaction not supported!!");
- }
- }
- catch (Exception e) {
- throw new ResourceException(e.getMessage());
- }
- return new CciLocalTransactionImpl(mc);
- }
-
- public void setAutoCommit(boolean autoCommit) throws ResourceException {
-
- try {
- java.sql.Connection con = getJdbcConnection();
- if (con.getTransactionIsolation() == con.TRANSACTION_NONE) {
- throw new ResourceException("Local Transaction not " + "supported!!");
- }
- con.setAutoCommit(autoCommit);
- }
- catch (Exception e) {
- throw new ResourceException(e.getMessage());
- }
- }
-
- public boolean getAutoCommit() throws ResourceException {
-
- boolean val = false;
- try {
- java.sql.Connection con = getJdbcConnection();
- if (con.getTransactionIsolation() == con.TRANSACTION_NONE) {
- throw new ResourceException("Local Transaction not " + "supported!!");
- }
- val = con.getAutoCommit();
- }
- catch (SQLException e) {
- throw new ResourceException(e.getMessage());
- }
- return val;
- }
-
- public ResultSetInfo getResultSetInfo() throws ResourceException {
- throw new NotSupportedException("ResultSet is not supported.");
- }
-
- public void close() throws ResourceException {
- if (mc == null) return; // already be closed
- mc.removeCciConnection(this);
- mc.sendEvent(ConnectionEvent.CONNECTION_CLOSED, null, this);
- mc = null;
- }
-
- public ConnectionMetaData getMetaData() throws ResourceException {
- return new CciConnectionMetaDataImpl(mc);
- }
-
- void associateConnection(CciManagedConnection newMc) throws ResourceException {
-
- try {
- checkIfValid();
- }
- catch (ResourceException ex) {
- throw new IllegalStateException("Connection is invalid");
- }
- // dissociate handle with current managed connection
- mc.removeCciConnection(this);
- // associate handle with new managed connection
- newMc.addCciConnection(this);
- mc = newMc;
- }
-
- void checkIfValid() throws ResourceException {
- if (mc == null) {
- throw new ResourceException("Connection is invalid");
- }
- }
-
- java.sql.Connection getJdbcConnection() throws SQLException {
-
- java.sql.Connection con = null;
- try {
- checkIfValid();
- // mc.getJdbcConnection() returns a SQL connection object
- con = mc.getJdbcConnection();
- }
- catch (ResourceException ex) {
- throw new SQLException("Connection is invalid.");
- }
- return con;
- }
-
- void invalidate() {
- mc = null;
- }
-
- private void checkIfDestroyed() throws ResourceException {
- if (destroyed) {
- throw new IllegalStateException("Managed connection is closed");
- }
- }
-
- class Internal {
- public Object narrow(Object ref, Class c) {
- return PortableRemoteObject.narrow(ref, c);
- }
- }
-
- public boolean calcMultiply(String serverUrl, String testUser, String testPassword,
- String testJndiName, int num1, int num2) {
-
- Context ctx = null;
- ConnectorTest connectorTest = null;
- Environment env = null;
- boolean result;
- try {
- System.out.println("### calcMultiply");
- env = new Environment();
- env.setProviderUrl(serverUrl);
- env.setSecurityPrincipal(testUser);
- env.setSecurityCredentials(testPassword);
- ctx = env.getInitialContext();
- System.out.println("Lookup for " + testJndiName);
- connectorTest = (ConnectorTest) ctx.lookup(testJndiName);
- //Internal intenalRef = new Internal();
- System.out.println("ConnectorTest is " + connectorTest);
- //ConnectorTest connectorTestRemote = (ConnectorTest) intenalRef.narrow(connectorTestHome.create(), ConnectorTest.class);
- if (connectorTest.calcMultiply(num1, num2) == (num1 * num2)) {
- result = true;
- } else {
- result = false;
- }
- }
- catch (Exception e) {
-
- result = false;
- System.out.println("Exception in calcMultiply ");
- e.printStackTrace();
- }
- return result;
- }
-}
diff --git a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciManagedConnectionFactory.java b/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciManagedConnectionFactory.java
deleted file mode 100644
index eafb320..0000000
--- a/appserver/tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx/com/sun/connector/cciblackbox/CciManagedConnectionFactory.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.connector.cciblackbox;
-
-//import weblogic.jdbc.common.internal.XAConnectionEnvFactory;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.Set;
-import javax.naming.Context;
-import jakarta.resource.NotSupportedException;
-import jakarta.resource.ResourceException;
-import jakarta.resource.spi.*;
-import jakarta.resource.spi.security.PasswordCredential;
-import javax.security.auth.Subject;
-import javax.sql.XAConnection;
-import javax.sql.XADataSource;
-import wlstest.functional.connector.common.utils.server.Logger;
-
-
-/**
- * An object of this class is a factory of both ManagedConnection and
- * connection factory instances.
- * This class supports connection pooling by defining methods for
- * matching and creating connections.
- * @author Sheetal Vartak
- */
-public class CciManagedConnectionFactory implements ManagedConnectionFactory, Serializable {
-
- private String XADataSourceName;
- private String url;
-
- transient private Context ic;
-
- public CciManagedConnectionFactory() {
- }
-
- public Object createConnectionFactory(ConnectionManager cxManager) throws ResourceException {
- return new CciConnectionFactory(this, cxManager);
- }
-
- public Object createConnectionFactory() throws ResourceException {
- return new CciConnectionFactory(this, null);
- }
-
- public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo info)
- throws ResourceException {
-
- try {
- XAConnection xacon = null;
- String userName = null;
- PasswordCredential pc = Util.getPasswordCredential(this, subject, info);
- if (pc == null) {
- xacon = getXADataSource().getXAConnection();
- } else {
- userName = pc.getUserName();
- xacon = getXADataSource().getXAConnection(userName, new String(pc.getPassword()));
- }
- Connection con = xacon.getConnection();
- return new CciManagedConnection(this, pc, xacon, con, true, true);
- }
- catch (SQLException ex) {
- ResourceException re = new EISSystemException("SQLException: " + ex.getMessage());
- re.setLinkedException(ex);
- throw re;
- }
-
- }
-
- public ManagedConnection matchManagedConnections(Set connectionSet, Subject subject,
- ConnectionRequestInfo info) throws ResourceException {
-
- PasswordCredential pc = Util.getPasswordCredential(this, subject, info);
- Iterator it = connectionSet.iterator();
- while (it.hasNext()) {
- Object obj = it.next();
- if (obj instanceof CciManagedConnection) {
- CciManagedConnection mc = (CciManagedConnection) obj;
- ManagedConnectionFactory mcf = mc.getManagedConnectionFactory();
- if (Util.isPasswordCredentialEqual(mc.getPasswordCredential(), pc) && mcf.equals(this)) {
- return mc;
- }
- }
- }
- return null;
- }
-
- public void setLogWriter(PrintWriter out) throws ResourceException {
-
- try {
- getXADataSource().setLogWriter(out);
- }
- catch (SQLException ex) {
-
- ResourceException rex = new ResourceException("SQLException");
- rex.setLinkedException(ex);
- throw rex;
- }
- }
-
- public PrintWriter getLogWriter() throws ResourceException {
- try {
- return getXADataSource().getLogWriter();
- }
- catch (SQLException ex) {
-
- ResourceException rex = new ResourceException("SQLException");
- rex.setLinkedException(ex);
- throw rex;
- }
- }
-
- public String getXADataSourceName() {
- return XADataSourceName;
- }
-
- public void setXADataSourceName(String XADataSourceName) {
- this.XADataSourceName = XADataSourceName;
- }
-
- public String getConnectionURL(){
- return url;
- }
-
- public void setConnectionURL(String connectionURL){
- this.url = connectionURL;
- }
-
- public XADataSource getXADataSource() throws ResourceException {
- try {
- String jdbcType = url.trim().substring(0, url.indexOf("//")).toLowerCase() ;
- if(jdbcType.contains("derby"))
- return getDerbyXADataSource();
- else if(jdbcType.contains("oracle"))
- return getOraXADataSource();
- else
- throw new NotSupportedException("Current flex mcf only support oracle & derby EIS simulation.");
- } catch (SQLException ex) {
- Logger.info("catch sql exception while exe getXADataSource()", ex);
- throw new ResourceException("catch sql exception while exe getXADataSource()", ex);
- }
- }
-
- private XADataSource getDerbyXADataSource() throws SQLException{
- String urltrim = url.trim().substring(url.indexOf("//") + 2);
- String host = urltrim.substring(0, urltrim.indexOf(":"));
- String port = urltrim.substring(urltrim.indexOf(":") + 1, urltrim.indexOf("/"));
- // String dbname = urltrim.substring(urltrim.indexOf("/")+1);
- String dbname = XADataSourceName + ";create=true;autocommit=false";
- Logger.info("getDerbyXADataSource() for host:" + host + ";port:" + port + ";dbname:" + dbname);
-
- Object ds = loadAndInstantiateClass("org.apache.derby.jdbc.ClientXADataSource");
- invokeMethod(ds, "setServerName", new Object[]{host});
- invokeMethod(ds, "setPortNumber", new Object[]{new Integer(port)});
- invokeMethod(ds, "setDatabaseName", new Object[]{dbname});
-
- return (XADataSource) ds;
- }
-
- private XADataSource getOraXADataSource() throws SQLException{
- Object ds = loadAndInstantiateClass("oracle.jdbc.xa.client.OracleXADataSource");
- invokeMethod(ds, "setURL", new Object[]{url});
- return (XADataSource)ds;
- }
-
- private Object loadAndInstantiateClass(String className){
- try {
- Class cls = Class.forName(className);
- Object obj = cls.newInstance();
- Logger.info("JDBC Driver Loaded and instantiated " + className + ".");
- return obj;
-
- } catch (InstantiationException | IllegalAccessException ex) {
- Logger.info("catch exception while instantiate class with non-param constructor: "+className, ex);
- }
- catch (ClassNotFoundException ex) {
- Logger.info("could not find class: "+className, ex);
- }
-
- return null;
- }
-
- private Object invokeMethod(Object obj, String methodName, Object[] args){
- Method methodToInvoke = null;
- Object ret = null;
- Method methods[] = obj.getClass().getMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methodName != null && methodName.equals(methods[i].getName())) {
- methodToInvoke = methods[i];
- break;
- }
- }
-
- if (methodToInvoke != null) {
- try {
- Logger.info("Found method " + methodName + ".");
-
- ret = methodToInvoke.invoke(obj, args);
- Logger.info("Invoked method " + methodName + ".");
- return ret;
- } catch (Exception ex) {
- Logger.info("catch exception while invoking method: " + methodName + " of obj: " + obj, ex);
- }
- } else {
- Logger.info("Unable to find method \"" + methodName + "\" in class \"" + obj + "\". Check to see if the method exists and that it is defined as public.");
- }
- return ret;
- }
-
- public static String throwable2StackTrace(Throwable throwable) {
- if (throwable == null) throwable = new Throwable(
- "[Null exception passed, creating stack trace for offending caller]");
- ByteArrayOutputStream bytearrayoutputstream = new ByteArrayOutputStream();
- throwable.printStackTrace(new PrintStream(bytearrayoutputstream));
- return bytearrayoutputstream.toString();
- }
-
- public boolean equals(Object obj) {
- if (obj == null) return false;
- if (obj instanceof CciManagedConnectionFactory) {
- String v1 = ((CciManagedConnectionFactory) obj).XADataSourceName;
- String v2 = this.XADataSourceName;
- return (v1 == null) ? (v2 == null) : (v1.equals(v2));
- } else {
- return false;
- }
- }
-
- public int hashCode() {
- if (XADataSourceName == null) {
- return (new String("")).hashCode();
- } else {
- return XADataSourceName.hashCode();
- }
- }
-}
diff --git a/appserver/tests/pom.xml b/appserver/tests/pom.xml
index 527998f..8611342 100755
--- a/appserver/tests/pom.xml
+++ b/appserver/tests/pom.xml
@@ -119,6 +119,7 @@
</activation>
<modules>
<module>tck</module>
+ <module>appserv-tests</module>
</modules>
</profile>
<profile>
@@ -127,11 +128,16 @@
</profile>
<profile>
<id>fastest</id>
- <modules />
+ <modules>
+ <!-- Compile dependencies -->
+ <module>appserv-tests</module>
+ </modules>
</profile>
<profile>
<id>fast</id>
- <modules />
+ <modules>
+ <module>appserv-tests</module>
+ </modules>
</profile>
</profiles>
</project>
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/build.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/build.xml
index 482be85..d3ef170 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/build.xml
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/build.xml
@@ -202,7 +202,7 @@
<target name="create-rar">
<copy file="descriptor/ra.xml" tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
- <copy file="${env.APS_HOME}/sqetests/connector/lib/cciblackbox-tx.jar" tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
+ <copy file="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar" tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
<replace file="${assemble.dir}/rar/META-INF/ra.xml" token="DBURL" value="${db.url}"/>
</target>
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/build.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/build.xml
index 433ef43..b979aa0 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/build.xml
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/build.xml
@@ -213,7 +213,7 @@
<target name="create-rar">
<copy file="descriptor/ra.xml"
tofile="${assemble.dir}/rar/META-INF/ra.xml"/>
- <copy file="${env.APS_HOME}/sqetests/connector/lib/cciblackbox-tx.jar"
+ <copy file="${env.APS_HOME}/cciblackbox-tx/target/cciblackbox-tx.jar"
tofile="${assemble.dir}/rar/cciblackbox-tx.jar"/>
<replace file="${assemble.dir}/rar/META-INF/ra.xml"
token="DBURL" value="${db.url}"/>
diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx.jar b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx.jar
deleted file mode 100644
index 730b04d..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/lib/cciblackbox-tx.jar
+++ /dev/null
Binary files differ
