Improve CApp classloader to handle connector dependencies

wso2 · Dec 16, 2024 · 173438d · 173438d
1 parent 61ab8c7
commit 173438d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/....integrator.core/src/main/java/org/wso2/micro/application/deployer/CarbonApplication.java b/....integrator.core/src/main/java/org/wso2/micro/application/deployer/CarbonApplication.java
@@ -32,6 +32,7 @@ public class CarbonApplication {
     private String appVersion;
     private boolean deploymentCompleted;
     private String mainSequence;
+    private ClassLoader classLoader;
 
     private ApplicationConfiguration appConfig;
 
@@ -109,5 +110,13 @@ public String getMainSequence() {
     public void setMainSequence(String mainSequence) {
         this.mainSequence = mainSequence;
     }
+
+    public ClassLoader getClassLoader() {
+        return classLoader;
+    }
+
+    public void setClassLoader(ClassLoader classLoader) {
+        this.classLoader = classLoader;
+    }
 }
 
diff --git a/...org/wso2/micro/integrator/initializer/deployment/synapse/deployer/SynapseAppDeployer.java b/...org/wso2/micro/integrator/initializer/deployment/synapse/deployer/SynapseAppDeployer.java
@@ -129,8 +129,8 @@ public void deployArtifacts(CarbonApplication carbonApp, AxisConfiguration axisC
         List<Artifact.Dependency> artifacts = carbonApp.getAppConfig().getApplicationArtifact()
                 .getDependencies();
 
-        deployClassMediators(artifacts, axisConfig);
-        deploySynapseLibrary(artifacts, axisConfig);
+        deployClassMediators(artifacts, axisConfig, carbonApp);
+        deploySynapseLibrary(artifacts, axisConfig, carbonApp);
         Map<String, List<Artifact.Dependency>> artifactTypeMap = getOrderedArtifactsMap(artifacts);
 
         //deploy artifacts
@@ -335,8 +335,8 @@ && handleMainFaultSeqUndeployment(artifact, axisConfig)) {
      * @param axisConfig AxisConfiguration of the current tenant
      * @throws DeploymentException if something goes wrong while deployment
      */
-    private void deployClassMediators(List<Artifact.Dependency> artifacts,
-                                     AxisConfiguration axisConfig) throws DeploymentException {
+    private void deployClassMediators(List<Artifact.Dependency> artifacts, AxisConfiguration axisConfig,
+                                      CarbonApplication carbonApplication) throws DeploymentException {
         for (Artifact.Dependency dependency : artifacts) {
 
             Artifact artifact = dependency.getArtifact();
@@ -354,7 +354,9 @@ private void deployClassMediators(List<Artifact.Dependency> artifacts,
                     String artifactPath = artifact.getExtractedPath() + File.separator + fileName;
 
                     try {
-                        deployer.deploy(new DeploymentFileData(new File(artifactPath), deployer));
+                        DeploymentFileData deploymentFileData = new DeploymentFileData(new File(artifactPath), deployer);
+                        deploymentFileData.setClassLoader(carbonApplication.getClassLoader());
+                        deployer.deploy(deploymentFileData);
                         artifact.setDeploymentStatus(AppDeployerConstants.DEPLOYMENT_STATUS_DEPLOYED);
                     } catch (DeploymentException e) {
                         artifact.setDeploymentStatus(AppDeployerConstants.DEPLOYMENT_STATUS_FAILED);
@@ -372,8 +374,8 @@ private void deployClassMediators(List<Artifact.Dependency> artifacts,
      * @param axisConfig AxisConfiguration of the current tenant
      * @throws DeploymentException if something goes wrong while deployment
      */
-    private void deploySynapseLibrary(List<Artifact.Dependency> artifacts,
-                                      AxisConfiguration axisConfig) throws DeploymentException {
+    private void deploySynapseLibrary(List<Artifact.Dependency> artifacts, AxisConfiguration axisConfig,
+                                      CarbonApplication carbonApplication) throws DeploymentException {
         for (Artifact.Dependency dependency : artifacts) {
 
             Artifact artifact = dependency.getArtifact();
@@ -397,7 +399,9 @@ private void deploySynapseLibrary(List<Artifact.Dependency> artifacts,
                         artifact.setDeploymentStatus(AppDeployerConstants.DEPLOYMENT_STATUS_DEPLOYED);
                     } else {
                         try {
-                            deployer.deploy(new DeploymentFileData(new File(artifactPath), deployer));
+                            DeploymentFileData deploymentFileData = new DeploymentFileData(new File(artifactPath), deployer);
+                            deploymentFileData.setClassLoader(carbonApplication.getClassLoader());
+                            deployer.deploy(deploymentFileData);
                             artifact.setDeploymentStatus(AppDeployerConstants.DEPLOYMENT_STATUS_DEPLOYED);
                             try {
                                 String artifactName = getArtifactName(artifactPath, axisConfig);
@@ -1122,7 +1126,9 @@ public void deployArtifactType(List<Artifact.Dependency> artifacts, CarbonApplic
                 } else {
                     try {
                         setCustomLogContent(deployer, carbonApp);
-                        deployer.deploy(new DeploymentFileData(new File(artifactPath), deployer));
+                        DeploymentFileData deploymentFileData = new DeploymentFileData(new File(artifactPath), deployer);
+                        deploymentFileData.setClassLoader(carbonApp.getClassLoader());
+                        deployer.deploy(deploymentFileData);
                         artifact.setDeploymentStatus(AppDeployerConstants.DEPLOYMENT_STATUS_DEPLOYED);
                     } catch (DeploymentException e) {
                         artifact.setDeploymentStatus(AppDeployerConstants.DEPLOYMENT_STATUS_FAILED);