You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/12/07 06:40:51 UTC
[1/3] stratos git commit: Revert "add oAuth war s to product"
Repository: stratos
Updated Branches:
refs/heads/master 8d9632f89 -> cfa63fb3a
Revert "add oAuth war s to product"
This reverts commit 61b1d31a8c4aa427c1cf1acdfa35bf60f31c35e8.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b460062b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b460062b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b460062b
Branch: refs/heads/master
Commit: b460062bff36a37c3ae3a58ac684da5d57aa44ad
Parents: e7c168f
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Dec 7 09:06:38 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sun Dec 7 09:51:55 2014 +0530
----------------------------------------------------------------------
.../stratos/modules/distribution/src/assembly/bin.xml | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b460062b/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 07b7de4..374236b 100755
--- a/products/stratos/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos/modules/distribution/src/assembly/bin.xml
@@ -941,17 +941,6 @@
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
- <!--oauth2.war and authenticationendpoint.war is related to oAuth feature -->
- <file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/oauth2.war</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
- <fileMode>644</fileMode>
- </file>
- <file>
- <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/authenticationendpoint.war</source>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/</outputDirectory>
- <fileMode>644</fileMode>
- </file>
<!-- End of REST endpoint webapp -->
<!-- Meta data service webapp -->
[3/3] stratos git commit: commenting token generation due to bundle
issue
Posted by ud...@apache.org.
commenting token generation due to bundle issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cfa63fb3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cfa63fb3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cfa63fb3
Branch: refs/heads/master
Commit: cfa63fb3a369fe3ca0f9620ba120a003698d1a7e
Parents: b460062
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Dec 7 11:10:25 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sun Dec 7 11:10:25 2014 +0530
----------------------------------------------------------------------
.../org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/cfa63fb3/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
index 6282901..d493c39 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41Utils.java
@@ -109,7 +109,7 @@ public class StratosApiV41Utils {
try {
CartridgeDeploymentManager.getDeploymentManager(cartridgeDefinitionBean.deployerType).deploy(cartridgeConfig);
} catch (ADCException e) {
- throw new RestAPIException(e.getMessage());
+ throw new RestAPIException(e);
}
log.info("Successfully deployed Cartridge [type] " + cartridgeDefinitionBean.type);
}
[2/3] stratos git commit: Revert "upgrading sso and adding oauth and
application management feature"
Posted by ud...@apache.org.
Revert "upgrading sso and adding oauth and application management feature"
This reverts commit b766e124e20d97005c3f7122c70df1d8b5d8d3dd.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e7c168ff
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e7c168ff
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e7c168ff
Branch: refs/heads/master
Commit: e7c168ff7c09ddea01f378801640d915c147bf5e
Parents: 8d9632f
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sun Dec 7 08:50:22 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sun Dec 7 09:51:55 2014 +0530
----------------------------------------------------------------------
products/stratos/modules/p2-profile-gen/pom.xml | 99 +++-----------------
1 file changed, 13 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e7c168ff/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 c5b3e92..0aa8593 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -272,9 +272,9 @@
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.transport.mgt.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
- <!--<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.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.3}</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.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>
@@ -284,20 +284,12 @@
<featureArtifactDef>org.apache.stratos:org.apache.stratos.metadataservice.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.oauth.feature:${carbon.platform.patch.version.4.2.3}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.provider.server.feature:${carbon.platform.patch.version.4.2.3}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.idp.mgt.feature:${carbon.platform.patch.version.4.2.3}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.stratos.common.server.feature:2.2.0</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:4.2.2</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.relying.party.server.feature:4.2.2</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.mgt.feature:4.2.0</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.core.feature:4.2.3</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
<featureArtifactDef>org.jaggeryjs:org.jaggeryjs.feature:0.9.0.ALPHA4.wso2v3</featureArtifactDef>
<featureArtifactDef>caramel:caramel.feature:1.0.1</featureArtifactDef>
<featureArtifactDef>org.wso2.store:org.wso2.store.feature:${store.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:4.2.1</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:4.2.1</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.autoscaler.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.version}</featureArtifactDef>
@@ -427,7 +419,7 @@
</feature>
<feature>
<id>org.wso2.carbon.identity.sso.saml.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.3}</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.apache.stratos.logging.mgt.feature.group</id>
@@ -518,44 +510,12 @@
<version>${store.version}</version>
</feature>
<feature>
- <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
- <version>4.2.2</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.oauth.feature.group</id>
- <version>4.2.3</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.provider.server.feature.group</id>
- <version>4.2.3</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.idp.mgt.feature.group</id>
- <version>4.2.3</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.stratos.common.server.feature.group</id>
- <version>2.2.0</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
- <version>4.2.2</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
- <version>4.2.2</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
- <version>4.2.0</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.core.feature.group</id>
- <version>4.2.3</version>
+ <id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
+ <version>4.2.1</version>
</feature>
<feature>
- <id>org.wso2.carbon.identity.user.profile.server.feature.group</id>
- <version>4.2.2</version>
+ <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
+ <version>4.2.1</version>
</feature>
<!-- User Management features -->
<feature>
@@ -755,7 +715,7 @@
</feature>
<feature>
<id>org.wso2.carbon.identity.sso.saml.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.3}</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
@@ -815,14 +775,12 @@
<!-- GApp SSO features -->
<feature>
<id>org.wso2.carbon.identity.core.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.3}</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
- <!--
<feature>
<id>org.wso2.carbon.identity.relying.party.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
- -->
<!--End GApp SSO features -->
<feature>
@@ -867,40 +825,9 @@
</feature>
<feature>
<id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
- <version>4.2.2</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.oauth.feature.group</id>
- <version>4.2.3</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.provider.server.feature.group</id>
- <version>4.2.3</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.idp.mgt.feature.group</id>
- <version>4.2.3</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.stratos.common.server.feature.group</id>
- <version>2.2.0</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
- <version>4.2.2</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
- <version>4.2.2</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
- <version>4.2.0</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.identity.core.feature.group</id>
- <version>4.2.3</version>
+ <version>4.2.1</version>
</feature>
+
<!--autoscalar-->
<feature>
<id>org.apache.stratos.autoscaler.feature.group</id>