diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/DiscoveryService.java b/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/DiscoveryService.java
deleted file mode 100644
index 64cd0e8ecb..0000000000
--- a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/DiscoveryService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package cdm.api.windows;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
-import java.io.InputStream;
-
-@Path("/EnrollmentServer")
-public interface DiscoveryService {
-
- @Path("/Discovery.svc")
- @POST
- @Consumes({ "application/soap+xml;charset=utf-8", "application/xml" })
- @Produces("application/soap+xml;charset=utf-8")
- Response getDiscoveryResponse(
- InputStream discoveryRequest);
-
- @Path("/Discovery.svc")
- @GET
- @Consumes("text/html")
- @Produces("text/html")
- Response getDiscoveryOKRequest();
-
- @Path("/Discovery.svc")
- @GET
- @Consumes({ "application/soap+xml;charset=utf-8", "application/xml" })
- @Produces("text/html")
- Response getDiscoveryOKRequestWithBody(InputStream discoveryRequest);
-
-}
diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/EnrolmentService.java b/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/EnrolmentService.java
deleted file mode 100644
index 9a61a3c61d..0000000000
--- a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/EnrolmentService.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package cdm.api.windows;
-
-import javax.swing.text.Document;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
-
-@Path("/ENROLLMENTSERVER")
-public interface EnrolmentService {
-
- @Path("/PolicyEnrollmentWebservice.svc")
- @POST
- @Consumes("application/soap+xml;charset=utf-8")
- @Produces("application/soap+xml;charset=utf-8")
- Response getPolicies(Document request);
-
- @Path("/DeviceEnrollmentWebservice.svc")
- @POST
- @Consumes("application/soap+xml;charset=utf-8")
- @Produces("application/soap+xml;charset=utf-8")
- Response enrollUser(Document request);
-
-}
diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/DiscoveryServiceImpl.java b/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/DiscoveryServiceImpl.java
deleted file mode 100644
index 59de66ae0f..0000000000
--- a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/DiscoveryServiceImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package cdm.api.windows.impl;
-
-import cdm.api.windows.DiscoveryService;
-
-import javax.ws.rs.core.Response;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-
-import org.apache.log4j.Logger;
-
-public class DiscoveryServiceImpl implements DiscoveryService {
-
- private Logger LOGGER = Logger.getLogger(DiscoveryServiceImpl.class);
-
- public Response getDiscoveryResponse(InputStream discoveryRequest) {
- LOGGER.info("Received Discovery Service POST Request [{}]");
-
- String response = null;
- File file = null;
- FileInputStream fis = null;
- byte[] data = null;
-
- try {
-
- file = new File("./conf/discover-service.xml");
- fis = new FileInputStream(file);
- data = new byte[(int) file.length()];
- fis.read(data);
- fis.close();
- response = new String(data, "UTF-8");
-
- } catch (IOException e) {
- LOGGER.error("An Unexpected Error has occurred while processing the request ", e);
- }
- LOGGER.info("Sending Discovery Response");
-
- return Response.ok().entity(response).build();
- }
-
- public Response getDiscoveryOKRequest() {
- LOGGER.info("Received a GET Request without body");
- return Response.ok().build();
- }
-
- public Response getDiscoveryOKRequestWithBody(InputStream discoveryRequest) {
- LOGGER.info("Received a GET Request with body [{}]");
- return Response.ok().build();
- }
-
-
-}
diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/EnrolmentServiceImpl.java b/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/EnrolmentServiceImpl.java
deleted file mode 100644
index c3acde8387..0000000000
--- a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/EnrolmentServiceImpl.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package cdm.api.windows.impl;
-
-import cdm.api.windows.EnrolmentService;
-import org.apache.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-import javax.swing.text.Document;
-import javax.ws.rs.core.Response;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathFactory;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Iterator;
-
-import cdm.api.windows.util.CertificateSigningService;
-
-public class EnrolmentServiceImpl implements EnrolmentService {
-
- private Logger LOGGER = Logger.getLogger(EnrolmentServiceImpl.class);
-
- static {
- Security.addProvider(new BouncyCastleProvider());
- }
-
- private String enrollmentResponseFile;
-
- private String wapProvisioningXmlFile;
-
- private String privatePemKeyFilePath;
-
- private String caCertificateFilePath;
-
- PrivateKey privateKey;
-
- X509Certificate rooCACertificate;
-
- public void init() {
-
- try {
- FileInputStream in = new FileInputStream(privatePemKeyFilePath);
- byte[] keyBytes = new byte[in.available()];
- in.read(keyBytes);
- in.close();
-
- String key = new String(keyBytes, "UTF-8");
- key = key.replaceAll(
- "(-+BEGIN RSA PRIVATE KEY-+\\r?\\n|-+END RSA PRIVATE KEY-+\\r?\\n?)", "");
-
- // don't use this for real projects!
- BASE64Decoder decoder = new BASE64Decoder();
- keyBytes = decoder.decodeBuffer(key);
-
- // generate private key
-
- PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes);
- KeyFactory keyFactory = KeyFactory.getInstance("RSA");
-
- privateKey = keyFactory.generatePrivate(spec);
-
- LOGGER.info("Private Key Algorithm : " + privateKey.getAlgorithm());
- } catch (Exception e) {
- LOGGER.error("An unexpected Error has occurred while reading CA Private Key, ", e);
- }
-
- try {
- FileInputStream fr = new FileInputStream(caCertificateFilePath);
- CertificateFactory cf = CertificateFactory.getInstance("X509");
- rooCACertificate = (X509Certificate) cf.generateCertificate(fr);
-
- rooCACertificate.verify(rooCACertificate.getPublicKey());
-
- LOGGER.info("CA Certificate Expiration Date : " + rooCACertificate.getNotAfter());
-
- } catch (Exception e) {
- LOGGER.error("An unexpected Error has occurred while reading CA Root Certificate, ", e);
- }
-
- /*try {
- KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA");
- gen.initialize(2048);
- key = gen.generateKeyPair();
- PrivateKey privateKey = key.getPrivate();
- PublicKey publicKey = key.getPublic();
-
-
- *//**
- * Following details need to be provided
- *
- * Serial number
- * Signature algorithm
- * Issuer Name.
- * Subject Name -- or a Subject Alternative Name (SAN).
- * Date range (not before, not after).
- * Subject Public Key.
- *//*
-
- X509V3CertificateGenerator v3CertGen = new X509V3CertificateGenerator();
- v3CertGen.setSerialNumber(BigInteger.valueOf(new SecureRandom().nextInt(Integer.MAX_VALUE)));
- v3CertGen.setIssuerDN(new X509Principal("CN=wso2.com"));
- //v3CertGen.setIssuerDN(new X509Principal("CN=wso2.com, OU=Mobile, O=wso2 L=Colombo, C=LK"));
- v3CertGen.setNotBefore(new Date(System.currentTimeMillis() - 1000L * 60 * 60 * 24 * 30));
- v3CertGen.setNotAfter(new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 365*10)));
- v3CertGen.setSubjectDN(new X509Principal("CN=wso2.com"));
- v3CertGen.setPublicKey(publicKey);
- v3CertGen.setSignatureAlgorithm("SHA1withRSA");
-
- rooCACertificate = v3CertGen.generateX509Certificate(privateKey);
-
- } catch (Exception e) {
- e.printStackTrace();
- }*/
- }
-
- public Response getPolicies(Document request) {
- LOGGER.info("Received Get Policies Request");
-
- String response = null;
- File file = null;
- FileInputStream fis = null;
- byte[] data = null;
-
- try {
-
- file = new File("./conf/policy-service.xml");
- fis = new FileInputStream(file);
- data = new byte[(int) file.length()];
- fis.read(data);
- fis.close();
- response = new String(data, "UTF-8");
-
- } catch (IOException e) {
- LOGGER.error("An Unexpected Error has occurred while processing the request ", e);
- }
-
- LOGGER.info("Sending Get Policy Response");
- return Response.ok().entity(response).build();
- }
-
- public Response enrollUser(Document request) {
- LOGGER.info("Received User Enrollment Request");
-
- XPath xPath = XPathFactory.newInstance().newXPath();
- xPath.setNamespaceContext(new MyNamespaceContext());
- String response = null;
-
- DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
-
- try {
- NodeList nl = (NodeList) xPath.evaluate(
- "/s:Envelope/s:Body/wst:RequestSecurityToken/wsse:BinarySecurityToken", request,
- XPathConstants.NODESET);
- Node node = nl.item(0);
- String certificateDataString = node.getTextContent();
- byte[] derByteArray =
- javax.xml.bind.DatatypeConverter.parseBase64Binary(certificateDataString);
-
- PKCS10CertificationRequest certificationRequest =
- new PKCS10CertificationRequest(derByteArray);
- JcaPKCS10CertificationRequest csrReq =
- new JcaPKCS10CertificationRequest(certificationRequest);
-
- LOGGER.info("Public Key of CSR : " + csrReq.getPublicKey());
-
- X509Certificate signedCert =
- CertificateSigningService.signCSR(csrReq, privateKey, rooCACertificate);
-
- LOGGER.info("Verifying Signed Certificate with CSR's public key : " +
- signedCert.getPublicKey());
-
- BASE64Encoder base64Encoder = new BASE64Encoder();
- String rootCertEncodedString = base64Encoder.encode(rooCACertificate.getEncoded());
- String signedCertEncoded = base64Encoder.encode(signedCert.getEncoded());
-
- DocumentBuilder builder = domFactory.newDocumentBuilder();
- org.w3c.dom.Document dDoc = builder.parse(wapProvisioningXmlFile);
-
- NodeList wapParm = dDoc.getElementsByTagName("parm");
-
- NamedNodeMap rootCertAttributes = wapParm.item(0).getAttributes();
- Node b64Encoded = rootCertAttributes.getNamedItem("value");
- b64Encoded.setTextContent(rootCertEncodedString);
-
- NamedNodeMap clientCertAttributes = wapParm.item(1).getAttributes();
- Node b64CliendEncoded = clientCertAttributes.getNamedItem("value");
- b64CliendEncoded.setTextContent(signedCertEncoded);
-
- String wapProvisioning = convertDocumentToString(dDoc);
- String encodedWap = base64Encoder.encode(wapProvisioning.getBytes());
-
- org.w3c.dom.Document responseXml = builder.parse(enrollmentResponseFile);
- NodeList token = responseXml.getElementsByTagName("BinarySecurityToken");
-
- Node firstToken = token.item(0);
- firstToken.setTextContent(encodedWap);
-
- response = convertDocumentToString(responseXml);
- } catch (Exception e) {
- LOGGER.error("An Unexpected Error has occurred while processing the request ", e);
- }
-
- LOGGER.info("Sending User Enrollment Response");
- return Response.ok().entity(response).build();
- }
-
- private String convertDocumentToString(org.w3c.dom.Document document) throws Exception {
- DOMSource domSource = new DOMSource(document);
- StringWriter writer = new StringWriter();
- StreamResult result = new StreamResult(writer);
- TransformerFactory tf = TransformerFactory.newInstance();
- Transformer transformer = tf.newTransformer();
- transformer.transform(domSource, result);
- String wapProvisioning = writer.toString();
-
- return wapProvisioning;
-
- }
-
- public void setEnrollmentResponseFile(String enrollmentResponseFile) {
- this.enrollmentResponseFile = enrollmentResponseFile;
- }
-
- public void setWapProvisioningXmlFile(String wapProvisioningXmlFile) {
- this.wapProvisioningXmlFile = wapProvisioningXmlFile;
- }
-
- public void setPrivatePemKeyFilePath(String privatePemKeyFilePath) {
- this.privatePemKeyFilePath = privatePemKeyFilePath;
- }
-
- public void setCaCertificateFilePath(String caCertificateFilePath) {
- this.caCertificateFilePath = caCertificateFilePath;
- }
-
- public void setPrivateKey(PrivateKey privateKey) {
- this.privateKey = privateKey;
- }
-
- public void setRooCACertificate(X509Certificate rooCACertificate) {
- this.rooCACertificate = rooCACertificate;
- }
-
- private static class MyNamespaceContext implements NamespaceContext {
-
- public String getNamespaceURI(String prefix) {
-
- if ("s".equals(prefix)) {
- return "http://www.w3.org/2003/05/soap-envelope";
- } else if ("wst".equals(prefix)) {
- return "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
- } else if ("wsse".equals(prefix)) {
- return "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
- }
- return null;
-
- }
-
- public String getPrefix(String namespaceURI) {
- return null;
- }
-
- public Iterator getPrefixes(String namespaceURI) {
- return null;
- }
- }
-}
diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/CertificateSigningService.java b/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/CertificateSigningService.java
deleted file mode 100644
index 6b00694097..0000000000
--- a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/CertificateSigningService.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package cdm.api.windows.util;
-
-import org.apache.log4j.Logger;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.X509v3CertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;
-import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest;
-
-import java.math.BigInteger;
-import java.security.PrivateKey;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-
-public class CertificateSigningService {
-
- private static Logger LOGGER = Logger.getLogger(CertificateSigningService.class);
-
- public static X509Certificate signCSR(JcaPKCS10CertificationRequest jcaRequest,
- PrivateKey privateKey, X509Certificate caCert)
- throws Exception {
- try {
-
- X509v3CertificateBuilder certificateBuilder = new JcaX509v3CertificateBuilder(caCert,
- BigInteger
- .valueOf(
- new SecureRandom()
- .nextInt(
- Integer.MAX_VALUE)),
- new Date(
- System.currentTimeMillis() -
- 1000L *
- 60 *
- 60 *
- 24 *
- 30),
- new Date(
- System.currentTimeMillis() +
- (1000L *
- 60 *
- 60 *
- 24 *
- 365 *
- 10)),
- new X500Name(
- "CN=abimaran"),
- jcaRequest
- .getPublicKey());
-
- JcaX509ExtensionUtils extUtils = new JcaX509ExtensionUtils();
-
- ContentSigner signer =
- new JcaContentSignerBuilder("SHA1withRSA").setProvider("BC").build(privateKey);
-
- X509Certificate theCert =
- new JcaX509CertificateConverter().setProvider("BC").getCertificate(
- certificateBuilder.build(signer));
-
- LOGGER.info("Signed Certificate CN : " + theCert.getSubjectDN().getName());
-
- LOGGER.info("Signed CSR's public key : " + theCert.getPublicKey());
-
- return theCert;
-
- } catch (Exception e) {
- throw new Exception("Error in signing the certificate", e);
- }
- }
-
-}
diff --git a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/WindowsAPIUtil.java b/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/WindowsAPIUtil.java
deleted file mode 100644
index ca784e1895..0000000000
--- a/product/modules/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/WindowsAPIUtil.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package cdm.api.windows.util;
-
-
-import com.google.gson.JsonObject;
-import org.wso2.carbon.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-
-
-/**
- * WindowsAPIUtil class provides utility function used by Android REST-API classes.
- */
-public class WindowsAPIUtil {
-
- public static Device convertToDeviceObject(JsonObject json){
- Device device = new Device();
- device.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
- device.setName("Test Device");
- device.setOwner("harshan");
- return device;
- }
-
- public static DeviceIdentifier convertToDeviceIdentifierObject(String deviceId){
- DeviceIdentifier identifier = new DeviceIdentifier();
- identifier.setId(deviceId);
- identifier.setType(DeviceManagementConstants.MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
- return identifier;
- }
-}
diff --git a/product/modules/agents/windows/jax-rs/src/main/resources/applicationContext.xml b/product/modules/agents/windows/jax-rs/src/main/resources/applicationContext.xml
deleted file mode 100644
index 5dd63f2c88..0000000000
--- a/product/modules/agents/windows/jax-rs/src/main/resources/applicationContext.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-