You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/03/19 03:45:39 UTC
[4/4] stratos git commit: s/persistance/persistence
s/persistance/persistence
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/10afa5c2
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/10afa5c2
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/10afa5c2
Branch: refs/heads/master
Commit: 10afa5c2a937fdafb6b8c001e33c0f867248c327
Parents: aafd604
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Mar 19 08:15:05 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Mar 19 08:15:05 2015 +0530
----------------------------------------------------------------------
.../cloud/controller/domain/Persistence.java | 24 +-
.../extensions/bash/VolumeMount.sh | 2 +-
.../util/converter/ObjectConverter.java | 6 +-
.../src/main/resources/AutoscalerService.wsdl | 2 +-
.../main/resources/CloudControllerService.wsdl | 1166 +++++++++---------
.../templates/extensions/mount-volumes.sh.erb | 2 +-
.../agent/extensions/mount-volumes.sh.erb | 2 +-
.../templates/extensions/mount-volumes.sh.erb | 2 +-
8 files changed, 603 insertions(+), 603 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/10afa5c2/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Persistence.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Persistence.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Persistence.java
index 9d2f38d..f0bba9e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Persistence.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Persistence.java
@@ -21,23 +21,23 @@ package org.apache.stratos.cloud.controller.domain;
import java.io.Serializable;
import java.util.Arrays;
-public class Persistence implements Serializable{
-
- private static final long serialVersionUID = 3455721979991902731L;
+public class Persistence implements Serializable {
- private boolean persistanceRequired;
- private Volume[] volumes;
+ private static final long serialVersionUID = 3455721979991902731L;
- public String toString () {
- return "Persistence Required: " + isPersistanceRequired();
+ private boolean persistenceRequired;
+ private Volume[] volumes;
+
+ public String toString() {
+ return "Persistence Required: " + isPersistenceRequired();
}
- public boolean isPersistanceRequired() {
- return persistanceRequired;
+ public boolean isPersistenceRequired() {
+ return persistenceRequired;
}
- public void setPersistanceRequired(boolean persistanceRequired) {
- this.persistanceRequired = persistanceRequired;
+ public void setPersistenceRequired(boolean persistenceRequired) {
+ this.persistenceRequired = persistenceRequired;
}
public Volume[] getVolumes() {
@@ -45,7 +45,7 @@ public class Persistence implements Serializable{
}
public void setVolumes(Volume[] volumes) {
- if(volumes == null) {
+ if (volumes == null) {
this.volumes = new Volume[0];
} else {
this.volumes = Arrays.copyOf(volumes, volumes.length);
http://git-wip-us.apache.org/repos/asf/stratos/blob/10afa5c2/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/VolumeMount.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/VolumeMount.sh b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/VolumeMount.sh
index 2e649bd..4bbefec 100755
--- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/VolumeMount.sh
+++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/extensions/bash/VolumeMount.sh
@@ -32,7 +32,7 @@ echo -e "Starting mounting volumes" 2>&1 | tee -a $log
echo -e "launh param file location $1" | tee -a $log
#source /opt/apache-stratos-cartridge-agent/launch.params
PERSISTENCE_MAPPING=$1
-echo -e "Persistance mappings : $PERSISTENCE_MAPPING" 2>&1 | tee -a $log
+echo -e "Persistence mappings : $PERSISTENCE_MAPPING" 2>&1 | tee -a $log
mount_volume(){
http://git-wip-us.apache.org/repos/asf/stratos/blob/10afa5c2/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index a048280..969f10d 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -163,7 +163,7 @@ public class ObjectConverter {
public static Persistence convertPersistenceBeanToStubPersistence(
org.apache.stratos.common.beans.cartridge.PersistenceBean persistenceBean) {
Persistence persistence = new Persistence();
- persistence.setPersistanceRequired(persistenceBean.isRequired());
+ persistence.setPersistenceRequired(persistenceBean.isRequired());
VolumeBean[] volumeBean = new VolumeBean[persistenceBean.getVolume().size()];
persistenceBean.getVolume().toArray(volumeBean);
Volume[] volumes = new Volume[persistenceBean.getVolume().size()];
@@ -1317,7 +1317,7 @@ public class ObjectConverter {
PersistenceContext persistenceContext = subscribableInfoContext.getPersistenceContext();
PersistenceBean persistenceBean = new PersistenceBean();
- persistenceBean.setRequired(persistenceContext.getPersistanceRequired());
+ persistenceBean.setRequired(persistenceContext.getPersistenceRequired());
persistenceBean.setVolume(convertStubVolumeToVolume(persistenceContext.getVolumes()));
subscribableInfo.setPersistenceBean(persistenceBean);
@@ -1406,7 +1406,7 @@ public class ObjectConverter {
PersistenceBean persistenceBean = subscribableInfo.getPersistenceBean();
PersistenceContext persistenceContext = new PersistenceContext();
- persistenceContext.setPersistanceRequired(persistenceBean.isRequired());
+ persistenceContext.setPersistenceRequired(persistenceBean.isRequired());
persistenceContext.setVolumes(convertVolumeToStubVolume(persistenceBean.getVolume()));
}
infoContext.setProperties(convertPropertyBeansToStubProperties(subscribableInfo.getProperty()));
http://git-wip-us.apache.org/repos/asf/stratos/blob/10afa5c2/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
index f5a5c98..cdc3709 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/src/main/resources/AutoscalerService.wsdl
@@ -104,7 +104,7 @@
</xs:complexType>
<xs:complexType name="PersistenceContext">
<xs:sequence>
- <xs:element minOccurs="0" name="persistanceRequired" type="xs:boolean"/>
+ <xs:element minOccurs="0" name="persistenceRequired" type="xs:boolean"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="volumes" nillable="true" type="ax25:VolumeContext"/>
</xs:sequence>
</xs:complexType>