Remove eula.xml from p2.inf, pom.xml and bin.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d114d223 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d114d223 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d114d223 Branch: refs/heads/master Commit: d114d22316872e835a0a5939b39b0d484426b68f Parents: ea5425a Author: M. Isuru Tharanga Chrishantha Perera <[email protected]> Authored: Thu Apr 17 07:28:36 2014 +0530 Committer: M. Isuru Tharanga Chrishantha Perera <[email protected]> Committed: Thu Apr 17 07:28:36 2014 +0530 ---------------------------------------------------------------------- .../manager/common/org.apache.stratos.common.server.feature/pom.xml | 1 - .../org.apache.stratos.common.server.feature/resources/p2.inf | 1 - .../src/main/resources/p2.inf | 1 - products/stratos/modules/distribution/src/assembly/bin.xml | 1 - 4 files changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d114d223/features/manager/common/org.apache.stratos.common.server.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml index 2464cf5..9f42fd9 100644 --- a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml +++ b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml @@ -166,7 +166,6 @@ <include>conf/identity.xml</include> <include>conf/tenant-mgt.xml</include> <include>conf/stratos.xml</include> - <include>conf/eula.xml</include> <include>conf/usage-throttling-agent-config.xml</include> <include>p2.inf</include> <include>build.properties</include> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d114d223/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf ---------------------------------------------------------------------- diff --git a/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf b/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf index 07fc263..329e2ee 100644 --- a/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf +++ b/features/manager/common/org.apache.stratos.common.server.feature/resources/p2.inf @@ -22,5 +22,4 @@ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../featur org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/tenant-mgt.xml,target:${installFolder}/../conf/multitenancy/tenant-mgt.xml,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/multitenancy-packages.xml,target:${installFolder}/../conf/multitenancy/multitenancy-packages.xml,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/usage-throttling-agent-config.xml,target:${installFolder}/../conf/multitenancy/usage-throttling-agent-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/eula.xml,target:${installFolder}/../conf/multitenancy/eula.xml,overwrite:true);\ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d114d223/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf ---------------------------------------------------------------------- diff --git a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf index 07fc263..329e2ee 100644 --- a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf +++ b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf @@ -22,5 +22,4 @@ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../featur org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/tenant-mgt.xml,target:${installFolder}/../conf/multitenancy/tenant-mgt.xml,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/multitenancy-packages.xml,target:${installFolder}/../conf/multitenancy/multitenancy-packages.xml,overwrite:true);\ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/usage-throttling-agent-config.xml,target:${installFolder}/../conf/multitenancy/usage-throttling-agent-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/eula.xml,target:${installFolder}/../conf/multitenancy/eula.xml,overwrite:true);\ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d114d223/products/stratos/modules/distribution/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml index 7de42a6..9a34fae 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -326,7 +326,6 @@ <includes> <include>**/multitenancy-packages.xml</include> <include>**/stratos.xml</include> - <include>**/eula.xml</include> <include>**/usage-throttling-agent-config.xml</include> <!--include>**/cloud-services-desc.xml</include--> </includes>
