Attachment #239478 for bug #407279




/*******************************************************************************
 * Copyright (c) 1998, 2014 Oracle, IBM Corporation and/or its affiliates. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 

 *
 * Contributors:
 *     Oracle - initial API and implementation from Oracle TopLink
 *     Rick Curtis - Add support for WebSphere Liberty
 ******************************************************************************/  
package org.eclipse.persistence.internal.sessions.factories;


import org.eclipse.persistence.internal.sessions.factories.model.platform.WebLogic_9_PlatformConfig;
import org.eclipse.persistence.internal.sessions.factories.model.platform.WebSphere_6_1_PlatformConfig;
import org.eclipse.persistence.internal.sessions.factories.model.platform.WebSphere_7_0_PlatformConfig;
import org.eclipse.persistence.internal.sessions.factories.model.platform.WebSphere_Liberty_Platform_Config;
import org.eclipse.persistence.internal.sessions.factories.model.transport.Oc4jJGroupsTransportManagerConfig;
import org.eclipse.persistence.internal.sessions.factories.model.transport.TransportManagerConfig;


        addDescriptor(buildServerPlatformConfigDescriptorFor(WebLogic_10_PlatformConfig.class));
        addDescriptor(buildServerPlatformConfigDescriptorFor(WebSphere_6_1_PlatformConfig.class));
        addDescriptor(buildServerPlatformConfigDescriptorFor(WebSphere_7_0_PlatformConfig.class));
        addDescriptor(buildServerPlatformConfigDescriptorFor(WebSphere_Liberty_Platform_Config.class));
        
        // 242452 -- add metadata support for XMLLogin's DocumentPreservationPolicy
        addDescriptor(buildDocumentPreservationPolicyConfigDescriptor());

        descriptor.getInheritancePolicy().addClassIndicator(WebLogic_9_PlatformConfig.class, "weblogic-9-platform");
        descriptor.getInheritancePolicy().addClassIndicator(WebLogic_10_PlatformConfig.class, "weblogic-10-platform");
        descriptor.getInheritancePolicy().addClassIndicator(WebSphere_6_1_PlatformConfig.class, "websphere-61-platform");
        descriptor.getInheritancePolicy().addClassIndicator(WebSphere_7_0_PlatformConfig.class, "websphere-7-platform");
        descriptor.getInheritancePolicy().addClassIndicator(WebSphere_Liberty_Platform_Config.class, "websphere-liberty-platform");
        return descriptor;
    }





/*******************************************************************************
 * Copyright (c) 2014 IBM Corporation. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Rick Curtis - Add support for WebSphere Liberty.
 ******************************************************************************/
package org.eclipse.persistence.internal.sessions.factories.model.platform;

public class WebSphere_Liberty_Platform_Config extends ServerPlatformConfig {
    public WebSphere_Liberty_Platform_Config() {
        super("org.eclipse.persistence.platform.server.was.WebSphere_Liberty_Platform");
    }
}




/*******************************************************************************
 * Copyright (c) 2014 IBM Corporation. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Rick Curtis - Add support for WebSphere Liberty.       
 ******************************************************************************/
package org.eclipse.persistence.platform.server.was;

import java.sql.Connection;

import org.eclipse.persistence.logging.SessionLog;
import org.eclipse.persistence.sessions.DatabaseSession;
import org.eclipse.persistence.transaction.was.WebSphereLibertyTransactionController;

/**
 * PUBLIC:
 * 
 * This is the concrete subclass responsible for representing WebSphere-specific server behavior.
 * 
 * This platform has:
 * <ul>
 * <li>WebSphereLibertyTransactionController (JTA integration).
 * </ul>
 */
public class WebSphere_Liberty_Platform extends WebSphere_7_Platform {
    /**
     * INTERNAL: Default Constructor: All behavior for the default constructor is inherited
     */
    public WebSphere_Liberty_Platform(DatabaseSession newDatabaseSession) {
        super(newDatabaseSession);
    }

    /**
     * INTERNAL: getExternalTransactionControllerClass(): Answer the class of external transaction
     * controller to use for WebSphere Liberty. This is read-only.
     * 
     * @return Class externalTransactionControllerClass
     * 
     * @see org.eclipse.persistence.transaction.JTATransactionController
     * @see ServerPlatformBase.isJTAEnabled()
     * @see ServerPlatformBase.disableJTA()
     * @see ServerPlatformBase.initializeExternalTransactionController()
     */
    public Class getExternalTransactionControllerClass() {
        if (externalTransactionControllerClass == null) {
            externalTransactionControllerClass = WebSphereLibertyTransactionController.class;
        }
        return externalTransactionControllerClass;
    }

    /**
     * This method overrides functionality exposed in the base WebSpherePlatform as Liberty doesn't
     * provide the same support.
     */
    @Override
    public Connection unwrapConnection(Connection connection) {
        try {
            return connection.getMetaData().getConnection();
        } catch (java.sql.SQLException e) {
            getAbstractSession().log(SessionLog.WARNING, SessionLog.CONNECTION, "cannot_unwrap_connection", e);
            return connection;
        }
    }
}




/*******************************************************************************
 * Copyright (c) 2014 IBM Corporation. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Rick Curtis - Initial implementation.
 ******************************************************************************/
package org.eclipse.persistence.transaction.was;

