You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/04/10 08:35:55 UTC
stratos git commit: Fixing minor issues STRATOS-1284 and STRATOS-1261
(Resolving conflicts)
Repository: stratos
Updated Branches:
refs/heads/master 2164c0749 -> 91227eb06
Fixing minor issues STRATOS-1284 and STRATOS-1261 (Resolving conflicts)
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/91227eb0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/91227eb0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/91227eb0
Branch: refs/heads/master
Commit: 91227eb064c936e97be87cbdfe78e3fc99215685
Parents: 2164c07
Author: Dinithi <di...@wso2.com>
Authored: Fri Apr 10 11:53:42 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Fri Apr 10 11:53:42 2015 +0530
----------------------------------------------------------------------
.../account/mgt/beans/AccountInfoBean.java | 16 +++++++--------
.../stratos/common/beans/TenantInfoBean.java | 21 ++++++++++----------
.../artifacts/domain-mappings.json | 2 +-
3 files changed, 19 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/91227eb0/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
index 78a2c92..ffcdb70 100644
--- a/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
+++ b/components/org.apache.stratos.account.mgt/src/main/java/org/apache/stratos/account/mgt/beans/AccountInfoBean.java
@@ -19,22 +19,22 @@
package org.apache.stratos.account.mgt.beans;
public class AccountInfoBean {
- private String firstname;
- private String lastname;
+ private String firstName;
+ private String lastName;
public String getFirstname() {
- return firstname;
+ return firstName;
}
- public void setFirstname(String firstname) {
- this.firstname = firstname;
+ public void setFirstname(String firstName) {
+ this.firstName = firstName;
}
public String getLastname() {
- return lastname;
+ return lastName;
}
- public void setLastname(String lastname) {
- this.lastname = lastname;
+ public void setLastname(String lastName) {
+ this.lastName = lastName;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/91227eb0/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java
index 62923c0..a58d84a 100755
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/TenantInfoBean.java
@@ -20,7 +20,6 @@
package org.apache.stratos.common.beans;
import javax.xml.bind.annotation.XmlRootElement;
-import java.util.Calendar;
/**
* Bean class for Tenant Information
@@ -29,8 +28,8 @@ import java.util.Calendar;
public class TenantInfoBean {
private String admin; //admin's user name
- private String firstname;
- private String lastname;
+ private String firstName;
+ private String lastName;
private String adminPassword;
private String tenantDomain;
private int tenantId;
@@ -48,8 +47,8 @@ public class TenantInfoBean {
/*copy constructor*/
public TenantInfoBean(TenantInfoBean tenantInfoBean) {
this.admin = tenantInfoBean.admin;
- this.firstname = tenantInfoBean.firstname;
- this.lastname = tenantInfoBean.lastname;
+ this.firstName = tenantInfoBean.firstName;
+ this.lastName = tenantInfoBean.lastName;
this.adminPassword = tenantInfoBean.adminPassword;
this.tenantDomain = tenantInfoBean.tenantDomain;
this.tenantId = tenantInfoBean.tenantId;
@@ -62,19 +61,19 @@ public class TenantInfoBean {
}
public String getFirstname() {
- return firstname;
+ return firstName;
}
- public void setFirstname(String firstname) {
- this.firstname = firstname;
+ public void setFirstname(String firstName) {
+ this.firstName = firstName;
}
public String getLastname() {
- return lastname;
+ return lastName;
}
- public void setLastname(String lastname) {
- this.lastname = lastname;
+ public void setLastname(String lastName) {
+ this.lastName = lastName;
}
public String getEmail() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/91227eb0/samples/applications/single-cartridge/artifacts/domain-mappings.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/domain-mappings.json b/samples/applications/single-cartridge/artifacts/domain-mappings.json
index 17ee4f6..78e6008 100644
--- a/samples/applications/single-cartridge/artifacts/domain-mappings.json
+++ b/samples/applications/single-cartridge/artifacts/domain-mappings.json
@@ -1,7 +1,7 @@
{
"domainMappings": [
{
- "cartridgeAlias":"php1",
+ "cartridgeAlias":"my-php",
"domainName":"abc.com",
"contextPath":"/abc/app"
}