code cleaned

IsurangaPerera · Aug 13, 2017 · e27977d · e27977d
1 parent 4059d86
commit e27977d
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 565 deletions.
diff --git a/org.wso2.carbon.sts.provider/pom.xml b/org.wso2.carbon.sts.provider/pom.xml
@@ -31,6 +31,12 @@
 			<version>1.0.0</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.wso2.carbon.sts</groupId>
+			<artifactId>org.wso2.carbon.sts.provider2</artifactId>
+			<version>1.0.0</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.neethi</groupId>
 			<artifactId>neethi</artifactId>

diff --git a/org.wso2.carbon.sts.provider/src/main/java/org/wso2/carbon/sts/resource/STSResource.java b/org.wso2.carbon.sts.provider/src/main/java/org/wso2/carbon/sts/resource/STSResource.java
@@ -10,10 +10,15 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.xml.transform.Source;
+import javax.xml.ws.Provider;
 
 import org.apache.cxf.binding.soap.SoapFault;
 import org.osgi.service.component.annotations.Component;
-import org.wso2.carbon.sts.resource.provider.DefaultSecurityTokenServiceProvider;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.wso2.carbon.sts.provider2.provider.DefaultSecurityTokenServiceProvider;
+import org.wso2.carbon.sts.resource.internal.DataHolder;
 import org.wso2.carbon.sts.resource.utils.SOAPUtils;
 import org.wso2.carbon.sts.resource.utils.WSContext;
 import org.wso2.msf4j.Microservice;
@@ -44,7 +49,7 @@ public class STSResource extends AbstractResource {
 	public void processRequest(@Context Request request, @Context Response response) {
 
 		try {
-			DefaultSecurityTokenServiceProvider provider = new DefaultSecurityTokenServiceProvider();
+			DefaultSecurityTokenServiceProvider provider = DataHolder.getInstance().getServiceProvider();
 			provider.setWebServiceContext(WSContext.getInstance()
 					.getWSContext());
 			Source resp = provider.invoke((Source) request
@@ -64,6 +69,23 @@ public void processRequest(@Context Request request, @Context Response response)
 		response.send();
 	}
 
+	@Reference(
+	        name = "provider",
+	        service = Provider.class,
+	        cardinality = ReferenceCardinality.MANDATORY,
+	        policy = ReferencePolicy.DYNAMIC,
+	        unbind = "removePolicy"
+		)
+		public void addServiceProvider(Provider provider) {
+
+			DataHolder.getInstance().setServiceProvider(((DefaultSecurityTokenServiceProvider)provider));
+		}
+
+		public void removePolicy(Provider provider) {
+
+			DataHolder.getInstance().setServiceProvider(null);
+		}
+
 	/*@Reference(
         name = "policy",
         service = SecurityPolicyService.class,

diff --git a/...der/src/main/java/org/wso2/carbon/sts/resource/interceptor/MSF4JMessageInInterceptor.java b/...der/src/main/java/org/wso2/carbon/sts/resource/interceptor/MSF4JMessageInInterceptor.java
@@ -29,7 +29,6 @@
 import org.apache.cxf.ws.policy.PolicyInInterceptor;
 import org.osgi.service.component.annotations.Component;
 import org.wso2.carbon.sts.resource.internal.DataHolder;
-import org.wso2.carbon.sts.resource.provider.PasswordCallbackHandler;
 import org.wso2.carbon.sts.resource.utils.SOAPUtils;
 import org.wso2.carbon.sts.resource.utils.WSContext;
 import org.wso2.msf4j.Interceptor;

diff --git a/...2.carbon.sts.provider/src/main/java/org/wso2/carbon/sts/resource/internal/DataHolder.java b/...2.carbon.sts.provider/src/main/java/org/wso2/carbon/sts/resource/internal/DataHolder.java
@@ -2,10 +2,12 @@
 
 import org.apache.cxf.message.Exchange;
 import org.apache.neethi.Policy;
+import org.wso2.carbon.sts.provider2.provider.DefaultSecurityTokenServiceProvider;
 
 public class DataHolder {
 	private Policy policy;
 	private Exchange exchange;
+	private DefaultSecurityTokenServiceProvider provider;
 
     private static DataHolder instance = new DataHolder();
 
@@ -30,4 +32,12 @@ public void setExchange(Exchange exchange) {
 	public Exchange getExchange() {
 		return exchange;
 	}
+
+	public void setServiceProvider(DefaultSecurityTokenServiceProvider provider) {
+		this.provider = provider;
+	}
+
+	public DefaultSecurityTokenServiceProvider getServiceProvider() {
+		return provider;
+	}
 }