Merge branch 'master' of https://github.com/rmsamitha/carbon-mediation

wso2 · Jan 9, 2025 · 6fae13f · 6fae13f
2 parents 8b094d2 + f4e304c
commit 6fae13f
Show file tree

Hide file tree

Showing 310 changed files with 964 additions and 541 deletions.
diff --git a/components/application-deployers/org.wso2.carbon.application.deployer.synapse/pom.xml b/components/application-deployers/org.wso2.carbon.application.deployer.synapse/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <artifactId>application-deployers</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.application.deployer.synapse</artifactId>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Synapse Application Deployer</name>
     <description>Application Deployer for deploying Synapse artifacts</description>

diff --git a/components/application-deployers/pom.xml b/components/application-deployers/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>carbon-mediation</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/application-mgt/org.wso2.carbon.application.mgt.synapse.ui/pom.xml b/components/application-mgt/org.wso2.carbon.application.mgt.synapse.ui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>application-mgt</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.application.mgt.synapse.ui</artifactId>

diff --git a/components/application-mgt/org.wso2.carbon.application.mgt.synapse/pom.xml b/components/application-mgt/org.wso2.carbon.application.mgt.synapse/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>application-mgt</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.application.mgt.synapse</artifactId>

diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>carbon-mediation</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.common/pom.xml b/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.common/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>hl7</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.business.messaging.hl7.common</artifactId>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - HL7 Business Messaging - Common</name>
     <url>http://wso2.org</url>

diff --git a/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.message/pom.xml b/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.message/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>hl7</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.business.messaging.hl7.message</artifactId>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - HL7 Business Messaging - Message</name>
     <url>http://wso2.org</url>

diff --git a/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.samples/pom.xml b/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.samples/pom.xml
@@ -19,11 +19,11 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>hl7</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.business.messaging.hl7.samples</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - HL7 Business Messaging - Samples</name>

diff --git a/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.store.ui/pom.xml b/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.store.ui/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>hl7</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.store/pom.xml b/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.store/pom.xml
@@ -19,11 +19,11 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>hl7</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.business.messaging.hl7.store</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - HL7 Business Messaging - Store</name>

diff --git a/...ng.hl7.store/src/main/java/org/wso2/carbon/business/messaging/hl7/store/JDBCConsumer.java b/...ng.hl7.store/src/main/java/org/wso2/carbon/business/messaging/hl7/store/JDBCConsumer.java
@@ -43,4 +43,10 @@ public void setId(int i) {
     public String getId() {
         return null;
     }
+
+    @Override
+    public boolean reInitialize() {
+
+        return false;
+    }
 }
diff --git a/...hl7.store/src/main/java/org/wso2/carbon/business/messaging/hl7/store/jpa/JPAConsumer.java b/...hl7.store/src/main/java/org/wso2/carbon/business/messaging/hl7/store/jpa/JPAConsumer.java
@@ -43,4 +43,10 @@ public void setId(int i) {
     public String getId() {
         return null;
     }
-}
+
+    @Override
+    public boolean reInitialize() {
+
+        return false;
+    }
+}
diff --git a/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.transport/pom.xml b/components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.transport/pom.xml
@@ -18,11 +18,11 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>hl7</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.business.messaging.hl7.transport</artifactId>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - HL7 Business Messaging - Transport</name>
     <url>http://wso2.org</url>

diff --git a/components/business-adaptors/hl7/pom.xml b/components/business-adaptors/hl7/pom.xml
@@ -20,11 +20,11 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>business-adaptors</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <artifactId>hl7</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - HL7 Business Messaging Aggregator Module</name>

diff --git a/components/business-adaptors/pom.xml b/components/business-adaptors/pom.xml
@@ -20,7 +20,7 @@
     <parent>
       <groupId>org.wso2.carbon.mediation</groupId>
       <artifactId>carbon-mediation</artifactId>
-      <version>4.7.221</version>
+      <version>4.7.224-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/carbon-mediation-startup/org.wso2.carbon.mediation.startup/pom.xml b/components/carbon-mediation-startup/org.wso2.carbon.mediation.startup/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <artifactId>carbon-mediation-startup</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.wso2.carbon.mediation.startup</artifactId>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Carbon Mediation StartUp</name>
     <description>Carbon StartUp</description>

diff --git a/components/carbon-mediation-startup/pom.xml b/components/carbon-mediation-startup/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>carbon-mediation</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/carbon-transports/pom.xml b/components/carbon-transports/pom.xml
@@ -20,7 +20,7 @@
     <parent>
       <groupId>org.wso2.carbon.mediation</groupId>
       <artifactId>carbon-mediation</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/carbon-transports/websocket/org.wso2.carbon.websocket.transport/pom.xml b/components/carbon-transports/websocket/org.wso2.carbon.websocket.transport/pom.xml
@@ -18,11 +18,11 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>websocket</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.websocket.transport</artifactId>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Websocket Carbon Transport</name>
     <url>http://wso2.org</url>

