You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/02/14 10:31:53 UTC
[1/2] git commit: removing root element of json respose in the rest EP
Updated Branches:
refs/heads/master 64a5cc85f -> 99d22a053
removing root element of json respose in the rest EP
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b8dc45a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b8dc45a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b8dc45a8
Branch: refs/heads/master
Commit: b8dc45a8b5d764a26cca3ff175fc4fcc976481fe
Parents: 5615e8d
Author: Isuru <is...@wso2.com>
Authored: Fri Feb 14 15:01:19 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Feb 14 15:01:19 2014 +0530
----------------------------------------------------------------------
.../src/main/webapp/stratos/WEB-INF/cxf-servlet.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b8dc45a8/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml
index 1d682c3..b73e7ae 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml
+++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/cxf-servlet.xml
@@ -53,6 +53,7 @@
<property name="oauthValidationEndpoint" value="https://localhost:9443/services/"/>
</bean>
<bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
+ <property name="dropRootElement" value="true" />
<property name="serializeAsArray" value="true"/>
<property name="arrayKeys">
<list>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@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/99d22a05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/99d22a05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/99d22a05
Branch: refs/heads/master
Commit: 99d22a053985c0a2594b1bdc6b5ebc7f08817f2d
Parents: b8dc45a 64a5cc8
Author: Isuru <is...@wso2.com>
Authored: Fri Feb 14 15:01:27 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Fri Feb 14 15:01:27 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/pojo/CartridgeInfo.java | 18 +-
.../controller/util/CloudControllerUtil.java | 11 +-
.../console/cartridges.jag | 4 +-
.../console/configure_stratos_wizard.jag | 1 +
.../controllers/cartridgeUnsubscribeSubmit.jag | 11 +
.../themes/theme1/partials/cartridges.hbs | 10 +-
.../partials/configure_stratos_wizard.hbs | 2 +-
.../console/themes/theme1/partials/header.hbs | 24 +-
.../theme1/renderers/configure_stratos.js | 56 +-
.../console/themes/theme1/ui/css/main.css | 8 +-
.../console/themes/theme1/ui/js/mycartridges.js | 12 +
.../console/themes/theme1/ui/js/popup.js | 80 +++
.../console/util/utility.jag | 33 +-
.../apache/stratos/manager/dto/Cartridge.java | 22 +-
.../stratos/rest/endpoint/bean/Error.java | 25 +
.../rest/endpoint/services/ServiceUtils.java | 9 +-
.../rest/endpoint/services/StratosAdmin.java | 11 +
.../main/resources/CloudControllerService.wsdl | 617 ++++++++++---------
18 files changed, 597 insertions(+), 357 deletions(-)
----------------------------------------------------------------------