public class WebSphereLibertyTransactionController extends WebSphereTransactionController {
    // Class and method to execute to obtain the TransactionManager
    protected final static String TX_MANAGER_FACTORY_CLASS = "com.ibm.tx.jta.TransactionManagerFactory";
    protected final static String TX_MANAGER_FACTORY_METHOD = "getTransactionManager";

    protected String getTxManagerFactoryClass() {
        return this.TX_MANAGER_FACTORY_CLASS;
    }

    protected String getTxManagerFactoryMethod() {
        return TX_MANAGER_FACTORY_METHOD;
    }
}

Lines 1-5 Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/transaction/was/WebSphereTransactionController.java (-6 / +14 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 1998, 2013 Oracle and/or its affiliates. All rights reserved.	2	* Copyright (c) 1998, 2014 Oracle, IBM Corporation and/or its affiliates. All rights reserved.
3	* This program and the accompanying materials are made available under the	3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0	4	* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5	* which accompanies this distribution.	5	* which accompanies this distribution.
Lines 9-14 Link Here
9	*	9	*
10	* Contributors:	10	* Contributors:
11	* Oracle - initial API and implementation from Oracle TopLink	11	* Oracle - initial API and implementation from Oracle TopLink
		12	* Rick Curtis -- Refactor to facilitate adding WebSphereLibertyTransactionController.
12	******************************************************************************/	13	******************************************************************************/
13	package org.eclipse.persistence.transaction.was;	14	package org.eclipse.persistence.transaction.was;
14		15
Lines 43-48 public class WebSphereTransactionController extends JTATransactionController { Link Here
43	super();	44	super();
44	}	45	}
45		46
		47	protected String getTxManagerFactoryClass() {
		48	return TX_MANAGER_FACTORY_CLASS;
		49	}
		50
		51	protected String getTxManagerFactoryMethod() {
		52	return TX_MANAGER_FACTORY_METHOD;
		53	}
		54
46	/**	55	/**
47	* INTERNAL:	56	* INTERNAL:
48	* Obtain and return the JTA TransactionManager on this platform.	57	* Obtain and return the JTA TransactionManager on this platform.
Lines 51-58 public class WebSphereTransactionController extends JTATransactionController { Link Here
51	protected TransactionManager acquireTransactionManager() throws Exception {	60	protected TransactionManager acquireTransactionManager() throws Exception {
52	if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()){	61	if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()){
53	try{	62	try{
54	Class clazz = (Class) AccessController.doPrivileged(new PrivilegedClassForName(TX_MANAGER_FACTORY_CLASS));	63	Class clazz = (Class) AccessController.doPrivileged(new PrivilegedClassForName(getTxManagerFactoryClass()));
55	Method method = AccessController.doPrivileged(new PrivilegedGetMethod(clazz, TX_MANAGER_FACTORY_METHOD, null, false));	64	Method method = AccessController.doPrivileged(new PrivilegedGetMethod(clazz, getTxManagerFactoryMethod(), null, false));
56	return (TransactionManager) AccessController.doPrivileged(new PrivilegedMethodInvoker(method, null, null));	65	return (TransactionManager) AccessController.doPrivileged(new PrivilegedMethodInvoker(method, null, null));
57	}catch (PrivilegedActionException ex){	66	}catch (PrivilegedActionException ex){
58	if (ex.getCause() instanceof ClassNotFoundException){	67	if (ex.getCause() instanceof ClassNotFoundException){
Lines 70-77 public class WebSphereTransactionController extends JTATransactionController { Link Here
70	throw (RuntimeException) ex.getCause();	79	throw (RuntimeException) ex.getCause();
71	}	80	}
72	}else{	81	}else{
73	Class clazz = PrivilegedAccessHelper.getClassForName(TX_MANAGER_FACTORY_CLASS);	82	Class clazz = PrivilegedAccessHelper.getClassForName(getTxManagerFactoryClass());
74	Method method = PrivilegedAccessHelper.getMethod(clazz, TX_MANAGER_FACTORY_METHOD, null, false);	83	Method method = PrivilegedAccessHelper.getMethod(clazz, getTxManagerFactoryMethod(), null, false);
75	return (TransactionManager)PrivilegedAccessHelper.invokeMethod(method, null, null);	84	return (TransactionManager)PrivilegedAccessHelper.invokeMethod(method, null, null);
76	}	85	}
77	}	86	}
78	-

Return to bug 407279

Added Link Here

(-)a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/internal/sessions/factories/model/platform/WebSphere_Liberty_Platform_Config.java (+19 lines)
1	/*******************************************************************************
2	* Copyright (c) 2014 IBM Corporation. All rights reserved.
3	* This program and the accompanying materials are made available under the
4	* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
5	* which accompanies this distribution.
6	* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
7	* and the Eclipse Distribution License is available at
8	* http://www.eclipse.org/org/documents/edl-v10.php.
9	*
10	* Contributors:
11	* Rick Curtis - Add support for WebSphere Liberty.
12	******************************************************************************/
13	package org.eclipse.persistence.internal.sessions.factories.model.platform;
14
15	public class WebSphere_Liberty_Platform_Config extends ServerPlatformConfig {
16	public WebSphere_Liberty_Platform_Config() {
17	super("org.eclipse.persistence.platform.server.was.WebSphere_Liberty_Platform");
18	}
19	}