Merge pull request #1705 from tharindu1st/wss4j-removal

remove wss4j

Author: tharindu1st

components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.samples/dist/assembly-bin-descriptor.xml

@@ -26,15 +26,6 @@
         <dependencySet>            
             <outputDirectory>lib</outputDirectory>
         </dependencySet>
-
-        <dependencySet>
-            <outputDirectory>samples/client_repo/modules</outputDirectory>
-            <includes>
-                <include>org.apache.axis2:addressing:mar</include>
-                <include>org.apache.rampart:rampart:mar</include>
-                <include>org.apache.sandesha2:sandesha2:mar</include>
-            </includes>            
-        </dependencySet>
     </dependencySets>
     <files>
         <file>

components/business-adaptors/hl7/org.wso2.carbon.business.messaging.hl7.samples/pom.xml

@@ -94,21 +94,6 @@
             </exclusions>
            <type>mar</type>
         </dependency>
-        <dependency>
-            <groupId>org.apache.rampart</groupId>
-            <artifactId>rampart</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.woden</groupId>
-                    <artifactId>woden-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j-over-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-            <type>mar</type>
-        </dependency>
     </dependencies>
 
 </project>

components/mediation-admin/org.wso2.carbon.proxyadmin.common/pom.xml

@@ -48,16 +48,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.rampart.wso2</groupId>
-            <artifactId>rampart-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j-over-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.wso2.org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>

components/mediation-admin/org.wso2.carbon.proxyadmin/pom.xml

@@ -52,16 +52,6 @@
             <groupId>org.wso2.carbon.deployment</groupId>
             <artifactId>org.wso2.carbon.service.mgt</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.rampart.wso2</groupId>
-            <artifactId>rampart-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j-over-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.wso2.org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>

components/mediation-admin/org.wso2.carbon.proxyadmin/src/main/java/org/wso2/carbon/proxyadmin/ProxyAdminServiceComponent.java

@@ -32,12 +32,10 @@
 import org.wso2.carbon.mediation.initializer.ServiceBusUtils;
 import org.wso2.carbon.mediation.initializer.services.SynapseEnvironmentService;
 import org.wso2.carbon.mediation.initializer.services.SynapseRegistrationsService;
-import org.wso2.carbon.proxyadmin.observer.ProxyObserver;
 import org.wso2.carbon.proxyadmin.observer.ProxyServiceParameterObserver;
 import org.wso2.carbon.proxyadmin.service.ProxyDeployerService;
 import org.wso2.carbon.proxyadmin.service.ProxyDeployerServiceImpl;
 import org.wso2.carbon.proxyadmin.util.ConfigHolder;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.service.mgt.ServiceAdmin;
 import org.wso2.carbon.utils.AbstractAxis2ConfigurationContextObserver;
@@ -86,14 +84,6 @@ protected void activate(ComponentContext context) {
             if (synEnvService != null) {
                 AxisConfiguration axisConf = synEnvService.getConfigurationContext().getAxisConfiguration();
                 try {
-                    if (!Boolean.parseBoolean(System.getProperty("NonRegistryMode"))) {
-                        ProxyObserver proxyObserver = new ProxyObserver(synEnvService, ConfigHolder.getInstance()
-                                .getRegistryService().getConfigSystemRegistry());
-                        ConfigHolder.getInstance().addProxyObserver(MultitenantConstants.SUPER_TENANT_ID,
-                                proxyObserver);
-                        axisConf.addObservers(proxyObserver);
-                        proxyObserver.setSynapseEnvironmentService(synEnvService);
-                    }
                     registerDeployer(synEnvService.getConfigurationContext().getAxisConfiguration(), synEnvService
                             .getSynapseEnvironment());
                     bindProxyParameterObserver(axisConf);
@@ -179,24 +169,12 @@ protected void setSynapseEnvironmentService(SynapseEnvironmentService synapseEnv
             int tenantId = synapseEnvironmentService.getTenantId();
             AxisConfiguration axisConfiguration = synapseEnvironmentService.getConfigurationContext()
                     .getAxisConfiguration();
-            ProxyObserver observer;
             if (!alreadyCreated) {
                 try {
                     registerDeployer(synapseEnvironmentService.getConfigurationContext().getAxisConfiguration(),
                             synapseEnvironmentService.getSynapseEnvironment());
-                    observer = new ProxyObserver(synapseEnvironmentService, ConfigHolder.getInstance()
-                            .getRegistryService().getConfigSystemRegistry(tenantId));
-                    axisConfiguration.addObservers(observer);
-                    ConfigHolder.getInstance().addProxyObserver(tenantId, observer);
                 } catch (ProxyAdminException e) {
                     log.error("Error while initializing the proxy admin.", e);
-                } catch (RegistryException e) {
-                    log.error("Error while initializing the proxy admin.", e);
-                }
-            } else {
-                observer = ConfigHolder.getInstance().getProxyObsever(tenantId);
-                if (observer != null) {
-                    observer.setSynapseEnvironmentService(synapseEnvironmentService);
                 }
             }
         }
@@ -303,12 +281,7 @@ public void createdConfigurationContext(ConfigurationContext configContext) {
                     SynapseEnvironmentService synEnvService = ConfigHolder.getInstance().getSynapseEnvironmentService
                             (tenantId);
                     if (synEnvService != null) {
-                        ProxyObserver proxyObserver = new ProxyObserver(synEnvService, ConfigHolder.getInstance()
-                                .getRegistryService().getConfigSystemRegistry(tenantId));
-                        ConfigHolder.getInstance().addProxyObserver(tenantId, proxyObserver);
-                        axisConfig.addObservers(proxyObserver);
                         registerDeployer(axisConfig, synEnvService.getSynapseEnvironment());
-                        proxyObserver.setSynapseEnvironmentService(synEnvService);
                     }
                 } else {
                     log.error("Error while initialzing AxisConfiguration", null);