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/12 11:11:48 UTC
[46/50] stratos git commit: Merge branch 'apache-4.1.0-test' into
4.1.0-test
Merge branch 'apache-4.1.0-test' into 4.1.0-test
Conflicts:
components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4d400e10
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4d400e10
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4d400e10
Branch: refs/heads/master
Commit: 4d400e10fd00572106f8205e83da9131d5e9f061
Parents: d0a359b dbdfc84
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Dec 12 14:40:37 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri Dec 12 14:40:37 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.account.mgt.ui/pom.xml | 8 +-
.../org.apache.stratos.account.mgt/pom.xml | 6 +-
.../account/mgt/services/AccountMgtService.java | 2 +-
.../apache/stratos/account/mgt/util/Util.java | 10 +-
.../parser/DefaultApplicationParser.java | 14 ++-
.../client/oAuthAdminServiceClient.java | 9 +-
.../stratos/common/TenantBillingService.java | 14 +--
.../exception/ApacheStratosException.java | 42 +++++++
.../common/exception/StratosException.java | 42 -------
.../common/listeners/TenantMgtListener.java | 16 +--
.../common/packages/PackageInfoHolder.java | 12 +-
.../src/main/resources/META-INF/services.xml | 34 ------
.../keystore/mgt/KeystoreTenantMgtListener.java | 18 +--
components/org.apache.stratos.manager/pom.xml | 6 +-
.../manager/listener/TenantUserRoleCreator.java | 22 ++--
.../manager/publisher/TenantEventPublisher.java | 16 +--
.../publisher/TenantSynzhronizerTask.java | 13 +--
.../org.apache.stratos.metadataservice/pom.xml | 6 +-
.../stratos/metadataservice/ServiceHolder.java | 2 +-
.../org.apache.stratos.rest.endpoint/pom.xml | 12 +-
.../stratos/rest/endpoint/ServiceHolder.java | 2 +-
.../rest/endpoint/api/StratosApiV40.java | 9 +-
.../rest/endpoint/api/StratosApiV41.java | 11 +-
.../CookieBasedAuthenticationHandler.java | 6 -
.../sender/listener/EmailSenderListener.java | 20 ++--
.../services/GAppTenantRegistrationService.java | 4 +-
.../mgt/services/TenantMgtAdminService.java | 14 +--
.../services/TenantSelfRegistrationService.java | 4 +-
.../stratos/tenant/mgt/util/TenantMgtUtil.java | 20 ++--
.../theme/mgt/util/ThemeLoadingListener.java | 18 +--
components/pom.xml | 8 +-
.../pom.xml | 32 ++----
.../pom.xml | 47 ++++----
features/manager/pom.xml | 10 +-
.../pom.xml | 8 +-
features/manager/tenant-mgt/pom.xml | 6 +-
.../modules/distribution/src/assembly/bin.xml | 11 ++
products/stratos/modules/integration/pom.xml | 6 +-
products/stratos/modules/p2-profile-gen/pom.xml | 114 +++++++++++++++----
service-stubs/pom.xml | 5 +-
40 files changed, 358 insertions(+), 301 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4d400e10/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4d400e10/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/oAuthAdminServiceClient.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/oAuthAdminServiceClient.java
index 3cddaed,3cddaed..8913c42
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/oAuthAdminServiceClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/oAuthAdminServiceClient.java
@@@ -58,7 -58,7 +58,11 @@@ public class oAuthAdminServiceClient
stub = new OAuthAdminServiceStub(epr);
stub._getServiceClient().getOptions().setProperty(HTTPConstants.SO_TIMEOUT, autosclaerSocketTimeout);
stub._getServiceClient().getOptions().setProperty(HTTPConstants.CONNECTION_TIMEOUT, autosclaerSocketTimeout);
-- Utility.setAuthHeaders(stub._getServiceClient(), "admin");
++ //String username = CarbonContext.getThreadLocalCarbonContext().getUsername();
++ //TODO StratosAuthenticationHandler does not set to carbon context, thus user name becomes null.
++ // For the moment username is hardcoded since above is fixed.
++ String username = "admin";
++ Utility.setAuthHeaders(stub._getServiceClient(), username);
} catch (AxisFault axisFault) {
String msg = "Failed to initiate identity service client. " + axisFault.getMessage();
@@@ -87,6 -87,6 +91,9 @@@
oAuthConsumerDTO.setApplicationName(appName);
oAuthConsumerDTO.setOAuthVersion(OAUTH_2_0);
oAuthConsumerDTO.setGrantTypes(GRANT_TYPE);
++ if(log.isDebugEnabled()){
++ log.debug(String.format("Trying to register oAuth application [%s]", appName));
++ }
stub.registerOAuthApplicationData(oAuthConsumerDTO);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4d400e10/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 23893ea,e2dcbff..159f142
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@@ -18,10 -18,11 +18,10 @@@
*/
package org.apache.stratos.rest.endpoint.api;
-import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
- import org.apache.stratos.common.beans.TenantInfoBean;
- import org.apache.stratos.common.exception.StratosException;
+ import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
+ import org.apache.stratos.common.exception.ApacheStratosException;
import org.apache.stratos.common.util.ClaimsMgtUtil;
import org.apache.stratos.common.util.CommonUtil;
import org.apache.stratos.manager.composite.application.beans.ApplicationDefinition;
@@@ -46,10 -52,9 +46,10 @@@ import org.apache.stratos.rest.endpoint
import org.apache.stratos.rest.endpoint.bean.topology.Cluster;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import org.apache.stratos.rest.endpoint.exception.TenantNotFoundException;
+import org.apache.stratos.rest.endpoint.ServiceHolder;
+import org.apache.stratos.rest.endpoint.Utils;
- import org.apache.stratos.tenant.mgt.core.TenantPersistor;
- import org.apache.stratos.tenant.mgt.util.TenantMgtUtil;
+ import org.wso2.carbon.tenant.mgt.core.TenantPersistor;
+ import org.wso2.carbon.tenant.mgt.util.TenantMgtUtil;
import org.wso2.carbon.context.CarbonContext;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.context.RegistryType;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4d400e10/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
index 109c177,109c177..3a0e2c5
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/CookieBasedAuthenticationHandler.java
@@@ -20,23 -20,23 +20,17 @@@ package org.apache.stratos.rest.endpoin
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
--import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.ext.RequestHandler;
--import org.apache.cxf.jaxrs.impl.HttpHeadersImpl;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.message.Message;
import org.apache.stratos.rest.endpoint.Utils;
import org.apache.stratos.rest.endpoint.context.AuthenticationContext;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
--import javax.ws.rs.core.Context;
--import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
--import java.util.List;
/*
* authenticate an incoming request using the session availability. Session is first established using the
* basic auth authentication. This handler will be the last to get executed in the current handler chain. Hence failure
http://git-wip-us.apache.org/repos/asf/stratos/blob/4d400e10/products/stratos/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------