diff --git a/product/modules/agents/windows/jax-rs/pom.xml b/product/modules/agents/windows/jax-rs/pom.xml
index 1b3963e4b79..484ab066ec8 100644
--- a/product/modules/agents/windows/jax-rs/pom.xml
+++ b/product/modules/agents/windows/jax-rs/pom.xml
@@ -186,6 +186,104 @@
             <artifactId>bcprov-jdk15on</artifactId>
             <version>1.49</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+            <version>1.2.14</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <version>1.2.14</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-bindings-soap</artifactId>
+            <version>2.6.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>2.6.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-extension-providers</artifactId>
+            <version>2.6.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.wss4j</groupId>
+            <artifactId>wss4j-ws-security-common</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>3.0.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>3.0.5.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.messaging.saaj</groupId>
+            <artifactId>saaj-impl</artifactId>
+            <version>1.3.18</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.messaging.saaj</groupId>
+            <artifactId>saaj-impl</artifactId>
+            <version>1.3.18</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>1.49</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.49</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>3.0.21</version>
+        </dependency>
+        <dependency>
+            <groupId>com.madgag.spongycastle</groupId>
+            <artifactId>pkix</artifactId>
+            <version>1.51.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.madgag.spongycastle</groupId>
+            <artifactId>prov</artifactId>
+            <version>1.51.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.madgag.spongycastle</groupId>
+            <artifactId>core</artifactId>
+            <version>1.51.0.0</version>
+        </dependency>
     </dependencies>
     <properties>
         <cxf.version>2.6.1</cxf.version>
diff --git a/product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml b/product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
index 165c9670477..89c9d1e886b 100644
--- a/product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -23,22 +23,52 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xmlns:jaxws="http://cxf.apache.org/jaxws"
        xsi:schemaLocation="
          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
          http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
 
 
-    <jaxrs:server id="ServiceDiscoveryService" address="/devices">
-        <jaxrs:serviceBeans>
-            <ref bean="ServiceDiscoveryServiceBean"/>
-        </jaxrs:serviceBeans>
-    </jaxrs:server>
-    <jaxrs:server id="enrollmentService" address="/enrollment">
+    <jaxws:endpoint
+            id="DiscoveryService"
+            implementor="cdm.api.windows.DiscoveryService.impl.DiscoveryServiceGetImpl"
+            address="/test/send"/>
+
+    <jaxrs:server id="DiscoveryService_rest" address="/test/send2">
         <jaxrs:serviceBeans>
-            <ref bean="enrollmentServiceBean"/>
+            <ref bean="DiscoveryService_rest_bean"/>
         </jaxrs:serviceBeans>
     </jaxrs:server>
-    <bean id="ServiceDiscoveryServiceBean" class="cdm.api.windows.impl.DiscoveryServiceImpl"/>
-    <bean id="enrollmentServiceBean" class="cdm.api.windows.impl.EnrolmentServiceImpl"/>
+    <bean id="DiscoveryService_rest_bean" class="cdm.api.windows.DiscoveryService.impl.DiscoveryServiceGetImpl"/>
+
+
+
+    <jaxws:endpoint
+            id="EnrollmentPolicyService"
+            implementor="cdm.api.windows.xcep.impl.xcepimpl"
+            address="/test/xcep">
+
+        <jaxws:handlers>
+            <bean id="serviceOptionsHandler_xcep"
+                  class="com.ex.xcep.impl.PPSRSOApMessageHandler"/>
+        </jaxws:handlers>
+        <jaxws:properties>
+            <entry key="ws-security.callback-handler" value-ref="myPasswordCallback"/>
+        </jaxws:properties>
+    </jaxws:endpoint>
+    <bean id="myPasswordCallback" class="cdm.api.windows.xcep.util.ServerPasswordCallback"/>
+
+
+
+    <jaxws:endpoint
+            id="CertificateEnrollmentService"
+            implementor="cdm.api.windows.wstep.impl.CertificateEnrollmentServiceImpl"
+            address="/cert">
+        <jaxws:handlers>
+            <bean id="serviceOptionsHandler_wstep"
+                  class="cdm.api.windows.wstep.util.PPSRSOApMessageHandler"/>
+        </jaxws:handlers>
+    </jaxws:endpoint>
+
 </beans>
 
diff --git a/product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml b/product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml
index 777ee8a709d..c36bac34d56 100644
--- a/product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml
+++ b/product/modules/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml
@@ -20,10 +20,16 @@
   -->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
   <display-name>CDM-Windows-API</display-name>
+
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>/WEB-INF/cxf-servlet.xml</param-value>
+  </context-param>
+
   <servlet>
-    <description>JAX-WS/JAX-RS Endpoint</description>
-    <display-name>JAX-WS/JAX-RS Servlet</display-name>
-    <servlet-name>JAXServlet</servlet-name>
+    <description>JAX-WS/JAX-RS-windows Endpoint</description>
+    <display-name>JAX-WS/JAX-RS-windows Servlet</display-name>
+    <servlet-name>JAXServlet-windows</servlet-name>
     <servlet-class>
             org.apache.cxf.transport.servlet.CXFServlet
     </servlet-class>
@@ -34,7 +40,7 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
-    <servlet-name>JAXServlet</servlet-name>
+    <servlet-name>JAXServlet-windows</servlet-name>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
   <session-config>