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/13 18:37:46 UTC
[1/2] git commit: adding a missed class
Updated Branches:
refs/heads/master 654db15d0 -> 2560c47e6
adding a missed class
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/990ebc7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/990ebc7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/990ebc7b
Branch: refs/heads/master
Commit: 990ebc7b7cd0856ab9743959c2772f15c02d3491
Parents: a46827c
Author: Isuru <is...@wso2.com>
Authored: Thu Feb 13 23:07:05 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Feb 13 23:07:05 2014 +0530
----------------------------------------------------------------------
.../endpoint/bean/StratosAdminResponse.java | 36 ++++++++++++++++++++
1 file changed, 36 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990ebc7b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/StratosAdminResponse.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/StratosAdminResponse.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/StratosAdminResponse.java
new file mode 100644
index 0000000..5f0fa4c
--- /dev/null
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/StratosAdminResponse.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package org.apache.stratos.rest.endpoint.bean;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class StratosAdminResponse {
+
+ private String message;
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
[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/2560c47e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2560c47e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2560c47e
Branch: refs/heads/master
Commit: 2560c47e610d0c3a98e15955539ff183a4e408aa
Parents: 990ebc7 654db15
Author: Isuru <is...@wso2.com>
Authored: Thu Feb 13 23:07:21 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Feb 13 23:07:21 2014 +0530
----------------------------------------------------------------------
.../console/controllers/wizardSubmit.jag | 2 +-
.../console/themes/theme1/pages/index.hbs | 19 ++++
.../themes/theme1/partials/cartridges.hbs | 3 +-
.../partials/configure_stratos_wizard.hbs | 2 +-
.../console/themes/theme1/partials/header.hbs | 100 +++++++++++--------
.../themes/theme1/partials/mycartridges.hbs | 7 +-
.../theme1/partials/subscribe_cartridge.hbs | 14 +--
.../themes/theme1/renderers/cartridges.js | 11 +-
.../console/themes/theme1/renderers/index.js | 17 ++--
.../console/themes/theme1/ui/css/main.css | 49 ++++++++-
.../console/themes/theme1/ui/js/wizard.js | 4 +-
.../console/util/utility.jag | 6 +-
.../manager/CartridgeSubscriptionManager.java | 2 +-
.../rest/endpoint/bean/CartridgeInfoBean.java | 38 +++++--
.../stratos/rest/endpoint/mock/MockContext.java | 25 +++++
.../rest/endpoint/mock/StratosTestAdmin.java | 10 ++
.../rest/endpoint/services/ServiceUtils.java | 24 +++--
17 files changed, 239 insertions(+), 94 deletions(-)
----------------------------------------------------------------------