From c281b6a6f00341a11cf4a0a162f94667dd1658af Mon Sep 17 00:00:00 2001 From: hasuniea Date: Wed, 25 May 2016 18:14:28 +0530 Subject: [PATCH] SCEP csr sign feature --- .../pom.xml | 42 +++++++------------ .../src/main/webapp/WEB-INF/cxf-servlet.xml | 7 ++-- .../pom.xml | 4 +- .../src/main/resources/p2.inf | 3 +- 4 files changed, 20 insertions(+), 36 deletions(-) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml index 2db59544e3..546fdd32b5 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml @@ -24,7 +24,7 @@ certificate-mgt org.wso2.carbon.devicemgt - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml @@ -48,7 +48,7 @@ maven-war-plugin WEB-INF/lib/*cxf*.jar - certificatemgt + certificate-mgt @@ -79,7 +79,7 @@ - + @@ -121,6 +121,12 @@ commons-codec.wso2 commons-codec + + + commons-codec + commons-codec + + org.apache.cxf @@ -135,31 +141,11 @@ junit test - - commons-httpclient.wso2 - commons-httpclient - provided - javax.ws.rs jsr311-api provided - - - - - - - - - - - - - - - org.wso2.carbon org.wso2.carbon.logging @@ -179,6 +165,10 @@ org.apache.axis2.wso2 axis2-client + + org.apache.neethi.wso2 + neethi + @@ -212,11 +202,7 @@ org.wso2.carbon.devicemgt org.wso2.carbon.apimgt.annotations - - - org.apache.axis2.wso2 - axis2-client - 1.6.1.wso2v14 + provided diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml index 693556cefb..a41ea82b98 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml @@ -26,7 +26,6 @@ - @@ -45,11 +44,11 @@ - - + + - + diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml index e7132ff227..3616a9d50c 100644 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml +++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml @@ -24,7 +24,7 @@ org.wso2.carbon.devicemgt certificate-mgt-feature - 1.1.0-SNAPSHOT + 1.1.1-SNAPSHOT ../pom.xml @@ -59,7 +59,7 @@ ${project.build.directory}/maven-shared-archive-resources/webapps - certificatemgt.war + certificate-mgt.war diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf index ba72f7f724..bc3212ee09 100644 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf +++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf @@ -1,3 +1,2 @@ instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.api_${feature.version}/webapps/certificatemgt.war,target:${installFolder}/../../deployment/server/webapps/certificatemgt.war,overwrite:true);\ \ No newline at end of file +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.api_${feature.version}/webapps/certificate-mgt.war,target:${installFolder}/../../deployment/server/webapps/certificate-mgt.war,overwrite:true);\ \ No newline at end of file