From 0f87c645faed4253a9eaf875cbf3467c614a8bcb Mon Sep 17 00:00:00 2001 From: Brian Decker Date: Fri, 10 May 2024 16:50:33 -0500 Subject: [PATCH] Fix EJB 2.x Refactor --- .../ejb/bb/argsemantics/TestLogic.java | 186 +++++++++++ .../tests/common/vehicle/ejb/EJBVehicle.java | 2 + .../mdb/ejblink/casesens/CaseBeanEJB.java | 4 +- .../ee/deploy/mdb/ejblink/casesens/build.xml | 4 +- .../mdb/ejblink/casesensT/CaseBeanEJB.java | 4 +- .../ee/deploy/mdb/ejblink/casesensT/build.xml | 4 +- .../mdb/ejblink/scope/ReferencedBean2EJB.java | 4 +- .../mdb/ejblink/scope/ReferencedBeanEJB.java | 4 +- .../ejb/ee/deploy/mdb/ejblink/scope/build.xml | 6 +- .../ejblink/scopeT/ReferencedBean2EJB.java | 4 +- .../mdb/ejblink/scopeT/ReferencedBeanEJB.java | 4 +- .../ee/deploy/mdb/ejblink/scopeT/build.xml | 6 +- .../ee/deploy/mdb/ejblink/single/MsgBean.java | 2 +- .../ee/deploy/mdb/ejblink/single/build.xml | 12 +- .../ejb_depMdbQ_ejblink_single_jar1_ejb.xml | 28 +- .../ejb_depMdbQ_ejblink_single_jar2_ejb.xml | 12 +- .../deploy/mdb/ejblink/singleT/MsgBean.java | 2 +- .../ee/deploy/mdb/ejblink/singleT/build.xml | 12 +- .../ejb_depMdbT_ejblink_single_jar1_ejb.xml | 28 +- .../ejb_depMdbT_ejblink_single_jar2_ejb.xml | 12 +- .../mdb/ejbref/casesens/CaseBeanEJB.java | 4 +- .../ee/deploy/mdb/ejbref/casesens/build.xml | 4 +- .../mdb/ejbref/casesensT/CaseBeanEJB.java | 4 +- .../ee/deploy/mdb/ejbref/casesensT/build.xml | 4 +- .../mdb/ejbref/scope/ReferencedBeanEJB.java | 4 +- .../ejb/ee/deploy/mdb/ejbref/scope/build.xml | 6 +- .../mdb/ejbref/scopeT/ReferencedBeanEJB.java | 4 +- .../ejb/ee/deploy/mdb/ejbref/scopeT/build.xml | 6 +- .../ee/deploy/mdb/ejbref/single/MsgBean.java | 2 +- .../ejb/ee/deploy/mdb/ejbref/single/build.xml | 12 +- .../ejb_depMdbQ_ejbref_single_jar1_ejb.xml | 28 +- .../ejb_depMdbQ_ejbref_single_jar2_ejb.xml | 12 +- .../ee/deploy/mdb/ejbref/singleT/MsgBean.java | 2 +- .../ee/deploy/mdb/ejbref/singleT/build.xml | 12 +- .../ejb_depMdbT_ejbref_single_jar1_ejb.xml | 28 +- .../ejb_depMdbT_ejbref_single_jar2_ejb.xml | 12 +- .../deploy/mdb/enventry/casesens/MsgBean.java | 4 +- .../ee/deploy/mdb/enventry/casesens/build.xml | 4 +- .../mdb/enventry/casesensT/MsgBean.java | 4 +- .../deploy/mdb/enventry/casesensT/build.xml | 4 +- .../ee/deploy/mdb/enventry/scope/MsgBean.java | 4 +- .../ee/deploy/mdb/enventry/scope/build.xml | 8 +- .../deploy/mdb/enventry/scopeT/MsgBean.java | 4 +- .../ee/deploy/mdb/enventry/scopeT/build.xml | 8 +- .../deploy/mdb/enventry/single/MsgBean.java | 4 +- .../ee/deploy/mdb/enventry/single/build.xml | 4 +- .../deploy/mdb/enventry/singleT/MsgBean.java | 4 +- .../ee/deploy/mdb/enventry/singleT/build.xml | 4 +- .../ee/deploy/mdb/resref/single/MsgBean.java | 4 +- .../ejb/ee/deploy/mdb/resref/single/build.xml | 6 +- .../ee/deploy/mdb/resref/singleT/MsgBean.java | 4 +- .../ee/deploy/mdb/resref/singleT/build.xml | 6 +- .../ejblink/casesens/CaseBeanEJB.java | 4 +- .../stateful/ejblink/casesens/build.xml | 4 +- .../ejblink/scope/ReferencedBean2EJB.java | 4 +- .../ejblink/scope/ReferencedBeanEJB.java | 4 +- .../session/stateful/ejblink/scope/build.xml | 6 +- .../stateful/ejblink/single/TestBeanEJB.java | 2 +- .../session/stateful/ejblink/single/build.xml | 12 +- .../ejb_depSsf_ejblink_single_jar1_ejb.xml | 30 +- .../ejb_depSsf_ejblink_single_jar2_ejb.xml | 12 +- .../stateful/ejbref/casesens/CaseBeanEJB.java | 4 +- .../stateful/ejbref/casesens/build.xml | 4 +- .../ejbref/scope/ReferencedBeanEJB.java | 4 +- .../session/stateful/ejbref/scope/build.xml | 6 +- .../stateful/ejbref/single/TestBeanEJB.java | 2 +- .../session/stateful/ejbref/single/build.xml | 12 +- .../ejb_depSsf_ejbref_single_jar1_ejb.xml | 28 +- .../ejb_depSsf_ejbref_single_jar2_ejb.xml | 12 +- .../enventry/casesens/CaseBeanEJB.java | 4 +- .../stateful/enventry/casesens/build.xml | 4 +- .../stateful/enventry/scope/BeanEJB.java | 4 +- .../session/stateful/enventry/scope/build.xml | 8 +- .../stateful/enventry/single/AllBeanEJB.java | 4 +- .../enventry/single/BooleanBeanEJB.java | 4 +- .../stateful/enventry/single/ByteBeanEJB.java | 4 +- .../stateful/enventry/single/CharBeanEJB.java | 4 +- .../enventry/single/DoubleBeanEJB.java | 4 +- .../enventry/single/FloatBeanEJB.java | 4 +- .../enventry/single/IntegerBeanEJB.java | 4 +- .../stateful/enventry/single/LongBeanEJB.java | 4 +- .../enventry/single/ShortBeanEJB.java | 4 +- .../enventry/single/StringBeanEJB.java | 4 +- .../stateful/enventry/single/build.xml | 4 +- .../stateful/resref/casesens/TestBeanEJB.java | 4 +- .../stateful/resref/casesens/build.xml | 4 +- .../stateful/resref/scope/QueueBeanEJB.java | 4 +- .../stateful/resref/scope/TopicBeanEJB.java | 4 +- .../session/stateful/resref/scope/build.xml | 6 +- .../stateful/resref/single/TestBeanEJB.java | 4 +- .../session/stateful/resref/single/build.xml | 6 +- .../ejblink/casesens/CaseBeanEJB.java | 4 +- .../stateless/ejblink/casesens/build.xml | 4 +- .../ejblink/scope/ReferencedBean2EJB.java | 4 +- .../ejblink/scope/ReferencedBeanEJB.java | 4 +- .../session/stateless/ejblink/scope/build.xml | 6 +- .../stateless/ejblink/single/TestBeanEJB.java | 2 +- .../stateless/ejblink/single/build.xml | 12 +- .../ejb_depSsl_ejblink_single_jar1_ejb.xml | 28 +- .../ejb_depSsl_ejblink_single_jar2_ejb.xml | 12 +- .../ejbref/casesens/CaseBeanEJB.java | 4 +- .../stateless/ejbref/casesens/build.xml | 4 +- .../ejbref/scope/ReferencedBeanEJB.java | 4 +- .../session/stateless/ejbref/scope/build.xml | 6 +- .../stateless/ejbref/single/TestBeanEJB.java | 2 +- .../session/stateless/ejbref/single/build.xml | 12 +- .../ejb_depSsl_ejbref_single_jar1_ejb.xml | 28 +- .../ejb_depSsl_ejbref_single_jar2_ejb.xml | 12 +- .../enventry/casesens/CaseBeanEJB.java | 4 +- .../stateless/enventry/casesens/build.xml | 4 +- .../stateless/enventry/scope/BeanEJB.java | 4 +- .../stateless/enventry/scope/build.xml | 8 +- .../stateless/enventry/single/AllBeanEJB.java | 4 +- .../enventry/single/BooleanBeanEJB.java | 4 +- .../enventry/single/ByteBeanEJB.java | 4 +- .../enventry/single/CharBeanEJB.java | 4 +- .../enventry/single/DoubleBeanEJB.java | 4 +- .../enventry/single/FloatBeanEJB.java | 4 +- .../enventry/single/IntegerBeanEJB.java | 4 +- .../enventry/single/LongBeanEJB.java | 4 +- .../enventry/single/ShortBeanEJB.java | 4 +- .../enventry/single/StringBeanEJB.java | 4 +- .../stateless/enventry/single/build.xml | 4 +- .../resref/casesens/TestBeanEJB.java | 4 +- .../stateless/resref/casesens/build.xml | 4 +- .../stateless/resref/scope/QueueBeanEJB.java | 4 +- .../stateless/resref/scope/TopicBeanEJB.java | 4 +- .../session/stateless/resref/scope/build.xml | 6 +- .../stateless/resref/single/TestBeanEJB.java | 4 +- .../session/stateless/resref/single/build.xml | 6 +- .../sun/ts/tests/ejb/ee/deploy/util/build.xml | 22 ++ .../deploy/util/refbean/StatefulExternal.java | 29 ++ .../util/refbean/StatefulExternalEJB.java | 36 +++ .../util/refbean/StatefulExternalHome.java | 33 ++ .../deploy/util/refbean/StatefulInternal.java | 29 ++ .../util/refbean/StatefulInternalEJB.java | 36 +++ .../util/refbean/StatefulInternalHome.java | 33 ++ .../util/refbean/StatelessExternal.java | 34 +++ .../util/refbean/StatelessExternalEJB.java | 35 +++ .../util/refbean/StatelessExternalHome.java | 32 ++ .../util/refbean/StatelessInternal.java | 34 +++ .../util/refbean/StatelessInternalEJB.java | 35 +++ .../util/refbean/StatelessInternalHome.java | 32 ++ .../ejb/ee/deploy/util/refbean/build.xml | 22 ++ .../tests/ejb/ee/deploy/util/shared/build.xml | 22 ++ .../ee/deploy/util/shared/ejbref/build.xml | 22 ++ .../ejbref/common/ReferencedBeanCode.java | 49 +++ .../util/shared/ejbref/common/build.xml | 22 ++ .../util/shared/ejbref/single/TestCode.java | 159 ++++++++++ .../util/shared/ejbref/single/build.xml | 22 ++ .../ee/deploy/util/shared/enventry/build.xml | 22 ++ .../shared/enventry/casesens/TestCode.java | 77 +++++ .../util/shared/enventry/casesens/build.xml | 22 ++ .../util/shared/enventry/scope/TestCode.java | 61 ++++ .../util/shared/enventry/scope/build.xml | 22 ++ .../util/shared/enventry/single/TestCode.java | 288 ++++++++++++++++++ .../util/shared/enventry/single/build.xml | 22 ++ .../ee/deploy/util/shared/resref/build.xml | 22 ++ .../util/shared/resref/casesens/TestCode.java | 73 +++++ .../util/shared/resref/casesens/build.xml | 22 ++ .../util/shared/resref/scope/QueueCode.java | 62 ++++ .../util/shared/resref/scope/TopicCode.java | 62 ++++ .../deploy/util/shared/resref/scope/build.xml | 22 ++ .../resref/single/ByteArrayDataSource.java | 85 ++++++ .../util/shared/resref/single/TestCode.java | 287 +++++++++++++++++ .../resref/single/appclient/TestCode.java | 126 ++++++++ .../shared/resref/single/appclient/build.xml | 23 ++ .../util/shared/resref/single/build.xml | 22 ++ .../ts/tests/ejb/ee/sec/mdb/MDBClient.java | 2 +- 169 files changed, 2678 insertions(+), 432 deletions(-) create mode 100644 common/src/main/java/com/sun/ts/tests/common/testlogic/ejb/bb/argsemantics/TestLogic.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternal.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternalEJB.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternalHome.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternal.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternalEJB.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternalHome.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternal.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternalEJB.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternalHome.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternal.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternalEJB.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternalHome.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/common/ReferencedBeanCode.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/common/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/single/TestCode.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/single/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/casesens/TestCode.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/casesens/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/scope/TestCode.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/scope/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/single/TestCode.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/single/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/casesens/TestCode.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/casesens/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/QueueCode.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/TopicCode.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/ByteArrayDataSource.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/TestCode.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/appclient/TestCode.java create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/appclient/build.xml create mode 100644 ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/build.xml diff --git a/common/src/main/java/com/sun/ts/tests/common/testlogic/ejb/bb/argsemantics/TestLogic.java b/common/src/main/java/com/sun/ts/tests/common/testlogic/ejb/bb/argsemantics/TestLogic.java new file mode 100644 index 0000000000..9312ac6018 --- /dev/null +++ b/common/src/main/java/com/sun/ts/tests/common/testlogic/ejb/bb/argsemantics/TestLogic.java @@ -0,0 +1,186 @@ +/* + * Copyright (c) 2007, 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.common.testlogic.ejb.bb.argsemantics; + +import java.util.Properties; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.common.ejb.calleebeans.SimpleArgument; +import com.sun.ts.tests.common.ejb.calleebeans.StatefulCallee; +import com.sun.ts.tests.common.ejb.calleebeans.StatefulCalleeHome; +import com.sun.ts.tests.common.ejb.calleebeans.StatefulCalleeLocal; +import com.sun.ts.tests.common.ejb.calleebeans.StatefulCalleeLocalHome; + +public class TestLogic { + + /* + * Names used for Callee beans lookups. + */ + public static final String prefix = "java:comp/env/"; + + public static final String statefulRemoteLookup = prefix + + "ejb/StatefulCalleeRemote"; + + public static final String statefulLocalLookup = prefix + + "ejb/StatefulCalleeLocal"; + + public static final String statefulBiRemoteLookup = prefix + + "ejb/StatefulCalleeBothRemote"; + + public static final String statefulBiLocalLookup = prefix + + "ejb/StatefulCalleeBothLocal"; + + /* + * Expected values for our custom argument. + */ + public static final int initialValue = 12; + + public static final int modifiedValue = 24; + + public static final int modifiedValue2 = 48; + + private static StatefulCallee ssfCalleeBean = null; + + private static StatefulCalleeLocal ssfCalleeLocalBean = null; + + public static boolean testStatefulRemote(TSNamingContext nctx, + Properties props) { + + return testStatefulRemote(statefulRemoteLookup, nctx, props); + } + + public static boolean testStatefulLocal(TSNamingContext nctx, + Properties props) { + + return testStatefulLocal(statefulLocalLookup, nctx, props); + } + + public static boolean testStatefulBoth(TSNamingContext nctx, + Properties props) { + + boolean pass; + + pass = testStatefulRemote(statefulBiRemoteLookup, nctx, props); + pass &= testStatefulLocal(statefulBiLocalLookup, nctx, props); + + return pass; + } + + protected static boolean testStatefulRemote(String lookupName, + TSNamingContext nctx, Properties props) { + + StatefulCalleeHome home; + ssfCalleeBean = null; + SimpleArgument arg; + boolean pass; + + try { + arg = new SimpleArgument(initialValue); + TestUtil.logTrace("[TestLogic] Initial value is " + arg.getValue()); + + TestUtil.logTrace("[TestLogic] Looking up Callee " + lookupName + " ..."); + home = (StatefulCalleeHome) nctx.lookup(lookupName, + StatefulCalleeHome.class); + + ssfCalleeBean = home.create(props, arg); + TestUtil.logTrace("[TestLogic] Value after create is " + arg.getValue()); + + ssfCalleeBean.call(props, arg); + TestUtil.logTrace( + "[TestLogic] Value after business " + "method is " + arg.getValue()); + + pass = (arg.getValue() == initialValue); + if (!pass) { + TestUtil.logErr( + "[TestLogic] Argument has been " + "modified to " + arg.getValue()); + } + } catch (Exception e) { + pass = false; + TestUtil.logErr("[TestLogic] Unexpected exception", e); + } + + return pass; + } + + protected static boolean testStatefulLocal(String lookupName, + TSNamingContext nctx, Properties props) { + + StatefulCalleeLocalHome home; + ssfCalleeLocalBean = null; + SimpleArgument arg; + String msg; + boolean pass; + + try { + arg = new SimpleArgument(initialValue); + TestUtil.logTrace("[TestLogic] Initial value is " + arg.getValue()); + + TestUtil.logTrace("[TestLogic] Looking up Callee " + lookupName + " ..."); + home = (StatefulCalleeLocalHome) nctx.lookup(lookupName); + + ssfCalleeLocalBean = home.create(props, arg); + TestUtil.logTrace("[TestLogic] Value after create is " + arg.getValue()); + pass = (arg.getValue() == modifiedValue); + if (!pass) { + msg = "Expected Argument to be set to " + modifiedValue; + TestUtil.logErr("[TestLogic] " + msg); + throw new Exception(msg); + } + + ssfCalleeLocalBean.call(props, arg); + TestUtil.logTrace( + "[TestLogic] Value after business " + "method is " + arg.getValue()); + + pass = (arg.getValue() == modifiedValue2); + if (!pass) { + TestUtil.logErr("[TestLogic] Expected argument to be " + "set to " + + modifiedValue2); + } + } catch (Exception e) { + pass = false; + TestUtil.logErr("[TestLogic] Unexpected exception", e); + } + + return pass; + } + + public static void cleanUpStatefulBean() { + TestUtil.logTrace("cleanUpStatefulBean"); + try { + if (ssfCalleeBean != null) { + TestUtil.logTrace("cleanUp Session Stateful Remote Callee Bean"); + ssfCalleeBean.remove(); + ssfCalleeBean = null; + } + + if (ssfCalleeLocalBean != null) { + TestUtil.logTrace("cleanUp Session Stateful Local Callee Bean"); + ssfCalleeLocalBean.remove(); + ssfCalleeLocalBean = null; + } + } catch (Exception e) { + TestUtil.logErr( + "Exception caught trying to remove Stateful Session beans", e); + } + } + +} diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/ejb/EJBVehicle.java b/common/src/main/java/com/sun/ts/tests/common/vehicle/ejb/EJBVehicle.java index fb1eeaae3f..a390e0c72a 100644 --- a/common/src/main/java/com/sun/ts/tests/common/vehicle/ejb/EJBVehicle.java +++ b/common/src/main/java/com/sun/ts/tests/common/vehicle/ejb/EJBVehicle.java @@ -27,6 +27,8 @@ import com.sun.ts.lib.harness.RemoteStatus; import com.sun.ts.lib.util.TestUtil; +import jakarta.ejb.EJBException; + public class EJBVehicle { private EETest testObj; diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/mdb/ejblink/casesens/CaseBeanEJB.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/mdb/ejblink/casesens/CaseBeanEJB.java index e30d1ad73f..df9d006bc2 100644 --- a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/mdb/ejblink/casesens/CaseBeanEJB.java +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/mdb/ejblink/casesens/CaseBeanEJB.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2024 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 @@ -19,7 +19,7 @@ */ package com.sun.ts.tests.ejb.ee.deploy.mdb.ejblink.casesens; -import com.sun.ts.tests.assembly.util.shared.ejbref.common.ReferencedBeanCode; +import com.sun.ts.tests.ejb.ee.deploy.util.shared.ejbref.common.ReferencedBeanCode; import com.sun.ts.tests.common.ejb.wrappers.StatelessWrapper; public class CaseBeanEJB extends StatelessWrapper { diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/mdb/ejblink/casesens/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/mdb/ejblink/casesens/build.xml index c72ad745d9..958fbf4045 100644 --- a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/mdb/ejblink/casesens/build.xml +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/mdb/ejblink/casesens/build.xml @@ -1,7 +1,7 @@ + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternal.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternal.java new file mode 100644 index 0000000000..af6f8d2457 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternal.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import java.rmi.RemoteException; + +import jakarta.ejb.EJBObject; + +public interface StatefulExternal extends EJBObject { + public boolean isTestStatefulExternal() throws RemoteException; +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternalEJB.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternalEJB.java new file mode 100644 index 0000000000..ee49437c4a --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternalEJB.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.common.ejb.wrappers.StatefulWrapper; + +public class StatefulExternalEJB extends StatefulWrapper { + + /** + * Method used to identify this bean (only available for this bean). + */ + public boolean isTestStatefulExternal() { + TestUtil.logTrace("StatefulExternal: isTestStatefulExternal()"); + return true; + } + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternalHome.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternalHome.java new file mode 100644 index 0000000000..e7f739d1aa --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulExternalHome.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import java.rmi.RemoteException; +import java.util.Properties; + +import jakarta.ejb.CreateException; +import jakarta.ejb.EJBHome; + +public interface StatefulExternalHome extends EJBHome { + + public StatefulExternal create(Properties p) + throws RemoteException, CreateException; +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternal.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternal.java new file mode 100644 index 0000000000..4b763eeef0 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternal.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import java.rmi.RemoteException; + +import jakarta.ejb.EJBObject; + +public interface StatefulInternal extends EJBObject { + public boolean isTestStatefulInternal() throws RemoteException; +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternalEJB.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternalEJB.java new file mode 100644 index 0000000000..693d5da3ed --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternalEJB.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.common.ejb.wrappers.StatefulWrapper; + +public class StatefulInternalEJB extends StatefulWrapper { + + /** + * Method used to identify this bean (only available for this bean). + */ + public boolean isTestStatefulInternal() { + TestUtil.logTrace("StatefulInternal: isTestStatefulInternal()"); + return true; + } + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternalHome.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternalHome.java new file mode 100644 index 0000000000..a2dc3a4b3f --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatefulInternalHome.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import java.rmi.RemoteException; +import java.util.Properties; + +import jakarta.ejb.CreateException; +import jakarta.ejb.EJBHome; + +public interface StatefulInternalHome extends EJBHome { + + public StatefulInternal create(Properties p) + throws RemoteException, CreateException; +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternal.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternal.java new file mode 100644 index 0000000000..79890f0458 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternal.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import java.rmi.RemoteException; +import java.util.Properties; + +import jakarta.ejb.EJBObject; + +public interface StatelessExternal extends EJBObject { + + public void initLogging(Properties p) throws RemoteException; + + public boolean isTestStatelessExternal() throws RemoteException; + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternalEJB.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternalEJB.java new file mode 100644 index 0000000000..9e0789afea --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternalEJB.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.common.ejb.wrappers.StatelessWrapper; + +public class StatelessExternalEJB extends StatelessWrapper { + + /** + * Method used to identify this bean (only available for this bean). + */ + public boolean isTestStatelessExternal() { + TestUtil.logTrace("StatelessExternal: isTestStatelessExternal()"); + return true; + } +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternalHome.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternalHome.java new file mode 100644 index 0000000000..b6c8153467 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessExternalHome.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import java.rmi.RemoteException; + +import jakarta.ejb.CreateException; +import jakarta.ejb.EJBHome; + +public interface StatelessExternalHome extends EJBHome { + + public StatelessExternal create() throws RemoteException, CreateException; + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternal.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternal.java new file mode 100644 index 0000000000..114dc3a8e2 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternal.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import java.rmi.RemoteException; +import java.util.Properties; + +import jakarta.ejb.EJBObject; + +public interface StatelessInternal extends EJBObject { + + public void initLogging(Properties p) throws RemoteException; + + public boolean isTestStatelessInternal() throws RemoteException; + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternalEJB.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternalEJB.java new file mode 100644 index 0000000000..53a7bc7121 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternalEJB.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.common.ejb.wrappers.StatelessWrapper; + +public class StatelessInternalEJB extends StatelessWrapper { + + /** + * Method used to identify this bean (only available for this bean). + */ + public boolean isTestStatelessInternal() { + TestUtil.logTrace("StatelessInternal: isStatelessInternal()"); + return true; + } +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternalHome.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternalHome.java new file mode 100644 index 0000000000..5489f50c9a --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/StatelessInternalHome.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * $Id$ + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.refbean; + +import java.rmi.RemoteException; + +import jakarta.ejb.CreateException; +import jakarta.ejb.EJBHome; + +public interface StatelessInternalHome extends EJBHome { + + public StatelessInternal create() throws RemoteException, CreateException; + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/build.xml new file mode 100644 index 0000000000..a1b7a73ef2 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/refbean/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/build.xml new file mode 100644 index 0000000000..379eebcd4d --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/build.xml new file mode 100644 index 0000000000..2fde899b3f --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/common/ReferencedBeanCode.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/common/ReferencedBeanCode.java new file mode 100644 index 0000000000..2b043d8e22 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/common/ReferencedBeanCode.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * @(#)ReferencedBeanCode.java 1.8 03/05/16 + */ +package com.sun.ts.tests.ejb.ee.deploy.util.shared.ejbref.common; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; + +import jakarta.ejb.EJBException; + +public class ReferencedBeanCode { + public static final String envEntryName = "java:comp/env/myName"; + + /** + * Method used to identify this bean. Return the value of bean env entry + * called 'myName'. + */ + public static String whoAreYou(TSNamingContext nctx) throws EJBException { + + String name; + + try { + TestUtil.logTrace("CaseBean: whoAreYou()"); + name = (String) nctx.lookup(envEntryName); + TestUtil.logTrace("CaseBean: my name is '" + name + "'"); + } catch (Exception e) { + TestUtil.logErr("CaseBean: Caught exception: " + e, e); + throw new EJBException(e.getMessage()); + } + + return name; + } +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/common/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/common/build.xml new file mode 100644 index 0000000000..55e6dc96eb --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/common/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/single/TestCode.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/single/TestCode.java new file mode 100644 index 0000000000..b7d9b66f9b --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/single/TestCode.java @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * @(#)TestCode.java 1.11 03/05/16 + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.shared.ejbref.single; + +import java.util.Properties; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.ejb.ee.deploy.util.refbean.StatefulExternal; +import com.sun.ts.tests.ejb.ee.deploy.util.refbean.StatefulExternalHome; +import com.sun.ts.tests.ejb.ee.deploy.util.refbean.StatefulInternal; +import com.sun.ts.tests.ejb.ee.deploy.util.refbean.StatefulInternalHome; +import com.sun.ts.tests.ejb.ee.deploy.util.refbean.StatelessExternal; +import com.sun.ts.tests.ejb.ee.deploy.util.refbean.StatelessExternalHome; +import com.sun.ts.tests.ejb.ee.deploy.util.refbean.StatelessInternal; +import com.sun.ts.tests.ejb.ee.deploy.util.refbean.StatelessInternalHome; + +public class TestCode { + + protected static final String prefix = "java:comp/env/ejb/"; + + protected static final String statelessInternalName = prefix + + "StatelessBean_SameJAR"; + + protected static final String statelessExternalName = prefix + + "StatelessBean_ExternalJAR"; + + protected static final String statefulInternalName = prefix + + "StatefulBean_SameJAR"; + + protected static final String statefulExternalName = prefix + + "StatefulBean_ExternalJAR"; + + private static StatefulExternal ssfExternalBeanRef1 = null; + + private static StatefulInternal ssfInternalBeanRef1 = null; + + public static boolean testStatelessInternal(TSNamingContext nctx, + Properties props) { + + StatelessInternalHome home = null; + StatelessInternal bean = null; + boolean pass; + + try { + home = (StatelessInternalHome) nctx.lookup(statelessInternalName, + StatelessInternalHome.class); + bean = home.create(); + bean.initLogging(props); + + pass = bean.isTestStatelessInternal(); + } catch (Exception e) { + TestUtil.logErr("TestBean: Caught exception: " + e, e); + pass = false; + } + + return pass; + } + + public static boolean testStatelessExternal(TSNamingContext nctx, + Properties props) { + + StatelessExternalHome home = null; + StatelessExternal bean = null; + boolean pass; + + try { + home = (StatelessExternalHome) nctx.lookup(statelessExternalName, + StatelessExternalHome.class); + bean = home.create(); + bean.initLogging(props); + pass = bean.isTestStatelessExternal(); + + pass = true; + } catch (Exception e) { + TestUtil.logErr( + "TestBean: Exception in " + "testStatelessExternal(): " + e, e); + pass = false; + } + return pass; + } + + public static boolean testStatefulInternal(TSNamingContext nctx, + Properties props) { + + StatefulInternalHome home = null; + boolean pass; + + try { + home = (StatefulInternalHome) nctx.lookup(statefulInternalName, + StatefulInternalHome.class); + ssfInternalBeanRef1 = home.create(props); + pass = ssfInternalBeanRef1.isTestStatefulInternal(); + + } catch (Exception e) { + TestUtil.logErr("Caught exception: " + e, e); + pass = false; + } + + return pass; + } + + public static boolean testStatefulExternal(TSNamingContext nctx, + Properties props) { + + StatefulExternalHome home = null; + boolean pass; + + try { + home = (StatefulExternalHome) nctx.lookup(statefulExternalName, + StatefulExternalHome.class); + ssfExternalBeanRef1 = home.create(props); + pass = ssfExternalBeanRef1.isTestStatefulExternal(); + } catch (Exception e) { + TestUtil.logErr("TestBean: Got exception: " + e, e); + pass = false; + } + + return pass; + } + + public static void cleanUpStatefulBean() { + TestUtil.logTrace("cleanUpStatefulBean"); + try { + if (ssfInternalBeanRef1 != null) { + TestUtil.logTrace("cleanUp Session StatefulInternal Bean"); + ssfInternalBeanRef1.remove(); + ssfInternalBeanRef1 = null; + } + if (ssfExternalBeanRef1 != null) { + TestUtil.logTrace("cleanUp Session StatefulExternal Bean"); + ssfExternalBeanRef1.remove(); + ssfExternalBeanRef1 = null; + } + } catch (Exception e) { + TestUtil.logErr( + "Exception caught trying to remove Stateful Session beans", e); + } + } + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/single/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/single/build.xml new file mode 100644 index 0000000000..1af23b4b13 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/ejbref/single/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/build.xml new file mode 100644 index 0000000000..f1e045fced --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/casesens/TestCode.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/casesens/TestCode.java new file mode 100644 index 0000000000..bfa932d685 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/casesens/TestCode.java @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * @(#)TestCode.java 1.8 03/05/16 + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.shared.enventry.casesens; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; + +public class TestCode { + + /** Prefix for JNDI lookups */ + public static final String prefix = "java:comp/env/"; + + /* + * Names we use to lookup the two env. entries - differ by case + */ + public static final String entryName1 = prefix + "aloha"; + + public static final String entryName2 = prefix + "Aloha"; + + /* + * Values specified in DD for these env. entries (must be distinct) + */ + public static final String ddValue1 = "Windsurf"; + + public static final String ddValue2 = "windsurf"; + + /** + * Check that two environment entries whose names differ only by case are + * associated with different runtime values (as specified in DD). + */ + public static boolean testCaseSensitivity(TSNamingContext nctx) { + /* Runtime values */ + String value1; + String value2; + + boolean pass; + + try { + TestUtil.logTrace("Looking up '" + entryName1 + "' ..."); + value1 = (String) nctx.lookup(entryName1); + TestUtil.logTrace("Runtime value is '" + value1 + "'"); + + TestUtil.logTrace("Looking up '" + entryName2 + "' ..."); + value2 = (String) nctx.lookup(entryName2); + TestUtil.logTrace("Runtime value is '" + value2 + "'"); + + pass = ddValue1.equals(value1) && ddValue2.equals(value2); + if (!pass) { + TestUtil.logErr(entryName1 + " value should be '" + ddValue1 + "' and " + + entryName2 + " value should " + "be '" + ddValue2 + "' !"); + } + } catch (Exception e) { + TestUtil.logErr("caught exception: " + e, e); + pass = false; + } + + return pass; + } +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/casesens/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/casesens/build.xml new file mode 100644 index 0000000000..0111c1ccfd --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/casesens/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/scope/TestCode.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/scope/TestCode.java new file mode 100644 index 0000000000..20791c72d8 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/scope/TestCode.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * @(#)TestCode.java 1.8 03/05/16 + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.shared.enventry.scope; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; + +public class TestCode { + + /** + * Lookup a String env entry and compare its runtime value with a reference + * value. + * + * @param name + * Name of the env entry to lookup. + * @param ref + * Reference value for this env entry (the one in DD). + * + * @return true if runtime value and reference matches. False otherwise. + */ + public static boolean checkEntry(TSNamingContext nctx, String name, + String ref) { + + String runtimeVal; + boolean pass; + + try { + TestUtil.logTrace("Looking up '" + name + "'"); + runtimeVal = (String) nctx.lookup("java:comp/env/" + name); + TestUtil.logTrace("Runtime value is '" + runtimeVal + "'"); + + pass = runtimeVal.equals(ref); + if (!pass) { + TestUtil.logErr("Expected value was '" + ref + "'"); + } + } catch (Exception e) { + TestUtil.logErr("Caught exception: " + e, e); + pass = false; + } + + return pass; + } +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/scope/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/scope/build.xml new file mode 100644 index 0000000000..64e08bc3af --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/scope/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/single/TestCode.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/single/TestCode.java new file mode 100644 index 0000000000..3a09702280 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/single/TestCode.java @@ -0,0 +1,288 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * @(#)TestCode.java 1.9 03/05/16 + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.shared.enventry.single; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; + +public class TestCode { + /** Prefix for JNDI lookups */ + protected static final String prefix = "java:comp/env/"; + + /* + * Names of the env. entries. + */ + protected static final String charEntryName = prefix + "myChar"; + + protected static final String stringEntryName = prefix + "myString"; + + protected static final String booleanEntryName = prefix + "myBoolean"; + + protected static final String byteEntryName = prefix + "myByte"; + + protected static final String shortEntryName = prefix + "myShort"; + + protected static final String integerEntryName = prefix + "myInteger"; + + protected static final String longEntryName = prefix + "myLong"; + + protected static final String floatEntryName = prefix + "myFloat"; + + protected static final String doubleEntryName = prefix + "myDouble"; + + /* + * Reference values for the environment entries. + */ + protected static final Character charValue = new Character('J'); + + protected static final String stringValue = new String("In vino veritas"); + + protected static final Boolean boolValue = new Boolean("true"); + + protected static final Byte byteValue = new Byte("22"); + + protected static final Short shortValue = new Short("1789"); + + protected static final Integer intValue = new Integer("-1"); + + protected static final Long longValue = new Long("55000000"); + + protected static final Float floatValue = new Float("37.2"); + + protected static final Double doubleValue = new Double("5.5"); + + /** + * Check that runtime value for Character env entry. + */ + public static boolean testCharacterEntry(TSNamingContext nctx) { + boolean pass; + Character value = null; + + try { + TestUtil.logTrace("Looking up env entry '" + charEntryName + "'"); + value = (Character) nctx.lookup(charEntryName); + TestUtil.logTrace("Runtime value is '" + value + "'"); + + pass = charValue.equals(value); + if (!pass) { + TestUtil.logErr("Value should be '" + charValue + "'"); + } + } catch (Exception e) { + TestUtil.logErr("Caught exception: " + e, e); + pass = false; + } + + return pass; + } + + /** + * Check that runtime value for String env entry. + */ + public static boolean testStringEntry(TSNamingContext nctx) { + boolean pass; + String value = null; + + try { + TestUtil.logTrace("Looking up env entry '" + stringEntryName + "'"); + value = (String) nctx.lookup(stringEntryName); + TestUtil.logTrace("Runtime value is '" + value + "'"); + + pass = stringValue.equals(value); + if (!pass) { + TestUtil.logErr("Value should be '" + stringValue + "'"); + } + } catch (Exception e) { + TestUtil.logErr("Caught exception: " + e, e); + pass = false; + } + + return pass; + } + + /** + * Check that runtime value for Boolean env entry. + */ + public static boolean testBooleanEntry(TSNamingContext nctx) { + boolean pass; + Boolean value; + + try { + TestUtil.logTrace("Looking up env entry '" + booleanEntryName + "'"); + value = (Boolean) nctx.lookup(booleanEntryName); + TestUtil.logTrace("Runtime value is '" + value + "'"); + + pass = boolValue.equals(value); + if (!pass) { + TestUtil.logErr("Value should be '" + boolValue + "'"); + } + } catch (Exception e) { + TestUtil.logErr("caught exception: " + e, e); + pass = false; + } + + return pass; + } + + /** + * Check that runtime value for Byte env entry. + */ + public static boolean testByteEntry(TSNamingContext nctx) { + boolean pass; + Byte value; + + try { + TestUtil.logTrace("Looking up env entry '" + byteEntryName + "'"); + value = (Byte) nctx.lookup(byteEntryName); + TestUtil.logTrace("Runtime value is '" + value + "'"); + + pass = byteValue.equals(value); + if (!pass) { + TestUtil.logErr("Value should be '" + byteValue + "'"); + } + } catch (Exception e) { + TestUtil.logErr("caught exception: " + e, e); + pass = false; + } + + return pass; + } + + /** + * Check that runtime value for Short env entry. + */ + public static boolean testShortEntry(TSNamingContext nctx) { + boolean pass; + Short value; + + try { + TestUtil.logTrace("Looking up env entry '" + shortEntryName + "'"); + value = (Short) nctx.lookup(shortEntryName); + TestUtil.logTrace("Runtime value is '" + value + "'"); + + pass = shortValue.equals(value); + if (!pass) { + TestUtil.logErr("Value should be '" + shortValue + "'"); + } + } catch (Exception e) { + TestUtil.logErr("caught exception: " + e, e); + pass = false; + } + + return pass; + } + + /** + * Check that runtime value for Integer env entry. + */ + public static boolean testIntegerEntry(TSNamingContext nctx) { + boolean pass; + Integer value; + + try { + TestUtil.logTrace("Looking up env entry '" + integerEntryName + "'"); + value = (Integer) nctx.lookup(integerEntryName); + TestUtil.logTrace("Runtime value is '" + value + "'"); + + pass = intValue.equals(value); + if (!pass) { + TestUtil.logErr("Value should be '" + intValue + "'"); + } + } catch (Exception e) { + TestUtil.logErr("Caught exception: " + e, e); + pass = false; + } + + return pass; + } + + /** + * Check that runtime value for Long env entry. + */ + public static boolean testLongEntry(TSNamingContext nctx) { + boolean pass; + Long value; + + try { + TestUtil.logTrace("Looking up env entry '" + longEntryName + "'"); + value = (Long) nctx.lookup(longEntryName); + TestUtil.logTrace("Runtime value is '" + value + "'"); + + pass = longValue.equals(value); + if (!pass) { + TestUtil.logErr("Value should be '" + longValue + "'"); + } + } catch (Exception e) { + TestUtil.logErr("caught exception: " + e, e); + pass = false; + } + + return pass; + } + + /** + * Check that runtime value for Float env entry. + */ + public static boolean testFloatEntry(TSNamingContext nctx) { + boolean pass; + Float value; + + try { + TestUtil.logTrace("Looking up env entry '" + floatEntryName + "'"); + value = (Float) nctx.lookup(floatEntryName); + TestUtil.logTrace("Runtime value is '" + value + "'"); + + pass = floatValue.equals(value); + if (!pass) { + TestUtil.logErr("Value should be '" + floatValue + "'"); + } + } catch (Exception e) { + TestUtil.logErr("Caught exception: " + e, e); + pass = false; + } + + return pass; + } + + /** + * Check that runtime value for Double env entry. + */ + public static boolean testDoubleEntry(TSNamingContext nctx) { + boolean pass; + Double value; + + try { + TestUtil.logTrace("Looking up env entry '" + doubleEntryName + "'"); + value = (Double) nctx.lookup(doubleEntryName); + TestUtil.logTrace("Runtime value is '" + value + "'"); + + pass = doubleValue.equals(value); + if (!pass) { + TestUtil.logErr("Value should be '" + doubleValue + "'"); + } + } catch (Exception e) { + TestUtil.logErr("Caught exception: " + e, e); + pass = false; + } + + return pass; + } + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/single/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/single/build.xml new file mode 100644 index 0000000000..e56ce0c8b6 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/enventry/single/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/build.xml new file mode 100644 index 0000000000..b8cb51d44a --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/casesens/TestCode.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/casesens/TestCode.java new file mode 100644 index 0000000000..d5476b3bb0 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/casesens/TestCode.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * @(#)TestCode.java 1.7 03/05/16 + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.shared.resref.casesens; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; + +import jakarta.jms.QueueConnection; +import jakarta.jms.QueueConnectionFactory; +import jakarta.jms.TopicConnection; +import jakarta.jms.TopicConnectionFactory; + +public class TestCode { + + /** Prefix used for JNDI lookups */ + private static final String prefix = "java:comp/env/"; + + /* + * JNDI lookup names for resource manager connection factories. They differ + * only by case. + */ + protected static final String res1Lookup = prefix + "Aloha"; + + protected static final String res2Lookup = prefix + "aloha"; + + public static boolean testCaseSensitivity(TSNamingContext nctx) { + QueueConnectionFactory res1; + TopicConnectionFactory res2; + QueueConnection conn1; + TopicConnection conn2; + boolean pass; + + try { + TestUtil.logTrace("[TestCode] Looking up " + res1Lookup); + res1 = (QueueConnectionFactory) nctx.lookup(res1Lookup); + TestUtil.logTrace("[TestCode] Create QueueConnection"); + conn1 = res1.createQueueConnection(); + conn1.close(); + + TestUtil.logTrace("[TestCode] Looking up " + res2Lookup); + res2 = (TopicConnectionFactory) nctx.lookup(res2Lookup); + TestUtil.logTrace("[TestCode] Create TopicConnection"); + conn2 = res2.createTopicConnection(); + + pass = true; + } catch (Exception e) { + TestUtil.logErr("Caught exception: " + e); + TestUtil.printStackTrace(e); + pass = false; + } + + return pass; + } + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/casesens/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/casesens/build.xml new file mode 100644 index 0000000000..32ed0642c1 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/casesens/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/QueueCode.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/QueueCode.java new file mode 100644 index 0000000000..2c2e6581ac --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/QueueCode.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * @(#)QueueCode.java 1.6 03/05/16 + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.shared.resref.scope; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; + +import jakarta.jms.QueueConnection; +import jakarta.jms.QueueConnectionFactory; + +public class QueueCode { + + /** Prefix used for JNDI lookups */ + private static final String prefix = "java:comp/env/jms/"; + + /* + * JNDI lookup names for resource manager connection factories. They differ + * only by case. + */ + protected static final String resLookup = prefix + "myFactory"; + + public static boolean checkYourQueue(TSNamingContext nctx) { + QueueConnectionFactory res; + QueueConnection conn; + boolean pass; + + try { + TestUtil.logTrace("[QueueCode] Looking up " + resLookup); + res = (QueueConnectionFactory) nctx.lookup(resLookup); + TestUtil.logTrace("[QueueCode] Create QueueConnection"); + conn = res.createQueueConnection(); + conn.close(); + + pass = true; + } catch (Exception e) { + TestUtil.logErr("Caught exception: " + e); + TestUtil.printStackTrace(e); + pass = false; + } + + return pass; + } + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/TopicCode.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/TopicCode.java new file mode 100644 index 0000000000..03d453d58c --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/TopicCode.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * @(#)TopicCode.java 1.6 03/05/16 + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.shared.resref.scope; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; + +import jakarta.jms.TopicConnection; +import jakarta.jms.TopicConnectionFactory; + +public class TopicCode { + + /** Prefix used for JNDI lookups */ + private static final String prefix = "java:comp/env/jms/"; + + /* + * JNDI lookup names for resource manager connection factories. They differ + * only by case. + */ + protected static final String resLookup = prefix + "myFactory"; + + public static boolean checkYourTopic(TSNamingContext nctx) { + TopicConnectionFactory res; + TopicConnection conn; + boolean pass; + + try { + TestUtil.logTrace("[TopicCode] Looking up " + resLookup); + res = (TopicConnectionFactory) nctx.lookup(resLookup); + TestUtil.logTrace("[TopicCode] Create TopicConnection"); + conn = res.createTopicConnection(); + conn.close(); + + pass = true; + } catch (Exception e) { + TestUtil.logErr("Caught exception: " + e); + TestUtil.printStackTrace(e); + pass = false; + } + + return pass; + } + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/build.xml new file mode 100644 index 0000000000..16288db89f --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/scope/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/ByteArrayDataSource.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/ByteArrayDataSource.java new file mode 100644 index 0000000000..68a91cabf9 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/ByteArrayDataSource.java @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * @(#)ByteArrayDataSource.java 1.10 03/05/16 + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.shared.resref.single; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; + +import com.sun.ts.lib.util.TestUtil; + +import jakarta.activation.DataSource; + +class ByteArrayDataSource implements DataSource { + private byte[] data; + + private String type; + + ByteArrayDataSource(InputStream is, String type) { + this.type = type; + try { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + int ch; + + while ((ch = is.read()) != -1) + os.write(ch); + + data = os.toByteArray(); + } catch (IOException ioex) { + TestUtil.printStackTrace(ioex); + } + } + + ByteArrayDataSource(byte[] data, String type) { + this.data = data; + this.type = type; + } + + ByteArrayDataSource(String data, String type) { + try { + this.data = data.getBytes("iso-8859-1"); + } catch (UnsupportedEncodingException uex) { + TestUtil.printStackTrace(uex); + } + this.type = type; + } + + public InputStream getInputStream() throws IOException { + if (data == null) + throw new IOException("no data"); + return new ByteArrayInputStream(data); + } + + public OutputStream getOutputStream() throws IOException { + throw new IOException("cannot do this"); + } + + public String getContentType() { + return type; + } + + public String getName() { + return "dummy"; + } +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/TestCode.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/TestCode.java new file mode 100644 index 0000000000..27443a09c8 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/TestCode.java @@ -0,0 +1,287 @@ +/* + * Copyright (c) 2024 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 + */ + +/* + * @(#)TestCode.java 1.10 03/05/16 + */ + +package com.sun.ts.tests.ejb.ee.deploy.util.shared.resref.single; + +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; +import java.sql.Connection; +import java.util.Date; +import java.util.Properties; + +import javax.sql.DataSource; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; + +import jakarta.activation.DataHandler; +import jakarta.jms.QueueConnectionFactory; +import jakarta.jms.TopicConnectionFactory; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; + +public class TestCode { + + /** Prefix used for JNDI lookups */ + private static final String prefix = "java:comp/env/"; + + /* + * JNDI lookup names for resource manager connection factories. + */ + protected static final String dbLookup = prefix + "jdbc/DB1"; + + protected static final String mailLookup = prefix + "mail/MailSession"; + + protected static final String urlLookup = prefix + "url/URL"; + + protected static final String queueLookup = prefix + + "jms/myQueueConnectionFactory"; + + protected static final String topicLookup = prefix + + "jms/myTopicConnectionFactory"; + + /* + * Hard coded values used to send mail. + */ + protected static final String mailer = "JavaMailer"; + + protected static final String subject = "Test message"; + + protected static final String htmlContents = "This is a test message"; + + public static boolean testDatasource(TSNamingContext nctx) { + DataSource ds; + Connection connection; + + try { + TestUtil.logTrace("[TestCode] looking up " + dbLookup); + ds = (DataSource) nctx.lookup(dbLookup); + TestUtil.logTrace("[TestCode] get a new DB connection..."); + connection = ds.getConnection(); + connection.close(); + } catch (Exception e) { + TestUtil.logErr("RestTest: Caught exception: " + e, e); + return false; + } + + return true; + } + + public static boolean testSession(TSNamingContext nctx) { + String recipient; + Session session; + + if (null == (recipient = getRecipient())) { + TestUtil.logErr("RestTest: Aborting testSession() [setup]"); + return false; + } + + try { + TestUtil.logTrace("[TestCode] looking up " + mailLookup); + session = (Session) nctx.lookup(mailLookup); + TestUtil.logTrace("[TestCode] sendind mail to " + recipient); + Transport.send(compose(session, recipient)); + } catch (Exception e) { + TestUtil.logErr("RestTest: Caught exception: " + e); + TestUtil.printStackTrace(e); + + return false; + } + + return true; + } + + public static boolean testURL(TSNamingContext nctx) { + Properties props; + String resRef; + URL myUrl; + URLConnection urlConnection; + + try { + TestUtil.logTrace("[TestCode] looking up " + urlLookup); + myUrl = (java.net.URL) nctx.lookup(urlLookup); + TestUtil.logTrace("[TestCode] get a new URL connection..."); + urlConnection = myUrl.openConnection(); + + props = TestUtil.getResponseProperties(urlConnection); + resRef = props.getProperty("resourceref"); + + if ((null == resRef) || (!resRef.equals("true"))) { + TestUtil.logErr("ResRef: Invalid connection!"); + return false; + } + } catch (Exception e) { + TestUtil.logErr("RestTest: Caught exception: " + e); + TestUtil.printStackTrace(e); + return false; + } + + return true; + } + + public static boolean testQueue(TSNamingContext nctx) { + QueueConnectionFactory queueFact; + + try { + TestUtil.logTrace("[TestCode] looking up " + queueLookup); + queueFact = (QueueConnectionFactory) nctx.lookup(queueLookup); + } catch (Exception e) { + TestUtil.logErr("RestTest: Caught exception: " + e); + TestUtil.printStackTrace(e); + return false; + } + + return true; + } + + public static boolean testTopic(TSNamingContext nctx) { + TopicConnectionFactory topicFact; + + try { + TestUtil.logTrace("[TestCode] looking up " + topicLookup); + topicFact = (TopicConnectionFactory) nctx.lookup(topicLookup); + } catch (Exception e) { + TestUtil.logErr("RestTest: Caught exception: " + e); + TestUtil.printStackTrace(e); + return false; + } + + return true; + } + + public static boolean testAll(TSNamingContext nctx) { + boolean pass = true; + + try { + pass &= testDatasource(nctx); + pass &= testSession(nctx); + pass &= testURL(nctx); + pass &= testQueue(nctx); + pass &= testTopic(nctx); + } catch (Exception e) { + TestUtil.logErr("ResRef: Caught exception in testAll: " + e); + TestUtil.printStackTrace(e); + return false; + } + + return pass; + } + + public static boolean testAllButDataSource(TSNamingContext nctx) { + boolean pass = true; + + try { + pass &= testSession(nctx); + pass &= testURL(nctx); + pass &= testQueue(nctx); + pass &= testTopic(nctx); + } catch (Exception e) { + TestUtil.logErr("ResRef: Caught exception in testAllButDataSource: " + e); + TestUtil.printStackTrace(e); + return false; + } + + return pass; + } + + /* + * Helper methods. + */ + + /** Get mail recipient address */ + protected static String getRecipient() { + String recipient; + + try { + recipient = TestUtil.getProperty("mailuser1"); + + if ("" == recipient || null == recipient) { + TestUtil.logErr("[TestCode] 'mailuser1' property is " + + ((null == recipient) ? "null" : "empty")); + return null; + } + + TestUtil.logTrace("[TestCode] Sending mail to:" + recipient); + } catch (Exception e) { + TestUtil.logErr("[TestCode] setupMail() failed: " + e, e); + return null; + } + + return recipient; + } + + /** Send a mail to 'recipient', using 'session' object. */ + protected static Message compose(Session session, String recipient) + throws Exception { + + Message msg; + + try { + msg = new MimeMessage(session); + msg.setFrom(); + + msg.setRecipients(Message.RecipientType.TO, + InternetAddress.parse(recipient, false)); + + msg.setSubject(subject); + collect(subject, htmlContents, msg); + msg.setHeader("X-Mailer", mailer); + msg.setSentDate(new Date()); + + } catch (Exception e) { + TestUtil.logErr("[TestCode] Caught exception in compose(): " + e); + TestUtil.printStackTrace(e); + throw new Exception("compose() failed due to " + e); + } + + return msg; + } + + protected static void collect(String subject, String htmlContents, + Message msg) throws MessagingException, IOException { + + String line; + StringBuffer sb = new StringBuffer(); + + sb.append("\n"); + + sb.append("\n"); + sb.append("\n"); + sb.append(subject + "\n"); + sb.append("\n"); + sb.append("\n"); + + sb.append("\n"); + sb.append("

" + subject + "

" + "\n"); + sb.append(htmlContents); + sb.append("\n"); + + sb.append("\n"); + + msg.setDataHandler( + new DataHandler(new ByteArrayDataSource(sb.toString(), "text/html"))); + } + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/appclient/TestCode.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/appclient/TestCode.java new file mode 100644 index 0000000000..ba9e66ce60 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/appclient/TestCode.java @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2024 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.ts.tests.ejb.ee.deploy.util.shared.resref.single.appclient; + +import java.net.URL; +import java.net.URLConnection; +import java.sql.Connection; +import java.util.Properties; + +import javax.sql.DataSource; + +import com.sun.ts.lib.util.TSNamingContext; +import com.sun.ts.lib.util.TestUtil; + +import jakarta.jms.QueueConnectionFactory; +import jakarta.jms.TopicConnectionFactory; + +public class TestCode { + + /** Prefix used for JNDI lookups */ + private static final String prefix = "java:comp/env/"; + + /* + * JNDI lookup names for resource manager connection factories. + */ + protected static final String dbLookup = prefix + "jdbc/DB1"; + + protected static final String urlLookup = prefix + "url/URL"; + + protected static final String queueLookup = prefix + + "jms/myQueueConnectionFactory"; + + protected static final String topicLookup = prefix + + "jms/myTopicConnectionFactory"; + + public static boolean testDatasource(TSNamingContext nctx) { + DataSource ds; + Connection connection; + + try { + TestUtil.logTrace("[TestCode] looking up " + dbLookup); + ds = (DataSource) nctx.lookup(dbLookup); + TestUtil.logTrace("[TestCode] get a new DB connection..."); + connection = ds.getConnection(); + connection.close(); + } catch (Exception e) { + TestUtil.logErr("RestTest: Caught exception: " + e, e); + return false; + } + + return true; + } + + public static boolean testURL(TSNamingContext nctx) { + Properties props; + String resRef; + URL myUrl; + URLConnection urlConnection; + + try { + TestUtil.logTrace("[TestCode] looking up " + urlLookup); + myUrl = (java.net.URL) nctx.lookup(urlLookup); + TestUtil.logTrace("[TestCode] get a new URL connection..."); + urlConnection = myUrl.openConnection(); + + props = TestUtil.getResponseProperties(urlConnection); + resRef = props.getProperty("resourceref"); + + if ((null == resRef) || (!resRef.equals("true"))) { + TestUtil.logErr("ResRef: Invalid connection!"); + return false; + } + } catch (Exception e) { + TestUtil.logErr("RestTest: Caught exception: " + e); + TestUtil.printStackTrace(e); + return false; + } + + return true; + } + + public static boolean testQueue(TSNamingContext nctx) { + QueueConnectionFactory queueFact; + + try { + TestUtil.logTrace("[TestCode] looking up " + queueLookup); + queueFact = (QueueConnectionFactory) nctx.lookup(queueLookup); + } catch (Exception e) { + TestUtil.logErr("RestTest: Caught exception: " + e); + TestUtil.printStackTrace(e); + return false; + } + + return true; + } + + public static boolean testTopic(TSNamingContext nctx) { + TopicConnectionFactory topicFact; + + try { + TestUtil.logTrace("[TestCode] looking up " + topicLookup); + topicFact = (TopicConnectionFactory) nctx.lookup(topicLookup); + } catch (Exception e) { + TestUtil.logErr("RestTest: Caught exception: " + e); + TestUtil.printStackTrace(e); + return false; + } + + return true; + } + +} diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/appclient/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/appclient/build.xml new file mode 100644 index 0000000000..ef3584f950 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/appclient/build.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/build.xml b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/build.xml new file mode 100644 index 0000000000..bdae6b8433 --- /dev/null +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/deploy/util/shared/resref/single/build.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/sec/mdb/MDBClient.java b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/sec/mdb/MDBClient.java index 9fa1c485c1..01a7fb626c 100644 --- a/ejb/src/main/java/com/sun/ts/tests/ejb/ee/sec/mdb/MDBClient.java +++ b/ejb/src/main/java/com/sun/ts/tests/ejb/ee/sec/mdb/MDBClient.java @@ -64,7 +64,7 @@ public void setup(String[] args, Properties p) throws Exception { bmtQ = (Queue) context.lookup("java:comp/env/jms/EJB_SEC_MDB_QUEUE_BMT"); } catch (Exception e) { - throw new Fault("Setup Failed!", e); + throw new Exception("Setup Failed!", e); } } /* Run tests */