diff --git a/components/carbon-transports/websocket/pom.xml b/components/carbon-transports/websocket/pom.xml
@@ -20,11 +20,11 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>carbon-transports</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <artifactId>websocket</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Carbon Transports Module</name>

diff --git a/components/event-sink/org.wso2.carbon.event.sink.config/pom.xml b/components/event-sink/org.wso2.carbon.event.sink.config/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>event-sink</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.event.sink.config</artifactId>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Publish Event Mediator Configuration</name>
     <url>http://wso2.org</url>

diff --git a/components/event-sink/org.wso2.carbon.event.sink/pom.xml b/components/event-sink/org.wso2.carbon.event.sink/pom.xml
@@ -19,13 +19,13 @@
     <parent>
         <groupId>org.wso2.carbon.mediation</groupId>
         <artifactId>event-sink</artifactId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.event.sink</artifactId>
     <packaging>bundle</packaging>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <name>WSO2 Carbon - Event Sink manager</name>
 
     <dependencies>

diff --git a/components/event-sink/pom.xml b/components/event-sink/pom.xml
@@ -13,13 +13,13 @@
     <parent>
         <artifactId>carbon-mediation</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>event-sink</artifactId>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>WSO2 Carbon - Event Sink</name>

diff --git a/components/inbound-endpoints/org.wso2.carbon.inbound.endpoint.ext.wsrm/pom.xml b/components/inbound-endpoints/org.wso2.carbon.inbound.endpoint.ext.wsrm/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <artifactId>inbound-endpoints</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.wso2.carbon.inbound.endpoint.ext.wsrm</artifactId>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
 
     <packaging>bundle</packaging>
 

diff --git a/...t.wsrm/src/main/java/org/wso2/carbon/inbound/endpoint/ext/wsrm/InboundRMHttpListener.java b/...t.wsrm/src/main/java/org/wso2/carbon/inbound/endpoint/ext/wsrm/InboundRMHttpListener.java
@@ -116,6 +116,21 @@ public boolean startListener() {
 
     @Override
     public void init() {
+        /*
+         * The activate/deactivate functionality is not currently implemented
+         * for this Inbound Endpoint type.
+         *
+         * Therefore, the following check has been added to immediately return if the "suspend"
+         * attribute is set to true in the inbound endpoint configuration due to the fixes done
+         * in Synapse level - https://github.com/wso2/wso2-synapse/pull/2261.
+         *
+         * Note: This implementation is temporary and should be revisited and improved once
+         * the activate/deactivate capability is implemented.
+         */
+        if (startInPausedMode) {
+            logger.info("Inbound endpoint [" + name + "] is currently suspended.");
+            return;
+        }
         startListener();
     }
 

diff --git a/components/inbound-endpoints/org.wso2.carbon.inbound.endpoint.osgi/pom.xml b/components/inbound-endpoints/org.wso2.carbon.inbound.endpoint.osgi/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>inbound-endpoints</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.inbound.endpoint.osgi</artifactId>
     <packaging>bundle</packaging>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
 
     <build>
         <plugins>

diff --git a/components/inbound-endpoints/org.wso2.carbon.inbound.endpoint.persistence/pom.xml b/components/inbound-endpoints/org.wso2.carbon.inbound.endpoint.persistence/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>inbound-endpoints</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.inbound.endpoint.persistence</artifactId>

diff --git a/components/inbound-endpoints/org.wso2.carbon.inbound.endpoint/pom.xml b/components/inbound-endpoints/org.wso2.carbon.inbound.endpoint/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <artifactId>inbound-endpoints</artifactId>
         <groupId>org.wso2.carbon.mediation</groupId>
-        <version>4.7.221</version>
+        <version>4.7.224-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.inbound.endpoint</artifactId>
     <packaging>bundle</packaging>
-    <version>4.7.221</version>
+    <version>4.7.224-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>javax.jms</groupId>

diff --git a/...n/java/org/wso2/carbon/inbound/endpoint/common/InboundOneTimeTriggerRequestProcessor.java b/...n/java/org/wso2/carbon/inbound/endpoint/common/InboundOneTimeTriggerRequestProcessor.java
@@ -38,6 +38,7 @@ public abstract class InboundOneTimeTriggerRequestProcessor implements InboundRe
     protected SynapseEnvironment synapseEnvironment;
     protected String name;
     protected boolean coordination;
+    protected boolean startInPausedMode;
 
     private OneTimeTriggerInboundRunner inboundRunner;
     private Thread runningThread;
@@ -130,4 +131,22 @@ public void destroy() {
             }
         }
     }
+
+    @Override
+    public boolean activate() {
+
+        return false;
+    }
+
+    @Override
+    public boolean deactivate() {
+
+        return false;
+    }
+
+    @Override
+    public boolean isDeactivated() {
+        // Need to properly implement this logic.
+        return false;
+    }
 }