Merge pull request #24604 from avpinchuk/ccx-remove-jbi

Remove all Service Engine references

appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties

@@ -1,4 +1,5 @@
 #
+# Copyright (c) 2023 Contributors to the Eclipse Foundation.
 # Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
@@ -148,7 +149,6 @@ standalone.InstanceName=Standalone Instance Name:
 #standalone.tab.Resources=Resources
 #standalone.tab.Monitor=Monitor
 #standalone.tab.Advanced=Advanced
-#standalone.tab.JBI=JBI
 #standalone.PageTitle=Standalone Server Instances
 #standalone.TableTitle=Server Instances
 #standalone.PageHelp=The instance named server cannot be started, stopped or deleted from here. The node agent of the instance must be running to start or stop it.

appserver/admingui/core/src/main/resources/org/glassfish/admingui/core/Strings.properties

@@ -1,4 +1,5 @@
 #
+# Copyright (c) 2023 Contributors to the Eclipse Foundation.
 # Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
@@ -357,13 +358,6 @@ commonTasks.task.deployCustomMBean.infoTitle=Deploy Custom MBean (.jar)
 commonTasks.task.deployCustomMBean.infoLinkText=More on Custom MBean (.jar) Deployment
 commonTasks.task.deployCustomMBean.toolTip=Deploy Custom MBean (.war)
 
-
-commonTasks.task.deployJbi=Deploy Java Business Integration (JBI) Service Assembly
-commonTasks.task.deployJbi.infoText=A JBI Service Assembly is packaged in a Jar or Zip file.
-commonTasks.task.deployJbi.infoTitle=Deploy Java Business Integration (JBI) Service Assembly
-commonTasks.task.deployJbi.infoLinkText=More on JBI Service Assembly Deployment
-commonTasks.task.deployJbi.toolTip=Deploy Java Business Integration (JBI) Service Assembly
-
 commonTasks.task.jdbcResource=Create New JDBC Resource
 commonTasks.task.jdbcResource.toolTip=Create New JDBC Resource
 
@@ -464,7 +458,6 @@ common.Naming=Naming
 common.Security=Security
 common.Jts=JTS
 common.Jta=JTA
-common.JBI=JBI
 common.Jaxws=JAXWS
 common.Admin=Admin
 common.Deployment=Deployment
@@ -819,28 +812,19 @@ configuration.pageTitleHelp=Manage configurations, and view the target server in
 configurations.pageTitle=Configurations
 configurations.pageTitleHelp=Manage configurations, and view the target server instances or clusters using the configurations.
 
-
-
 required.field.legend = Indicates required field
 
-
-# JBI page resources moved to publish/glassfish/jbi/lib/jbi-admin-gui.jar, built from open-esb source:
-# cvs.dev.java.net:/cvs/open-esb/ri-clients/jbi-admin-gui/src/com/sun/jbi/jsf/resources/Bundle.properties
-
 #Common keys
 desc.Enabled=Enabled
 desc.Required=Required
 
-
 #Connector Service
 headings.ConnService=Connector Service
 connServ.ConnServiceInfo=The attributes specified apply to all resource adapters deployed in this cluster/server-instance.
 connServ.shutdTimeoutLabel=Shutdown Timeout:
 connServ.shutdTimeoutHelp=Resource Adapters that take longer are ignored and the shutdown procedure continues
 
 # Transaction Service
-#
-
 
 ## Connection Pool
 cp.Title=Connection Pool

appserver/admingui/core/src/main/resources/templates/menu.inc

@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,13 +25,6 @@
 <sc:menuItem value="Lifecycle Module" url="#{request.contextPath}/layouttest.jsf?page=Lifecycle+Module" />
 <sc:menuItem value="App Client Module" url="#{request.contextPath}/layouttest.jsf?page=App+Client+Module" />
 <sc:menuItem value="Custom MBean" url="#{request.contextPath}/layouttest.jsf?page=Custom+MBean" />
-<!--
-<sc:subMenu value="JBI" id="jbiMenu">
-<sc:menuItem value="Component" url="#{request.contextPath}/layouttest.jsf?page=Component" />
-<sc:menuItem value="Shared Library" url="#{request.contextPath}/layouttest.jsf?page=Shared+Library" />
-</sc:subMenu>
--->
-
 </sc:subMenu>
 
 <sc:subMenu value="Configure" id="editMenu">
