From 637eeb9be3a1c2d68d270d71a3e473aed2e1b1f0 Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Wed, 3 Dec 2014 13:35:16 +0530 Subject: [PATCH] Fixing pom and refactring --- modules/features/org.wso2.emm.feature/pom.xml | 221 ------------------ .../org.wso2.emm.feature/resources/p2.inf | 6 - .../org.wso2.emm.styles.feature/pom.xml | 78 ------- modules/features/pom.xml | 47 ---- pom.xml | 1 - 5 files changed, 353 deletions(-) delete mode 100644 modules/features/org.wso2.emm.feature/pom.xml delete mode 100644 modules/features/org.wso2.emm.feature/resources/p2.inf delete mode 100644 modules/features/org.wso2.emm.styles.feature/pom.xml delete mode 100644 modules/features/pom.xml diff --git a/modules/features/org.wso2.emm.feature/pom.xml b/modules/features/org.wso2.emm.feature/pom.xml deleted file mode 100644 index 90a71d3dacd..00000000000 --- a/modules/features/org.wso2.emm.feature/pom.xml +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - org.wso2.emm - wso2emm-features - 1.1.0 - ../pom.xml - - - 4.0.0 - org.wso2.emm.feature - pom - WSO2 Enterprise Mobility Manager (EMM) feature - http://wso2.org - - - - org.wso2.store - org.wso2.store.sso.common - ${es.version} - - - org.wso2.emm - org.wso2.emm.admin.styles - ${project.version} - - - com.googlecode.plist - dd-plist - 1.8 - - - org.bouncycastle.wso2 - bcprov-jdk15on - ${bcprov.wso2.version} - - - org.bouncycastle.wso2 - bcpkix-jdk15on - ${bcpkix.wso2.version} - - - org.bouncycastle.wso2 - bcmail-jdk15on - ${bcmail.wso2.version} - - - com.google.code.gson - gson - ${gson.version} - - - commons-httpclient.wso2 - commons-httpclient - ${apache.httpclient.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.notnoop.apns - apns - ${notnoop.apns.version} - - - com.google.code.jscep.wso2 - jscep - ${jscep.version} - - - net.jcip.wso2 - jcip-annotations - ${jcip.annotations.version} - - - commons-codec - commons-codec - ${version.commons.codec} - - - commons-io - commons-io - ${version.commons.io} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - - - - org.wso2.maven - carbon-p2-plugin - ${carbon.p2.plugin.version} - - - p2-feature-generation - package - - p2-feature-gen - - - org.wso2.emm - ../../../../etc/feature.properties - - - org.wso2.carbon.p2.category.type:console - org.eclipse.equinox.p2.type.group:false - - - - slf4j.wso2:slf4j:1.5.10.wso2v1 - org.wso2.emm:org.wso2.emm.admin.styles:${project.version} - org.wso2.emm:org.wso2.emm.gcm:${project.version} - org.wso2.emm:org.wso2.emm.task:${project.version} - org.wso2.emm:org.wso2.emm.core:${project.version} - com.googlecode.plist:dd-plist:1.8 - org.bouncycastle.wso2:bcprov-jdk15on:${bcprov.wso2.version} - org.bouncycastle.wso2:bcpkix-jdk15on:${bcpkix.wso2.version} - org.bouncycastle.wso2:bcmail-jdk15on:${bcmail.wso2.version} - com.google.code.gson:gson:${gson.version} - commons-httpclient.wso2:commons-httpclient:${apache.httpclient.version} - com.notnoop.apns:apns:${notnoop.apns.version} - com.google.code.jscep.wso2:jscep:${jscep.version} - com.fasterxml.jackson.core:jackson-core:${jackson.version} - com.fasterxml.jackson.core:jackson-databind:${jackson.version} - com.fasterxml.jackson.core:jackson-annotations:${jackson.version} - net.jcip.wso2:jcip-annotations:${jcip.annotations.version} - commons-codec:commons-codec:${version.commons.codec} - commons-io:commons-io:${version.commons.io} - org.slf4j:slf4j-api:${slf4j.version} - - - - - - - - - - - maven-resources-plugin - ${maven-resources-plugin.version} - - - prefilter-resources - generate-resources - - copy-resources - - - src/main/resources - - - resources - - p2.inf - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - clean_target - install - - - - - - - - - run - - - - - - - diff --git a/modules/features/org.wso2.emm.feature/resources/p2.inf b/modules/features/org.wso2.emm.feature/resources/p2.inf deleted file mode 100644 index bcb306a28cb..00000000000 --- a/modules/features/org.wso2.emm.feature/resources/p2.inf +++ /dev/null @@ -1,6 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps,overwrite:true); \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../../deployment/server/jaggeryapps/publisher,target:${installFolder}/../../deployment/server/jaggeryapps/fakepublisher,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/publisher);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../../deployment/server/jaggeryapps/store,target:${installFolder}/../../deployment/server/jaggeryapps/fakestore,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/store);\ \ No newline at end of file diff --git a/modules/features/org.wso2.emm.styles.feature/pom.xml b/modules/features/org.wso2.emm.styles.feature/pom.xml deleted file mode 100644 index 9255ca90053..00000000000 --- a/modules/features/org.wso2.emm.styles.feature/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - org.wso2.emm - wso2emm-features - 1.1.0 - ../pom.xml - - - 4.0.0 - org.wso2.emm.styles.feature - pom - WSO2 Enterprise Mobility Manager (EMM) Styles Feature - http://wso2.org - - - - org.wso2.emm - org.wso2.emm.admin.styles - ${project.version} - - - - - - - org.wso2.maven - carbon-p2-plugin - ${carbon.p2.plugin.version} - - - p2-feature-generation - package - - p2-feature-gen - - - org.wso2.emm.styles - ../../etc/feature.properties - - - - org.wso2.carbon.p2.category.type:console - - - - - - org.wso2.emm:org.wso2.emm.admin.styles - - - - - - - - - - diff --git a/modules/features/pom.xml b/modules/features/pom.xml deleted file mode 100644 index 42438eae6e0..00000000000 --- a/modules/features/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - org.wso2.emm - wso2emm-parent - 1.1.0 - ../../pom.xml - - - 4.0.0 - org.wso2.emm - wso2emm-features - pom - WSO2 Enterprise Mobility Manager (EMM) Features - http://wso2.org - - - org.wso2.emm.feature - org.wso2.emm.styles.feature - - - - - - - - - diff --git a/pom.xml b/pom.xml index d13e5e45ad6..e8eaec09cf0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ - modules/features modules/p2-profile-gen modules/distribution modules/integration