tenant redirect, dispatcher , theme mgt refers to wso2 versions
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f5a07b13 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f5a07b13 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f5a07b13 Branch: refs/heads/apache-4.1.0-test Commit: f5a07b132458db27c14cc65c29d870dd3fb4aea7 Parents: 5155b45 Author: Udara Liyanage <[email protected]> Authored: Thu Dec 11 17:22:11 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Thu Dec 11 17:22:11 2014 +0530 ---------------------------------------------------------------------- .../parser/DefaultApplicationParser.java | 2 +- .../src/main/resources/META-INF/services.xml | 34 -------------------- components/pom.xml | 6 +++- .../pom.xml | 16 ++++----- .../pom.xml | 31 +++++++++--------- features/manager/pom.xml | 8 ++--- .../pom.xml | 8 ++--- features/manager/tenant-mgt/pom.xml | 6 ++-- products/stratos/modules/p2-profile-gen/pom.xml | 15 ++++----- service-stubs/pom.xml | 4 +-- 10 files changed, 49 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index de9110f..5472163 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -794,7 +794,7 @@ public class DefaultApplicationParser implements ApplicationParser { // Create text payload PayloadData payloadData = ApplicationUtils.createPayload(appId, groupName, cartridgeInfo, subscriptionKey, tenantId, clusterId, hostname, repoUrl, alias, null, dependencyAliases, properties); - //TOD payloadData.add("TOKEN", createToken(appId)); + payloadData.add("TOKEN", createToken(appId)); String textPayload = payloadData.toString(); return new ApplicationClusterContext(cartridgeInfo.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB); http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/components/org.apache.stratos.common/src/main/resources/META-INF/services.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.common/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.common/src/main/resources/META-INF/services.xml deleted file mode 100644 index 7f0bcf3..0000000 --- a/components/org.apache.stratos.common/src/main/resources/META-INF/services.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> -<serviceGroup> - - <service name="PackageInfoService" scope="transportsession"> - <transports> - <transport>https</transport> - </transports> - <parameter name="ServiceClass" locked="false"> - org.apache.stratos.common.services.PackageInfoService - </parameter> - <parameter name="adminService" locked="ture">false</parameter> - </service> - - <parameter name="hiddenService" locked="ture">true</parameter> - -</serviceGroup> http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index d2afb7f..d9657f3 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -81,8 +81,10 @@ <module>org.apache.stratos.throttling.ui</module--> <!-- Redirector --> <module>org.apache.stratos.sso.redirector.ui</module> +<!-- <module>org.apache.stratos.redirector.servlet</module> <module>org.apache.stratos.redirector.servlet.ui</module> +--> <!-- Status Monitor --> <module>org.apache.stratos.status.monitor.core</module> <module>org.apache.stratos.status.monitor</module> @@ -94,12 +96,14 @@ <module>org.apache.stratos.usage.summary.helper</module> <module>org.apache.stratos.usage.ui</module--> - <module>org.apache.stratos.tenant.dispatcher</module> + <!--<module>org.apache.stratos.tenant.dispatcher</module>--> <module>org.apache.stratos.keystore.mgt</module> <module>org.apache.stratos.activation</module> <!-- Theme mgt --> +<!-- <module>org.apache.stratos.theme.mgt.ui</module> <module>org.apache.stratos.theme.mgt</module> +--> <!--Logging mgt--> <module>org.apache.stratos.logging.view.ui</module> <!-- RESTful admin services --> http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/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 bff7eb4..f368ea4 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 @@ -65,9 +65,9 @@ </dependency> --> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.redirector.servlet</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.redirector.servlet</artifactId> + <version>2.2.1</version> </dependency> <!--<dependency> <groupId>org.wso2.carbon</groupId> @@ -128,9 +128,9 @@ <version>${wso2carbon.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.theme.mgt</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.theme.mgt</artifactId> + <version>2.2.0</version> </dependency> </dependencies> @@ -190,7 +190,7 @@ </adviceFile> <bundles> <bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet:2.2.1</bundleDef> <bundleDef>org.apache.stratos:org.apache.stratos.activation:${project.version}</bundleDef> <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.sample.installer:${stratos.version}</bundleDef>--> <!-- @@ -211,7 +211,7 @@ <bundleDef>kaptcha.wso2:kaptcha</bundleDef> <bundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</bundleDef> <bundleDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.theme.mgt:${project.version}</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt:2.2.0</bundleDef> <!-- End Tenant Mgmt --> </bundles> http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml index 8a4793e..480c0c0 100644 --- a/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml +++ b/features/manager/common/org.apache.stratos.common.ui.feature/pom.xml @@ -34,14 +34,14 @@ <dependencies> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.redirector.servlet.ui</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.redirector.servlet.ui</artifactId> + <version>2.2.0</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.sso.redirector.ui</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.sso.redirector.ui</artifactId> + <version>2.2.0</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> @@ -64,16 +64,15 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.theme.mgt.ui</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.theme.mgt.ui</artifactId> + <version>2.2.0</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.theme.mgt.stub</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.theme.mgt.stub</artifactId> + <version>4.2.0</version> </dependency> - </dependencies> <build> <plugins> @@ -98,9 +97,9 @@ </properties> </adviceFile> <bundles> - <bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet.ui</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.redirector.servlet.stub:${project.version}</bundleDef> - <bundleDef>org.apache.stratos:org.apache.stratos.sso.redirector.ui</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.ui</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet.stub:4.2.0</bundleDef> + <bundleDef>org.wso2.carbon:org.wso2.carbon.sso.redirector.ui</bundleDef> <bundleDef>org.wso2.carbon:org.wso2.carbon.google.analytics.ui</bundleDef> <!-- Tenant Mgmt--> http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/features/manager/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/pom.xml b/features/manager/pom.xml index 02825ed..c7a3557 100644 --- a/features/manager/pom.xml +++ b/features/manager/pom.xml @@ -73,14 +73,14 @@ <version>${stratos.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.redirector.servlet</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.redirector.servlet</artifactId> + <version>2.2.1</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.redirector.servlet.ui</artifactId> - <version>${project.version}</version> + <version>2.2.0</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml index 416ac96..3c4ee55 100644 --- a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml +++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml @@ -44,9 +44,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.theme.mgt</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.theme.mgt</artifactId> + <version>2.2.0</version> </dependency> <dependency> <groupId>org.apache.stratos</groupId> @@ -106,7 +106,7 @@ <importBundles> <importBundleDef>org.apache.stratos:org.apache.stratos.common</importBundleDef> <importBundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.core</importBundleDef> - <importBundleDef>org.apache.stratos:org.apache.stratos.theme.mgt</importBundleDef> + <importBundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt</importBundleDef> <importBundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</importBundleDef> </importBundles> <importFeatures> http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/features/manager/tenant-mgt/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/tenant-mgt/pom.xml b/features/manager/tenant-mgt/pom.xml index 463348d..112882d 100644 --- a/features/manager/tenant-mgt/pom.xml +++ b/features/manager/tenant-mgt/pom.xml @@ -54,9 +54,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.theme.mgt</artifactId> - <version>${project.version}</version> + <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.theme.mgt</artifactId> + <version>2.2.0</version> </dependency> <dependency> <groupId>org.wso2.carbon</groupId> http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/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 6be2f03..60fa2e4 100644 --- a/products/stratos/modules/p2-profile-gen/pom.xml +++ b/products/stratos/modules/p2-profile-gen/pom.xml @@ -307,7 +307,6 @@ <featureArtifactDef>org.wso2.carbon:org.apache.synapse.transport.nhttp.feature:${synapse.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.mediation.initializer.feature:${carbon.version}</featureArtifactDef> - <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.service.mgt.server.feature:${carbon.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.version}</featureArtifactDef> <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.mediators.server.feature:${carbon.version}</featureArtifactDef> @@ -333,7 +332,7 @@ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.cassandra.common.feature:${carbon.platform.version}</featureArtifactDef> <!-- Common features --> <featureArtifactDef>org.apache.stratos:org.apache.stratos.metadata.client.feature:${project.version}</featureArtifactDef> - <!--featureArtifactDef>org.apache.stratos:org.apache.stratos.custom.handlers.feature:${project.version}</featureArtifactDef--> + <featureArtifactDef>org.apache.stratos:org.apache.stratos.custom.handlers.feature:${project.version}</featureArtifactDef> </featureArtifacts> </configuration> </execution> @@ -562,10 +561,10 @@ <id>org.wso2.carbon.user.mgt.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature> - <!--feature> + <feature> <id>org.apache.stratos.custom.handlers.feature.group</id> <version>${project.version}</version> - </feature--> + </feature> </features> </configuration> </execution> @@ -679,7 +678,7 @@ </feature> <feature> <id>org.wso2.carbon.service.mgt.server.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.platform.patch.version.4.2.1}</version> </feature> <feature> <id>org.wso2.carbon.transport.mgt.server.feature.group</id> @@ -922,7 +921,7 @@ </feature> <feature> <id>org.wso2.carbon.service.mgt.server.feature.group</id> - <version>${carbon.version}</version> + <version>${carbon.platform.patch.version.4.2.1}</version> </feature> <feature> @@ -1002,10 +1001,10 @@ <id>org.apache.stratos.metadata.client.feature.group</id> <version>${project.version}</version> </feature> - <!--feature> + <feature> <id>org.apache.stratos.custom.handlers.feature.group</id> <version>${project.version}</version> - </feature--> + </feature> </features> </configuration> http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a07b13/service-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml index 87fe43f..e42dbef 100644 --- a/service-stubs/pom.xml +++ b/service-stubs/pom.xml @@ -44,11 +44,11 @@ <module>org.apache.stratos.tenant.register.stub</module> <module>org.apache.stratos.cartridge.agent.stub</module> <module>org.apache.stratos.tenant.activity.stub</module> - <module>org.apache.stratos.theme.mgt.stub</module> + <!--<module>org.apache.stratos.theme.mgt.stub</module>--> <module>org.apache.stratos.validate.domain.stub</module> <module>org.apache.stratos.adc.instanceinfo.mgt.stub</module> <module>org.apache.stratos.tenant.register.gapp.stub</module> - <module>org.apache.stratos.redirector.servlet.stub</module> + <!--<module>org.apache.stratos.redirector.servlet.stub</module>--> <module>org.apache.stratos.adc.reponotification.service.stub</module> <module>org.apache.stratos.billing.mgt.stub</module> <module>org.apache.stratos.throttle.stub</module>