@@ -96,7 +90,6 @@
     <sc:menuItem value="HTTP Load Balancers" url="#{request.contextPath}/layouttest.jsf?page=HTTP+Load+Balancers" />
     <sc:menuItem value="Stand-Alone Instances" url="#{request.contextPath}/layouttest.jsf?page=Stand-Alone Instances" />
     <sc:menuItem value="Node Agent References" url="#{request.contextPath}/layouttest.jsf?page=Node+Agent+References" />
-    <sc:subMenu value="JBI">
 	<sc:menuItem value="Service Assemblies" url="#{request.contextPath}/layouttest.jsf?page=Service+Assemblies" />
 	<sc:menuItem value="Components" url="#{request.contextPath}/layouttest.jsf?page=Components" />
 	<sc:menuItem value="Shared Libraries" url="#{request.contextPath}/layouttest.jsf?page=Shared+Libraries" />

appserver/jdbc/admin/src/test/resources/DomainTest.xml

@@ -1,5 +1,6 @@
 <!--
 
+    Copyright (c) 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -171,7 +172,6 @@
     <server name="server" config-ref="server-config">
       <application-ref ref="adminapp" virtual-servers="__asadmin"></application-ref>
       <application-ref ref="admingui" virtual-servers="__asadmin"></application-ref>
-      <application-ref ref="JBIFramework"></application-ref>
       <application-ref ref="WSTXServices"></application-ref>
       <application-ref ref="WSTCPConnectorLCModule"></application-ref>
       <resource-ref ref="jdbc/__TimerPool"></resource-ref>

appserver/tests/appserv-tests/devtests/admin/cli/resources/configs/v2domain.xml

@@ -2,6 +2,7 @@
 <!DOCTYPE domain PUBLIC "-//Sun Microsystems Inc.//DTD Application Server 9.1 Domain//EN" "http://www.sun.com/software/appserver/dtds/sun-domain_1_3.dtd">
 <!--
 
+    Copyright (c) 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -32,10 +33,6 @@
       <!-- System Web Module - DO NOT DELETE! -->
     </web-module>
     <web-module availability-enabled="false" context-root="/__wstx-services" directory-deployed="true" enabled="true" location="${com.sun.aas.installRoot}/lib/install/applications/wstx-services" name="WSTXServices" object-type="system-all"/>
-    <lifecycle-module class-name="com.sun.jbi.framework.sun.SunASJBIBootstrap" classpath="${com.sun.aas.installRoot}/jbi/lib/jbi_framework.jar" enabled="true" is-failure-fatal="false" name="JBIFramework" object-type="system-all">
-      <description>"JBI Framework LifecycleModule"</description>
-      <property name="com.sun.jbi.home" value="${com.sun.aas.installRoot}/jbi"/>
-    </lifecycle-module>
     <lifecycle-module class-name="com.sun.xml.ws.transport.tcp.server.glassfish.WSTCPLifeCycleModule" classpath="${com.sun.aas.installRoot}/lib/webservices-rt.jar" enabled="true" is-failure-fatal="false" name="WSTCPConnectorLCModule" object-type="system-all"/>
   </applications>
   <resources>
@@ -676,7 +673,6 @@
     <server config-ref="server-config" lb-weight="100" name="server">
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="adminapp" virtual-servers="__asadmin"/>
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="admingui" virtual-servers="__asadmin"/>
-      <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="JBIFramework"/>
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="WSTXServices"/>
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="WSTCPConnectorLCModule"/>
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="__ejb_container_timer_app" virtual-servers="server"/>
@@ -694,7 +690,6 @@
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="__JWSappclients"/>
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="MEjbApp"/>
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="WSTXServices"/>
-      <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="JBIFramework"/>
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="WSTCPConnectorLCModule"/>
     </cluster>
     <cluster config-ref="testUpgradeClusterNonDefaultGMSProperties-config" heartbeat-address="228.8.83.98" heartbeat-enabled="true" heartbeat-port="33000" name="testUpgradeClusterNonDefaultGMSProperties">
@@ -703,7 +698,6 @@
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="__JWSappclients"/>
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="MEjbApp"/>
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="WSTXServices"/>
-      <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="JBIFramework"/>
       <application-ref disable-timeout-in-minutes="30" enabled="true" lb-enabled="false" ref="WSTCPConnectorLCModule"/>
       <property name="gms-bind-interface-address" value="${GMS_testUpdateClusterNonDefaultGMSProperties_BIND_INTERFACE_ADDR}"/>
     </cluster>