Repository: stratos Updated Branches: refs/heads/master 6ba4fae38 -> f010309c7
Removing org.wso2.stratos.identity.saml2.sso.mgt references and removing org.wso2.stratos references Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/af1af67f Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/af1af67f Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/af1af67f Branch: refs/heads/master Commit: af1af67f694f06b6acd6678a650c526c8ef4e331 Parents: d1ebdc6 Author: lasinducharith <[email protected]> Authored: Wed Sep 24 11:08:50 2014 +0530 Committer: lasinducharith <[email protected]> Committed: Wed Sep 24 11:10:33 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/common/constants/StratosConstants.java | 2 +- .../ui/internal/TenantActivityUIServiceComponent.java | 2 +- .../activity/internal/TenantActivityServiceComponent.java | 2 +- products/stratos/modules/distribution/src/assembly/bin.xml | 3 --- products/stratos/modules/p2-profile-gen/pom.xml | 9 --------- 5 files changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/af1af67f/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java index 597b02e..8b940b2 100644 --- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java +++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/constants/StratosConstants.java @@ -24,7 +24,7 @@ public class StratosConstants { public static final String CLOUD_SERVICE_IS_ACTIVE_PROP_KEY = "active"; public static final String CLOUD_SERVICE_INFO_STORE_PATH = - "/repository/components/org.wso2.stratos/cloud-manager/cloud-services"; + "/repository/components/org.apache.stratos/cloud-manager/cloud-services"; public static final String TENANT_USER_VALIDATION_STORE_PATH = "/repository/components/org.wso2.carbon.validations"; http://git-wip-us.apache.org/repos/asf/stratos/blob/af1af67f/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java b/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java index 00b30ca..f1fca05 100644 --- a/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java +++ b/components/org.apache.stratos.tenant.activity.ui/src/main/java/org/apache/stratos/tenant/activity/ui/internal/TenantActivityUIServiceComponent.java @@ -25,7 +25,7 @@ import org.apache.stratos.common.util.StratosConfiguration; import org.wso2.carbon.utils.ConfigurationContextService; /** - * @scr.component name="org.wso2.stratos.tenant.activity.ui" immediate="true" + * @scr.component name="org.apache.stratos.tenant.activity.ui" immediate="true" * @scr.reference name="config.context.service" * interface="org.wso2.stratos.utils.ConfigurationContextService" * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" http://git-wip-us.apache.org/repos/asf/stratos/blob/af1af67f/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java index e937d3e..3e317c5 100644 --- a/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java +++ b/components/org.apache.stratos.tenant.activity/src/main/java/org/apache/stratos/tenant/activity/internal/TenantActivityServiceComponent.java @@ -32,7 +32,7 @@ import org.wso2.carbon.utils.ConfigurationContextService; import java.lang.Throwable; /** - * @scr.component name="org.wso2.stratos.tenant.activity" immediate="true" + * @scr.component name="org.apache.stratos.tenant.activity" immediate="true" * @scr.reference name="registry.service" * interface="org.wso2.carbon.registry.core.service.RegistryService" cardinality="1..1" * policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService" http://git-wip-us.apache.org/repos/asf/stratos/blob/af1af67f/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 cef5a88..b7b91d2 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -450,9 +450,6 @@ <fileSet> <directory>../../conf/temp-artifacts</directory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/plugins</outputDirectory> - <includes> - <include>org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar</include> - </includes> </fileSet> <!-- autoscaler --> http://git-wip-us.apache.org/repos/asf/stratos/blob/af1af67f/products/stratos/modules/p2-profile-gen/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml index 5e0fcf2..1e14598 100644 --- a/products/stratos/modules/p2-profile-gen/pom.xml +++ b/products/stratos/modules/p2-profile-gen/pom.xml @@ -199,7 +199,6 @@ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.relying.party.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.core.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.sso.saml.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.feature:2.2.0</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.module.mgt.server.feature:${carbon.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.caching.feature:${carbon.version}</featureArtifactDef> @@ -342,10 +341,6 @@ <version>${carbon.platform.patch.version.4.2.2}</version> </feature> <feature> - <id>org.wso2.stratos.identity.saml2.sso.mgt.feature.group</id> - <version>2.2.0</version> - </feature> - <feature> <id>org.apache.stratos.logging.mgt.feature.group</id> <version>${project.version}</version> </feature> @@ -615,10 +610,6 @@ <version>${carbon.platform.patch.version.4.2.2}</version> </feature> <feature> - <id>org.wso2.stratos.identity.saml2.sso.mgt.feature.group</id> - <version>2.2.0</version> - </feature> - <feature> <id>org.wso2.carbon.databridge.datapublisher.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature>
