From af1af67f694f06b6acd6678a650c526c8ef4e331 Mon Sep 17 00:00:00 2001 From: lasinducharith Date: Wed, 24 Sep 2014 11:08:50 +0530 Subject: [PATCH] Removing org.wso2.stratos.identity.saml2.sso.mgt references and removing org.wso2.stratos references --- .../stratos/common/constants/StratosConstants.java | 2 +- .../ui/internal/TenantActivityUIServiceComponent.java | 2 +- .../internal/TenantActivityServiceComponent.java | 2 +- .../stratos/modules/distribution/src/assembly/bin.xml | 3 --- products/stratos/modules/p2-profile-gen/pom.xml | 9 --------- 5 files changed, 3 insertions(+), 15 deletions(-) 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 597b02eba0..8b940b2ffe 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"; 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 00b30caaf6..f1fca05444 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.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" 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 e937d3e172..3e317c5b16 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 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" diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml index cef5a889c8..b7b91d2b02 100755 --- a/products/stratos/modules/distribution/src/assembly/bin.xml +++ b/products/stratos/modules/distribution/src/assembly/bin.xml @@ -450,9 +450,6 @@ ../../conf/temp-artifacts ${pom.artifactId}-${pom.version}/repository/components/plugins - - org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar - diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml index 5e0fcf2153..1e14598ae6 100644 --- a/products/stratos/modules/p2-profile-gen/pom.xml +++ b/products/stratos/modules/p2-profile-gen/pom.xml @@ -199,7 +199,6 @@ org.wso2.carbon:org.wso2.carbon.identity.relying.party.feature:${carbon.platform.patch.version.4.2.1} org.wso2.carbon:org.wso2.carbon.identity.core.feature:${carbon.platform.patch.version.4.2.2} org.wso2.carbon:org.wso2.carbon.identity.sso.saml.feature:${carbon.platform.patch.version.4.2.2} - org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.feature:2.2.0 org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.version} org.wso2.carbon:org.wso2.carbon.module.mgt.server.feature:${carbon.version} org.wso2.carbon:org.wso2.carbon.caching.feature:${carbon.version} @@ -341,10 +340,6 @@ org.wso2.carbon.identity.sso.saml.feature.group ${carbon.platform.patch.version.4.2.2} - - org.wso2.stratos.identity.saml2.sso.mgt.feature.group - 2.2.0 - org.apache.stratos.logging.mgt.feature.group ${project.version} @@ -614,10 +609,6 @@ org.wso2.carbon.identity.sso.saml.feature.group ${carbon.platform.patch.version.4.2.2} - - org.wso2.stratos.identity.saml2.sso.mgt.feature.group - 2.2.0 - org.wso2.carbon.databridge.datapublisher.feature.group ${carbon.platform.patch.version.4.2.1}