You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/02/06 05:26:08 UTC
[1/2] git commit: cookie endpoint to mockContext as well
Updated Branches:
refs/heads/master 101a4ec26 -> e5d7e1fd3
cookie endpoint to mockContext as well
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d7208b90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d7208b90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d7208b90
Branch: refs/heads/master
Commit: d7208b902c06b01dda74f72c6dc5b656ad626209
Parents: f44be60
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Feb 6 09:55:04 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Feb 6 09:55:04 2014 +0530
----------------------------------------------------------------------
.../rest/endpoint/mock/StratosTestAdmin.java | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d7208b90/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
index 208d521..79704f1 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
@@ -25,6 +25,7 @@ import org.apache.stratos.common.beans.TenantInfoBean;
import org.apache.stratos.manager.dto.Cartridge;
import org.apache.stratos.manager.dto.SubscriptionInfo;
import org.apache.stratos.manager.exception.ADCException;
+import org.apache.stratos.rest.endpoint.Utils;
import org.apache.stratos.rest.endpoint.annotation.AuthorizationAction;
import org.apache.stratos.rest.endpoint.annotation.SuperTenantService;
import org.apache.stratos.rest.endpoint.bean.CartridgeInfoBean;
@@ -35,11 +36,31 @@ import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.Deploy
import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean;
import org.apache.stratos.rest.endpoint.exception.RestAPIException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
@Path("/admin/")
public class StratosTestAdmin {
private static Log log = LogFactory.getLog(StratosTestAdmin.class);
+ @Context
+ HttpServletRequest httpServletRequest;
+
+
+ @GET
+ @Path("/cookie")
+ @Produces("application/json")
+ @Consumes("application/json")
+ @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+ public Response getCookie(){
+ HttpSession httpSession = httpServletRequest.getSession(true);//create session if not found
+ String sessionId = httpSession.getId();
+ return Response.ok().header("WWW-Authenticate", "Basic").type(MediaType.APPLICATION_JSON).
+ entity(Utils.buildAuthenticationSuccessMessage(sessionId)).build();
+ }
@GET
@Path("/cartridge/tenanted/list")
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by pr...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e5d7e1fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e5d7e1fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e5d7e1fd
Branch: refs/heads/master
Commit: e5d7e1fd3febc4df3332bd3b371ea7aac3170ff5
Parents: d7208b9 101a4ec
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Thu Feb 6 09:55:12 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Thu Feb 6 09:55:12 2014 +0530
----------------------------------------------------------------------
.../stratos/cli/RestCommandLineService.java | 160 +++++++------------
.../stratos/cli/beans/cartridge/Cartridge.java | 9 ++
.../controller/topology/TopologyBuilder.java | 2 +-
.../topology/TopologyEventPublisher.java | 5 +-
.../conf/LoadBalancerConfiguration.java | 32 +++-
.../load/balancer/conf/domain/MemberIpType.java | 31 ++++
.../balancer/conf/domain/TenantIdentifier.java | 19 +++
.../load/balancer/conf/util/Constants.java | 1 +
.../TenantAwareLoadBalanceEndpoint.java | 41 ++++-
.../sample/configuration/loadbalancer1.conf | 6 +
.../sample/configuration/loadbalancer2.conf | 6 +
.../sample/configuration/loadbalancer3.conf | 6 +
.../model/TopologyClusterInformationModel.java | 3 +-
.../StratosManagerTopologyReceiver.java | 39 +++++
.../broker/connect/TopicConnector.java | 2 +
.../event/topology/InstanceSpawnedEvent.java | 19 +++
.../InstanceSpawnedMessageProcessor.java | 2 +
.../stratos/messaging/util/Constants.java | 2 +
.../rest/endpoint/services/StratosAdmin.java | 1 +
.../load-balancer/haproxy-extension/INSTALL.txt | 19 ++-
.../src/main/bin/haproxy-extension.sh | 7 +-
.../stratos/haproxy/extension/Constants.java | 1 +
.../haproxy/extension/HAProxyConfigWriter.java | 36 ++---
.../haproxy/extension/HAProxyContext.java | 8 +
.../distribution/src/main/conf/mincheck.drl | 2 +-
.../src/main/conf/loadbalancer.conf | 8 +-
26 files changed, 332 insertions(+), 135 deletions(-)
----------------------------------------------------------------------