You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/11 13:29:45 UTC
[1/2] git commit: Renamed instance.status.MemberStartedEvent to
InstanceStartedEvent and instance.status.MemberActivatedEvent to
InstanceActivatedEvent
Updated Branches:
refs/heads/master e6714baa6 -> a10d95fb0
Renamed instance.status.MemberStartedEvent to InstanceStartedEvent and instance.status.MemberActivatedEvent to InstanceActivatedEvent
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a6c674e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a6c674e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a6c674e8
Branch: refs/heads/master
Commit: a6c674e85c8e9e8b3cad3c0765aec8f3c2c2ecf3
Parents: f8bd48a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 11 17:59:18 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 11 17:59:18 2013 +0530
----------------------------------------------------------------------
.../mgt/listener/InstanceStatusListener.java | 6 +-
.../instance/status/InstanceActivatedEvent.java | 60 +++++++++++++++
.../instance/status/InstanceStartedEvent.java | 59 ++++++++++++++
.../instance/status/MemberActivatedEvent.java | 59 --------------
.../instance/status/MemberStartedEvent.java | 59 --------------
.../event/topology/ClusterCreatedEvent.java | 10 +--
.../event/topology/ClusterRemovedEvent.java | 13 +---
.../event/topology/CompleteTopologyEvent.java | 11 +--
.../event/topology/InstanceSpawnedEvent.java | 24 +++---
.../event/topology/MemberActivatedEvent.java | 26 ++++---
.../event/topology/MemberStartedEvent.java | 7 +-
.../event/topology/MemberSuspendedEvent.java | 7 +-
.../event/topology/MemberTerminatedEvent.java | 7 +-
.../event/topology/PartitionCreatedEvent.java | 39 ----------
.../event/topology/PartitionRemovedEvent.java | 37 ---------
.../event/topology/PartitionUpdatedEvent.java | 81 --------------------
.../event/topology/ServiceCreatedEvent.java | 2 +-
.../event/topology/ServiceRemovedEvent.java | 11 +--
.../event/subscriber/ArtifactListener.java | 13 ++--
.../subscriber/CartridgeAgentConstants.java | 7 +-
.../cartridge/agent/event/subscriber/Main.java | 11 +--
21 files changed, 195 insertions(+), 354 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java
index fbf4c92..05b5d45 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/listener/InstanceStatusListener.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.stratos.adc.mgt.dao.CartridgeSubscriptionInfo;
import org.apache.stratos.adc.mgt.publisher.ArtifactUpdatePublisher;
import org.apache.stratos.adc.mgt.utils.PersistenceManager;
-import org.apache.stratos.messaging.event.instance.status.MemberStartedEvent;
+import org.apache.stratos.messaging.event.instance.status.InstanceStartedEvent;
import org.apache.stratos.messaging.util.Constants;
import org.apache.stratos.messaging.util.Util;
@@ -50,9 +50,9 @@ public class InstanceStatusListener implements MessageListener {
}
// If member started event is received publish artifact update message
// To do a git clone
- if (MemberStartedEvent.class.getName().equals(type)) {
+ if (InstanceStartedEvent.class.getName().equals(type)) {
String json = receivedMessage.getText();
- MemberStartedEvent event = (MemberStartedEvent) Util.jsonToObject(json, MemberStartedEvent.class);
+ InstanceStartedEvent event = (InstanceStartedEvent) Util.jsonToObject(json, InstanceStartedEvent.class);
String clusterId = event.getClusterId();
if(log.isInfoEnabled()) {
log.info("Cluster id: " + clusterId);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java
new file mode 100644
index 0000000..003cf68
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceActivatedEvent.java
@@ -0,0 +1,60 @@
+/*
+ * 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.messaging.event.instance.status;
+
+import org.apache.stratos.messaging.event.topology.TopologyEvent;
+
+import java.io.Serializable;
+
+/**
+ * This event is fired by cartridge agent when it has started the server and
+ * applications are ready to serve the incoming requests.
+ */
+public class InstanceActivatedEvent extends TopologyEvent implements Serializable {
+ private static final long serialVersionUID = 2625412714611885089L;
+
+ private final String serviceName;
+ private final String clusterId;
+ private final String partitionId;
+ private final String memberId;
+
+ public InstanceActivatedEvent(String serviceName, String clusterId, String partitionId, String memberId) {
+ this.serviceName = serviceName;
+ this.clusterId = clusterId;
+ this.partitionId = partitionId;
+ this.memberId = memberId;
+ }
+
+ public String getServiceName() {
+ return serviceName;
+ }
+
+ public String getClusterId() {
+ return clusterId;
+ }
+
+ public String getPartitionId() {
+ return partitionId;
+ }
+
+ public String getMemberId() {
+ return memberId;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
new file mode 100644
index 0000000..1bee5a3
--- /dev/null
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/InstanceStartedEvent.java
@@ -0,0 +1,59 @@
+/*
+ * 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.messaging.event.instance.status;
+
+
+import org.apache.stratos.messaging.event.topology.TopologyEvent;
+
+import java.io.Serializable;
+
+/**
+ * This event is fired by cartridge agent when the its started.
+ */
+public class InstanceStartedEvent extends TopologyEvent implements Serializable {
+ private static final long serialVersionUID = 7447068435627208619L;
+
+ private final String serviceName;
+ private final String clusterId;
+ private final String partitionId;
+ private final String memberId;
+
+ public InstanceStartedEvent(String serviceName, String clusterId, String partitionId, String memberId) {
+ this.serviceName = serviceName;
+ this.clusterId = clusterId;
+ this.partitionId = partitionId;
+ this.memberId = memberId;
+ }
+
+ public String getServiceName() {
+ return serviceName;
+ }
+
+ public String getClusterId() {
+ return clusterId;
+ }
+
+ public String getPartitionId() {
+ return partitionId;
+ }
+
+ public String getMemberId() {
+ return memberId;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/MemberActivatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/MemberActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/MemberActivatedEvent.java
deleted file mode 100644
index 7f3549e..0000000
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/MemberActivatedEvent.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.messaging.event.instance.status;
-
-import org.apache.stratos.messaging.event.topology.TopologyEvent;
-
-import java.io.Serializable;
-
-/**
- * This event is fired by Instance when it has started it's server and
- * applications are ready to serve the incoming requests.
- */
-public class MemberActivatedEvent extends TopologyEvent implements Serializable {
- private static final long serialVersionUID = 2625412714611885089L;
-
- private String serviceName;
- private String clusterId;
- private String memberId;
-
- public String getServiceName() {
- return serviceName;
- }
-
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-
- public String getClusterId() {
- return clusterId;
- }
-
- public void setClusterId(String clusterId) {
- this.clusterId = clusterId;
- }
-
- public String getMemberId() {
- return memberId;
- }
-
- public void setMemberId(String memberId) {
- this.memberId = memberId;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/MemberStartedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/MemberStartedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/MemberStartedEvent.java
deleted file mode 100644
index c784a68..0000000
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/instance/status/MemberStartedEvent.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.messaging.event.instance.status;
-
-
-import org.apache.stratos.messaging.event.topology.TopologyEvent;
-
-import java.io.Serializable;
-
-/**
- * This event is fired by cartridge agent when it is started by the IaaS in a given cluster.
- */
-public class MemberStartedEvent extends TopologyEvent implements Serializable {
- private static final long serialVersionUID = 7447068435627208619L;
-
- private String serviceName;
- private String clusterId;
- private String memberId;
-
- public String getServiceName() {
- return serviceName;
- }
-
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-
- public String getClusterId() {
- return clusterId;
- }
-
- public void setClusterId(String clusterId) {
- this.clusterId = clusterId;
- }
-
- public String getMemberId() {
- return memberId;
- }
-
- public void setMemberId(String memberId) {
- this.memberId = memberId;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterCreatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterCreatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterCreatedEvent.java
index 2aeea1a..4ed54cf 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterCreatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterCreatedEvent.java
@@ -30,9 +30,9 @@ import java.util.Properties;
public class ClusterCreatedEvent extends TopologyEvent implements Serializable {
private static final long serialVersionUID = 2080623816272047762L;
- private String serviceName;
- private String clusterId;
- private String hostName;
+ private final String serviceName;
+ private final String clusterId;
+ private final String hostName;
private String tenantRange;
private String autoscalingPolicyName;
private String deploymentPolicyName;
@@ -56,10 +56,6 @@ public class ClusterCreatedEvent extends TopologyEvent implements Serializable {
return hostName;
}
- public void setHostName(String hostName) {
- this.hostName = hostName;
- }
-
public String getTenantRange() {
return tenantRange;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java
index c2f3f5e..79fa15f 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ClusterRemovedEvent.java
@@ -26,8 +26,9 @@ import java.io.Serializable;
*/
public class ClusterRemovedEvent extends TopologyEvent implements Serializable {
private static final long serialVersionUID = -1335777148602870262L;
- private String serviceName;
- private String clusterId;
+
+ private final String serviceName;
+ private final String clusterId;
public ClusterRemovedEvent(String serviceName, String clusterId) {
this.serviceName = serviceName;
@@ -38,15 +39,7 @@ public class ClusterRemovedEvent extends TopologyEvent implements Serializable {
return serviceName;
}
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-
public String getClusterId() {
return clusterId;
}
-
- public void setClusterId(String clusterId) {
- this.clusterId = clusterId;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompleteTopologyEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompleteTopologyEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompleteTopologyEvent.java
index 68b5d73..e8de7d5 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompleteTopologyEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/CompleteTopologyEvent.java
@@ -30,13 +30,14 @@ import java.io.Serializable;
*/
public class CompleteTopologyEvent extends TopologyEvent implements Serializable {
private static final long serialVersionUID = 8580862188444892004L;
- private Topology topology;
- public Topology getTopology() {
- return topology;
- }
+ private final Topology topology;
- public void setTopology(Topology topology) {
+ public CompleteTopologyEvent(Topology topology) {
this.topology = topology;
}
+
+ public Topology getTopology() {
+ return topology;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java
index 153f78c..3817b12 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/InstanceSpawnedEvent.java
@@ -27,25 +27,17 @@ import java.io.Serializable;
*/
public class InstanceSpawnedEvent extends TopologyEvent implements Serializable {
private static final long serialVersionUID = 2672909702971355178L;
- private String serviceName;
- private String clusterId;
- private String memberId;
- private String partitionId;
+ private final String serviceName;
+ private final String clusterId;
+ private final String memberId;
+ private final String partitionId;
- public InstanceSpawnedEvent(String serviceName, String clusterId, String memberId, String iaasNodeId) {
+ public InstanceSpawnedEvent(String serviceName, String clusterId, String partitionId, String memberId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
- this.memberId = memberId;
- this.partitionId = iaasNodeId;
- }
-
- public String getPartitionId() {
- return partitionId;
- }
-
- public void setPartitionId(String partitionId) {
this.partitionId = partitionId;
+ this.memberId = memberId;
}
public String getServiceName() {
@@ -56,6 +48,10 @@ public class InstanceSpawnedEvent extends TopologyEvent implements Serializable
return clusterId;
}
+ public String getPartitionId() {
+ return partitionId;
+ }
+
public String getMemberId() {
return memberId;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
index 4a73dea..dddd0bd 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
@@ -32,16 +32,19 @@ import org.apache.stratos.messaging.domain.topology.Port;
*/
public class MemberActivatedEvent extends TopologyEvent implements Serializable {
private static final long serialVersionUID = 5493702477320416932L;
- private String serviceName;
- private String clusterId;
- private String memberId;
+
+ private final String serviceName;
+ private final String clusterId;
+ private final String partitionId;
+ private final String memberId;
private Map<String, Port> portMap;
private String memberIp;
- private String partitionId;
+ private String lbClusterId;
- public MemberActivatedEvent(String serviceName, String clusterId, String memberId) {
+ public MemberActivatedEvent(String serviceName, String clusterId, String partitionId, String memberId) {
this.serviceName = serviceName;
this.clusterId = clusterId;
+ this.partitionId = partitionId;
this.memberId = memberId;
this.portMap = new HashMap<String, Port>();
}
@@ -89,13 +92,16 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable
public void setMemberIp(String memberIp) {
this.memberIp = memberIp;
}
-
- public void setPartitionId(String partitionId) {
- this.partitionId = partitionId;
-
- }
public String getPartitionId(){
return this.partitionId;
}
+
+ public String getLbClusterId() {
+ return lbClusterId;
+ }
+
+ public void setLbClusterId(String lbClusterId) {
+ this.lbClusterId = lbClusterId;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
index b2e2e61..5d57b16 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberStartedEvent.java
@@ -28,9 +28,10 @@ import java.util.Properties;
*/
public class MemberStartedEvent extends TopologyEvent implements Serializable {
private static final long serialVersionUID = -2207722159444875880L;
- private String serviceName;
- private String clusterId;
- private String memberId;
+
+ private final String serviceName;
+ private final String clusterId;
+ private final String memberId;
private MemberStatus status;
private Properties properties;
private String partitionId;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
index 54296ec..91d13c6 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberSuspendedEvent.java
@@ -26,9 +26,10 @@ import java.io.Serializable;
*/
public class MemberSuspendedEvent extends TopologyEvent implements Serializable {
private static final long serialVersionUID = -6374918444978329986L;
- private String serviceName;
- private String clusterId;
- private String memberId;
+
+ private final String serviceName;
+ private final String clusterId;
+ private final String memberId;
public MemberSuspendedEvent(String serviceName, String clusterId, String memberId) {
this.serviceName = serviceName;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
index 662a143..1ae6e46 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberTerminatedEvent.java
@@ -26,9 +26,10 @@ import java.io.Serializable;
*/
public class MemberTerminatedEvent extends TopologyEvent implements Serializable {
private static final long serialVersionUID = -7899511757547631157L;
- private String serviceName;
- private String clusterId;
- private String memberId;
+
+ private final String serviceName;
+ private final String clusterId;
+ private final String memberId;
public MemberTerminatedEvent(String serviceName, String clusterId, String memberId) {
this.serviceName = serviceName;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionCreatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionCreatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionCreatedEvent.java
deleted file mode 100644
index 39c5ab0..0000000
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionCreatedEvent.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.messaging.event.topology;
-
-import java.io.Serializable;
-
-public class PartitionCreatedEvent extends TopologyEvent implements Serializable {
- private static final long serialVersionUID = -312209596940292730L;
-// private Partition partition;
-//
-// public PartitionCreatedEvent(Partition partition) {
-// this.setPartition(partition);
-// }
-//
-// public Partition getPartition() {
-// return partition;
-// }
-//
-// public void setPartition(Partition partition) {
-// this.partition = partition;
-// }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionRemovedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionRemovedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionRemovedEvent.java
deleted file mode 100644
index c1eb51a..0000000
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionRemovedEvent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.messaging.event.topology;
-
-import java.io.Serializable;
-
-public class PartitionRemovedEvent extends TopologyEvent implements Serializable {
- private String partitionId;
-
- public PartitionRemovedEvent(String partitionId) {
- this.partitionId = partitionId;
- }
-
- public String getPartitionId() {
- return partitionId;
- }
-
- public void setPartitionId(String partitionId) {
- this.partitionId = partitionId;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionUpdatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionUpdatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionUpdatedEvent.java
deleted file mode 100644
index b1474c4..0000000
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/PartitionUpdatedEvent.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.messaging.event.topology;
-
-import org.apache.stratos.messaging.domain.topology.Scope;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-public class PartitionUpdatedEvent extends TopologyEvent implements Serializable {
- private String id;
- private Scope scope;
- private Map<String, String> properties = new HashMap<String, String>();
- private String oldPartitionId;
-
- public PartitionUpdatedEvent(String id, Scope scope, String oldId) {
- this.id = id;
- this.scope = scope;
- this.oldPartitionId = oldId;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Scope getScope() {
- return scope;
- }
-
- public void setScope(Scope scope) {
- this.scope = scope;
- }
-
- public Map<String, String> getProperties() {
- return properties;
- }
-
- public void setProperties(Map<String, String> properties) {
- this.properties = properties;
- }
-
- public void setProperty(String key, String value) {
-
- if (key != null && value != null) {
- getProperties().put(key, value);
- }
- }
-
- public String getProperty(String key) {
- return getProperties().get(key);
- }
-
- public String getOldPartitionId() {
- return oldPartitionId;
- }
-
- public void setOldPartitionId(String oldPartitionId) {
- this.oldPartitionId = oldPartitionId;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java
index 4f23a1d..846091e 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java
@@ -37,7 +37,7 @@ public class ServiceCreatedEvent extends TopologyEvent implements Serializable {
private final String serviceName;
private final ServiceType serviceType;
- private Map<String, Port> portMap;
+ private final Map<String, Port> portMap;
private Properties properties;
public ServiceCreatedEvent(String serviceName, ServiceType serviceType) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceRemovedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceRemovedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceRemovedEvent.java
index cbb8c6b..d39fef1 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceRemovedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceRemovedEvent.java
@@ -26,13 +26,14 @@ import java.io.Serializable;
*/
public class ServiceRemovedEvent extends TopologyEvent implements Serializable {
private static final long serialVersionUID = -4835613174531768139L;
- private String serviceName;
- public String getServiceName() {
- return serviceName;
- }
+ private final String serviceName;
- public void setServiceName(String serviceName) {
+ public ServiceRemovedEvent(String serviceName) {
this.serviceName = serviceName;
}
+
+ public String getServiceName() {
+ return serviceName;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/ArtifactListener.java
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/ArtifactListener.java b/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/ArtifactListener.java
index 514efb7..ddb1c3d 100644
--- a/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/ArtifactListener.java
+++ b/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/ArtifactListener.java
@@ -33,7 +33,7 @@ import org.apache.stratos.deployment.synchronizer.RepositoryInformation;
import org.apache.stratos.deployment.synchronizer.git.impl.GitBasedArtifactRepository;
import org.apache.stratos.messaging.broker.publish.EventPublisher;
import org.apache.stratos.messaging.event.artifact.synchronization.ArtifactUpdatedEvent;
-import org.apache.stratos.messaging.event.instance.status.MemberActivatedEvent;
+import org.apache.stratos.messaging.event.instance.status.InstanceActivatedEvent;
import org.apache.stratos.messaging.util.Constants;
import org.apache.stratos.messaging.util.Util;
@@ -80,12 +80,13 @@ public class ArtifactListener implements MessageListener{
// send member activated event
log.info("Sending member activated event");
// Send member activated event
- MemberActivatedEvent memberActivatedEvent = new MemberActivatedEvent();
- memberActivatedEvent.setServiceName(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.SERVICE_NAME));
- memberActivatedEvent.setClusterId(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.CLUSTER_ID));
- memberActivatedEvent.setMemberId(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.MEMBER_ID));
+ InstanceActivatedEvent instanceActivatedEvent = new InstanceActivatedEvent(
+ LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.SERVICE_NAME),
+ LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.CLUSTER_ID),
+ LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.PARTITION_ID),
+ LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.MEMBER_ID));
EventPublisher publisher = new EventPublisher(Constants.INSTANCE_STATUS_TOPIC);
- publisher.publish(memberActivatedEvent);
+ publisher.publish(instanceActivatedEvent);
log.info("Member activated event is sent");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/CartridgeAgentConstants.java
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/CartridgeAgentConstants.java b/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/CartridgeAgentConstants.java
index d3ce926..440284d 100644
--- a/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/CartridgeAgentConstants.java
+++ b/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/CartridgeAgentConstants.java
@@ -27,10 +27,9 @@ public class CartridgeAgentConstants implements Serializable{
public static final String PARAM_FILE_PATH = "param.file.path";
public static final String CARTRIDGE_KEY = "CARTRIDGE_KEY";
- public static final String CLUSTER_ID = "CLUSTER_ID";
public static final String APP_PATH = "APP_PATH";
public static final String SERVICE_NAME = "SERVICE_NAME";
- public static final String MEMBER_ID = "MEMBER_ID";
-
-
+ public static final String CLUSTER_ID = "CLUSTER_ID";
+ public static final String PARTITION_ID = "PARTITION_ID";
+ public static final String MEMBER_ID = "MEMBER_ID";
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a6c674e8/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/Main.java
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/Main.java b/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/Main.java
index 3452f7c..9aa5149 100644
--- a/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/Main.java
+++ b/products/cartridge-agent/modules/event-subscriber/src/main/java/org/apache/stratos/cartridge/agent/event/subscriber/Main.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.messaging.broker.publish.EventPublisher;
import org.apache.stratos.messaging.broker.subscribe.TopicSubscriber;
-import org.apache.stratos.messaging.event.instance.status.MemberStartedEvent;
+import org.apache.stratos.messaging.event.instance.status.InstanceStartedEvent;
import org.apache.stratos.messaging.util.Constants;
/**
@@ -59,10 +59,11 @@ public class Main {
log.info("Sending member started event");
// Send member activated event
- MemberStartedEvent event = new MemberStartedEvent();
- event.setServiceName(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.SERVICE_NAME));
- event.setClusterId(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.CLUSTER_ID));
- event.setMemberId(LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.MEMBER_ID));
+ InstanceStartedEvent event = new InstanceStartedEvent(
+ LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.SERVICE_NAME),
+ LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.CLUSTER_ID),
+ LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.PARTITION_ID),
+ LaunchParamsUtil.readParamValueFromPayload(CartridgeAgentConstants.MEMBER_ID));
EventPublisher publisher = new EventPublisher(Constants.INSTANCE_STATUS_TOPIC);
publisher.publish(event);
log.info("Member started event is sent");
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a10d95fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a10d95fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a10d95fb
Branch: refs/heads/master
Commit: a10d95fb07163478092b940cb9e03468233e245d
Parents: a6c674e e6714ba
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 11 17:59:36 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 11 17:59:36 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/client/AutoscalerServiceClient.java | 24 +-
.../client/CloudControllerServiceClient.java | 11 +-
.../ApplicationCartridgeSubscription.java | 8 +-
.../mgt/subscription/CartridgeSubscription.java | 3 +-
.../subscription/DataCartridgeSubscription.java | 7 +-
.../FrameworkCartridgeSubscription.java | 9 +-
.../subscription/LBCartridgeSubscription.java | 3 +-
.../SubscriptionMultiTenantBehaviour.java | 2 +-
.../SubscriptionSingleTenantBehaviour.java | 2 +-
.../tenancy/SubscriptionTenancyBehaviour.java | 3 +-
.../processor/ClusterStatusEventProcessor.java | 113 ++++
.../CompleteTopologyEventProcessor.java | 122 ++++
.../processor/InstanceStatusEventProcessor.java | 412 +++++++++++++
.../processor/InstanceStatusProcessor.java | 409 -------------
.../processor/TopologyEventProcessorChain.java | 18 +-
.../model/TopologyClusterInformationModel.java | 477 +++++++++++++++
.../topology/model/TopologyClusterModel.java | 477 ---------------
.../mgt/utils/ApplicationManagementUtil.java | 16 +-
.../autoscaler/NetworkPartitionContext.java | 30 +
.../autoscaler/api/AutoScalerServiceImpl.java | 96 ++-
.../interfaces/AutoScalerServiceInterface.java | 34 +-
.../cartridge/mgt/ui/CartridgeAdminClient.java | 8 +-
.../web/cartridge-mgt/available_cartridges.jsp | 4 +-
.../cartridge-mgt/map_domain_ajaxprocessor.jsp | 2 +-
.../remove_domain_ajaxprocessor.jsp | 2 +-
.../resources/web/cartridge-mgt/subscribe.jsp | 2 +-
.../cartridge-mgt/subscribe_ajaxprocessor.jsp | 4 +-
.../web/cartridge-mgt/subscribed_cartridges.jsp | 4 +-
.../subscribed_cartridges_ajaxprocessor.jsp | 4 +-
.../cartridge-mgt/sync_repo_ajaxprocessor.jsp | 2 +-
.../cartridge-mgt/test_git_ajaxprocessor.jsp | 2 +-
.../cartridge-mgt/unsubscribe_ajaxprocessor.jsp | 2 +-
components/org.apache.stratos.cli/pom.xml | 5 +
.../java/org/apache/stratos/cli/Cartridge.java | 202 +++++++
.../apache/stratos/cli/CartridgeInfoBean.java | 106 ++++
.../apache/stratos/cli/CommandLineService.java | 14 +-
.../apache/stratos/cli/GenericRestClient.java | 58 ++
.../java/org/apache/stratos/cli/RestClient.java | 189 ++++++
.../stratos/cli/RestCommandLineService.java | 563 ++++++++++++++++++
.../apache/stratos/cli/StratosApplication.java | 50 +-
.../apache/stratos/cli/SubscriptionInfo.java | 44 ++
.../org/apache/stratos/cli/TenantInfoBean.java | 85 +++
.../apache/stratos/cli/WebClientWrapper.java | 63 ++
.../stratos/cli/commands/AddTenantCommand.java | 188 ++++++
.../AutoscalingPolicyDeploymentCommand.java | 138 +++++
.../commands/CartridgeDeploymentCommand.java | 140 +++++
.../stratos/cli/commands/CartridgesCommand.java | 10 +-
.../DeploymentPolicyDeploymentCommand.java | 138 +++++
.../stratos/cli/commands/ListCommand.java | 13 +-
.../commands/PartitionDeploymentCommand.java | 138 +++++
.../stratos/cli/commands/SubscribeCommand.java | 10 +-
.../cli/commands/UnsubscribeCommand.java | 5 +-
.../apache/stratos/cli/utils/CliConstants.java | 48 ++
.../impl/CloudControllerServiceImpl.java | 4 -
.../cloud/controller/pojo/CartridgeInfo.java | 10 +
.../cloud/controller/pojo/MemberContext.java | 10 +
.../controller/topology/TopologyBuilder.java | 6 +
.../controller/topology/TopologyManager.java | 1 -
.../util/CloudControllerConstants.java | 2 +-
.../controller/util/CloudControllerUtil.java | 1 +
.../rest/endpoint/services/ServiceUtils.java | 334 ++++++-----
.../rest/endpoint/services/StratosAdmin.java | 5 -
.../org.apache.stratos.adc.mgt.stub/pom.xml | 9 +-
.../pom.xml | 2 +-
.../pom.xml | 3 +-
.../src/main/resources/AutoScalerService.wsdl | 214 ++++++-
.../main/resources/CloudControllerService.wsdl | 13 +-
tools/stratos-installer/conf/setup.conf | 131 ++---
.../config/sc/repository/conf/carbon.xml | 586 -------------------
.../repository/conf/cartridge-config.properties | 51 --
.../conf/datasources/master-datasources.xml | 129 ----
.../conf/datasources/stratos-datasources.xml | 51 --
.../resources/user-data/ssl-cert-snakeoil.key | 16 -
.../resources/user-data/ssl-cert-snakeoil.pem | 14 -
.../config/sm/repository/conf/carbon.xml | 586 +++++++++++++++++++
.../repository/conf/cartridge-config.properties | 51 ++
.../conf/datasources/master-datasources.xml | 129 ++++
.../conf/datasources/stratos-datasources.xml | 51 ++
.../config/sm/repository/conf/jndi.properties | 4 +
tools/stratos-installer/setup.sh | 504 ++++++++--------
80 files changed, 5047 insertions(+), 2389 deletions(-)
----------------------------------------------------------------------