This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch TOMEE-2324
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/TOMEE-2324 by this push:
new 78b5ae28ba TOMEE-2324 - Remove CORBA
78b5ae28ba is described below
commit 78b5ae28bada42bc82565f98a4c10c1ca0d80733
Author: Richard Zowalla <r...@apache.org>
AuthorDate: Thu Sep 19 19:56:12 2024 +0200
TOMEE-2324 - Remove CORBA
---
.../main/resources/tomee/conf/logging.properties | 2 -
.../main/resources/tomee/conf/logging.properties | 2 -
.../main/resources/tomee/conf/logging.properties | 2 -
.../main/resources/tomee/conf/logging.properties | 2 -
container/openejb-core/pom.xml | 1 -
.../java/org/apache/openejb/util/LogCategory.java | 1 -
.../org.apache.openejb.embedded/service-jar.xml | 1 -
.../resources/log4j.embedded.logging.properties | 1 -
.../resources/log4j.standalone.logging.properties | 2 -
.../service-jar.xml | 1 -
docs/configuring-logging-in-tests.adoc | 2 -
docs/containers-and-resources.adoc | 10 ----
docs/deployment-id.adoc | 46 ----------------
docs/orb-config.adoc | 42 ---------------
.../org/apache/openejb/test/CorbaTestServer.java | 63 ----------------------
server/openejb-client/pom.xml | 2 -
.../openejb/server/ejbd/JndiRequestHandler.java | 15 ------
server/openejb-server/pom.xml | 2 -
.../apache/tomee/catalina/TomcatJndiBuilder.java | 8 ---
.../apache/tomee/catalina/TomcatWebAppBuilder.java | 8 ---
.../java/org/apache/tomee/installer/Installer.java | 2 -
.../META-INF/org.apache.tomee/service-jar.xml | 1 -
.../META-INF/org.apache.tomee/service-jar.xml | 1 -
.../src/main/resources/juli.properties | 2 -
.../META-INF/org.apache.tomee/service-jar.xml | 1 -
.../src/main/resources/juli.properties | 2 -
.../META-INF/org.apache.tomee/service-jar.xml | 1 -
.../src/main/resources/juli.properties | 2 -
.../META-INF/org.apache.tomee/service-jar.xml | 1 -
.../src/main/resources/juli.properties | 2 -
tomee/tomee-webapp/src/main/webapp/juli.properties | 2 -
31 files changed, 230 deletions(-)
diff --git
a/boms/tomee-microprofile/src/main/resources/tomee/conf/logging.properties
b/boms/tomee-microprofile/src/main/resources/tomee/conf/logging.properties
index a5db12f797..eb5892d117 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/logging.properties
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/logging.properties
@@ -96,7 +96,6 @@
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
# OpenEJB.startup.service.level = WARNING
# OpenEJB.startup.config.level = INFO
# OpenEJB.hsql.level = INFO
-# CORBA-Adapter.level = WARNING
# Transaction.level = WARNING
# org.apache.activemq.level = SEVERE
# org.apache.geronimo.level = SEVERE
@@ -115,7 +114,6 @@
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
# OpenEJB.startup.service.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# OpenEJB.startup.config.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# OpenEJB.hsql.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
-# CORBA-Adapter.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# Transaction.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# org.apache.activemq.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# org.apache.geronimo.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/logging.properties
b/boms/tomee-plume/src/main/resources/tomee/conf/logging.properties
index a5db12f797..eb5892d117 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/logging.properties
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/logging.properties
@@ -96,7 +96,6 @@
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
# OpenEJB.startup.service.level = WARNING
# OpenEJB.startup.config.level = INFO
# OpenEJB.hsql.level = INFO
-# CORBA-Adapter.level = WARNING
# Transaction.level = WARNING
# org.apache.activemq.level = SEVERE
# org.apache.geronimo.level = SEVERE
@@ -115,7 +114,6 @@
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
# OpenEJB.startup.service.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# OpenEJB.startup.config.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# OpenEJB.hsql.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
-# CORBA-Adapter.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# Transaction.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# org.apache.activemq.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# org.apache.geronimo.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/logging.properties
b/boms/tomee-plus/src/main/resources/tomee/conf/logging.properties
index a5db12f797..eb5892d117 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/logging.properties
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/logging.properties
@@ -96,7 +96,6 @@
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
# OpenEJB.startup.service.level = WARNING
# OpenEJB.startup.config.level = INFO
# OpenEJB.hsql.level = INFO
-# CORBA-Adapter.level = WARNING
# Transaction.level = WARNING
# org.apache.activemq.level = SEVERE
# org.apache.geronimo.level = SEVERE
@@ -115,7 +114,6 @@
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
# OpenEJB.startup.service.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# OpenEJB.startup.config.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# OpenEJB.hsql.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
-# CORBA-Adapter.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# Transaction.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# org.apache.activemq.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# org.apache.geronimo.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
diff --git
a/boms/tomee-webprofile/src/main/resources/tomee/conf/logging.properties
b/boms/tomee-webprofile/src/main/resources/tomee/conf/logging.properties
index a5db12f797..eb5892d117 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/logging.properties
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/logging.properties
@@ -96,7 +96,6 @@
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
# OpenEJB.startup.service.level = WARNING
# OpenEJB.startup.config.level = INFO
# OpenEJB.hsql.level = INFO
-# CORBA-Adapter.level = WARNING
# Transaction.level = WARNING
# org.apache.activemq.level = SEVERE
# org.apache.geronimo.level = SEVERE
@@ -115,7 +114,6 @@
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
# OpenEJB.startup.service.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# OpenEJB.startup.config.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# OpenEJB.hsql.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
-# CORBA-Adapter.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# Transaction.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# org.apache.activemq.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
# org.apache.geronimo.handlers = 5tomee.org.apache.juli.FileHandler,
org.apache.tomee.jul.formatter.AsyncConsoleHandler
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index bbf7bc4a6a..2439a1578f 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -208,7 +208,6 @@
org.junit.runners;resolution:=optional,
org.junit.runners.model;resolution:=optional,
org.testng;resolution:=optional,
- org.omg.CORBA,
org.osgi.framework,
org.apache.openejb.quartz;resolution:=optional,
org.apache.openejb.quartz.impl;resolution:=optional,
diff --git
a/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java
b/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java
index 5ec2f365a7..47bb036414 100644
---
a/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java
+++
b/container/openejb-core/src/main/java/org/apache/openejb/util/LogCategory.java
@@ -51,7 +51,6 @@ public final class LogCategory {
public static final LogCategory ACTIVEMQ = new
LogCategory("org.apache.activemq");
public static final LogCategory GERONIMO = new
LogCategory("org.apache.geronimo");
public static final LogCategory OPENJPA = new LogCategory("openjpa");
- public static final LogCategory CORBA_ADAPTER = new
LogCategory("CORBA-Adapter");
public static final LogCategory AXIS = new LogCategory("axis");
public static final LogCategory AXIS2 = new LogCategory("axis");
public static final LogCategory CXF = new LogCategory("cxf");
diff --git
a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
index 72e053034f..7b605840d8 100644
---
a/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
+++
b/container/openejb-core/src/main/resources/META-INF/org.apache.openejb.embedded/service-jar.xml
@@ -36,7 +36,6 @@
<ServiceProvider id="Default JMS Connection Factory"
parent="org.apache.openejb:Default JMS Connection Factory"/>
<ServiceProvider id="Default Queue" parent="org.apache.openejb:Default
Queue"/>
<ServiceProvider id="Default Topic" parent="org.apache.openejb:Default
Topic"/>
- <ServiceProvider id="Default ORB" parent="org.apache.openejb:Default ORB"/>
<ServiceProvider id="Default Mail Session"
parent="org.apache.openejb:Default Mail Session"/>
<ServiceProvider id="Default Remote Jndi Provider"
parent="org.apache.openejb:Default Remote Jndi Provider"/>
<ServiceProvider id="RoutedDataSource"
parent="org.apache.openejb:RoutedDataSource"/>
diff --git
a/container/openejb-core/src/main/resources/log4j.embedded.logging.properties
b/container/openejb-core/src/main/resources/log4j.embedded.logging.properties
index 5a675852b6..2fc275451a 100644
---
a/container/openejb-core/src/main/resources/log4j.embedded.logging.properties
+++
b/container/openejb-core/src/main/resources/log4j.embedded.logging.properties
@@ -23,7 +23,6 @@ log4j.category.OpenEJB.startup = info
log4j.category.OpenEJB.startup.service = warn
log4j.category.OpenEJB.startup.config = info
log4j.category.OpenEJB.hsql = info
-log4j.category.CORBA-Adapter = warn
log4j.category.Transaction = warn
log4j.category.org.apache.activemq = error
log4j.category.org.apache.geronimo = error
diff --git
a/container/openejb-core/src/main/resources/log4j.standalone.logging.properties
b/container/openejb-core/src/main/resources/log4j.standalone.logging.properties
index b263c38a66..16702e2927 100644
---
a/container/openejb-core/src/main/resources/log4j.standalone.logging.properties
+++
b/container/openejb-core/src/main/resources/log4j.standalone.logging.properties
@@ -35,7 +35,6 @@ log4j.category.OpenEJB.hsql = info
log4j.category.OpenEJB.ws = info
log4j.category.OpenEJB.rs = info
log4j.category.OpenEJB.tomcat = info
-log4j.category.CORBA-Adapter = error,R
log4j.category.Transaction = warn,TX
log4j.category.org.apache.activemq = error,R
log4j.category.org.apache.geronimo = error,R
@@ -79,7 +78,6 @@ log4j.appender.TX.layout.ConversionPattern=%d - %-5p - %m%n
#log4j.category.OpenEJB.startup.service = warn
#log4j.category.OpenEJB.startup.config = info
#log4j.category.OpenEJB.hsql = info
-#log4j.category.CORBA-Adapter = info
#log4j.category.Transaction = warn
#log4j.category.org.apache.activemq = error
#log4j.category.org.apache.geronimo = error
diff --git
a/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actpropfalse/service-jar.xml
b/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actpropfalse/service-jar.xml
index ba70d3b1a8..676114826e 100644
---
a/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actpropfalse/service-jar.xml
+++
b/container/openejb-core/src/test/resources/META-INF/org.apache.openejb.actpropfalse/service-jar.xml
@@ -39,7 +39,6 @@
<ServiceProvider id="Default JMS Connection Factory"
parent="org.apache.openejb:Default JMS Connection Factory"/>
<ServiceProvider id="Default Queue" parent="org.apache.openejb:Default
Queue"/>
<ServiceProvider id="Default Topic" parent="org.apache.openejb:Default
Topic"/>
- <ServiceProvider id="Default ORB" parent="org.apache.openejb:Default ORB"/>
<ServiceProvider id="Default Mail Session"
parent="org.apache.openejb:Default Mail Session"/>
<ServiceProvider id="Default Remote Jndi Provider"
parent="org.apache.openejb:Default Remote Jndi Provider"/>
<ServiceProvider id="RoutedDataSource"
parent="org.apache.openejb:RoutedDataSource"/>
diff --git a/docs/configuring-logging-in-tests.adoc
b/docs/configuring-logging-in-tests.adoc
index cad3b84392..e7d147988b 100644
--- a/docs/configuring-logging-in-tests.adoc
+++ b/docs/configuring-logging-in-tests.adoc
@@ -58,7 +58,6 @@ p.put("log4j.category.OpenEJB.startup", "info");
p.put("log4j.category.OpenEJB.startup.service", "warn");
p.put("log4j.category.OpenEJB.startup.config", "info");
p.put("log4j.category.OpenEJB.hsql", "info");
-p.put("log4j.category.CORBA-Adapter", "info");
p.put("log4j.category.Transaction", "warn");
p.put("log4j.category.org.apache.activemq", "error");
p.put("log4j.category.org.apache.geronimo", "error");
@@ -101,7 +100,6 @@ log4j.category.OpenEJB.startup = info
log4j.category.OpenEJB.startup.service = warn
log4j.category.OpenEJB.startup.config = info
log4j.category.OpenEJB.hsql = info
-log4j.category.CORBA-Adapter = info
log4j.category.Transaction = warn
log4j.category.org.apache.activemq = error
log4j.category.org.apache.geronimo = error
diff --git a/docs/containers-and-resources.adoc
b/docs/containers-and-resources.adoc
index acefa0cfca..2f5c17c5b9 100644
--- a/docs/containers-and-resources.adoc
+++ b/docs/containers-and-resources.adoc
@@ -453,16 +453,6 @@ destination
Specifies the name of the topic
-org.omg.CORBA.ORB
-
-Declarable in tomee.xml via
-
-Declarable in properties via
-
-Foo = new://Resource?type=org.omg.CORBA.ORB
-
-No properties.
-
jakarta.mail.Session
Declarable in tomee.xml via
diff --git a/docs/deployment-id.adoc b/docs/deployment-id.adoc
index 1a3b0fbffa..c87040c629 100644
--- a/docs/deployment-id.adoc
+++ b/docs/deployment-id.adoc
@@ -146,52 +146,6 @@ Object bean = initialContext.lookup("/my/bean/Foo");
...
----
-== In the CORBA Adapter
-
-The CORBA Adapter is separate than the Remote Server. It adapts the
-OpenEJB Container System and the Local Server into OpenORB as an
-embedded library. It provides users of OpenORB the ability to lookup and
-execute beans (EJBs) via the RMI-IIOP protocol. All the EJBHome and
-EJBObject interfaces of beans in OpenEJB are implemented by OpenORB as
-CORBA stubs and ties.
-
-The beans are exported into OpenORB's naming service by deployment id.
-So, just as with the Local Server and Remote Server, clients can lookup
-beans using the bean's deployment id. OpenORB has a JNDI implementation
-of their naming service, so lookups can be done just as before.
-
-[source,java]
-----
-...
-String[] args = ...
-
-// The ORB and Object
-org.omg.CORBA.ORB orb = null;
-org.omg.CORBA.Object bean = null.
-
-// The Naming Service and Object Name
-org.omg.CosNaming.NamingContext context = null;
-org.omg.CosNaming.NameComponent[] name = null;
-
-// Get the ORB
-orb = org.omg.CORBA.ORB.init( args, null );
-
-// Get the Naming Service
-org.omg.CORBA.Object ref = null;
-ref = orb.resolve_initial_references("NameService");
-context = org.omg.CosNaming.NamingContextHelper.narrow( ref );
-
-// Get the Name as a component
-// Note: the string is the bean's deployment id
-name = new org.omg.CosNaming.NameComponent[ 1 ];
-name[0] = new org.omg.CosNaming.NameComponent("/my/bean/foo","");
-
-// Finally, get the bean as a CORBA object
-// Equvalent to an InitialContext.lookup("/my/bean/foo");
-bean = context.resolve( name );
-...
-----
-
= What happens if there is a duplicate deployment ID?
The deployment ID uniquely identifies the bean in the OpenEJB container
diff --git a/docs/orb-config.adoc b/docs/orb-config.adoc
deleted file mode 100644
index 94c86ae6bd..0000000000
--- a/docs/orb-config.adoc
+++ /dev/null
@@ -1,42 +0,0 @@
-= ORB Configuration
-:index-group: Configuration
-:jbake-date: 2018-12-05
-:jbake-type: page
-:jbake-status: published
-
-
-A ORB can be declared via xml in the `<tomee-home>/conf/tomee.xml` file
-or in a `WEB-INF/resources.xml` file using a declaration like the
-following. All properties in the element body are optional.
-
-[source,xml]
-----
-<Resource id="myORB" type="org.omg.CORBA.ORB">
-</Resource>
-----
-
-Alternatively, a ORB can be declared via properties in the
-`<tomee-home>/conf/system.properties` file or via Java VirtualMachine
-`-D` properties. The properties can also be used when embedding TomEE
-via the `jakarta.ejb.embeddable.EJBContainer` API or `InitialContext`
-
-[source,properties]
-----
-myORB = new://Resource?type=org.omg.CORBA.ORB
-----
-
-Properties and xml can be mixed. Properties will override the xml
-allowing for easy configuration change without the need for $\{} style
-variable substitution. Properties are not case sensitive. If a property
-is specified that is not supported by the declared ORB a warning will be
-logged. If a ORB is needed by the application and one is not declared,
-TomEE will create one dynamically using default settings. Multiple ORB
-declarations are allowed. # Supported Properties
-
-Property
-
-Type
-
-Default
-
-Description
diff --git
a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/CorbaTestServer.java
b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/CorbaTestServer.java
deleted file mode 100644
index 6888fd4bdd..0000000000
---
a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/CorbaTestServer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.openejb.test;
-
-import java.util.Properties;
-
-public class CorbaTestServer implements TestServer {
-
- Properties props;
-
- public void init(final Properties props) {
- /* TO DO:
- * Perform some test to see if the OpenEJB CORBA Server
- * is started. If not, display the followding message
- * and exit.
- */
-// log("OpenEJB Test Suite with the OpenEJB CORBA Server");
-// log("");
-// log("Before running the OpenEJB test suite on the ");
-// log("OpenEJB CORBA Server, the MapNamingContext");
-// log("and CORBA Server must each be started in ");
-// log("separate processes.");
-// log("");
-// log("1) Execute corba_naming_server.sh or .bat in a process.");
-// log("2) Execute corba_server.sh or .bat in another process.");
-// log("");
-
- this.props = props;
- }
-
- public void log(final String s) {
- System.out.println("[NOTE] " + s);
- }
-
- public void destroy() {
- }
-
- public void start() {
- }
-
- public void stop() {
-
- }
-
- public Properties getContextEnvironment() {
- return (Properties) props.clone();
- }
-
-}
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index 7e3559034f..8ae011e26d 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -44,7 +44,6 @@
javax.net,
javax.net.ssl,
javax.rmi,
- javax.rmi.CORBA,
javax.security.auth,
javax.security.auth.callback,
javax.security.auth.login,
@@ -60,7 +59,6 @@
jakarta.xml.ws.spi,
jakarta.xml.ws.wsaddressing,
org.apache.geronimo.osgi.locator,
- org.omg.CORBA,
org.osgi.framework,
org.w3c.dom
</openejb.osgi.import.pkg>
diff --git
a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
index 995d51decf..dff0fb1f8d 100644
---
a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
+++
b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
@@ -81,17 +81,6 @@ import java.util.Set;
import static org.apache.openejb.server.ejbd.ClientObjectFactory.convert;
class JndiRequestHandler extends RequestHandler {
- private static final Class<?> ORB_CLASS;
-
- static {
- Class<?> orb;
- try {
- orb =
JndiRequestHandler.class.getClassLoader().loadClass("org.omg.CORBA.ORB");
- } catch (final ClassNotFoundException e) {
- orb = null;
- }
- ORB_CLASS = orb;
- }
private static final Logger LOGGER =
Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("jndi"),
"org.apache.openejb.server.util.resources");
@@ -301,10 +290,6 @@ class JndiRequestHandler extends RequestHandler {
res.setResponseCode(ResponseCodes.JNDI_RESOURCE);
res.setResult(ConnectionFactory.class.getName());
return;
- } else if (ORB_CLASS != null && ORB_CLASS.isInstance(object)) {
- res.setResponseCode(ResponseCodes.JNDI_RESOURCE);
- res.setResult(ORB_CLASS.getName());
- return;
} else if (object instanceof ValidatorFactory) {
res.setResponseCode(ResponseCodes.JNDI_RESOURCE);
res.setResult(ValidatorFactory.class.getName());
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index 79f6de1710..75fac0cb42 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -153,7 +153,6 @@
jakarta.resource.spi.endpoint,
jakarta.resource.spi.work,
javax.rmi,
- javax.rmi.CORBA,
javax.security.auth,
javax.security.auth.callback,
javax.security.auth.login,
@@ -275,7 +274,6 @@
org.eclipse.persistence.transaction;resolution:=optional,
org.hibernate;resolution:=optional,
org.hibernate.transaction;resolution:=optional,
- org.omg.CORBA,
org.osgi.framework;version="[1.5,2)",
org.osgi.util.tracker;version="[1.4,2)",
org.apache.openejb.quartz;resolution:=optional,
diff --git
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
index c6b9e77851..5a12eb2696 100644
---
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
+++
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
@@ -267,11 +267,6 @@ public class TomcatJndiBuilder {
final TransactionSynchronizationRegistry synchronizationRegistry =
SystemInstance.get().getComponent(TransactionSynchronizationRegistry.class);
comp.rebind("TransactionSynchronizationRegistry",
synchronizationRegistry);
- try {
- comp.rebind("ORB", new
SystemComponentReference(TomcatJndiBuilder.class.getClassLoader().loadClass("org.omg.CORBA.ORB")));
- } catch (final NoClassDefFoundError | ClassNotFoundException
ncdfe) {
- // no-op
- }
comp.rebind("HandleDelegate", new
SystemComponentReference(HandleDelegate.class));
if (webContext != null && webContext.getWebbeansContext() != null)
{
@@ -700,9 +695,6 @@ public class TomcatJndiBuilder {
} else if
(TransactionSynchronizationRegistry.class.getName().equals(ref.resourceEnvRefType))
{
resourceEnv.setProperty(Constants.FACTORY,
SystemComponentFactory.class.getName());
resourceEnv.setProperty(NamingUtil.COMPONENT_TYPE,
TransactionSynchronizationRegistry.class.getName());
- } else if ("org.omg.CORBA.ORB".equals(ref.resourceEnvRefType)) {
- resourceEnv.setProperty(Constants.FACTORY,
SystemComponentFactory.class.getName());
- resourceEnv.setProperty(NamingUtil.COMPONENT_TYPE,
ref.resourceEnvRefType);
} else if
(HandleDelegate.class.getName().equals(ref.resourceEnvRefType)) {
resourceEnv.setProperty(Constants.FACTORY,
SystemComponentFactory.class.getName());
resourceEnv.setProperty(NamingUtil.COMPONENT_TYPE,
HandleDelegate.class.getName());
diff --git
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index cbec4b030d..1a14eb4ede 100644
---
a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -1786,14 +1786,6 @@ public class TomcatWebAppBuilder implements
WebAppBuilder, ContextListener, Pare
}
}
- try {
- final Class<?> orb =
TomcatWebAppBuilder.class.getClassLoader().loadClass("org.omg.CORBA.ORB");
- if (SystemInstance.get().getComponent(orb) != null) {
- safeBind(comp, "ORB", new SystemComponentReference(orb));
- }
- } catch (final NoClassDefFoundError | ClassNotFoundException cnfe)
{
- // no-op
- }
if (SystemInstance.get().getComponent(HandleDelegate.class) !=
null) {
safeBind(comp, "HandleDelegate", new
SystemComponentReference(HandleDelegate.class));
}
diff --git
a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index df002c25bf..5b8eacffa3 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -769,7 +769,6 @@ public class Installer implements InstallerInterface {
"# OpenEJB.startup.service.level = WARNING\r\n" +
"# OpenEJB.startup.config.level = INFO\r\n" +
"# OpenEJB.hsql.level = INFO\r\n" +
- "# CORBA-Adapter.level = WARNING\r\n" +
"# Transaction.level = WARNING\r\n" +
"# org.apache.activemq.level = SEVERE\r\n" +
"# org.apache.geronimo.level = SEVERE\r\n" +
@@ -788,7 +787,6 @@ public class Installer implements InstallerInterface {
"# OpenEJB.startup.service.handlers =
5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler\r\n" +
"# OpenEJB.startup.config.handlers =
5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler\r\n" +
"# OpenEJB.hsql.handlers =
5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler\r\n" +
- "# CORBA-Adapter.handlers =
5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler\r\n" +
"# Transaction.handlers =
5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler\r\n" +
"# org.apache.activemq.handlers =
5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler\r\n" +
"# org.apache.geronimo.handlers =
5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler\r\n" +
diff --git
a/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
b/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
index f532ff9163..0658a357f3 100644
---
a/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
+++
b/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
@@ -37,7 +37,6 @@
<ServiceProvider id="Default JMS Connection Factory"
parent="org.apache.openejb.embedded:Default JMS Connection Factory"/>
<ServiceProvider id="Default Queue"
parent="org.apache.openejb.embedded:Default Queue"/>
<ServiceProvider id="Default Topic"
parent="org.apache.openejb.embedded:Default Topic"/>
- <ServiceProvider id="Default ORB"
parent="org.apache.openejb.embedded:Default ORB"/>
<ServiceProvider id="Default Mail Session"
parent="org.apache.openejb.embedded:Default Mail Session"/>
<ServiceProvider id="Default Remote Jndi Provider"
parent="org.apache.openejb.embedded:Default Remote Jndi Provider"/>
<ServiceProvider id="RoutedDataSource"
parent="org.apache.openejb:RoutedDataSource"/>
diff --git
a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
index dd6c6e5b07..631d500ace 100644
---
a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
+++
b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
@@ -41,7 +41,6 @@
<ServiceProvider id="Default JMS Connection Factory"
parent="org.apache.openejb:Default JMS Connection Factory"/>
<ServiceProvider id="Default Queue" parent="org.apache.openejb:Default
Queue"/>
<ServiceProvider id="Default Topic" parent="org.apache.openejb:Default
Topic"/>
- <ServiceProvider id="Default ORB" parent="org.apache.openejb:Default ORB"/>
<ServiceProvider id="Default Mail Session"
parent="org.apache.openejb:Default Mail Session"/>
<ServiceProvider id="Default Remote Jndi Provider"
parent="org.apache.openejb:Default Remote Jndi Provider"/>
<ServiceProvider id="RoutedDataSource"
parent="org.apache.openejb:RoutedDataSource"/>
diff --git
a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/juli.properties
b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/juli.properties
index 873ce5065b..27e07601f1 100644
---
a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/juli.properties
+++
b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/juli.properties
@@ -26,8 +26,6 @@ OpenEJB.startup.level = INFO
OpenEJB.startup.config.level = INFO
OpenEJB.hsql.level = INFO
OpenEJB.handlers = 9OpenEJB.org.apache.juli.FileHandler
-CORBA-Adapter.hsql.level = ERROR
-CORBA-Adapter.handlers = 9OpenEJB.org.apache.juli.FileHandler
Transaction.level = WARNING
Transaction.handlers = 9Transaction.org.apache.juli.FileHandler
org.apache.activemq.level = ERROR
diff --git
a/tomee/tomee-plume-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
b/tomee/tomee-plume-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
index dd6c6e5b07..631d500ace 100644
---
a/tomee/tomee-plume-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
+++
b/tomee/tomee-plume-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
@@ -41,7 +41,6 @@
<ServiceProvider id="Default JMS Connection Factory"
parent="org.apache.openejb:Default JMS Connection Factory"/>
<ServiceProvider id="Default Queue" parent="org.apache.openejb:Default
Queue"/>
<ServiceProvider id="Default Topic" parent="org.apache.openejb:Default
Topic"/>
- <ServiceProvider id="Default ORB" parent="org.apache.openejb:Default ORB"/>
<ServiceProvider id="Default Mail Session"
parent="org.apache.openejb:Default Mail Session"/>
<ServiceProvider id="Default Remote Jndi Provider"
parent="org.apache.openejb:Default Remote Jndi Provider"/>
<ServiceProvider id="RoutedDataSource"
parent="org.apache.openejb:RoutedDataSource"/>
diff --git a/tomee/tomee-plume-webapp/src/main/resources/juli.properties
b/tomee/tomee-plume-webapp/src/main/resources/juli.properties
index 873ce5065b..27e07601f1 100644
--- a/tomee/tomee-plume-webapp/src/main/resources/juli.properties
+++ b/tomee/tomee-plume-webapp/src/main/resources/juli.properties
@@ -26,8 +26,6 @@ OpenEJB.startup.level = INFO
OpenEJB.startup.config.level = INFO
OpenEJB.hsql.level = INFO
OpenEJB.handlers = 9OpenEJB.org.apache.juli.FileHandler
-CORBA-Adapter.hsql.level = ERROR
-CORBA-Adapter.handlers = 9OpenEJB.org.apache.juli.FileHandler
Transaction.level = WARNING
Transaction.handlers = 9Transaction.org.apache.juli.FileHandler
org.apache.activemq.level = ERROR
diff --git
a/tomee/tomee-plus-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
b/tomee/tomee-plus-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
index dd6c6e5b07..631d500ace 100644
---
a/tomee/tomee-plus-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
+++
b/tomee/tomee-plus-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
@@ -41,7 +41,6 @@
<ServiceProvider id="Default JMS Connection Factory"
parent="org.apache.openejb:Default JMS Connection Factory"/>
<ServiceProvider id="Default Queue" parent="org.apache.openejb:Default
Queue"/>
<ServiceProvider id="Default Topic" parent="org.apache.openejb:Default
Topic"/>
- <ServiceProvider id="Default ORB" parent="org.apache.openejb:Default ORB"/>
<ServiceProvider id="Default Mail Session"
parent="org.apache.openejb:Default Mail Session"/>
<ServiceProvider id="Default Remote Jndi Provider"
parent="org.apache.openejb:Default Remote Jndi Provider"/>
<ServiceProvider id="RoutedDataSource"
parent="org.apache.openejb:RoutedDataSource"/>
diff --git a/tomee/tomee-plus-webapp/src/main/resources/juli.properties
b/tomee/tomee-plus-webapp/src/main/resources/juli.properties
index 873ce5065b..27e07601f1 100644
--- a/tomee/tomee-plus-webapp/src/main/resources/juli.properties
+++ b/tomee/tomee-plus-webapp/src/main/resources/juli.properties
@@ -26,8 +26,6 @@ OpenEJB.startup.level = INFO
OpenEJB.startup.config.level = INFO
OpenEJB.hsql.level = INFO
OpenEJB.handlers = 9OpenEJB.org.apache.juli.FileHandler
-CORBA-Adapter.hsql.level = ERROR
-CORBA-Adapter.handlers = 9OpenEJB.org.apache.juli.FileHandler
Transaction.level = WARNING
Transaction.handlers = 9Transaction.org.apache.juli.FileHandler
org.apache.activemq.level = ERROR
diff --git
a/tomee/tomee-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
b/tomee/tomee-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
index dd6c6e5b07..631d500ace 100644
---
a/tomee/tomee-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
+++
b/tomee/tomee-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml
@@ -41,7 +41,6 @@
<ServiceProvider id="Default JMS Connection Factory"
parent="org.apache.openejb:Default JMS Connection Factory"/>
<ServiceProvider id="Default Queue" parent="org.apache.openejb:Default
Queue"/>
<ServiceProvider id="Default Topic" parent="org.apache.openejb:Default
Topic"/>
- <ServiceProvider id="Default ORB" parent="org.apache.openejb:Default ORB"/>
<ServiceProvider id="Default Mail Session"
parent="org.apache.openejb:Default Mail Session"/>
<ServiceProvider id="Default Remote Jndi Provider"
parent="org.apache.openejb:Default Remote Jndi Provider"/>
<ServiceProvider id="RoutedDataSource"
parent="org.apache.openejb:RoutedDataSource"/>
diff --git a/tomee/tomee-webapp/src/main/resources/juli.properties
b/tomee/tomee-webapp/src/main/resources/juli.properties
index 873ce5065b..27e07601f1 100644
--- a/tomee/tomee-webapp/src/main/resources/juli.properties
+++ b/tomee/tomee-webapp/src/main/resources/juli.properties
@@ -26,8 +26,6 @@ OpenEJB.startup.level = INFO
OpenEJB.startup.config.level = INFO
OpenEJB.hsql.level = INFO
OpenEJB.handlers = 9OpenEJB.org.apache.juli.FileHandler
-CORBA-Adapter.hsql.level = ERROR
-CORBA-Adapter.handlers = 9OpenEJB.org.apache.juli.FileHandler
Transaction.level = WARNING
Transaction.handlers = 9Transaction.org.apache.juli.FileHandler
org.apache.activemq.level = ERROR
diff --git a/tomee/tomee-webapp/src/main/webapp/juli.properties
b/tomee/tomee-webapp/src/main/webapp/juli.properties
index 873ce5065b..27e07601f1 100644
--- a/tomee/tomee-webapp/src/main/webapp/juli.properties
+++ b/tomee/tomee-webapp/src/main/webapp/juli.properties
@@ -26,8 +26,6 @@ OpenEJB.startup.level = INFO
OpenEJB.startup.config.level = INFO
OpenEJB.hsql.level = INFO
OpenEJB.handlers = 9OpenEJB.org.apache.juli.FileHandler
-CORBA-Adapter.hsql.level = ERROR
-CORBA-Adapter.handlers = 9OpenEJB.org.apache.juli.FileHandler
Transaction.level = WARNING
Transaction.handlers = 9Transaction.org.apache.juli.FileHandler
org.apache.activemq.level = ERROR
