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/04/13 05:22:14 UTC
[01/16] stratos git commit: Organize imports of common component
Repository: stratos
Updated Branches:
refs/heads/master 6855f2189 -> c774dc036
Organize imports of common component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/69524662
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/69524662
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/69524662
Branch: refs/heads/master
Commit: 69524662f4612d79350f6b4162e86f49157dfe40
Parents: 6855f21
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:41:37 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:41:37 2015 +0530
----------------------------------------------------------------------
.../stratos/common/beans/application/ApplicationBean.java | 3 +--
.../apache/stratos/common/beans/application/ComponentBean.java | 3 +--
.../stratos/common/beans/application/GroupReferenceBean.java | 1 -
.../stratos/common/beans/application/SubscribableInfo.java | 3 +--
.../stratos/common/beans/cartridge/CartridgeReferenceBean.java | 3 +--
.../stratos/common/beans/cartridge/NetworkInterfaceBean.java | 3 +--
.../apache/stratos/common/beans/cartridge/PersistenceBean.java | 2 +-
.../common/beans/policy/deployment/ApplicationPolicyBean.java | 5 ++---
.../org/apache/stratos/common/beans/topology/ClusterBean.java | 3 +--
.../stratos/common/client/StratosManagerServiceClient.java | 1 -
.../clustering/impl/HazelcastDistributedObjectProvider.java | 2 +-
.../apache/stratos/common/config/CloudServicesDescConfig.java | 4 +++-
.../java/org/apache/stratos/common/util/CloudServicesUtil.java | 6 +++---
13 files changed, 16 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java
index 1fad1ad..71e0c6c 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ApplicationBean.java
@@ -21,11 +21,10 @@ package org.apache.stratos.common.beans.application;
import org.apache.stratos.common.beans.PropertyBean;
+import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-
@XmlRootElement
public class ApplicationBean implements Serializable {
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java
index 9a6a0ce..69345f4 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/ComponentBean.java
@@ -2,11 +2,10 @@ package org.apache.stratos.common.beans.application;
import org.apache.stratos.common.beans.cartridge.CartridgeReferenceBean;
+import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-
@XmlRootElement(name = "components")
public class ComponentBean implements Serializable {
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java
index 6804f4e..c48c214 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/GroupReferenceBean.java
@@ -22,7 +22,6 @@ package org.apache.stratos.common.beans.application;
import org.apache.stratos.common.beans.cartridge.CartridgeReferenceBean;
import javax.xml.bind.annotation.XmlRootElement;
-
import java.io.Serializable;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
index cbe107c..e119558 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/application/SubscribableInfo.java
@@ -23,11 +23,10 @@ import org.apache.stratos.common.beans.PropertyBean;
import org.apache.stratos.common.beans.artifact.repository.ArtifactRepositoryBean;
import org.apache.stratos.common.beans.cartridge.PersistenceBean;
+import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-
@XmlRootElement(name = "subscribableInfo")
public class SubscribableInfo implements Serializable {
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
index 27fa37e..4207cbd 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/CartridgeReferenceBean.java
@@ -20,9 +20,8 @@ package org.apache.stratos.common.beans.cartridge;
import org.apache.stratos.common.beans.application.SubscribableInfo;
-import java.io.Serializable;
-
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
@XmlRootElement
public class CartridgeReferenceBean implements Serializable {
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/NetworkInterfaceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/NetworkInterfaceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/NetworkInterfaceBean.java
index d34728a..b104fd6 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/NetworkInterfaceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/NetworkInterfaceBean.java
@@ -19,9 +19,8 @@
package org.apache.stratos.common.beans.cartridge;
-import java.util.List;
-
import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
@XmlRootElement(name = "networkInterfaces")
public class NetworkInterfaceBean {
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PersistenceBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PersistenceBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PersistenceBean.java
index 7a3a2d7..a2bfedc 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PersistenceBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/cartridge/PersistenceBean.java
@@ -19,8 +19,8 @@
package org.apache.stratos.common.beans.cartridge;
-import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
@XmlRootElement(name = "persistence")
public class PersistenceBean {
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ApplicationPolicyBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ApplicationPolicyBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ApplicationPolicyBean.java
index 50f2581..8c906aa 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ApplicationPolicyBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/policy/deployment/ApplicationPolicyBean.java
@@ -19,11 +19,10 @@
package org.apache.stratos.common.beans.policy.deployment;
-import java.util.List;
+import org.apache.stratos.common.beans.PropertyBean;
import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.stratos.common.beans.PropertyBean;
+import java.util.List;
@XmlRootElement
public class ApplicationPolicyBean {
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
index 24d94c9..a781359 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/beans/topology/ClusterBean.java
@@ -18,10 +18,9 @@
*/
package org.apache.stratos.common.beans.topology;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.stratos.common.beans.cartridge.PropertyBean;
+import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
@XmlRootElement(name = "clusters")
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
index f19b04d..add2267 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/client/StratosManagerServiceClient.java
@@ -33,7 +33,6 @@ import org.apache.stratos.manager.service.stub.domain.application.signup.Applica
import org.apache.stratos.manager.service.stub.domain.application.signup.DomainMapping;
import java.rmi.RemoteException;
-import java.util.List;
/**
* Stratos manager service client.
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedObjectProvider.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedObjectProvider.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedObjectProvider.java
index e1c7ccf..860ebf3 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedObjectProvider.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/clustering/impl/HazelcastDistributedObjectProvider.java
@@ -26,8 +26,8 @@ import com.hazelcast.core.IMap;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.services.DistributedObjectProvider;
import org.apache.stratos.common.internal.ServiceReferenceHolder;
+import org.apache.stratos.common.services.DistributedObjectProvider;
import org.wso2.carbon.caching.impl.MapEntryListener;
import org.wso2.carbon.core.clustering.hazelcast.HazelcastDistributedMapProvider;
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServicesDescConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServicesDescConfig.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServicesDescConfig.java
index a0799af..f887558 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServicesDescConfig.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/config/CloudServicesDescConfig.java
@@ -23,7 +23,9 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
public class CloudServicesDescConfig {
private static final Log log = LogFactory.getLog(CloudServicesDescConfig.class);
http://git-wip-us.apache.org/repos/asf/stratos/blob/69524662/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CloudServicesUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CloudServicesUtil.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CloudServicesUtil.java
index 8756c0d..740c4a7 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CloudServicesUtil.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/CloudServicesUtil.java
@@ -18,9 +18,6 @@
*/
package org.apache.stratos.common.util;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.config.CloudServiceConfig;
@@ -36,6 +33,9 @@ import org.wso2.carbon.user.core.UserStoreException;
import org.wso2.carbon.user.mgt.UserMgtConstants;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+import java.util.List;
+import java.util.Map;
+
public class CloudServicesUtil {
private static final Log log = LogFactory.getLog(CloudServicesUtil.class);
[14/16] stratos git commit: Formatting Stratos manager module
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
index d269f0e..cb84da7 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
@@ -91,134 +91,134 @@ public class StratosManagerServiceImpl implements StratosManagerService {
public void removeDomainMapping(String applicationId, int tenantId, String domainName) throws DomainMappingException {
domainMappingHandler.removeDomainMapping(applicationId, tenantId, domainName);
}
-
+
@Override
public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) {
- Lock lock = null;
- try {
- lock = StratosManagerContext.getInstance().acquireCartridgesCartridgeGroupsWriteLock();
- StratosManagerContext.getInstance().addUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames);
- StratosManagerContext.getInstance().persist();
- } finally {
+ Lock lock = null;
+ try {
+ lock = StratosManagerContext.getInstance().acquireCartridgesCartridgeGroupsWriteLock();
+ StratosManagerContext.getInstance().addUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames);
+ StratosManagerContext.getInstance().persist();
+ } finally {
if (lock != null) {
- StratosManagerContext.getInstance().releaseWriteLock(lock);
+ StratosManagerContext.getInstance().releaseWriteLock(lock);
}
}
}
-
+
@Override
public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) {
- Lock lock = null;
- try {
- lock = StratosManagerContext.getInstance().acquireCartridgesCartridgeGroupsWriteLock();
- StratosManagerContext.getInstance().removeUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames);
- StratosManagerContext.getInstance().persist();
- } finally {
+ Lock lock = null;
+ try {
+ lock = StratosManagerContext.getInstance().acquireCartridgesCartridgeGroupsWriteLock();
+ StratosManagerContext.getInstance().removeUsedCartridgesInCartridgeGroups(cartridgeGroupName, cartridgeNames);
+ StratosManagerContext.getInstance().persist();
+ } finally {
if (lock != null) {
- StratosManagerContext.getInstance().releaseWriteLock(lock);
+ StratosManagerContext.getInstance().releaseWriteLock(lock);
}
}
}
-
+
@Override
public void addUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) {
- Lock lock = null;
- try {
- lock = StratosManagerContext.getInstance().acquireCartridgesApplicationsWriteLock();
- StratosManagerContext.getInstance().addUsedCartridgesInApplications(applicationName, cartridgeNames);
- StratosManagerContext.getInstance().persist();
- } finally {
+ Lock lock = null;
+ try {
+ lock = StratosManagerContext.getInstance().acquireCartridgesApplicationsWriteLock();
+ StratosManagerContext.getInstance().addUsedCartridgesInApplications(applicationName, cartridgeNames);
+ StratosManagerContext.getInstance().persist();
+ } finally {
if (lock != null) {
- StratosManagerContext.getInstance().releaseWriteLock(lock);
+ StratosManagerContext.getInstance().releaseWriteLock(lock);
}
}
}
-
+
@Override
public void removeUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) {
- Lock lock = null;
- try {
- lock = StratosManagerContext.getInstance().acquireCartridgesApplicationsWriteLock();
- StratosManagerContext.getInstance().removeUsedCartridgesInApplications(applicationName, cartridgeNames);
- StratosManagerContext.getInstance().persist();
- } finally {
+ Lock lock = null;
+ try {
+ lock = StratosManagerContext.getInstance().acquireCartridgesApplicationsWriteLock();
+ StratosManagerContext.getInstance().removeUsedCartridgesInApplications(applicationName, cartridgeNames);
+ StratosManagerContext.getInstance().persist();
+ } finally {
if (lock != null) {
- StratosManagerContext.getInstance().releaseWriteLock(lock);
+ StratosManagerContext.getInstance().releaseWriteLock(lock);
}
}
}
-
+
@Override
public boolean canCartridgeBeRemoved(String cartridgeName) {
- if (StratosManagerContext.getInstance().isCartridgeIncludedInCartridgeGroups(cartridgeName) ||
- StratosManagerContext.getInstance().isCartridgeIncludedInApplications(cartridgeName)) {
- return false;
- }
- return true;
+ if (StratosManagerContext.getInstance().isCartridgeIncludedInCartridgeGroups(cartridgeName) ||
+ StratosManagerContext.getInstance().isCartridgeIncludedInApplications(cartridgeName)) {
+ return false;
+ }
+ return true;
}
-
+
@Override
public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) {
- Lock lock = null;
- try {
- lock = StratosManagerContext.getInstance().acquireCartridgeGroupsCartridgeSubGroupsWriteLock();
- StratosManagerContext.getInstance().addUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames);
- StratosManagerContext.getInstance().persist();
- } finally {
+ Lock lock = null;
+ try {
+ lock = StratosManagerContext.getInstance().acquireCartridgeGroupsCartridgeSubGroupsWriteLock();
+ StratosManagerContext.getInstance().addUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames);
+ StratosManagerContext.getInstance().persist();
+ } finally {
if (lock != null) {
- StratosManagerContext.getInstance().releaseWriteLock(lock);
+ StratosManagerContext.getInstance().releaseWriteLock(lock);
}
}
}
-
+
@Override
public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) {
- Lock lock = null;
- try {
- lock = StratosManagerContext.getInstance().acquireCartridgeGroupsCartridgeSubGroupsWriteLock();
- StratosManagerContext.getInstance().removeUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames);
- StratosManagerContext.getInstance().persist();
- } finally {
+ Lock lock = null;
+ try {
+ lock = StratosManagerContext.getInstance().acquireCartridgeGroupsCartridgeSubGroupsWriteLock();
+ StratosManagerContext.getInstance().removeUsedCartridgeGroupsInCartridgeSubGroups(cartridgeSubGroupName, cartridgeGroupNames);
+ StratosManagerContext.getInstance().persist();
+ } finally {
if (lock != null) {
- StratosManagerContext.getInstance().releaseWriteLock(lock);
+ StratosManagerContext.getInstance().releaseWriteLock(lock);
}
}
}
-
+
@Override
public void addUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) {
- Lock lock = null;
- try {
- lock = StratosManagerContext.getInstance().acquireCartridgeGroupsApplicationsWriteLock();
- StratosManagerContext.getInstance().addUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames);
- StratosManagerContext.getInstance().persist();
- } finally {
+ Lock lock = null;
+ try {
+ lock = StratosManagerContext.getInstance().acquireCartridgeGroupsApplicationsWriteLock();
+ StratosManagerContext.getInstance().addUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames);
+ StratosManagerContext.getInstance().persist();
+ } finally {
if (lock != null) {
- StratosManagerContext.getInstance().releaseWriteLock(lock);
+ StratosManagerContext.getInstance().releaseWriteLock(lock);
}
}
}
-
+
@Override
public void removeUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) {
- Lock lock = null;
- try {
- lock = StratosManagerContext.getInstance().acquireCartridgeGroupsApplicationsWriteLock();
- StratosManagerContext.getInstance().removeUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames);
- StratosManagerContext.getInstance().persist();
- } finally {
+ Lock lock = null;
+ try {
+ lock = StratosManagerContext.getInstance().acquireCartridgeGroupsApplicationsWriteLock();
+ StratosManagerContext.getInstance().removeUsedCartridgeGroupsInApplications(applicationName, cartridgeGroupNames);
+ StratosManagerContext.getInstance().persist();
+ } finally {
if (lock != null) {
- StratosManagerContext.getInstance().releaseWriteLock(lock);
+ StratosManagerContext.getInstance().releaseWriteLock(lock);
}
}
}
-
+
@Override
public boolean canCartirdgeGroupBeRemoved(String cartridgeGroupName) {
- if(StratosManagerContext.getInstance().isCartridgeGroupIncludedInCartridgeSubGroups(cartridgeGroupName) ||
- StratosManagerContext.getInstance().isCartridgeGroupIncludedInApplications(cartridgeGroupName)) {
- return false;
- }
- return true;
+ if (StratosManagerContext.getInstance().isCartridgeGroupIncludedInCartridgeSubGroups(cartridgeGroupName) ||
+ StratosManagerContext.getInstance().isCartridgeGroupIncludedInApplications(cartridgeGroupName)) {
+ return false;
+ }
+ return true;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
index 4a3718f..aca7858 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
@@ -42,136 +42,136 @@ import org.wso2.carbon.utils.CarbonUtils;
*/
public class CartridgeSubscriptionDataPublisher {
- private static final Log log = LogFactory
- .getLog(CartridgeSubscriptionDataPublisher.class);
- private static AsyncDataPublisher dataPublisher;
- private static StreamDefinition streamDefinition;
- private static final String stratosManagerEventStreamVersion = "1.0.0";
-
- @SuppressWarnings("deprecation")
- public static void publish(int tenantID, String adminUser,
- String cartridgeAlias, String cartridgeType, String repositoryUrl,
- boolean isMultiTenant, String autoScalingPolicy,
- String deploymentPolicy, String clusterID, String hostName,
- String mappedDomain, String action) throws StratosManagerException {
-
- //check if bam is enabled in cartridge-config.properties
- if(! Boolean.parseBoolean(System.getProperty(CartridgeConstants.BAM_PUBLISHER_ENABLED))){
+ private static final Log log = LogFactory
+ .getLog(CartridgeSubscriptionDataPublisher.class);
+ private static AsyncDataPublisher dataPublisher;
+ private static StreamDefinition streamDefinition;
+ private static final String stratosManagerEventStreamVersion = "1.0.0";
+
+ @SuppressWarnings("deprecation")
+ public static void publish(int tenantID, String adminUser,
+ String cartridgeAlias, String cartridgeType, String repositoryUrl,
+ boolean isMultiTenant, String autoScalingPolicy,
+ String deploymentPolicy, String clusterID, String hostName,
+ String mappedDomain, String action) throws StratosManagerException {
+
+ //check if bam is enabled in cartridge-config.properties
+ if (!Boolean.parseBoolean(System.getProperty(CartridgeConstants.BAM_PUBLISHER_ENABLED))) {
return;
}
-
- log.debug(CartridgeConstants.DATA_PUB_TASK_NAME+" cycle started.");
-
- if (dataPublisher == null) {
- createDataPublisher();
-
- // If we cannot create a data publisher we should give up
- // this means data will not be published
- if (dataPublisher == null) {
- log.error("Data Publisher cannot be created or found.");
- return;
- }
- }
-
- //Construct the data to be published
- List<Object> payload = new ArrayList<Object>();
-
- // Payload values
- payload.add(String.valueOf(tenantID));
- payload.add(handleNull(adminUser));
- payload.add(handleNull(cartridgeAlias));
- payload.add(cartridgeType);
- payload.add(handleNull(repositoryUrl));
- payload.add(handleNull(String.valueOf(isMultiTenant)));
- payload.add(handleNull(autoScalingPolicy));
- payload.add(handleNull(deploymentPolicy));
- payload.add(String.valueOf(clusterID));
- payload.add(handleNull(hostName));
- payload.add(handleNull(mappedDomain));
- payload.add(handleNull(action));
-
- Event event = new Event();
- event.setPayloadData(payload.toArray());
- event.setArbitraryDataMap(new HashMap<String, String>());
-
- try {
- if (log.isDebugEnabled()) {
- log.debug(String.format(
- "Publishing BAM event: [stream] %s [version] %s",
- streamDefinition.getName(),
- streamDefinition.getVersion()));
- }
- dataPublisher.publish(streamDefinition.getName(),
- streamDefinition.getVersion(), event);
- } catch (AgentException e) {
- if (log.isErrorEnabled()) {
- log.error(
- String.format(
- "Could not publish BAM event: [stream] %s [version] %s",
- streamDefinition.getName(),
- streamDefinition.getVersion()), e);
- }
- }
- }
-
- private static StreamDefinition initializeStream() throws Exception {
- streamDefinition = new StreamDefinition( CartridgeConstants.STRATOS_MANAGER_EVENT_STREAM,
- stratosManagerEventStreamVersion);
- streamDefinition.setNickName("stratos.manager");
- streamDefinition.setDescription("Tenant Subscription Data");
- // Payload definition
- List<Attribute> payloadData = new ArrayList<Attribute>();
- payloadData.add(new Attribute(CartridgeConstants.TENANT_ID_COL, AttributeType.STRING));
- payloadData.add(new Attribute(CartridgeConstants.ADMIN_USER_COL, AttributeType.STRING));
- payloadData.add(new Attribute(CartridgeConstants.CARTRIDGE_ALIAS_COL, AttributeType.STRING));
- payloadData.add(new Attribute(CartridgeConstants.CARTRIDGE_TYPE_COL, AttributeType.STRING));
- payloadData.add(new Attribute(CartridgeConstants.REPOSITORY_URL_COL, AttributeType.STRING));
- payloadData.add(new Attribute(CartridgeConstants.MULTI_TENANT_BEHAVIOR_COL, AttributeType.STRING));
- payloadData.add(new Attribute(CartridgeConstants.AUTO_SCALE_POLICY_COL, AttributeType.STRING));
- payloadData
- .add(new Attribute(CartridgeConstants.DEPLOYMENT_POLICY_COL, AttributeType.STRING));
- payloadData.add(new Attribute(CartridgeConstants.CLUSTER_ID_COL, AttributeType.STRING));
- payloadData.add(new Attribute(CartridgeConstants.HOST_NAME_COL, AttributeType.STRING));
- payloadData.add(new Attribute(CartridgeConstants.MAPPED_DOMAIN_COL, AttributeType.STRING));
- payloadData.add(new Attribute(CartridgeConstants.ACTION_COL, AttributeType.STRING));
- streamDefinition.setPayloadData(payloadData);
- return streamDefinition;
- }
-
- private static void createDataPublisher() throws StratosManagerException {
- // creating the agent
- ServerConfiguration serverConfig = CarbonUtils.getServerConfiguration();
- String trustStorePath = serverConfig.getFirstProperty("Security.TrustStore.Location");
- String trustStorePassword = serverConfig.getFirstProperty("Security.TrustStore.Password");
-
- //value is in the carbon.xml file and should be set to the thrift port of BAM
- String bamServerUrl = serverConfig.getFirstProperty("BamServerURL");
-
+
+ log.debug(CartridgeConstants.DATA_PUB_TASK_NAME + " cycle started.");
+
+ if (dataPublisher == null) {
+ createDataPublisher();
+
+ // If we cannot create a data publisher we should give up
+ // this means data will not be published
+ if (dataPublisher == null) {
+ log.error("Data Publisher cannot be created or found.");
+ return;
+ }
+ }
+
+ //Construct the data to be published
+ List<Object> payload = new ArrayList<Object>();
+
+ // Payload values
+ payload.add(String.valueOf(tenantID));
+ payload.add(handleNull(adminUser));
+ payload.add(handleNull(cartridgeAlias));
+ payload.add(cartridgeType);
+ payload.add(handleNull(repositoryUrl));
+ payload.add(handleNull(String.valueOf(isMultiTenant)));
+ payload.add(handleNull(autoScalingPolicy));
+ payload.add(handleNull(deploymentPolicy));
+ payload.add(String.valueOf(clusterID));
+ payload.add(handleNull(hostName));
+ payload.add(handleNull(mappedDomain));
+ payload.add(handleNull(action));
+
+ Event event = new Event();
+ event.setPayloadData(payload.toArray());
+ event.setArbitraryDataMap(new HashMap<String, String>());
+
+ try {
+ if (log.isDebugEnabled()) {
+ log.debug(String.format(
+ "Publishing BAM event: [stream] %s [version] %s",
+ streamDefinition.getName(),
+ streamDefinition.getVersion()));
+ }
+ dataPublisher.publish(streamDefinition.getName(),
+ streamDefinition.getVersion(), event);
+ } catch (AgentException e) {
+ if (log.isErrorEnabled()) {
+ log.error(
+ String.format(
+ "Could not publish BAM event: [stream] %s [version] %s",
+ streamDefinition.getName(),
+ streamDefinition.getVersion()), e);
+ }
+ }
+ }
+
+ private static StreamDefinition initializeStream() throws Exception {
+ streamDefinition = new StreamDefinition(CartridgeConstants.STRATOS_MANAGER_EVENT_STREAM,
+ stratosManagerEventStreamVersion);
+ streamDefinition.setNickName("stratos.manager");
+ streamDefinition.setDescription("Tenant Subscription Data");
+ // Payload definition
+ List<Attribute> payloadData = new ArrayList<Attribute>();
+ payloadData.add(new Attribute(CartridgeConstants.TENANT_ID_COL, AttributeType.STRING));
+ payloadData.add(new Attribute(CartridgeConstants.ADMIN_USER_COL, AttributeType.STRING));
+ payloadData.add(new Attribute(CartridgeConstants.CARTRIDGE_ALIAS_COL, AttributeType.STRING));
+ payloadData.add(new Attribute(CartridgeConstants.CARTRIDGE_TYPE_COL, AttributeType.STRING));
+ payloadData.add(new Attribute(CartridgeConstants.REPOSITORY_URL_COL, AttributeType.STRING));
+ payloadData.add(new Attribute(CartridgeConstants.MULTI_TENANT_BEHAVIOR_COL, AttributeType.STRING));
+ payloadData.add(new Attribute(CartridgeConstants.AUTO_SCALE_POLICY_COL, AttributeType.STRING));
+ payloadData
+ .add(new Attribute(CartridgeConstants.DEPLOYMENT_POLICY_COL, AttributeType.STRING));
+ payloadData.add(new Attribute(CartridgeConstants.CLUSTER_ID_COL, AttributeType.STRING));
+ payloadData.add(new Attribute(CartridgeConstants.HOST_NAME_COL, AttributeType.STRING));
+ payloadData.add(new Attribute(CartridgeConstants.MAPPED_DOMAIN_COL, AttributeType.STRING));
+ payloadData.add(new Attribute(CartridgeConstants.ACTION_COL, AttributeType.STRING));
+ streamDefinition.setPayloadData(payloadData);
+ return streamDefinition;
+ }
+
+ private static void createDataPublisher() throws StratosManagerException {
+ // creating the agent
+ ServerConfiguration serverConfig = CarbonUtils.getServerConfiguration();
+ String trustStorePath = serverConfig.getFirstProperty("Security.TrustStore.Location");
+ String trustStorePassword = serverConfig.getFirstProperty("Security.TrustStore.Password");
+
+ //value is in the carbon.xml file and should be set to the thrift port of BAM
+ String bamServerUrl = serverConfig.getFirstProperty("BamServerURL");
+
//getting the BAM related values from cartridge-config.properties
- String adminUsername = System.getProperty(CartridgeConstants.BAM_ADMIN_USERNAME);
- String adminPassword = System.getProperty(CartridgeConstants.BAM_ADMIN_PASSWORD);
-
- System.setProperty("javax.net.ssl.trustStore", trustStorePath);
- System.setProperty("javax.net.ssl.trustStorePassword",
- trustStorePassword);
-
- try {
- dataPublisher = new AsyncDataPublisher(
- "tcp://" + bamServerUrl + "", adminUsername, adminPassword);
- initializeStream();
- dataPublisher.addStreamDefinition(streamDefinition);
- } catch (Exception e) {
- String msg = "Unable to create a data publisher to "+ bamServerUrl;
- log.error(msg, e);
- throw new StratosManagerException(msg, e);
- }
- }
-
- private static String handleNull(String val) {
- if (val == null) {
- return "";
- }
- return val;
- }
+ String adminUsername = System.getProperty(CartridgeConstants.BAM_ADMIN_USERNAME);
+ String adminPassword = System.getProperty(CartridgeConstants.BAM_ADMIN_PASSWORD);
+
+ System.setProperty("javax.net.ssl.trustStore", trustStorePath);
+ System.setProperty("javax.net.ssl.trustStorePassword",
+ trustStorePassword);
+
+ try {
+ dataPublisher = new AsyncDataPublisher(
+ "tcp://" + bamServerUrl + "", adminUsername, adminPassword);
+ initializeStream();
+ dataPublisher.addStreamDefinition(streamDefinition);
+ } catch (Exception e) {
+ String msg = "Unable to create a data publisher to " + bamServerUrl;
+ log.error(msg, e);
+ throw new StratosManagerException(msg, e);
+ }
+ }
+
+ private static String handleNull(String val) {
+ if (val == null) {
+ return "";
+ }
+ return val;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
index 29a1959..54ab562 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
@@ -41,39 +41,40 @@ public class TenantUserRoleManager implements TenantMgtListener {
/**
* Create an 'user' role at tenant creation time
+ *
* @param tenantInfo TenantInfoBean
* @throws org.apache.stratos.common.exception.ApacheStratosException
*/
@Override
public void onTenantCreate(TenantInfoBean tenantInfo) throws ApacheStratosException {
- try {
-
- PrivilegedCarbonContext.startTenantFlow();
- PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- carbonContext.setTenantDomain(tenantInfo.getTenantDomain());
- carbonContext.setTenantId(tenantInfo.getTenantId());
- //Get tenant UserRealm & UserStoreManager
- UserRealm userRealm = ServiceReferenceHolder.getRealmService().getTenantUserRealm(tenantInfo.getTenantId());
- UserStoreManager userStoreManager = userRealm.getUserStoreManager();
- //Call Util class to create the user role
-
- UserRoleCreator.createInternalUserRole(userStoreManager);
-
- } catch (UserStoreException e) {
- String msg = "Error while retrieving the user store for tenant: "+ tenantInfo.getTenantDomain();
- log.error(msg, e);
- throw new ApacheStratosException(e.getMessage(), e);
- } catch (UserManagerException e) {
- String msg = "Error while creating the user role in tenant: "+ tenantInfo.getTenantDomain();
- log.error(msg, e);
- throw new ApacheStratosException(e.getMessage(), e);
- } finally {
- PrivilegedCarbonContext.endTenantFlow();
- }
-
+ try {
+
+ PrivilegedCarbonContext.startTenantFlow();
+ PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+ carbonContext.setTenantDomain(tenantInfo.getTenantDomain());
+ carbonContext.setTenantId(tenantInfo.getTenantId());
+ //Get tenant UserRealm & UserStoreManager
+ UserRealm userRealm = ServiceReferenceHolder.getRealmService().getTenantUserRealm(tenantInfo.getTenantId());
+ UserStoreManager userStoreManager = userRealm.getUserStoreManager();
+ //Call Util class to create the user role
+
+ UserRoleCreator.createInternalUserRole(userStoreManager);
+
+ } catch (UserStoreException e) {
+ String msg = "Error while retrieving the user store for tenant: " + tenantInfo.getTenantDomain();
+ log.error(msg, e);
+ throw new ApacheStratosException(e.getMessage(), e);
+ } catch (UserManagerException e) {
+ String msg = "Error while creating the user role in tenant: " + tenantInfo.getTenantDomain();
+ log.error(msg, e);
+ throw new ApacheStratosException(e.getMessage(), e);
+ } finally {
+ PrivilegedCarbonContext.endTenantFlow();
}
+ }
+
@Override
public void onTenantUpdate(TenantInfoBean tenantInfo) throws ApacheStratosException {
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java
index 525186b..76a579c 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/ApplicationManagementUtil.java
@@ -36,12 +36,12 @@ public class ApplicationManagementUtil {
public static int getTenantId(ConfigurationContext configurationContext) {
int tenantId = MultitenantUtils.getTenantId(configurationContext);
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Returning tenant ID : " + tenantId);
}
return tenantId;
}
-
+
public static org.apache.stratos.cloud.controller.stub.Properties toCCStubProperties(
org.apache.stratos.common.Properties properties) {
org.apache.stratos.cloud.controller.stub.Properties stubProps = new org.apache.stratos.cloud.controller.stub.Properties();
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java
index b5d4cc7..1ecfc9e 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConstants.java
@@ -23,24 +23,24 @@ public class CartridgeConstants {
public static final String FEATURE_MULTI_TENANT_MULTIPLE_SUBSCRIPTION_ENABLED = "feature.multitenant.multiplesubscription.enabled";
- // BAM publisher related values
- public static final String BAM_PUBLISHER_ENABLED = "bam.publisher.enabled";
- public static final String BAM_ADMIN_USERNAME = "bam.admin.username";
- public static final String BAM_ADMIN_PASSWORD = "bam.admin.password";
- public static final String DATA_PUB_TASK_NAME = "CartridgeSubscriptionDataPublisher";
- public static final String STRATOS_MANAGER_EVENT_STREAM = "org_apache_stratos_manager";
+ // BAM publisher related values
+ public static final String BAM_PUBLISHER_ENABLED = "bam.publisher.enabled";
+ public static final String BAM_ADMIN_USERNAME = "bam.admin.username";
+ public static final String BAM_ADMIN_PASSWORD = "bam.admin.password";
+ public static final String DATA_PUB_TASK_NAME = "CartridgeSubscriptionDataPublisher";
+ public static final String STRATOS_MANAGER_EVENT_STREAM = "org_apache_stratos_manager";
- // BAM stream definition relate values
- public static final String TENANT_ID_COL = "tenantID";
- public static final String ADMIN_USER_COL = "adminUser";
- public static final String CARTRIDGE_ALIAS_COL = "cartridgeAlias";
- public static final String CARTRIDGE_TYPE_COL = "cartridgeType";
- public static final String REPOSITORY_URL_COL = "repositoryUrl";
- public static final String MULTI_TENANT_BEHAVIOR_COL = "isMultiTenant";
- public static final String AUTO_SCALE_POLICY_COL = "autoScalePolicy";
- public static final String DEPLOYMENT_POLICY_COL = "deploymentPolicy";
- public static final String CLUSTER_ID_COL = "clusterId";
- public static final String HOST_NAME_COL = "hostname";
- public static final String MAPPED_DOMAIN_COL = "mappedDomain";
- public static final String ACTION_COL = "action";
+ // BAM stream definition relate values
+ public static final String TENANT_ID_COL = "tenantID";
+ public static final String ADMIN_USER_COL = "adminUser";
+ public static final String CARTRIDGE_ALIAS_COL = "cartridgeAlias";
+ public static final String CARTRIDGE_TYPE_COL = "cartridgeType";
+ public static final String REPOSITORY_URL_COL = "repositoryUrl";
+ public static final String MULTI_TENANT_BEHAVIOR_COL = "isMultiTenant";
+ public static final String AUTO_SCALE_POLICY_COL = "autoScalePolicy";
+ public static final String DEPLOYMENT_POLICY_COL = "deploymentPolicy";
+ public static final String CLUSTER_ID_COL = "clusterId";
+ public static final String HOST_NAME_COL = "hostname";
+ public static final String MAPPED_DOMAIN_COL = "mappedDomain";
+ public static final String ACTION_COL = "action";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
index dd15959..6cbb311 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
@@ -49,18 +49,18 @@ public class UserRoleCreator {
}
//Set permissions to the Internal/user role
Permission[] tenantUserPermissions = new Permission[]{new Permission(PermissionConstants.VIEW_AUTOSCALING_POLICY, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.VIEW_DEPLOYMENT_POLICY, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.VIEW_CARTRIDGE, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.VIEW_SERVICE, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.VIEW_SUBSCRIPTION, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.VIEW_DOMAIN, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.VIEW_CLUSTER, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.VIEW_INSTANCE, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.VIEW_KUBERNETES, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.ADD_GIT_SYNC, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.ADD_SUBSCRIPTION, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.ADD_DOMAIN, UserMgtConstants.EXECUTE_ACTION),
- new Permission(PermissionConstants.REST_LOGIN, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.VIEW_DEPLOYMENT_POLICY, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.VIEW_CARTRIDGE, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.VIEW_SERVICE, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.VIEW_SUBSCRIPTION, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.VIEW_DOMAIN, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.VIEW_CLUSTER, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.VIEW_INSTANCE, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.VIEW_KUBERNETES, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.ADD_GIT_SYNC, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.ADD_SUBSCRIPTION, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.ADD_DOMAIN, UserMgtConstants.EXECUTE_ACTION),
+ new Permission(PermissionConstants.REST_LOGIN, UserMgtConstants.EXECUTE_ACTION),
};
String[] userList = new String[]{};
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.manager/src/main/resources/META-INF/services.xml
index 9f4820b..f4a6453 100644
--- a/components/org.apache.stratos.manager/src/main/resources/META-INF/services.xml
+++ b/components/org.apache.stratos.manager/src/main/resources/META-INF/services.xml
@@ -17,11 +17,13 @@
# under the License.
-->
<serviceGroup>
- <service name="StratosManagerService" scope="application">
- <parameter name="ServiceClass">org.apache.stratos.manager.services.impl.StratosManagerServiceImpl</parameter>
- <messageReceivers>
- <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only" class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out" class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
- </messageReceivers>
- </service>
+ <service name="StratosManagerService" scope="application">
+ <parameter name="ServiceClass">org.apache.stratos.manager.services.impl.StratosManagerServiceImpl</parameter>
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
+ class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
+ class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
+ </messageReceivers>
+ </service>
</serviceGroup>
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/resources/policies.xsd
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/resources/policies.xsd b/components/org.apache.stratos.manager/src/main/resources/policies.xsd
index b9c0503..4b6b0c3 100644
--- a/components/org.apache.stratos.manager/src/main/resources/policies.xsd
+++ b/components/org.apache.stratos.manager/src/main/resources/policies.xsd
@@ -18,37 +18,37 @@
under the License.
-->
<xs:schema attributeFormDefault="unqualified"
- elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="policies">
- <xs:annotation>
- <xs:documentation>Use below section to specify auto-scaling policies
- for cartridges.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="policy" maxOccurs="unbounded"
- minOccurs="1">
- <xs:annotation>
- <xs:documentation>You can have 1..n policy elements.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element type="xs:string" name="description" />
- <xs:element type="xs:integer" name="min_app_instances" />
- <xs:element type="xs:integer" name="max_app_instances" />
- <xs:element type="xs:integer" name="max_requests_per_second" />
- <xs:element type="xs:decimal" name="alarming_upper_rate" />
- <xs:element type="xs:decimal" name="alarming_lower_rate" />
- <xs:element type="xs:decimal" name="scale_down_factor" />
- <xs:element type="xs:integer" name="rounds_to_average" />
- </xs:sequence>
- <xs:attribute type="xs:string" name="name" use="required" />
- <xs:attribute type="xs:boolean" name="isDefault" use="required" />
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="policies">
+ <xs:annotation>
+ <xs:documentation>Use below section to specify auto-scaling policies
+ for cartridges.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="policy" maxOccurs="unbounded"
+ minOccurs="1">
+ <xs:annotation>
+ <xs:documentation>You can have 1..n policy elements.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="description"/>
+ <xs:element type="xs:integer" name="min_app_instances"/>
+ <xs:element type="xs:integer" name="max_app_instances"/>
+ <xs:element type="xs:integer" name="max_requests_per_second"/>
+ <xs:element type="xs:decimal" name="alarming_upper_rate"/>
+ <xs:element type="xs:decimal" name="alarming_lower_rate"/>
+ <xs:element type="xs:decimal" name="scale_down_factor"/>
+ <xs:element type="xs:integer" name="rounds_to_average"/>
+ </xs:sequence>
+ <xs:attribute type="xs:string" name="name" use="required"/>
+ <xs:attribute type="xs:boolean" name="isDefault" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
[16/16] stratos git commit: Organize imports of Stratos manager module
Posted by la...@apache.org.
Organize imports of Stratos manager module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c774dc03
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c774dc03
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c774dc03
Branch: refs/heads/master
Commit: c774dc03647efa1cb08be3495d0b849f39f9cc45
Parents: 779eb76
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 08:50:36 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 08:50:36 2015 +0530
----------------------------------------------------------------------
.../manager/components/DomainMappingHandler.java | 2 +-
.../manager/context/StratosManagerContext.java | 14 +++++++-------
.../synchronizer/TenantEventSynchronizer.java | 3 ++-
.../manager/services/StratosManagerService.java | 4 +---
.../services/impl/StratosManagerServiceImpl.java | 4 ++--
.../publisher/CartridgeSubscriptionDataPublisher.java | 8 ++++----
.../user/management/TenantUserRoleManager.java | 2 +-
.../manager/utils/CartridgeConfigFileReader.java | 8 ++++----
.../apache/stratos/manager/utils/UserRoleCreator.java | 3 ---
9 files changed, 22 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
index cbf3fa2..506913f 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
@@ -21,9 +21,9 @@ package org.apache.stratos.manager.components;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.manager.exception.DomainMappingException;
import org.apache.stratos.manager.messaging.publisher.DomainMappingEventPublisher;
+import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.messaging.domain.application.signup.DomainMapping;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
index 856c9db..299f2fd 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
@@ -19,20 +19,20 @@
package org.apache.stratos.manager.context;
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.manager.registry.RegistryManager;
import org.apache.stratos.common.services.DistributedObjectProvider;
import org.apache.stratos.manager.internal.ServiceReferenceHolder;
+import org.apache.stratos.manager.registry.RegistryManager;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.locks.Lock;
+
/**
* Stratos manager context.
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
index 390663d..d7d8ef4 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
@@ -30,7 +30,8 @@ import org.apache.stratos.messaging.util.MessagingUtil;
import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
import org.wso2.carbon.user.core.tenant.TenantManager;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
/**
* Tenant event synchronizer publishes complete tenant event periodically.
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
index cc8dc12..b80aea7 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
@@ -19,12 +19,10 @@
package org.apache.stratos.manager.services;
-import java.util.List;
-
-import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.manager.exception.ApplicationSignUpException;
import org.apache.stratos.manager.exception.ArtifactDistributionCoordinatorException;
import org.apache.stratos.manager.exception.DomainMappingException;
+import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.messaging.domain.application.signup.DomainMapping;
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
index cb84da7..f7c0858 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
@@ -19,8 +19,6 @@
package org.apache.stratos.manager.services.impl;
-import java.util.concurrent.locks.Lock;
-
import org.apache.stratos.manager.components.ApplicationSignUpHandler;
import org.apache.stratos.manager.components.ArtifactDistributionCoordinator;
import org.apache.stratos.manager.components.DomainMappingHandler;
@@ -32,6 +30,8 @@ import org.apache.stratos.manager.services.StratosManagerService;
import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.messaging.domain.application.signup.DomainMapping;
+import java.util.concurrent.locks.Lock;
+
/**
* Stratos manager service implementation.
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
index aca7858..caac6e6 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
@@ -19,10 +19,6 @@
package org.apache.stratos.manager.statistics.publisher;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.manager.exception.StratosManagerException;
@@ -36,6 +32,10 @@ import org.wso2.carbon.databridge.commons.Event;
import org.wso2.carbon.databridge.commons.StreamDefinition;
import org.wso2.carbon.utils.CarbonUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
/**
* This will publish the subscription details of tenants to a data receiver.
* Data is published when a tenant subscribe to a cartridge and when it unsubscribe.
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
index 54ab562..ed5a029 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
@@ -28,9 +28,9 @@ import org.apache.stratos.manager.internal.ServiceReferenceHolder;
import org.apache.stratos.manager.user.management.exception.UserManagerException;
import org.apache.stratos.manager.utils.UserRoleCreator;
import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.user.api.UserRealm;
import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.user.api.UserStoreManager;
-import org.wso2.carbon.user.api.UserRealm;
/**
* Listener for Tenant create event to create a new Role
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java
index 35b4e48..223e158 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java
@@ -19,16 +19,16 @@
package org.apache.stratos.manager.utils;
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Properties;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.utils.CarbonUtils;
import org.wso2.securevault.SecretResolver;
import org.wso2.securevault.SecretResolverFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Properties;
+
public class CartridgeConfigFileReader {
private static String carbonHome = CarbonUtils.getCarbonHome();
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
index 6cbb311..e7dfe94 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
@@ -22,13 +22,10 @@ package org.apache.stratos.manager.utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.manager.internal.ServiceReferenceHolder;
import org.apache.stratos.manager.user.management.exception.UserManagerException;
import org.wso2.carbon.user.api.Permission;
import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.user.api.UserStoreManager;
-import org.wso2.carbon.user.core.UserRealm;
-import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.user.mgt.UserMgtConstants;
public class UserRoleCreator {
[11/16] stratos git commit: Formatting Logging view module
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/js/logviewer.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/js/logviewer.js b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/js/logviewer.js
index 73bf9da..2565405 100644
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/js/logviewer.js
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/js/logviewer.js
@@ -18,83 +18,79 @@
*/
/*
-log.js contains scripts need to handle log information.
-*/
+ log.js contains scripts need to handle log information.
+ */
function viewSingleLogLevels() {
- var loglevel = document.getElementById("logLevelID");
- var loglevel_index = null;
- var loglevel_value = null;
- if (loglevel != null)
- {
- loglevel_index = loglevel.selectedIndex;
- if (loglevel_index != null) {
- loglevel_value = loglevel.options[loglevel_index].value;
- }
- }
- if (loglevel_value != null && loglevel_value != "") {
- location.href = "index.jsp?type=" + loglevel_value;
- } else {
- return;
- }
+ var loglevel = document.getElementById("logLevelID");
+ var loglevel_index = null;
+ var loglevel_value = null;
+ if (loglevel != null) {
+ loglevel_index = loglevel.selectedIndex;
+ if (loglevel_index != null) {
+ loglevel_value = loglevel.options[loglevel_index].value;
+ }
+ }
+ if (loglevel_value != null && loglevel_value != "") {
+ location.href = "index.jsp?type=" + loglevel_value;
+ } else {
+ return;
+ }
}
function viewApplicationLogs() {
- var loglevel = document.getElementById("logLevelID");
- var appName = document.getElementById("appName");
- var loglevel_index = null;
- var loglevel_value = null;
- var appName_index = null;
- var appName_value = null;
- if (loglevel != null)
- {
- loglevel_index = loglevel.selectedIndex;
- if (loglevel_index != null) {
- loglevel_value = loglevel.options[loglevel_index].value;
- }
- }
-
- if (appName != null)
- {
- appName_index = appName.selectedIndex;
- if (appName_index != null) {
- appName_value = appName.options[appName_index].value;
- }
- }
- if (loglevel_value == "Custom") {
- loglevel_value = "ALL";
- }
- if (loglevel_value != null && loglevel_value != "") {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value +"&appName="+appName_value;
- } else if (appName_value != null && appName_value != "") {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value +"&appName="+appName_value;
- } else {
- return;
- }
+ var loglevel = document.getElementById("logLevelID");
+ var appName = document.getElementById("appName");
+ var loglevel_index = null;
+ var loglevel_value = null;
+ var appName_index = null;
+ var appName_value = null;
+ if (loglevel != null) {
+ loglevel_index = loglevel.selectedIndex;
+ if (loglevel_index != null) {
+ loglevel_value = loglevel.options[loglevel_index].value;
+ }
+ }
+
+ if (appName != null) {
+ appName_index = appName.selectedIndex;
+ if (appName_index != null) {
+ appName_value = appName.options[appName_index].value;
+ }
+ }
+ if (loglevel_value == "Custom") {
+ loglevel_value = "ALL";
+ }
+ if (loglevel_value != null && loglevel_value != "") {
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName=" + appName_value;
+ } else if (appName_value != null && appName_value != "") {
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName=" + appName_value;
+ } else {
+ return;
+ }
}
function viewSingleLogLevel() {
var loglevel = document.getElementById("logLevelID");
- var tenantDomain = document.getElementById("tenantDomain").value;
- var serviceName = document.getElementById("serviceName").value;
- var logFile = document.getElementById("logFile").value;
+ var tenantDomain = document.getElementById("tenantDomain").value;
+ var serviceName = document.getElementById("serviceName").value;
+ var logFile = document.getElementById("logFile").value;
var loglevel_index = null;
var loglevel_value = null;
- if (loglevel != null)
- {
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
}
}
if (loglevel_value != null && loglevel_value != "") {
- location.href = "syslog_index.jsp?type=" + loglevel_value+"&logFile="+logFile+"&tenantDomain="+tenantDomain+"&serviceName="+serviceName;
+ location.href = "syslog_index.jsp?type=" + loglevel_value + "&logFile=" + logFile + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName;
} else {
return;
}
}
-function getTenantSpecificIndex () {
+function getTenantSpecificIndex() {
var loglevel = document.getElementById("logLevelID");
var loglevel_index = null;
var loglevel_value = null;
@@ -102,8 +98,7 @@ function getTenantSpecificIndex () {
var serviceName = document.getElementById("serviceName");
var servicelevel_idex = null;
var service_value = null;
- if (loglevel != null)
- {
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
@@ -112,28 +107,27 @@ function getTenantSpecificIndex () {
loglevel_value = "ALL";
}
}
- if(serviceName != null)
- {
+ if (serviceName != null) {
servicelevel_idex = serviceName.selectedIndex;
- if(servicelevel_idex != null) {
+ if (servicelevel_idex != null) {
service_value = serviceName.options[servicelevel_idex].value;
}
}
var keyword = document.getElementById("logkeyword");
if (keyword != null && keyword != undefined && keyword.value != null && keyword.value != undefined) {
if (keyword.value == "") {
- if(serviceName != null) {
+ if (serviceName != null) {
location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain=" + tenantDomain;
} else {
- location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain=" + tenantDomain + "&serviceName="+serviceName;
+ location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName;
}
} else {
- if(serviceName != null) {
- location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain="+
- tenantDomain+"&serviceName="+serviceName+"&keyword=" + keyword.value;
+ if (serviceName != null) {
+ location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain=" +
+ tenantDomain + "&serviceName=" + serviceName + "&keyword=" + keyword.value;
} else {
- location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain="+
- tenantDomain +"&keyword=" + keyword.value;
+ location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain=" +
+ tenantDomain + "&keyword=" + keyword.value;
}
}
} else {
@@ -153,26 +147,23 @@ function getTenantApplicationSpecificIndex() {
var service_value = null;
var tenantDomain = document.getElementById("tenantDomain");
var serviceName = document.getElementById("serviceName");
- if (loglevel != null)
- {
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
}
}
- if (appName != null)
- {
+ if (appName != null) {
appName_index = appName.selectedIndex;
if (appName_index != null) {
appName_value = appName.options[appName_index].value;
}
}
- if(serviceName != null)
- {
+ if (serviceName != null) {
servicelevel_idex = serviceName.selectedIndex;
- if(servicelevel_idex != null) {
+ if (servicelevel_idex != null) {
service_value = serviceName.options[servicelevel_idex].value;
}
}
@@ -181,22 +172,22 @@ function getTenantApplicationSpecificIndex() {
loglevel_value = "ALL";
}
var keyword = document.getElementById("logkeyword");
- if (keyword != null && keyword != undefined ) {
- if(keyword.value == "") {
- if(serviceName != null) {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&serviceName="+service_value
- + "&appName="+appName_value + "&tenantDomain=" + tenantDomain.value;
+ if (keyword != null && keyword != undefined) {
+ if (keyword.value == "") {
+ if (serviceName != null) {
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&serviceName=" + service_value
+ + "&appName=" + appName_value + "&tenantDomain=" + tenantDomain.value;
} else {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName="+appName_value +
- "&tenantDomain=" + tenantDomain.value ;
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName=" + appName_value +
+ "&tenantDomain=" + tenantDomain.value;
}
} else {
- if(serviceName != null) {
- location.href = "application_log_viewer.jsp?type="+loglevel_value + "&keyword=" + keyword.value +
- "&serviceName="+service_value + "&appName="+appName_value;
+ if (serviceName != null) {
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&keyword=" + keyword.value +
+ "&serviceName=" + service_value + "&appName=" + appName_value;
} else {
- location.href = "application_log_viewer.jsp?type="+loglevel_value + "&keyword=" + keyword.value +
- "&appName="+appName_value;
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&keyword=" + keyword.value +
+ "&appName=" + appName_value;
}
}
} else {
@@ -217,24 +208,21 @@ function getTenantProductSpecificIndex() {
var service_value = null;
var tenantDomain = document.getElementById("tenantDomain");
var serviceName = document.getElementById("serviceName");
- if (loglevel != null)
- {
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
}
}
- if(serviceName != null)
- {
+ if (serviceName != null) {
servicelevel_idex = serviceName.selectedIndex;
- if(servicelevel_idex != null) {
+ if (servicelevel_idex != null) {
service_value = serviceName.options[servicelevel_idex].value;
}
}
- if (appName != null)
- {
+ if (appName != null) {
appName_index = appName.selectedIndex;
if (appName_index != null) {
appName_value = appName.options[appName_index].value;
@@ -246,20 +234,20 @@ function getTenantProductSpecificIndex() {
var keyword = document.getElementById("logkeyword");
if (keyword != null && keyword != undefined) {
if (keyword.value == "") {
- if(tenantDomain != null && tenantDomain != undefined ) {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value +"&appName="+appName_value+
- "&tenantDomain=" + tenantDomain.value + "&serviceName=" + service_value;
+ if (tenantDomain != null && tenantDomain != undefined) {
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName=" + appName_value +
+ "&tenantDomain=" + tenantDomain.value + "&serviceName=" + service_value;
} else {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value +"&appName="+appName_value+
- "&serviceName=" + service_value;
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName=" + appName_value +
+ "&serviceName=" + service_value;
}
} else {
- if(tenantDomain != null && tenantDomain != undefined ) {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value +"&appName="+appName_value+
- "&tenantDomain=" + tenantDomain.value + "&serviceName=" + service_value + "&keyword=" + keyword.value;
+ if (tenantDomain != null && tenantDomain != undefined) {
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName=" + appName_value +
+ "&tenantDomain=" + tenantDomain.value + "&serviceName=" + service_value + "&keyword=" + keyword.value;
} else {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value +"&appName="+appName_value+
- "&serviceName=" + service_value + "&keyword=" + keyword.value;
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName=" + appName_value +
+ "&serviceName=" + service_value + "&keyword=" + keyword.value;
}
}
} else {
@@ -274,8 +262,7 @@ function getProductTenantSpecificIndex() {
var tenantDomain = document.getElementById("tenantDomain");
var serviceName = document.getElementById("serviceName");
- if (loglevel != null)
- {
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
@@ -287,19 +274,19 @@ function getProductTenantSpecificIndex() {
var keyword = document.getElementById("logkeyword");
if (keyword != null && keyword != undefined) {
if (keyword.value == "") {
- if(tenantDomain != null && tenantDomain != undefined ) {
- location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain="+tenantDomain.value + "&serviceName="+serviceName.value;
+ if (tenantDomain != null && tenantDomain != undefined) {
+ location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain=" + tenantDomain.value + "&serviceName=" + serviceName.value;
} else {
location.href = "index.jsp?type=" + loglevel_value + "&serviceName=" + serviceName.value;
}
} else {
- if(tenantDomain != null && tenantDomain != undefined ) {
+ if (tenantDomain != null && tenantDomain != undefined) {
location.href = "index.jsp?type=" + loglevel_value + "&serviceName=" + serviceName.value +
- "&tenantDomain=" + tenantDomain.value + "&keyword=" + keyword.value;
+ "&tenantDomain=" + tenantDomain.value + "&keyword=" + keyword.value;
} else {
location.href = "index.jsp?type=" + loglevel_value + "&serviceName=" + serviceName.value +
- "&keyword=" + keyword.value;
+ "&keyword=" + keyword.value;
}
}
} else {
@@ -308,18 +295,18 @@ function getProductTenantSpecificIndex() {
}
function submitenter(e) {
- var keycode;
- if (window.event) {
- keycode = window.event.keyCode;
- } else if (e) {
- keycode = e.which;
- }
- if (keycode == 13) {
- searchLogs();
- return true;
- } else {
- return true;
- }
+ var keycode;
+ if (window.event) {
+ keycode = window.event.keyCode;
+ } else if (e) {
+ keycode = e.which;
+ }
+ if (keycode == 13) {
+ searchLogs();
+ return true;
+ } else {
+ return true;
+ }
}
function submitenterNormal(e) {
@@ -359,15 +346,14 @@ function submitenterTenant(e) {
keycode = e.which;
}
if (keycode == 13) {
- getTenantSpecificIndex ();
+ getTenantSpecificIndex();
return true;
} else {
return true;
}
}
-function submitenterbottomUp(e)
-{
+function submitenterbottomUp(e) {
var keycode;
if (window.event) {
keycode = window.event.keyCode;
@@ -375,9 +361,8 @@ function submitenterbottomUp(e)
else if (e) {
keycode = e.which;
}
- if (keycode == 13)
- {
- searchLogBottomLogs();
+ if (keycode == 13) {
+ searchLogBottomLogs();
return true;
}
else {
@@ -385,66 +370,65 @@ function submitenterbottomUp(e)
}
}
-function isNumeric(str)
-{
- var validChars = "0123456789";
- var isNumber = true;
- var char;
- for (i = 0; i < str.length && isNumber == true; i++) {
- char = str.charAt(i);
- if (validChars.indexOf(char) == -1) {
- isNumber = false;
- }
- }
- return isNumber;
+function isNumeric(str) {
+ var validChars = "0123456789";
+ var isNumber = true;
+ var char;
+ for (i = 0; i < str.length && isNumber == true; i++) {
+ char = str.charAt(i);
+ if (validChars.indexOf(char) == -1) {
+ isNumber = false;
+ }
+ }
+ return isNumber;
}
function searchLogBottomLogs() {
- var logFile = document.getElementById("logFile").value;
- var log_index = document.getElementById("logIndex").value;
- var loglevel = document.getElementById("logLevelID");
- var serviceName = document.getElementById("serviceName").value;
- var loglevel_index = null;
- var loglevel_value = null;
- var tenantDomain = document.getElementById("tenantDomain").value;
- if(log_index == ''){
+ var logFile = document.getElementById("logFile").value;
+ var log_index = document.getElementById("logIndex").value;
+ var loglevel = document.getElementById("logLevelID");
+ var serviceName = document.getElementById("serviceName").value;
+ var loglevel_index = null;
+ var loglevel_value = null;
+ var tenantDomain = document.getElementById("tenantDomain").value;
+ if (log_index == '') {
CARBON.showWarningDialog('Head index cannot be empty');
return false;
}
- if(! isNumeric(log_index)) {
- CARBON.showWarningDialog('Enter non negative numeric values for log head');
- return false;
+ if (!isNumeric(log_index)) {
+ CARBON.showWarningDialog('Enter non negative numeric values for log head');
+ return false;
}
- if(log_index < 1){
- CARBON.showWarningDialog('Log index should be between 1 and 10000000');
+ if (log_index < 1) {
+ CARBON.showWarningDialog('Log index should be between 1 and 10000000');
return false;
}
- if(log_index > 10000000){
+ if (log_index > 10000000) {
CARBON.showWarningDialog('Log index should be between 1 and 10000000');
return false;
}
- if (loglevel != null) {
- loglevel_index = loglevel.selectedIndex;
- if (loglevel_index != null) {
- loglevel_value = loglevel.options[loglevel_index].value;
- if (loglevel_value == "Custom") {
- loglevel_value = "ALL";
- }
- }
- }
- var keyword = document.getElementById("keyword");
- if (keyword != null && keyword != undefined && keyword.value != null
+ if (loglevel != null) {
+ loglevel_index = loglevel.selectedIndex;
+ if (loglevel_index != null) {
+ loglevel_value = loglevel.options[loglevel_index].value;
+ if (loglevel_value == "Custom") {
+ loglevel_value = "ALL";
+ }
+ }
+ }
+ var keyword = document.getElementById("keyword");
+ if (keyword != null && keyword != undefined && keyword.value != null
&& keyword.value != undefined) {
- if (keyword.value == "") {
- location.href = "view.jsp?type=ALL&logIndex=" + log_index+"&logFile="+logFile+"&tenantDomain="+tenantDomain+"&serviceName="+serviceName;
- } else {
- location.href = "view.jsp?type=" + loglevel_value + "&keyword="
- + keyword.value+"&logIndex=" + log_index+"&logFile="+logFile+"&tenantDomain="+tenantDomain+"&serviceName="+serviceName;
- }
- } else {
- return;
- }
+ if (keyword.value == "") {
+ location.href = "view.jsp?type=ALL&logIndex=" + log_index + "&logFile=" + logFile + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName;
+ } else {
+ location.href = "view.jsp?type=" + loglevel_value + "&keyword="
+ + keyword.value + "&logIndex=" + log_index + "&logFile=" + logFile + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName;
+ }
+ } else {
+ return;
+ }
}
function searchLogs() {
var loglevel = document.getElementById("logLevelID");
@@ -457,71 +441,69 @@ function searchLogs() {
var collapseVal = document.getElementById("propertyTableSearch");
var collapse = "false";
- if (loglevel != null)
- {
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
- }
+ }
if (loglevel_value == "Custom") {
- loglevel_value = "ALL";
- }
+ loglevel_value = "ALL";
+ }
}
- if(collapseVal.style.display == "") {
+ if (collapseVal.style.display == "") {
collapse = "true";
}
- if(serviceName != null)
- {
+ if (serviceName != null) {
servicelevel_idex = serviceName.selectedIndex;
- if(servicelevel_idex != null) {
+ if (servicelevel_idex != null) {
service_value = serviceName.options[servicelevel_idex].value;
}
}
var propertyTab = document.getElementById('propertyTable');
- var propertySymbolMax = document.getElementById('propertySymbolMax');
+ var propertySymbolMax = document.getElementById('propertySymbolMax');
var keyword = document.getElementById("logkeyword");
if (keyword != null && keyword != undefined) {
if (keyword.value == "") {
- if(tenantDomain != null && tenantDomain != undefined ) {
- if(serviceName != null) {
- location.href = "index.jsp?type="+loglevel_value+"&tenantDomain=" + tenantDomain.value +
- "&serviceName="+service_value + "&collapse=" + collapse;
+ if (tenantDomain != null && tenantDomain != undefined) {
+ if (serviceName != null) {
+ location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain=" + tenantDomain.value +
+ "&serviceName=" + service_value + "&collapse=" + collapse;
} else {
- location.href = "index.jsp?type="+loglevel_value+"&tenantDomain=" + tenantDomain.value +
- "&collapse=" + collapse;
+ location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain=" + tenantDomain.value +
+ "&collapse=" + collapse;
}
} else {
- if(serviceName != null) {
- location.href = "index.jsp?type="+loglevel_value+"&serviceName=" + service_value + "&collapse=" + collapse;
+ if (serviceName != null) {
+ location.href = "index.jsp?type=" + loglevel_value + "&serviceName=" + service_value + "&collapse=" + collapse;
} else {
location.href = "index.jsp?type=" + loglevel_value + "&collapse=" + collapse;
}
}
} else {
- if(tenantDomain != null && tenantDomain != undefined ) {
- if(serviceName != null) {
- location.href = "index.jsp?type="+loglevel_value + "&tenantDomain="+tenantDomain.value +
- "&serviceName=" + service_value+ "&keyword="+ keyword.value + "&collapse=" + collapse;
+ if (tenantDomain != null && tenantDomain != undefined) {
+ if (serviceName != null) {
+ location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain=" + tenantDomain.value +
+ "&serviceName=" + service_value + "&keyword=" + keyword.value + "&collapse=" + collapse;
} else {
- location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain="+tenantDomain.value +
- "&keyword=" + keyword.value + "&collapse=" + collapse;
+ location.href = "index.jsp?type=" + loglevel_value + "&tenantDomain=" + tenantDomain.value +
+ "&keyword=" + keyword.value + "&collapse=" + collapse;
}
} else {
- if(serviceName != null) {
- location.href = "index.jsp?type="+loglevel_value + "&serviceName="+service_value +
- "&keyword=" + keyword.value + "&collapse=" + collapse;
+ if (serviceName != null) {
+ location.href = "index.jsp?type=" + loglevel_value + "&serviceName=" + service_value +
+ "&keyword=" + keyword.value + "&collapse=" + collapse;
} else {
- location.href = "index.jsp?type="+loglevel_value +
- "&keyword=" + keyword.value + "&collapse=" + collapse;
+ location.href = "index.jsp?type=" + loglevel_value +
+ "&keyword=" + keyword.value + "&collapse=" + collapse;
}
}
}
} else {
- return ;
+ return;
}
}
@@ -529,8 +511,7 @@ function searchNormal() {
var loglevel = document.getElementById("logLevelID");
var loglevel_index = null;
var loglevel_value = null;
- if (loglevel != null)
- {
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
@@ -560,8 +541,7 @@ function searchNormalManager() {
var loglevel_value = null;
var collapseVal = document.getElementById("propertyTableSearch");
var collapse = "false";
- if (loglevel != null)
- {
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
@@ -570,14 +550,13 @@ function searchNormalManager() {
loglevel_value = "ALL";
}
}
- if(collapseVal.style.display == "") {
+ if (collapseVal.style.display == "") {
collapse = "true";
}
- if(serviceName != null)
- {
+ if (serviceName != null) {
servicelevel_idex = serviceName.selectedIndex;
- if(servicelevel_idex != null) {
+ if (servicelevel_idex != null) {
service_value = serviceName.options[servicelevel_idex].value;
}
}
@@ -587,35 +566,35 @@ function searchNormalManager() {
location.href = "index.jsp?type=" + loglevel_value + "&serviceName=" + service_value + "&collapse=" + collapse;
} else {
location.href = "index.jsp?type=" + loglevel_value + "&keyword=" + keyword.value +
- "&serviceName=" + service_value + "&collapse=" + collapse;
+ "&serviceName=" + service_value + "&collapse=" + collapse;
}
} else {
- return ;
+ return;
}
}
function showQueryProperties() {
var propertyTab = document.getElementById('propertyTable');
- var propertySymbolMax = document.getElementById('propertySymbolMax');
- if(propertyTab.style.display == 'none') {
+ var propertySymbolMax = document.getElementById('propertySymbolMax');
+ if (propertyTab.style.display == 'none') {
propertyTab.style.display = '';
- propertySymbolMax.setAttribute('style','background-image:url(images/minus.gif);');
+ propertySymbolMax.setAttribute('style', 'background-image:url(images/minus.gif);');
} else {
propertyTab.style.display = 'none';
- propertySymbolMax.setAttribute('style','background-image:url(images/plus.gif);');
+ propertySymbolMax.setAttribute('style', 'background-image:url(images/plus.gif);');
}
}
function showQueryPropertiesSearch() {
var propertyTab = document.getElementById('propertyTableSearch');
- var propertySymbolMax = document.getElementById('propertySymbolMaxSearch');
- if(propertyTab.style.display == 'none') {
+ var propertySymbolMax = document.getElementById('propertySymbolMaxSearch');
+ if (propertyTab.style.display == 'none') {
propertyTab.style.display = '';
- propertySymbolMax.setAttribute('style','background-image:url(images/minus.gif);');
+ propertySymbolMax.setAttribute('style', 'background-image:url(images/minus.gif);');
} else {
propertyTab.style.display = 'none';
- propertySymbolMax.setAttribute('style','background-image:url(images/plus.gif);');
+ propertySymbolMax.setAttribute('style', 'background-image:url(images/plus.gif);');
}
}
function appSubmitenter(e) {
@@ -654,8 +633,7 @@ function searchAppLogs() {
var loglevel_value = null;
var appName_index = null;
var appName_value = null;
- if (loglevel != null)
- {
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
@@ -664,8 +642,7 @@ function searchAppLogs() {
if (loglevel_value == "Custom") {
loglevel_value = "ALL";
}
- if (appName != null)
- {
+ if (appName != null) {
appName_index = appName.selectedIndex;
if (appName_index != null) {
appName_value = appName.options[appName_index].value;
@@ -674,9 +651,9 @@ function searchAppLogs() {
var keyword = document.getElementById("logkeyword");
if (keyword != null && keyword != undefined) {
if (keyword.value == "") {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName="+appName_value;
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName=" + appName_value;
} else {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&keyword=" + keyword.value+"&appName="+appName_value;
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&keyword=" + keyword.value + "&appName=" + appName_value;
}
} else {
return;
@@ -696,8 +673,7 @@ function searchAppLogsAdv() {
var loglevel_value = null;
var appName_index = null;
var appName_value = null;
- if (loglevel != null)
- {
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
@@ -706,58 +682,56 @@ function searchAppLogsAdv() {
if (loglevel_value == "Custom") {
loglevel_value = "ALL";
}
- if (appName != null)
- {
+ if (appName != null) {
appName_index = appName.selectedIndex;
if (appName_index != null) {
appName_value = appName.options[appName_index].value;
}
}
- if(serviceName != null)
- {
+ if (serviceName != null) {
servicelevel_idex = serviceName.selectedIndex;
- if(servicelevel_idex != null) {
+ if (servicelevel_idex != null) {
service_value = serviceName.options[servicelevel_idex].value;
}
}
var keyword = document.getElementById("logkeyword");
if (keyword != null && keyword != undefined) {
if (keyword.value == "") {
- if(tenantDomain != null && tenantDomain != undefined ) {
- if(serviceName != null) {
- location.href = "application_log_viewer.jsp?type="+loglevel_value+"&tenantDomain=" +
- tenantDomain.value + "&serviceName="+service_value + "&appName=" + appName_value;
+ if (tenantDomain != null && tenantDomain != undefined) {
+ if (serviceName != null) {
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&tenantDomain=" +
+ tenantDomain.value + "&serviceName=" + service_value + "&appName=" + appName_value;
} else {
- location.href = "application_log_viewer.jsp?type="+loglevel_value+"&tenantDomain=" +
- tenantDomain.value + "&appName=" + appName_value;
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&tenantDomain=" +
+ tenantDomain.value + "&appName=" + appName_value;
}
} else {
- if(serviceName != null) {
- location.href = "application_log_viewer.jsp?type="+loglevel_value+"&serviceName=" + service_value +
- "&appName=" + appName_value;
+ if (serviceName != null) {
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&serviceName=" + service_value +
+ "&appName=" + appName_value;
} else {
location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&appName=" + appName_value;
}
}
} else {
- if(tenantDomain != null && tenantDomain != undefined ) {
- if(serviceName != null) {
- location.href = "application_log_viewer.jsp?type="+loglevel_value + "&tenantDomain="+
- tenantDomain.value +
- "&serviceName=" + service_value+ "&keyword="+ keyword.value + "&appName=" + appName_value;
+ if (tenantDomain != null && tenantDomain != undefined) {
+ if (serviceName != null) {
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&tenantDomain=" +
+ tenantDomain.value +
+ "&serviceName=" + service_value + "&keyword=" + keyword.value + "&appName=" + appName_value;
} else {
- location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&tenantDomain="+tenantDomain.value +
- "&keyword=" + keyword.value + "&appName=" + appName_value;
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&tenantDomain=" + tenantDomain.value +
+ "&keyword=" + keyword.value + "&appName=" + appName_value;
}
} else {
- if(serviceName != null) {
- location.href = "application_log_viewer.jsp?type="+loglevel_value + "&serviceName="+service_value +
- "&keyword=" + keyword.value + "&appName=" + appName_value;
+ if (serviceName != null) {
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value + "&serviceName=" + service_value +
+ "&keyword=" + keyword.value + "&appName=" + appName_value;
} else {
- location.href = "application_log_viewer.jsp?type="+loglevel_value +
- "&keyword=" + keyword.value + "&appName=" + appName_value;
+ location.href = "application_log_viewer.jsp?type=" + loglevel_value +
+ "&keyword=" + keyword.value + "&appName=" + appName_value;
}
}
@@ -769,13 +743,12 @@ function searchAppLogsAdv() {
function searchLog111() {
var loglevel = document.getElementById("logLevelID");
- var logFile = document.getElementById("logFile").value;
- var serviceName = document.getElementById("serviceName").value;
+ var logFile = document.getElementById("logFile").value;
+ var serviceName = document.getElementById("serviceName").value;
var loglevel_index = null;
var loglevel_value = null;
- var tenantDomain = document.getElementById("tenantDomain").value;
- if (loglevel != null)
- {
+ var tenantDomain = document.getElementById("tenantDomain").value;
+ if (loglevel != null) {
loglevel_index = loglevel.selectedIndex;
if (loglevel_index != null) {
loglevel_value = loglevel.options[loglevel_index].value;
@@ -784,9 +757,9 @@ function searchLog111() {
var keyword = document.getElementById("keyword");
if (keyword != null && keyword != undefined && keyword.value != null && keyword.value != undefined) {
if (keyword.value == "") {
- location.href = "syslog_index.jsp?type=ALL"+"&logFile="+logFile+"&tenantDomain="+tenantDomain;
+ location.href = "syslog_index.jsp?type=ALL" + "&logFile=" + logFile + "&tenantDomain=" + tenantDomain;
} else {
- location.href = "syslog_index.jsp?type=" + loglevel_value + "&keyword=" + keyword.value+"&logFile="+logFile+"&tenantDomain="+tenantDomain+"&serviceName="+serviceName;
+ location.href = "syslog_index.jsp?type=" + loglevel_value + "&keyword=" + keyword.value + "&logFile=" + logFile + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName;
}
} else {
return;
@@ -794,92 +767,92 @@ function searchLog111() {
}
function clearLogEntries(message) {
- CARBON.showConfirmationDialog(message, function() {
+ CARBON.showConfirmationDialog(message, function () {
location.href = "syslog_index.jsp?action=clear-logs";
});
}
function viewSingleSysLogLevel() {
- var loglevel = document.getElementById("logLevelID");
- var serviceName = document.getElementById("serviceName").value;
- var logFile = document.getElementById("logFile").value;
- var tenantDomain = document.getElementById("tenantDomain").value;
- var loglevel_index = null;
- var loglevel_value = null;
- if (loglevel != null) {
- loglevel_index = loglevel.selectedIndex;
- if (loglevel_index != null) {
- loglevel_value = loglevel.options[loglevel_index].value;
- }
- }
- if (loglevel_value != null && loglevel_value != "") {
- location.href = "view.jsp?type=" + loglevel_value+"&logFile="+logFile+"&tenantDomain="+tenantDomain+"&serviceName="+serviceName;
- } else {
- return;
- }
+ var loglevel = document.getElementById("logLevelID");
+ var serviceName = document.getElementById("serviceName").value;
+ var logFile = document.getElementById("logFile").value;
+ var tenantDomain = document.getElementById("tenantDomain").value;
+ var loglevel_index = null;
+ var loglevel_value = null;
+ if (loglevel != null) {
+ loglevel_index = loglevel.selectedIndex;
+ if (loglevel_index != null) {
+ loglevel_value = loglevel.options[loglevel_index].value;
+ }
+ }
+ if (loglevel_value != null && loglevel_value != "") {
+ location.href = "view.jsp?type=" + loglevel_value + "&logFile=" + logFile + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName;
+ } else {
+ return;
+ }
}
function clearProperties() {
- document.getElementById("logIndex").value = "";
- document.getElementById("type").value="ALL";
- document.getElementById("keyword").value="";
+ document.getElementById("logIndex").value = "";
+ document.getElementById("type").value = "ALL";
+ document.getElementById("keyword").value = "";
}
function searchTenantLog() {
- var loglevel = document.getElementById("logLevelID");
- var serviceName = document.getElementById("serviceName").value;
- var logFile = document.getElementById("logFile").value;
- var tenantDomain = document.getElementById("tenantDomain").value;
- var loglevel_index = null;
- var loglevel_value = null;
- if (loglevel != null) {
- loglevel_index = loglevel.selectedIndex;
- if (loglevel_index != null) {
- loglevel_value = loglevel.options[loglevel_index].value;
- if (loglevel_value == "Custom") {
- loglevel_value = "ALL";
- }
- }
- }
- var keyword = document.getElementById("keyword");
- if (keyword != null && keyword != undefined && keyword.value != null
- && keyword.value != undefined) {
- if (keyword.value == "") {
- location.href = "view.jsp?type=ALL"+"&logFile="+logFile+"&tenantDomain="+tenantDomain+"&serviceName="+serviceName;
- } else {
- location.href = "view.jsp?type=" + loglevel_value
- + "&keyword=" + keyword.value+"&logFile="+logFile+"&tenantDomain="+tenantDomain+"&serviceName="+serviceName;
- }
- } else {
- return;
- }
+ var loglevel = document.getElementById("logLevelID");
+ var serviceName = document.getElementById("serviceName").value;
+ var logFile = document.getElementById("logFile").value;
+ var tenantDomain = document.getElementById("tenantDomain").value;
+ var loglevel_index = null;
+ var loglevel_value = null;
+ if (loglevel != null) {
+ loglevel_index = loglevel.selectedIndex;
+ if (loglevel_index != null) {
+ loglevel_value = loglevel.options[loglevel_index].value;
+ if (loglevel_value == "Custom") {
+ loglevel_value = "ALL";
+ }
+ }
+ }
+ var keyword = document.getElementById("keyword");
+ if (keyword != null && keyword != undefined && keyword.value != null
+ && keyword.value != undefined) {
+ if (keyword.value == "") {
+ location.href = "view.jsp?type=ALL" + "&logFile=" + logFile + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName;
+ } else {
+ location.href = "view.jsp?type=" + loglevel_value
+ + "&keyword=" + keyword.value + "&logFile=" + logFile + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName;
+ }
+ } else {
+ return;
+ }
}
-
+
function getFilteredLogs() {
-
- var loglevel = document.getElementById("logLevelID");
- var log_index = document.getElementById("logIndex").value;
- var appName = document.getElementById("appName");
- var start = document.getElementById("start").value;
- var end = document.getElementById("end").value;
- if (document.getElementById("NowradioDate").checked) {
- start='';
- end='';
- }
- var serviceName = null;
- var tenantDomain = null;
- // regular expression to match required date format
- var reTdate = '\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{1,2}:\\d{1,2}';
- var re = new RegExp(reTdate);
-
- if(start != '' && !start.match(re)) {
- CARBON.showWarningDialog('Invalid start date Format');
- return false;
- }
- if(end != '' && !end.match(re)) {
- CARBON.showWarningDialog('Invalid end date Format');
- return false;
- }
+
+ var loglevel = document.getElementById("logLevelID");
+ var log_index = document.getElementById("logIndex").value;
+ var appName = document.getElementById("appName");
+ var start = document.getElementById("start").value;
+ var end = document.getElementById("end").value;
+ if (document.getElementById("NowradioDate").checked) {
+ start = '';
+ end = '';
+ }
+ var serviceName = null;
+ var tenantDomain = null;
+ // regular expression to match required date format
+ var reTdate = '\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{1,2}:\\d{1,2}';
+ var re = new RegExp(reTdate);
+
+ if (start != '' && !start.match(re)) {
+ CARBON.showWarningDialog('Invalid start date Format');
+ return false;
+ }
+ if (end != '' && !end.match(re)) {
+ CARBON.showWarningDialog('Invalid end date Format');
+ return false;
+ }
// // regular expression to match required time format
// var reTime = /^\d{1,2}:\d{2}([ap]m)?$/;
// if(time != '' && !time.match(reTime)) {
@@ -887,54 +860,53 @@ function getFilteredLogs() {
// return false;
// }
- if (document.getElementById("serviceName") != null) {
- serviceName = document.getElementById("serviceName").value
- }
- if (document.getElementById("tenantDomain") != null) {
- tenantDomain = document.getElementById("tenantDomain").value
- }
- var loglevel_index = null;
- var loglevel_value = null;
-
- if (loglevel != null) {
- loglevel_index = loglevel.selectedIndex;
- if (loglevel_index != null) {
- loglevel_value = loglevel.options[loglevel_index].value;
- if (loglevel_value == "Custom") {
- loglevel_value = "ALL";
- }
- }
- }
- var keyword = document.getElementById("keyword").value;
- var logger = document.getElementById("logger").value;
- if (appName != null) {
- appName = document.getElementById("appName").value;
- location.href = "application_log_viewer.jsp?priority=" + loglevel_value
- + "&keyword=" + keyword + "&logIndex=" + log_index
- + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName
- + "&logger=" + logger + "&start=" + start + "&appName=" + appName
- + "&end=" + end;
- } else {
- location.href = "cassandra_log_viewer.jsp?priority=" + loglevel_value
- + "&keyword=" + keyword + "&logIndex=" + log_index
- + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName
- + "&logger=" + logger + "&start=" + start
- + "&end=" + end;
- }
-
-}
+ if (document.getElementById("serviceName") != null) {
+ serviceName = document.getElementById("serviceName").value
+ }
+ if (document.getElementById("tenantDomain") != null) {
+ tenantDomain = document.getElementById("tenantDomain").value
+ }
+ var loglevel_index = null;
+ var loglevel_value = null;
+
+ if (loglevel != null) {
+ loglevel_index = loglevel.selectedIndex;
+ if (loglevel_index != null) {
+ loglevel_value = loglevel.options[loglevel_index].value;
+ if (loglevel_value == "Custom") {
+ loglevel_value = "ALL";
+ }
+ }
+ }
+ var keyword = document.getElementById("keyword").value;
+ var logger = document.getElementById("logger").value;
+ if (appName != null) {
+ appName = document.getElementById("appName").value;
+ location.href = "application_log_viewer.jsp?priority=" + loglevel_value
+ + "&keyword=" + keyword + "&logIndex=" + log_index
+ + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName
+ + "&logger=" + logger + "&start=" + start + "&appName=" + appName
+ + "&end=" + end;
+ } else {
+ location.href = "cassandra_log_viewer.jsp?priority=" + loglevel_value
+ + "&keyword=" + keyword + "&logIndex=" + log_index
+ + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName
+ + "&logger=" + logger + "&start=" + start
+ + "&end=" + end;
+ }
+}
function showTrace(obj) {
- var traceTab = document.getElementById('traceTable'+obj);
- var traceSymbolMax = document.getElementById('traceSymbolMax'+obj);
- if(traceTab.style.display == 'none') {
+ var traceTab = document.getElementById('traceTable' + obj);
+ var traceSymbolMax = document.getElementById('traceSymbolMax' + obj);
+ if (traceTab.style.display == 'none') {
traceTab.style.display = '';
- traceSymbolMax.setAttribute('style','background-image:url(images/minus.gif);');
+ traceSymbolMax.setAttribute('style', 'background-image:url(images/minus.gif);');
} else {
traceTab.style.display = 'none';
- traceSymbolMax.setAttribute('style','background-image:url(images/plus.gif);');
+ traceSymbolMax.setAttribute('style', 'background-image:url(images/plus.gif);');
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/syslog_index.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/syslog_index.jsp b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/syslog_index.jsp
index efa8af8..3faaca3 100644
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/syslog_index.jsp
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/syslog_index.jsp
@@ -1,368 +1,372 @@
<!--
- 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
+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
+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.
+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.
-->
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"
- prefix="carbon"%>
-<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient"%>
-<%@ page import="org.apache.axis2.context.ConfigurationContext"%>
-<%@ page import="org.wso2.carbon.CarbonConstants"%>
+ prefix="carbon" %>
+<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
+<%@ page import="org.wso2.carbon.CarbonConstants" %>
<%@ page
- import="org.wso2.carbon.logging.view.stub.types.carbon.LogMessage"%>
-<%@ page import="org.wso2.carbon.utils.ServerConstants"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogInfo"%>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent"%>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogInfo"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
-<%@ page import="java.util.regex.Matcher"%>
-<%@ page import="java.util.regex.Pattern"%>
+ import="org.wso2.carbon.logging.view.stub.types.carbon.LogMessage" %>
+<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogInfo" %>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent" %>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogInfo" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
+<%@ page import="java.util.regex.Matcher" %>
+<%@ page import="java.util.regex.Pattern" %>
<script type="text/javascript" src="js/logviewer.js"></script>
<script type="text/javascript" src="../admin/dialog/js/dialog.js"></script>
<script type="text/javascript">
-function startDownload()
-{
- var url='download-ajaxprocessor.jsp';
- //jQuery.get(url);
-}
+ function startDownload() {
+ var url = 'download-ajaxprocessor.jsp';
+ //jQuery.get(url);
+ }
</script>
<%!
-private boolean isArchiveFile (String fileName) {
- String archivePattern = "[a-zA-Z]*\\.gz";
- CharSequence inputStr = fileName;
- Pattern pattern = Pattern.compile(archivePattern);
- Matcher matcher = pattern.matcher(inputStr);
- return matcher.find();
-}
+ private boolean isArchiveFile(String fileName) {
+ String archivePattern = "[a-zA-Z]*\\.gz";
+ CharSequence inputStr = fileName;
+ Pattern pattern = Pattern.compile(archivePattern);
+ Matcher matcher = pattern.matcher(inputStr);
+ return matcher.find();
+ }
%>
<%
- String backendServerURL = CarbonUIUtil
- .getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
- .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
+ String backendServerURL = CarbonUIUtil
+ .getServerURL(config.getServletContext(), session);
+ ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
+ .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- LogViewerClient logViewerClient;
- String action;
- LogMessage[] logMessages;
- LogInfo[] logInfo;
- String tenantDomain = "";
- String serviceName = "WSO2 Stratos Manager";
- boolean isLogsFromSyslog;
- PaginatedLogInfo paginatedLogInfo;
- boolean isStratosService = false;
- String pageNumberStr = request.getParameter("pageNumber");
- boolean isSTSyslog = false;
- String serviceNames[];
- boolean isManager = false;
- boolean showManager = false;
- if (pageNumberStr == null) {
- pageNumberStr = "0";
- }
- boolean showTenantDomain = false;
- int pageNumber = 0;
- int numberOfPages = 0;
- try {
- pageNumber = Integer.parseInt(pageNumberStr);
- } catch (NumberFormatException ignored) {
- // page number format exception
- }
- try {
+ String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
+ LogViewerClient logViewerClient;
+ String action;
+ LogMessage[] logMessages;
+ LogInfo[] logInfo;
+ String tenantDomain = "";
+ String serviceName = "WSO2 Stratos Manager";
+ boolean isLogsFromSyslog;
+ PaginatedLogInfo paginatedLogInfo;
+ boolean isStratosService = false;
+ String pageNumberStr = request.getParameter("pageNumber");
+ boolean isSTSyslog = false;
+ String serviceNames[];
+ boolean isManager = false;
+ boolean showManager = false;
+ if (pageNumberStr == null) {
+ pageNumberStr = "0";
+ }
+ boolean showTenantDomain = false;
+ int pageNumber = 0;
+ int numberOfPages = 0;
+ try {
+ pageNumber = Integer.parseInt(pageNumberStr);
+ } catch (NumberFormatException ignored) {
+ // page number format exception
+ }
+ try {
- logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
- action = request.getParameter("action");
- tenantDomain = request.getParameter("tenantDomain");
- serviceName = request.getParameter("serviceName");
- isLogsFromSyslog = logViewerClient.isDataFromSysLog(tenantDomain);
- isSTSyslog = logViewerClient.isSTSyslogConfig(tenantDomain);
- isManager = logViewerClient.isManager();
-
- serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
- tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
- serviceNames = logViewerClient.getServiceNames();
- isStratosService = logViewerClient.isStratosService();
- showTenantDomain = (isSTSyslog && isLogsFromSyslog && isStratosService);
- showManager = (isManager && isLogsFromSyslog);
- if (logViewerClient.isLogsConfigured(tenantDomain)) {
- paginatedLogInfo = logViewerClient.getPaginatedLogInfo(pageNumber,
- tenantDomain, serviceName);
- if (paginatedLogInfo != null) {
- logInfo = paginatedLogInfo.getLogInfo();
- numberOfPages = paginatedLogInfo.getNumberOfPages();
- //logMessages = logViewerClient.getTenentLogs();
+ logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
+ action = request.getParameter("action");
+ tenantDomain = request.getParameter("tenantDomain");
+ serviceName = request.getParameter("serviceName");
+ isLogsFromSyslog = logViewerClient.isDataFromSysLog(tenantDomain);
+ isSTSyslog = logViewerClient.isSTSyslogConfig(tenantDomain);
+ isManager = logViewerClient.isManager();
- //logMessages = logViewerClient.getLogs(type, keyword);
+ serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
+ tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
+ serviceNames = logViewerClient.getServiceNames();
+ isStratosService = logViewerClient.isStratosService();
+ showTenantDomain = (isSTSyslog && isLogsFromSyslog && isStratosService);
+ showManager = (isManager && isLogsFromSyslog);
+ if (logViewerClient.isLogsConfigured(tenantDomain)) {
+ paginatedLogInfo = logViewerClient.getPaginatedLogInfo(pageNumber,
+ tenantDomain, serviceName);
+ if (paginatedLogInfo != null) {
+ logInfo = paginatedLogInfo.getLogInfo();
+ numberOfPages = paginatedLogInfo.getNumberOfPages();
+ //logMessages = logViewerClient.getTenentLogs();
- for (int i = 0; i < logInfo.length; i++) {
- String logFile = logInfo[i].getLogName();
- String logDate = logInfo[i].getLogDate();
- String logSize = logInfo[i].getLogDate();
- }
- }
- else {
- logViewerClient.getPaginatedLogInfo(pageNumber,
- tenantDomain, serviceName);
- CarbonUIMessage.sendCarbonUIMessage(
- "Please configure syslog in order to view tenant specific logs.",
- CarbonUIMessage.ERROR, request);
- %>
- <script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
- <%
- return;
- }
-
- } else {
- logViewerClient.getPaginatedLogInfo(pageNumber,
- tenantDomain, serviceName);
- CarbonUIMessage.sendCarbonUIMessage(
- "Please configure syslog in order to view tenant specific logs.",
- CarbonUIMessage.ERROR, request);
+ //logMessages = logViewerClient.getLogs(type, keyword);
+
+ for (int i = 0; i < logInfo.length; i++) {
+ String logFile = logInfo[i].getLogName();
+ String logDate = logInfo[i].getLogDate();
+ String logSize = logInfo[i].getLogDate();
+ }
+ } else {
+ logViewerClient.getPaginatedLogInfo(pageNumber,
+ tenantDomain, serviceName);
+ CarbonUIMessage.sendCarbonUIMessage(
+ "Please configure syslog in order to view tenant specific logs.",
+ CarbonUIMessage.ERROR, request);
%>
<script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
+ location.href = "../admin/error.jsp";
+</script>
<%
- return;
- }
+ return;
+ }
- } catch (Exception e) {
- CarbonUIMessage.sendCarbonUIMessage(e.getLocalizedMessage(), CarbonUIMessage.ERROR, request,
- e);
+} else {
+ logViewerClient.getPaginatedLogInfo(pageNumber,
+ tenantDomain, serviceName);
+ CarbonUIMessage.sendCarbonUIMessage(
+ "Please configure syslog in order to view tenant specific logs.",
+ CarbonUIMessage.ERROR, request);
%>
<script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
+ location.href = "../admin/error.jsp";
+</script>
<%
- return;
- }
+ return;
+ }
+
+} catch (Exception e) {
+ CarbonUIMessage.sendCarbonUIMessage(e.getLocalizedMessage(), CarbonUIMessage.ERROR, request,
+ e);
+%>
+<script type="text/javascript">
+ location.href = "../admin/error.jsp";
+</script>
+<%
+ return;
+ }
%>
<fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
- <carbon:breadcrumb label="system.logs"
- resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
- topPage="true" request="<%=request%>" />
- <div id="middle">
- <h2>
- <fmt:message key="system.logs" />
- </h2>
+ <carbon:breadcrumb label="system.logs"
+ resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
+ topPage="true" request="<%=request%>"/>
+ <div id="middle">
+ <h2>
+ <fmt:message key="system.logs"/>
+ </h2>
- <div id="workArea">
- <br />
- <%
- if (isLogsFromSyslog) {
- %>
- <font color="blue"><fmt:message
- key="remote.log.location.information" />
- </font>
- <%
- } else {
- %>
- <font color="blue"><fmt:message
- key="local.log.location.information" />
- </font>
- <%
- }
- %>
+ <div id="workArea">
+ <br/>
+ <%
+ if (isLogsFromSyslog) {
+ %>
+ <font color="blue"><fmt:message
+ key="remote.log.location.information"/>
+ </font>
+ <%
+ } else {
+ %>
+ <font color="blue"><fmt:message
+ key="local.log.location.information"/>
+ </font>
+ <%
+ }
+ %>
- <br /> <br />
- <%
- if (showTenantDomain || showManager) {
- %>
- <table border="0" class="styledLeft">
- <tbody>
- <tr>
- <td>
+ <br/> <br/>
+ <%
+ if (showTenantDomain || showManager) {
+ %>
+ <table border="0" class="styledLeft">
+ <tbody>
+ <tr>
+ <td>
- <table class="normal">
- <tr>
- <%
- if (showTenantDomain) {
- %>
+ <table class="normal">
+ <tr>
+ <%
+ if (showTenantDomain) {
+ %>
- <td style="padding-right: 2px !important;"><nobr>
- <fmt:message key="tenant.domain" />
- </nobr>
- </td>
- <td style="padding-right: 2px !important;"><input
- value="<%=tenantDomain%>" id="tenantDomain"
- name="tenantDomain" size="20" type="text"></td>
+ <td style="padding-right: 2px !important;">
+ <nobr>
+ <fmt:message key="tenant.domain"/>
+ </nobr>
+ </td>
+ <td style="padding-right: 2px !important;"><input
+ value="<%=tenantDomain%>" id="tenantDomain"
+ name="tenantDomain" size="20" type="text"></td>
- <td style="padding-left: 0px !important;"><input
- type="button" value="Get Tenant Logs"
- onclick="javascript:getTenantSpecificIndex(); return false;"
- class="button"></td>
- <%
- } else {
- %>
- <td><input type="hidden" id="tenantDomain"
- name="tenantDomain" value="<%=tenantDomain%>" />
- </td>
- <%
- }
- if (showManager) {
- %>
- <td style="width: 100%;"></td>
- <td style="width: 100%;"></td>
- <td style="width: 100%;"></td>
- <td style="padding-left: 0px !important;"><nobr>
- <fmt:message key="service.name" />
- </nobr>
- </td>
- <td style="width: 100%;"></td>
- <td style="padding-left: 0px !important;"><select
- name="serviceName" id="serviceName"
- onchange="getProductTenantSpecificIndex()">
- <%
- for (String name : serviceNames) {
- %>
- <%
- if (name.equals(serviceName)) {
- %>
- <option selected="selected" value="<%=name%>">
- <%=name%>
- </option>
- <%
- } else {
- %>
- <option value="<%=name%>">
- <%=name%>
- </option>
- <%
- }
- %>
- <%
- }
- %>
+ <td style="padding-left: 0px !important;"><input
+ type="button" value="Get Tenant Logs"
+ onclick="javascript:getTenantSpecificIndex(); return false;"
+ class="button"></td>
+ <%
+ } else {
+ %>
+ <td><input type="hidden" id="tenantDomain"
+ name="tenantDomain" value="<%=tenantDomain%>"/>
+ </td>
+ <%
+ }
+ if (showManager) {
+ %>
+ <td style="width: 100%;"></td>
+ <td style="width: 100%;"></td>
+ <td style="width: 100%;"></td>
+ <td style="padding-left: 0px !important;">
+ <nobr>
+ <fmt:message key="service.name"/>
+ </nobr>
+ </td>
+ <td style="width: 100%;"></td>
+ <td style="padding-left: 0px !important;"><select
+ name="serviceName" id="serviceName"
+ onchange="getProductTenantSpecificIndex()">
+ <%
+ for (String name : serviceNames) {
+ %>
+ <%
+ if (name.equals(serviceName)) {
+ %>
+ <option selected="selected" value="<%=name%>">
+ <%=name%>
+ </option>
+ <%
+ } else {
+ %>
+ <option value="<%=name%>">
+ <%=name%>
+ </option>
+ <%
+ }
+ %>
+ <%
+ }
+ %>
- </select></td>
- <%
- } else {
- %>
- <input type="hidden" id="serviceName" name="serviceName"
- value="<%=serviceName%>" />
- <%
- }
- %>
- </tr>
+ </select></td>
+ <%
+ } else {
+ %>
+ <input type="hidden" id="serviceName" name="serviceName"
+ value="<%=serviceName%>"/>
+ <%
+ }
+ %>
+ </tr>
- </table></td>
- </tr>
- </tbody>
- </table>
- <%
- }
- %>
- <br /> <br />
- <carbon:paginator pageNumber="<%=pageNumber%>"
- numberOfPages="<%=numberOfPages%>" page="index.jsp"
- pageNumberParameterName="pageNumber" />
- <table border="1" class="styledLeft">
- <tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <%
+ }
+ %>
+ <br/> <br/>
+ <carbon:paginator pageNumber="<%=pageNumber%>"
+ numberOfPages="<%=numberOfPages%>" page="index.jsp"
+ pageNumberParameterName="pageNumber"/>
+ <table border="1" class="styledLeft">
+ <tbody>
- <tr>
- <td class="formRow">
- <table class="styledLeft">
- <thead>
- <tr>
- <th><b><fmt:message key="file.name" /> </b></th>
- <th><b><fmt:message key="date" /> </b></th>
- <th><b><fmt:message key="file.size" /> </b></th>
- <th><b><fmt:message key="action" /> </b></th>
- </tr>
- </thead>
- <%
- int index = -1;
- for (LogInfo logMessage : logInfo) {
- ++index;
- if (index % 2 != 0) {
- %>
- <tr>
- <%
+ <tr>
+ <td class="formRow">
+ <table class="styledLeft">
+ <thead>
+ <tr>
+ <th><b><fmt:message key="file.name"/> </b></th>
+ <th><b><fmt:message key="date"/> </b></th>
+ <th><b><fmt:message key="file.size"/> </b></th>
+ <th><b><fmt:message key="action"/> </b></th>
+ </tr>
+ </thead>
+ <%
+ int index = -1;
+ for (LogInfo logMessage : logInfo) {
+ ++index;
+ if (index % 2 != 0) {
+ %>
+ <tr>
+ <%
} else {
%>
-
- <tr bgcolor="#eeeffb">
- <%
- }
- if (logMessage.getLogName().trim().equalsIgnoreCase("NO_LOG_FILES")) {
- %>
- <td colspan="4"><fmt:message key="no.logs" /></td>
- <%
- } else {
- String logFile = logMessage.getLogName().replace("0_","");
- String logDate = logMessage.getLogDate().replace("0_","");
- String logSize = logMessage.getFileSize();
- %>
+ <tr bgcolor="#eeeffb">
+ <%
+ }
+ if (logMessage.getLogName().trim().equalsIgnoreCase("NO_LOG_FILES")) {
+ %>
- <td><%=logFile%></td>
- <td><%=logDate%></td>
- <td><%=logSize%></td>
- <td>
- <% if(!isArchiveFile(logFile)) { %>
- <a class="icon-link"
- style="background-image: url(images/view.gif);"
- href="view.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
- key="view" /> </a>
- <%
- }
- %>
- <% if(isArchiveFile(logFile)) { %>
- <a class="icon-link"
- style="background-image: url(images/download.gif);"
- onclick="startDownload()"
- href="downloadgz-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
- key="download" /> </a>
- <%
- } else {
- %>
- <a class="icon-link"
- style="background-image: url(images/download.gif);"
- onclick="startDownload()"
- href="download-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
- key="download" /> </a>
- <%
- }
- %>
- </td>
+ <td colspan="4"><fmt:message key="no.logs"/></td>
+ <%
+ } else {
+ String logFile = logMessage.getLogName().replace("0_", "");
+ String logDate = logMessage.getLogDate().replace("0_", "");
+ String logSize = logMessage.getFileSize();
+ %>
- <%
- }
- %>
+ <td><%=logFile%>
+ </td>
+ <td><%=logDate%>
+ </td>
+ <td><%=logSize%>
+ </td>
+ <td>
+ <% if (!isArchiveFile(logFile)) { %>
+ <a class="icon-link"
+ style="background-image: url(images/view.gif);"
+ href="view.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
+ key="view"/> </a>
+ <%
+ }
+ %>
+ <% if (isArchiveFile(logFile)) { %>
+ <a class="icon-link"
+ style="background-image: url(images/download.gif);"
+ onclick="startDownload()"
+ href="downloadgz-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
+ key="download"/> </a>
+ <%
+ } else {
+ %>
+ <a class="icon-link"
+ style="background-image: url(images/download.gif);"
+ onclick="startDownload()"
+ href="download-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
+ key="download"/> </a>
+ <%
+ }
+ %>
+ </td>
+
+ <%
+ }
+ %>
- </tr>
+ </tr>
- <%
- }
- %>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- <carbon:paginator pageNumber="<%=pageNumber%>"
- numberOfPages="<%=numberOfPages%>" page="index.jsp"
- pageNumberParameterName="pageNumber" />
- </div>
- </div>
+ <%
+ }
+ %>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <carbon:paginator pageNumber="<%=pageNumber%>"
+ numberOfPages="<%=numberOfPages%>" page="index.jsp"
+ pageNumberParameterName="pageNumber"/>
+ </div>
+ </div>
</fmt:bundle>
[07/16] stratos git commit: Organize imports of Load banacer common
module
Posted by la...@apache.org.
Organize imports of Load banacer common module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2d54dbca
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2d54dbca
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2d54dbca
Branch: refs/heads/master
Commit: 2d54dbca228f005d9427f63aa8bf217a4fcff6d5
Parents: e02f3e1
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:47:03 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:47:03 2015 +0530
----------------------------------------------------------------------
.../org/apache/stratos/load/balancer/common/domain/Member.java | 4 +++-
.../receivers/LoadBalancerCommonDomainMappingEventReceiver.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2d54dbca/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java
index d03dd1f..953dabd 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java
@@ -19,7 +19,9 @@
package org.apache.stratos.load.balancer.common.domain;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
/**
* Load balancer member definition.
http://git-wip-us.apache.org/repos/asf/stratos/blob/2d54dbca/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonDomainMappingEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonDomainMappingEventReceiver.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonDomainMappingEventReceiver.java
index e78d9e2..a075d32 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonDomainMappingEventReceiver.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonDomainMappingEventReceiver.java
@@ -21,8 +21,8 @@ package org.apache.stratos.load.balancer.common.event.receivers;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.load.balancer.common.topology.TopologyProvider;
import org.apache.stratos.load.balancer.common.domain.Cluster;
+import org.apache.stratos.load.balancer.common.topology.TopologyProvider;
import org.apache.stratos.messaging.event.Event;
import org.apache.stratos.messaging.event.domain.mapping.DomainMappingAddedEvent;
import org.apache.stratos.messaging.event.domain.mapping.DomainMappingRemovedEvent;
[04/16] stratos git commit: Formatting Load balancer module
Posted by la...@apache.org.
Formatting Load balancer module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7d6d933b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7d6d933b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7d6d933b
Branch: refs/heads/master
Commit: 7d6d933b952678f5894ab43e6797e16465c6cc60
Parents: 13e979e
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:45:27 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:45:27 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.load.balancer/pom.xml | 3 +-
.../conf/LoadBalancerConfiguration.java | 8 ++-
.../conf/configurator/CEPConfigurator.java | 2 +-
.../load/balancer/conf/domain/MemberIpType.java | 2 +-
.../load/balancer/conf/structure/Node.java | 32 ++++++------
.../balancer/conf/structure/NodeBuilder.java | 32 ++++++------
.../load/balancer/conf/util/Constants.java | 32 ++++++------
.../load/balancer/context/AlgorithmContext.java | 6 +--
.../balancer/context/LoadBalancerContext.java | 2 +-
.../balancer/endpoint/RequestDelegator.java | 26 +++++-----
.../TenantAwareLoadBalanceEndpoint.java | 50 ++++++++++---------
.../internal/LoadBalancerServiceComponent.java | 52 ++++++++++----------
.../balancer/mediators/LocationReWriter.java | 38 +++++++-------
.../balancer/mediators/ResponseInterceptor.java | 40 +++++++--------
.../LoadBalancerStatisticsCollector.java | 4 +-
.../test/LoadBalancerConfigurationTest.java | 32 ++++++------
.../LoadBalancerStatisticsCollectorTest.java | 34 ++++++-------
17 files changed, 199 insertions(+), 196 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/pom.xml b/components/org.apache.stratos.load.balancer/pom.xml
index 981bad4..b723858 100644
--- a/components/org.apache.stratos.load.balancer/pom.xml
+++ b/components/org.apache.stratos.load.balancer/pom.xml
@@ -17,7 +17,8 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.stratos</groupId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
index 9ea21e9..87a9cb3 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
@@ -538,13 +538,11 @@ public class LoadBalancerConfiguration {
}
private MemberIpType transformMemberIpType(String topologyMemberIpType) {
- if("private".equals(topologyMemberIpType)) {
+ if ("private".equals(topologyMemberIpType)) {
return MemberIpType.Private;
- }
- else if("public".equals(topologyMemberIpType)) {
+ } else if ("public".equals(topologyMemberIpType)) {
return MemberIpType.Public;
- }
- else {
+ } else {
throw new InvalidConfigurationException(String.format("Topology member ip address type is not valid: %s", topologyMemberIpType));
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/CEPConfigurator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/CEPConfigurator.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/CEPConfigurator.java
index 952ce52..fca1722 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/CEPConfigurator.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/configurator/CEPConfigurator.java
@@ -29,7 +29,7 @@ public class CEPConfigurator {
public static void configure(LoadBalancerConfiguration configuration) {
// Set system properties
System.setProperty("cep.stats.publisher.enabled", String.valueOf(configuration.isCepStatsPublisherEnabled()));
- if(configuration.isCepStatsPublisherEnabled()) {
+ if (configuration.isCepStatsPublisherEnabled()) {
System.setProperty("thrift.receiver.ip", configuration.getCepIp());
System.setProperty("thrift.receiver.port", String.valueOf(configuration.getCepPort()));
System.setProperty("network.partition.id", configuration.getNetworkPartitionId());
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/domain/MemberIpType.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/domain/MemberIpType.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/domain/MemberIpType.java
index f5132d6..00e36a8 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/domain/MemberIpType.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/domain/MemberIpType.java
@@ -26,6 +26,6 @@ package org.apache.stratos.load.balancer.conf.domain;
* Time: 11:18 AM
* To change this template use File | Settings | File Templates.
*/
-public enum MemberIpType {
+public enum MemberIpType {
Private, Public
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/Node.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/Node.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/Node.java
index a7b3808..2b33725 100755
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/Node.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/Node.java
@@ -1,20 +1,20 @@
/**
- * 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.
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.load.balancer.conf.structure;
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/NodeBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/NodeBuilder.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/NodeBuilder.java
index bbdbe9b..297f5a5 100755
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/NodeBuilder.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/structure/NodeBuilder.java
@@ -1,20 +1,20 @@
/**
- * 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.
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.load.balancer.conf.structure;
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java
index ba59d8e..79b5bcd 100755
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/util/Constants.java
@@ -1,20 +1,20 @@
/**
- * 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.
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.load.balancer.conf.util;
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/context/AlgorithmContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/context/AlgorithmContext.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/context/AlgorithmContext.java
index d261791..fc1f4a5 100755
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/context/AlgorithmContext.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/context/AlgorithmContext.java
@@ -52,7 +52,7 @@ public class AlgorithmContext {
lock = acquireCurrentMemberIndexLock();
putCurrentMemberIndex(serviceName, clusterId, 0);
} finally {
- if(lock != null) {
+ if (lock != null) {
releaseCurrentMemberIndexLock(lock);
}
}
@@ -76,7 +76,7 @@ public class AlgorithmContext {
lock = acquireCurrentMemberIndexLock();
putCurrentMemberIndex(getServiceName(), getClusterId(), currentMemberIndex);
} finally {
- if(lock != null) {
+ if (lock != null) {
releaseCurrentMemberIndexLock(lock);
}
}
@@ -91,7 +91,7 @@ public class AlgorithmContext {
}
private void releaseCurrentMemberIndexLock(Lock lock) {
- if(lock != null) {
+ if (lock != null) {
distributedObjectProvider.releaseLock(lock);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/context/LoadBalancerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/context/LoadBalancerContext.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/context/LoadBalancerContext.java
index 2ba0cfd..2ebc466 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/context/LoadBalancerContext.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/context/LoadBalancerContext.java
@@ -90,7 +90,7 @@ public class LoadBalancerContext {
}
public void removeDomainMappingContextPath(String hostName) {
- if(containsDomainMappingContextPath(hostName)) {
+ if (containsDomainMappingContextPath(hostName)) {
hostNameToDomainMappingContextPathMap.remove(hostName);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/RequestDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/RequestDelegator.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/RequestDelegator.java
index 636955d..5047fc6 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/RequestDelegator.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/RequestDelegator.java
@@ -48,7 +48,8 @@ public class RequestDelegator {
/**
* Find the next member in a cluster by applying a load balancing algorithm by the given host name.
- * @param hostName host name of the cluster
+ *
+ * @param hostName host name of the cluster
* @param messageId synapse message id to be included in debugging logs
* @return
*/
@@ -73,9 +74,8 @@ public class RequestDelegator {
}
}
return member;
- }
- else {
- if(log.isWarnEnabled()) {
+ } else {
+ if (log.isWarnEnabled()) {
log.warn(String.format("Could not find a cluster for hostname %s", hostName));
}
}
@@ -84,6 +84,7 @@ public class RequestDelegator {
/**
* Find the next member in a cluster by applying a load balancing algorithm by the given host name and tenant id.
+ *
* @param hostName host name of the cluster
* @param tenantId tenant id of the incoming request
* @return
@@ -104,22 +105,21 @@ public class RequestDelegator {
}
}
return member;
- }
- else {
- if(log.isWarnEnabled()) {
+ } else {
+ if (log.isWarnEnabled()) {
log.warn(String.format("Could not find a cluster for hostname %s and tenant-id %d", hostName, tenantId));
}
}
return null;
}
- /**
+ /**
* Find next member in the cluster by applying a load balancing algorithm.
- *
- * This operation should be synchronized in order to find a member
- * correctly. This has no performance impact as per the load tests
- * carried out.
- */
+ * <p/>
+ * This operation should be synchronized in order to find a member
+ * correctly. This has no performance impact as per the load tests
+ * carried out.
+ */
private synchronized Member findNextMemberInCluster(Cluster cluster) {
// Find algorithm context of the cluster
ClusterContext clusterContext = LoadBalancerContext.getInstance().getClusterContext(cluster.getClusterId());
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/TenantAwareLoadBalanceEndpoint.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/TenantAwareLoadBalanceEndpoint.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/TenantAwareLoadBalanceEndpoint.java
index a71c7a8..b483bb2 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/TenantAwareLoadBalanceEndpoint.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/TenantAwareLoadBalanceEndpoint.java
@@ -76,7 +76,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
/* Sessions time out interval */
private long sessionTimeout = -1;
-
+
private final static Pattern LAST_INT_PATTERN = Pattern.compile("[^0-9]+([0-9]+)$");
@Override
@@ -156,15 +156,15 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
private void setupLoadBalancerContextProperties(MessageContext synCtx, org.apache.axis2.clustering.Member currentMember) {
String targetHostname = extractTargetHost(synCtx);
org.apache.axis2.context.MessageContext axis2MsgCtx = ((Axis2MessageContext) synCtx).getAxis2MessageContext();
-
+
String httpTransportName = "http", httpsTransportName = "https";
String transportId = getTransportId(extractIncomingTransport(synCtx));
-
- if (transportId != null) {
- httpsTransportName = httpsTransportName.concat(transportId);
- httpTransportName = httpTransportName.concat(transportId);
- }
-
+
+ if (transportId != null) {
+ httpsTransportName = httpsTransportName.concat(transportId);
+ httpTransportName = httpTransportName.concat(transportId);
+ }
+
TransportInDescription httpTransportIn = axis2MsgCtx.getConfigurationContext().getAxisConfiguration().getTransportIn(httpTransportName);
TransportInDescription httpsTransportIn = axis2MsgCtx.getConfigurationContext().getAxisConfiguration().getTransportIn(httpsTransportName);
String lbHttpPort = (String) httpTransportIn.getParameter("port").getValue();
@@ -176,16 +176,16 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
synCtx.setProperty(LoadBalancerConstants.LB_HTTPS_PORT, lbHttpsPort);
synCtx.setProperty(LoadBalancerConstants.CLUSTER_ID, clusterId);
}
-
- protected String getTransportId(String incomingTransportName) {
- // pattern match and find the transport id.
- Matcher matcher = LAST_INT_PATTERN.matcher(incomingTransportName);
- if (matcher.find()) {
- return matcher.group(1);
- }
- return null;
- }
+ protected String getTransportId(String incomingTransportName) {
+ // pattern match and find the transport id.
+ Matcher matcher = LAST_INT_PATTERN.matcher(incomingTransportName);
+ if (matcher.find()) {
+ return matcher.group(1);
+ }
+
+ return null;
+ }
/**
@@ -241,8 +241,8 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
String url = extractUrl(synCtx);
int tenantId = scanUrlForTenantId(url);
- if(tenantId == -1) {
- // If there is no tenant involves in the URL, Find next member from host name
+ if (tenantId == -1) {
+ // If there is no tenant involves in the URL, Find next member from host name
member = requestDelegator.findNextMemberFromHostName(targetHost, synCtx.getMessageID());
} else if (tenantExists(tenantId)) {
// Tenant found, find member from hostname and tenant id
@@ -264,6 +264,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
/**
* Create axis2 member from load balancer member object.
+ *
* @param synCtx
* @param member
* @return
@@ -290,7 +291,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
* @param axis2Member
*/
private void updateAxis2MemberPorts(MessageContext synCtx, org.apache.axis2.clustering.Member axis2Member) {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Updating axis2 member port");
}
@@ -437,7 +438,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
private int scanUrlForTenantId(String url) {
int tenantId = -1;
List<String> regexList = LoadBalancerConfiguration.getInstance().getTenantIdentifierRegexList();
- for(String regex : regexList) {
+ for (String regex : regexList) {
if (log.isDebugEnabled()) {
log.debug(String.format("Request URL: %s ", url));
log.debug(String.format("Tenant identifier regex: %s ", regex));
@@ -475,6 +476,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
/**
* Check tenant exists.
+ *
* @param tenantId
* @return
*/
@@ -489,6 +491,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
/**
* Find tenant id from tenant domain.
+ *
* @param tenantDomain
* @return
*/
@@ -507,6 +510,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
/**
* Extract target host from incoming request.
+ *
* @param synCtx
* @return
*/
@@ -528,7 +532,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
org.apache.axis2.context.MessageContext axis2MessageContext = ((Axis2MessageContext) synCtx).getAxis2MessageContext();
return axis2MessageContext.getTransportIn().getName();
}
-
+
private String extractIncomingTransport(MessageContext synCtx) {
org.apache.axis2.context.MessageContext axis2MessageContext = ((Axis2MessageContext) synCtx).getAxis2MessageContext();
return axis2MessageContext.getIncomingTransportName();
@@ -591,7 +595,7 @@ public class TenantAwareLoadBalanceEndpoint extends org.apache.synapse.endpoints
String hostName = extractTargetHost(synCtx);
if (LoadBalancerContext.getInstance().containsDomainMappingContextPath(hostName)) {
String appContext = LoadBalancerContext.getInstance().getDomainMappingContextPath(hostName);
- if(StringUtils.isNotBlank(appContext)) {
+ if (StringUtils.isNotBlank(appContext)) {
if (log.isDebugEnabled()) {
log.debug(String.format("Domain mapping found with application context: [domain-name] %s " +
"[app-context] %s", hostName, appContext));
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java
index ca055de..4577735 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/internal/LoadBalancerServiceComponent.java
@@ -68,21 +68,21 @@ import java.util.concurrent.ExecutorService;
/**
* @scr.component name="org.apache.stratos.load.balancer.internal.LoadBalancerServiceComponent" immediate="true"
* @scr.reference name="distributedObjectProvider" interface="org.apache.stratos.common.services.DistributedObjectProvider"
- * cardinality="1..1" policy="dynamic" bind="setDistributedObjectProvider" unbind="unsetDistributedObjectProvider"
+ * cardinality="1..1" policy="dynamic" bind="setDistributedObjectProvider" unbind="unsetDistributedObjectProvider"
* @scr.reference name="configuration.context.service" interface="org.wso2.carbon.utils.ConfigurationContextService"
- * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" unbind="unsetConfigurationContextService"
+ * cardinality="1..1" policy="dynamic" bind="setConfigurationContextService" unbind="unsetConfigurationContextService"
* @scr.reference name="synapse.config.service" interface="org.wso2.carbon.mediation.initializer.services.SynapseConfigurationService"
- * cardinality="1..1" policy="dynamic" bind="setSynapseConfigurationService" unbind="unsetSynapseConfigurationService"
+ * cardinality="1..1" policy="dynamic" bind="setSynapseConfigurationService" unbind="unsetSynapseConfigurationService"
* @scr.reference name="synapse.env.service" interface="org.wso2.carbon.mediation.initializer.services.SynapseEnvironmentService"
- * cardinality="1..n" policy="dynamic" bind="setSynapseEnvironmentService" unbind="unsetSynapseEnvironmentService"
+ * cardinality="1..n" policy="dynamic" bind="setSynapseEnvironmentService" unbind="unsetSynapseEnvironmentService"
* @scr.reference name="registry.service" interface="org.wso2.carbon.registry.core.service.RegistryService"
- * cardinality="1..1" policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
+ * cardinality="1..1" policy="dynamic" bind="setRegistryService" unbind="unsetRegistryService"
* @scr.reference name="dependency.mgt.service" interface="org.wso2.carbon.mediation.dependency.mgt.services.DependencyManagementService"
- * cardinality="0..1" policy="dynamic" bind="setDependencyManager" unbind="unsetDependencyManager"
+ * cardinality="0..1" policy="dynamic" bind="setDependencyManager" unbind="unsetDependencyManager"
* @scr.reference name="synapse.registrations.service" interface="org.wso2.carbon.mediation.initializer.services.SynapseRegistrationsService"
- * cardinality="1..n" policy="dynamic" bind="setSynapseRegistrationsService" unbind="unsetSynapseRegistrationsService"
+ * cardinality="1..n" policy="dynamic" bind="setSynapseRegistrationsService" unbind="unsetSynapseRegistrationsService"
* @scr.reference name="user.realmservice.default" interface="org.wso2.carbon.user.core.service.RealmService"
- * cardinality="1..1" policy="dynamic" bind="setRealmService" unbind="unsetRealmService"
+ * cardinality="1..1" policy="dynamic" bind="setRealmService" unbind="unsetRealmService"
*/
@SuppressWarnings({"UnusedDeclaration", "JavaDoc"})
public class LoadBalancerServiceComponent {
@@ -101,7 +101,7 @@ public class LoadBalancerServiceComponent {
try {
ClusteringAgent clusteringAgent = ServiceReferenceHolder.getInstance().getAxisConfiguration().getClusteringAgent();
boolean clusteringEnabled = (clusteringAgent != null);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Load balancer clustering is %s", (clusteringEnabled ? "enabled" : "disabled")));
}
@@ -127,7 +127,7 @@ public class LoadBalancerServiceComponent {
threadPoolSize);
TopologyProvider topologyProvider = LoadBalancerConfiguration.getInstance().getTopologyProvider();
- if(topologyProvider == null) {
+ if (topologyProvider == null) {
topologyProvider = new TopologyProvider();
LoadBalancerConfiguration.getInstance().setTopologyProvider(topologyProvider);
}
@@ -138,7 +138,7 @@ public class LoadBalancerServiceComponent {
startApplicationSignUpEventReceiver(executorService, topologyProvider);
}
- if(configuration.isDomainMappingEnabled()) {
+ if (configuration.isDomainMappingEnabled()) {
// Start domain mapping event receiver
startDomainMappingEventReceiver(executorService, topologyProvider);
}
@@ -148,7 +148,7 @@ public class LoadBalancerServiceComponent {
startTopologyEventReceiver(executorService, topologyProvider);
}
- if(configuration.isCepStatsPublisherEnabled()) {
+ if (configuration.isCepStatsPublisherEnabled()) {
// Start statistics notifier
startStatisticsNotifier(topologyProvider);
}
@@ -165,7 +165,7 @@ public class LoadBalancerServiceComponent {
}
private void startDomainMappingEventReceiver(ExecutorService executorService, TopologyProvider topologyProvider) {
- if(domainMappingEventReceiver != null) {
+ if (domainMappingEventReceiver != null) {
return;
}
@@ -178,7 +178,7 @@ public class LoadBalancerServiceComponent {
}
private void startApplicationSignUpEventReceiver(ExecutorService executorService, TopologyProvider topologyProvider) {
- if(applicationSignUpEventReceiver != null) {
+ if (applicationSignUpEventReceiver != null) {
return;
}
@@ -191,29 +191,29 @@ public class LoadBalancerServiceComponent {
}
private void startTopologyEventReceiver(ExecutorService executorService, TopologyProvider topologyProvider) {
- if(topologyEventReceiver != null) {
+ if (topologyEventReceiver != null) {
return;
}
topologyEventReceiver = new LoadBalancerTopologyEventReceiver(topologyProvider);
- topologyEventReceiver.setExecutorService(executorService);
- topologyEventReceiver.execute();
+ topologyEventReceiver.setExecutorService(executorService);
+ topologyEventReceiver.execute();
if (log.isInfoEnabled()) {
log.info("Topology receiver thread started");
}
if (log.isInfoEnabled()) {
- if(TopologyServiceFilter.getInstance().isActive()) {
+ if (TopologyServiceFilter.getInstance().isActive()) {
log.info(String.format("Service filter activated: [filter] %s",
TopologyServiceFilter.getInstance().toString()));
}
- if(TopologyClusterFilter.getInstance().isActive()) {
+ if (TopologyClusterFilter.getInstance().isActive()) {
log.info(String.format("Cluster filter activated: [filter] %s",
TopologyClusterFilter.getInstance().toString()));
}
- if(TopologyMemberFilter.getInstance().isActive()) {
+ if (TopologyMemberFilter.getInstance().isActive()) {
log.info(String.format("Member filter activated: [filter] %s",
TopologyMemberFilter.getInstance().toString()));
}
@@ -254,7 +254,7 @@ public class LoadBalancerServiceComponent {
}
// Terminate topology receiver
- if(topologyEventReceiver != null) {
+ if (topologyEventReceiver != null) {
try {
topologyEventReceiver.terminate();
} catch (Exception e) {
@@ -263,7 +263,7 @@ public class LoadBalancerServiceComponent {
}
// Terminate application signup event receiver
- if(applicationSignUpEventReceiver != null) {
+ if (applicationSignUpEventReceiver != null) {
try {
applicationSignUpEventReceiver.terminate();
} catch (Exception e) {
@@ -272,7 +272,7 @@ public class LoadBalancerServiceComponent {
}
// Terminate domain mapping event receiver
- if(domainMappingEventReceiver != null) {
+ if (domainMappingEventReceiver != null) {
try {
domainMappingEventReceiver.terminate();
} catch (Exception e) {
@@ -281,7 +281,7 @@ public class LoadBalancerServiceComponent {
}
// Terminate statistics notifier
- if(statisticsNotifier != null) {
+ if (statisticsNotifier != null) {
try {
statisticsNotifier.terminate();
} catch (Exception e) {
@@ -290,7 +290,7 @@ public class LoadBalancerServiceComponent {
}
// Shutdown executor service
- if(executorService != null) {
+ if (executorService != null) {
try {
executorService.shutdownNow();
} catch (Exception e) {
@@ -390,7 +390,7 @@ public class LoadBalancerServiceComponent {
if (!alreadyCreated) {
try {
registerDeployer(synapseEnvironmentService
- .getConfigurationContext().getAxisConfiguration(),
+ .getConfigurationContext().getAxisConfiguration(),
synapseEnvironmentService.getSynapseEnvironment());
if (log.isDebugEnabled()) {
log.debug("Endpoint admin bundle is activated ");
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/mediators/LocationReWriter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/mediators/LocationReWriter.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/mediators/LocationReWriter.java
index 312ff46..24720d5 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/mediators/LocationReWriter.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/mediators/LocationReWriter.java
@@ -1,20 +1,20 @@
/**
- * 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.
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.load.balancer.mediators;
@@ -68,13 +68,13 @@ public class LocationReWriter extends AbstractMediator {
String clusterHostname = topologyProvider.getClusterHostname(inLocationUrl.getHost());
if (StringUtils.isEmpty(clusterHostname)) {
if (topologyProvider.getClusterByHostName(inLocationUrl.getHost()) == null) {
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("A cluster hostname not found for ip: [ip-address] %s",
inLocationUrl.getHost()));
}
- return;
+ return;
} else {
- clusterHostname = inLocationUrl.getHost();
+ clusterHostname = inLocationUrl.getHost();
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/mediators/ResponseInterceptor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/mediators/ResponseInterceptor.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/mediators/ResponseInterceptor.java
index 91cea19..8e9cec2 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/mediators/ResponseInterceptor.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/mediators/ResponseInterceptor.java
@@ -1,20 +1,20 @@
/**
- * 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.
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.load.balancer.mediators;
@@ -50,14 +50,14 @@ public class ResponseInterceptor extends AbstractMediator implements ManagedLife
if (StringUtils.isNotBlank(clusterId)) {
FutureTask<Object> task = new FutureTask<Object>(new InFlightRequestDecrementCallable(clusterId));
LoadBalancerStatisticsExecutor.getInstance().getService().submit(task);
- } else{
- if (log.isDebugEnabled()) {
+ } else {
+ if (log.isDebugEnabled()) {
log.debug("Could not decrement in-flight request count : cluster id not found in message context");
}
}
-
+
} catch (Exception e) {
- if(log.isErrorEnabled()) {
+ if (log.isErrorEnabled()) {
log.error("Could not decrement in-flight request count", e);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java
index 2e5723f..b195407 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/statistics/LoadBalancerStatisticsCollector.java
@@ -70,7 +70,7 @@ public class LoadBalancerStatisticsCollector implements LoadBalancerStatisticsRe
synchronized (LoadBalancerStatisticsCollector.class) {
if (clusterIdRequestCountMap.containsKey(clusterId)) {
Integer count = clusterIdRequestCountMap.get(clusterId);
- if(count != null) {
+ if (count != null) {
return count;
}
}
@@ -81,7 +81,7 @@ public class LoadBalancerStatisticsCollector implements LoadBalancerStatisticsRe
/**
* Returns the number of requests served since the last time this function was called.
*/
- public int getServedRequestCount(String clusterId){
+ public int getServedRequestCount(String clusterId) {
synchronized (LoadBalancerStatisticsCollector.class) {
if (clusterIdServedRequestCountMap.containsKey(clusterId)) {
Integer servedCount = clusterIdServedRequestCountMap.get(clusterId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java
index d8ee1fd..7e867dd 100755
--- a/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java
+++ b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java
@@ -1,20 +1,20 @@
/**
- * 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.
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.load.balancer.test;
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d6d933b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerStatisticsCollectorTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerStatisticsCollectorTest.java b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerStatisticsCollectorTest.java
index 26b5f34..594b9a4 100644
--- a/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerStatisticsCollectorTest.java
+++ b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerStatisticsCollectorTest.java
@@ -1,20 +1,20 @@
/**
- * 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.
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.load.balancer.test;
@@ -75,7 +75,7 @@ public class LoadBalancerStatisticsCollectorTest {
private void executeTask(FutureTask<Object> task) {
Future future = LoadBalancerStatisticsExecutor.getInstance().getService().submit(task);
- while(!future.isDone()) {
+ while (!future.isDone()) {
// Wait until task get executed
try {
Thread.sleep(100);
[09/16] stratos git commit: Organize imports of Load banacer
extension module
Posted by la...@apache.org.
Organize imports of Load banacer extension module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/76b39e1e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/76b39e1e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/76b39e1e
Branch: refs/heads/master
Commit: 76b39e1e1f57de21d9c78d96eb82796687674dab
Parents: e60d751
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:48:08 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:48:08 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/load/balancer/extension/api/LoadBalancer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/76b39e1e/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
index 68641ad..dd49e7f 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
+++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
@@ -19,8 +19,8 @@
package org.apache.stratos.load.balancer.extension.api;
-import org.apache.stratos.load.balancer.extension.api.exception.LoadBalancerExtensionException;
import org.apache.stratos.load.balancer.common.domain.Topology;
+import org.apache.stratos.load.balancer.extension.api.exception.LoadBalancerExtensionException;
/**
* A generic load balancer life-cycle definition.
[06/16] stratos git commit: Formatting Load balancer common module
Posted by la...@apache.org.
Formatting Load balancer common module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e02f3e12
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e02f3e12
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e02f3e12
Branch: refs/heads/master
Commit: e02f3e121a74b46c1b954bf64f8320a0b8a4b2ea
Parents: bf56f15
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:46:39 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:46:39 2015 +0530
----------------------------------------------------------------------
.../pom.xml | 7 ++-
.../load/balancer/common/domain/Cluster.java | 4 +-
.../load/balancer/common/domain/Member.java | 4 +-
.../load/balancer/common/domain/Service.java | 8 +--
...alancerCommonDomainMappingEventReceiver.java | 10 ++--
...LoadBalancerCommonTopologyEventReceiver.java | 27 +++++----
.../LoadBalancerCommonServiceComponent.java | 32 +++++-----
.../LoadBalancerStatisticsReader.java | 2 +
.../common/topology/TopologyProvider.java | 61 ++++++++++++--------
9 files changed, 88 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e02f3e12/components/org.apache.stratos.load.balancer.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/pom.xml b/components/org.apache.stratos.load.balancer.common/pom.xml
index db81289..b19e0a0 100644
--- a/components/org.apache.stratos.load.balancer.common/pom.xml
+++ b/components/org.apache.stratos.load.balancer.common/pom.xml
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.stratos</groupId>
@@ -31,9 +32,9 @@
<packaging>bundle</packaging>
<name>Apache Stratos - Load Balancer - Common</name>
<url>http://apache.org</url>
-
+
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
<version>${wso2carbon.version}</version>
http://git-wip-us.apache.org/repos/asf/stratos/blob/e02f3e12/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Cluster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Cluster.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Cluster.java
index 1f4bee9..ccb0195 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Cluster.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Cluster.java
@@ -76,8 +76,8 @@ public class Cluster {
public void removeMember(String memberId) {
Member member = memberMap.get(memberId);
- if(member == null) {
- if(log.isWarnEnabled()) {
+ if (member == null) {
+ if (log.isWarnEnabled()) {
log.warn(String.format("Could not remove member, member not found: [member] %s", memberId));
}
return;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e02f3e12/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java
index dae7e8c..d03dd1f 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Member.java
@@ -53,7 +53,7 @@ public class Member {
}
public Port getPort(int proxy) {
- if(portMap.containsKey(proxy)) {
+ if (portMap.containsKey(proxy)) {
return portMap.get(proxy);
}
return null;
@@ -64,7 +64,7 @@ public class Member {
}
public void addPorts(Collection<Port> ports) {
- for(Port port : ports) {
+ for (Port port : ports) {
addPort(port);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e02f3e12/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Service.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Service.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Service.java
index f94e7f8..8b62c3a 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Service.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/domain/Service.java
@@ -77,7 +77,7 @@ public class Service {
}
public Port getPort(int proxy) {
- if(portMap.containsKey(proxy)) {
+ if (portMap.containsKey(proxy)) {
return portMap.get(proxy);
}
return null;
@@ -88,15 +88,15 @@ public class Service {
}
public void addPorts(Collection<Port> ports) {
- for(Port port : ports) {
- if(!portExists(port)) {
+ for (Port port : ports) {
+ if (!portExists(port)) {
addPort(port);
}
}
}
public void removePort(Port port) {
- if(portExists(port)) {
+ if (portExists(port)) {
this.portMap.remove(port.getProxy());
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e02f3e12/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonDomainMappingEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonDomainMappingEventReceiver.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonDomainMappingEventReceiver.java
index a75121c..e78d9e2 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonDomainMappingEventReceiver.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonDomainMappingEventReceiver.java
@@ -50,14 +50,14 @@ public class LoadBalancerCommonDomainMappingEventReceiver extends DomainMappingE
addEventListener(new DomainMappingAddedEventListener() {
@Override
protected void onEvent(Event event) {
- DomainMappingAddedEvent domainMappingAddedEvent = (DomainMappingAddedEvent)event;
+ DomainMappingAddedEvent domainMappingAddedEvent = (DomainMappingAddedEvent) event;
String domainName = domainMappingAddedEvent.getDomainName();
String contextPath = domainMappingAddedEvent.getContextPath();
String clusterId = domainMappingAddedEvent.getClusterId();
Cluster cluster = topologyProvider.getClusterByClusterId(clusterId);
- if(cluster == null) {
+ if (cluster == null) {
log.warn(String.format("Could not add domain mapping, cluster not found: [cluster] %s", clusterId));
}
@@ -68,11 +68,11 @@ public class LoadBalancerCommonDomainMappingEventReceiver extends DomainMappingE
addEventListener(new DomainMappingRemovedEventListener() {
@Override
protected void onEvent(Event event) {
- DomainMappingRemovedEvent domainMappingRemovedEvent = (DomainMappingRemovedEvent)event;
+ DomainMappingRemovedEvent domainMappingRemovedEvent = (DomainMappingRemovedEvent) event;
String clusterId = domainMappingRemovedEvent.getClusterId();
Cluster cluster = topologyProvider.getClusterByClusterId(clusterId);
- if(cluster == null) {
+ if (cluster == null) {
log.warn(String.format("Could not remove domain mapping, cluster not found: [cluster] %s", clusterId));
}
@@ -84,6 +84,7 @@ public class LoadBalancerCommonDomainMappingEventReceiver extends DomainMappingE
/**
* Add domain mapping.
+ *
* @param cluster
* @param domainName
* @param contextPath
@@ -95,6 +96,7 @@ public class LoadBalancerCommonDomainMappingEventReceiver extends DomainMappingE
/**
* Remove domain mapping.
+ *
* @param cluster
* @param domainName
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/e02f3e12/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java
index 5a5c014..4412d5c 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/event/receivers/LoadBalancerCommonTopologyEventReceiver.java
@@ -48,7 +48,7 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
}
public void execute() {
- super.execute();
+ super.execute();
if (log.isInfoEnabled()) {
log.info("Load balancer topology receiver thread started");
}
@@ -72,7 +72,7 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
}
}
}
- if(membersFound) {
+ if (membersFound) {
initialized = true;
}
} catch (Exception e) {
@@ -91,7 +91,7 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
addEventListener(new CompleteTopologyEventListener() {
@Override
protected void onEvent(Event event) {
- if(!initialized) {
+ if (!initialized) {
initializeTopology();
}
}
@@ -230,7 +230,7 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
}
return;
}
- for(Cluster cluster : service.getClusters()) {
+ for (Cluster cluster : service.getClusters()) {
removeCluster(cluster);
}
} catch (Exception e) {
@@ -244,16 +244,18 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
/**
* Remove cluster from topology provider
+ *
* @param cluster
*/
protected void removeCluster(Cluster cluster) {
- for(Member member : cluster.getMembers()) {
+ for (Member member : cluster.getMembers()) {
removeMember(member.getServiceName(), member.getClusterId(), member.getMemberId());
}
}
/**
* Add member to topology provider
+ *
* @param serviceName
* @param clusterId
* @param memberId
@@ -279,12 +281,12 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
validateHostNames(cluster);
// Add service if not exists
- if(!topologyProvider.serviceExists(serviceName)) {
+ if (!topologyProvider.serviceExists(serviceName)) {
topologyProvider.addService(transformService(service));
}
// Add cluster if not exists
- if(!topologyProvider.clusterExistsByClusterId(cluster.getClusterId())) {
+ if (!topologyProvider.clusterExistsByClusterId(cluster.getClusterId())) {
topologyProvider.addCluster(transformCluster(cluster));
}
@@ -301,7 +303,7 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
org.apache.stratos.load.balancer.common.domain.Member lbMember = transformMember(member);
org.apache.stratos.load.balancer.common.domain.Service lbService = topologyProvider.getTopology().
getService(serviceName);
- if(lbService == null) {
+ if (lbService == null) {
log.warn(String.format("Service not found: %s", serviceName));
return;
}
@@ -311,6 +313,7 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
/**
* Remove member from topology provider
+ *
* @param serviceName
* @param clusterId
* @param memberId
@@ -351,7 +354,7 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
}
private void validateHostNames(Cluster cluster) {
- if((cluster.getHostNames() == null) || (cluster.getHostNames().size() == 0)) {
+ if ((cluster.getHostNames() == null) || (cluster.getHostNames().size() == 0)) {
throw new RuntimeException(String.format("Host names not found in cluster: " +
"[cluster] %s", cluster.getClusterId()));
}
@@ -375,7 +378,7 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
new org.apache.stratos.load.balancer.common.domain.Cluster(messagingCluster.getServiceName(),
messagingCluster.getClusterId());
cluster.setTenantRange(messagingCluster.getTenantRange());
- if(messagingCluster.getHostNames() != null) {
+ if (messagingCluster.getHostNames() != null) {
for (String hostName : messagingCluster.getHostNames()) {
cluster.addHostName(hostName);
}
@@ -386,13 +389,13 @@ public class LoadBalancerCommonTopologyEventReceiver extends TopologyEventReceiv
private org.apache.stratos.load.balancer.common.domain.Member transformMember(Member messagingMember) {
String hostName;
- if(messagingMember.getLoadBalancingIPType() == LoadBalancingIPType.Private) {
+ if (messagingMember.getLoadBalancingIPType() == LoadBalancingIPType.Private) {
if (StringUtils.isEmpty(messagingMember.getDefaultPrivateIP())) {
throw new RuntimeException(String.format("Default private IP not found: [member] %s",
messagingMember.getMemberId()));
}
hostName = messagingMember.getDefaultPrivateIP();
- } else if(messagingMember.getLoadBalancingIPType() == LoadBalancingIPType.Public) {
+ } else if (messagingMember.getLoadBalancingIPType() == LoadBalancingIPType.Public) {
if (StringUtils.isEmpty(messagingMember.getDefaultPublicIP())) {
throw new RuntimeException(String.format("Default public IP not found: [member] %s",
messagingMember.getMemberId()));
http://git-wip-us.apache.org/repos/asf/stratos/blob/e02f3e12/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/internal/LoadBalancerCommonServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/internal/LoadBalancerCommonServiceComponent.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/internal/LoadBalancerCommonServiceComponent.java
index 3b9e7f0..e61e0e6 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/internal/LoadBalancerCommonServiceComponent.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/internal/LoadBalancerCommonServiceComponent.java
@@ -1,20 +1,20 @@
/**
- * 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.
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.load.balancer.common.internal;
http://git-wip-us.apache.org/repos/asf/stratos/blob/e02f3e12/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java
index c9d2556..c92345b 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/statistics/LoadBalancerStatisticsReader.java
@@ -28,6 +28,7 @@ public interface LoadBalancerStatisticsReader {
/**
* Returns in-flight request count of sliding window configured.
+ *
* @param clusterId
*/
int getInFlightRequestCount(String clusterId);
@@ -37,6 +38,7 @@ public interface LoadBalancerStatisticsReader {
/**
* Returns the number of requests served since the last time this method was called.
+ *
* @param clusterId
* @return
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/e02f3e12/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/topology/TopologyProvider.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/topology/TopologyProvider.java b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/topology/TopologyProvider.java
index 2db648d..867c41d 100644
--- a/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/topology/TopologyProvider.java
+++ b/components/org.apache.stratos.load.balancer.common/src/main/java/org/apache/stratos/load/balancer/common/topology/TopologyProvider.java
@@ -58,10 +58,11 @@ public class TopologyProvider {
/**
* Add service to the topology.
+ *
* @param service
*/
public void addService(Service service) {
- if(service != null) {
+ if (service != null) {
topology.addService(service);
log.info(String.format("Service added: [service] %s", service.getServiceName()));
@@ -76,30 +77,31 @@ public class TopologyProvider {
/**
* Add cluster to the topology.
+ *
* @param cluster
*/
public void addCluster(Cluster cluster) {
- if(cluster != null) {
+ if (cluster != null) {
Service service = topology.getService(cluster.getServiceName());
- if(service == null) {
+ if (service == null) {
throw new RuntimeException(String.format("Could not add cluster, service not found: [service] %s",
cluster.getServiceName()));
}
service.addCluster(cluster);
clusterIdToClusterMap.put(cluster.getClusterId(), cluster);
- for(String hostName : cluster.getHostNames()) {
+ for (String hostName : cluster.getHostNames()) {
hostNameToClusterMap.put(hostName, cluster);
}
- if((cluster.getHostNames() != null) && (cluster.getHostNames().size() > 0)) {
+ if ((cluster.getHostNames() != null) && (cluster.getHostNames().size() > 0)) {
log.info(String.format("Cluster added to service: [service] %s [cluster] %s [hostnames] %s",
cluster.getServiceName(), cluster.getClusterId(), cluster.getHostNames()));
}
Collection<Member> members = cluster.getMembers();
- if((members != null) && (members.size() > 0)) {
- for(Member member : members) {
+ if ((members != null) && (members.size() > 0)) {
+ for (Member member : members) {
addMember(member);
}
}
@@ -108,23 +110,24 @@ public class TopologyProvider {
/**
* Add a member to its cluster.
+ *
* @param member
*/
public void addMember(Member member) {
Cluster cluster = getClusterByClusterId(member.getClusterId());
- if(cluster == null) {
+ if (cluster == null) {
log.warn(String.format("Could not add member, cluster not found: [cluster] %s",
member.getClusterId()));
return;
}
- if(StringUtils.isBlank(member.getHostName())) {
+ if (StringUtils.isBlank(member.getHostName())) {
log.warn(String.format("Could not add member, member hostname not found: [cluster] %s [member] %s",
member.getClusterId(), member.getMemberId()));
return;
}
cluster.addMember(member);
- if((cluster.getHostNames() != null) && (cluster.getHostNames().size() > 0)) {
+ if ((cluster.getHostNames() != null) && (cluster.getHostNames().size() > 0)) {
memberHostNameToClusterHostNameMap.put(member.getHostName(), cluster.getHostNames().iterator().next());
}
@@ -134,21 +137,22 @@ public class TopologyProvider {
/**
* Remove cluster from the topology.
+ *
* @param clusterId
*/
public void removeCluster(String clusterId) {
Cluster cluster = getClusterByClusterId(clusterId);
- if(cluster == null) {
+ if (cluster == null) {
log.warn(String.format("Could not remove cluster, cluster not found: [cluster] %s", clusterId));
return;
}
- for(String hostName : cluster.getHostNames()) {
+ for (String hostName : cluster.getHostNames()) {
hostNameToClusterMap.remove(hostName);
}
clusterIdToClusterMap.remove(cluster.getClusterId());
- if((cluster.getHostNames() != null) && (cluster.getHostNames().size() > 0)) {
+ if ((cluster.getHostNames() != null) && (cluster.getHostNames().size() > 0)) {
log.info(String.format("Cluster removed: [cluster] %s [hostnames] %s", cluster.getClusterId(),
cluster.getHostNames()));
}
@@ -156,6 +160,7 @@ public class TopologyProvider {
/**
* Returns true if cluster exists by cluster id else return false.
+ *
* @param clusterId
* @return
*/
@@ -165,6 +170,7 @@ public class TopologyProvider {
/**
* Returns true if cluster exists by host name else return false.
+ *
* @param hostName
* @return
*/
@@ -174,6 +180,7 @@ public class TopologyProvider {
/**
* Get cluster by cluster id.
+ *
* @param clusterId
* @return
*/
@@ -183,23 +190,24 @@ public class TopologyProvider {
/**
* Add tenant signup for cluster.
+ *
* @param clusterId
* @param tenantId
*/
public void addTenantSignUp(String clusterId, int tenantId) {
Cluster cluster = getClusterByClusterId(clusterId);
- if(cluster != null) {
+ if (cluster != null) {
boolean subscribed = false;
- for(String hostName : cluster.getHostNames()) {
+ for (String hostName : cluster.getHostNames()) {
Map<Integer, Cluster> tenantIdToClusterMap = hostNameToTenantIdToClusterMap.get(hostName);
- if(tenantIdToClusterMap == null) {
+ if (tenantIdToClusterMap == null) {
tenantIdToClusterMap = new ConcurrentHashMap<Integer, Cluster>();
hostNameToTenantIdToClusterMap.put(hostName, tenantIdToClusterMap);
}
tenantIdToClusterMap.put(tenantId, cluster);
subscribed = true;
}
- if(subscribed) {
+ if (subscribed) {
log.info(String.format("Tenant signed up to cluster: [tenant] %d [cluster] %s [hostnames] %s",
tenantId, cluster.getClusterId(), cluster.getHostNames()));
}
@@ -208,16 +216,17 @@ public class TopologyProvider {
/**
* Remove tenant signup for cluster.
+ *
* @param clusterId
* @param tenantId
*/
public void removeTenantSignUp(String clusterId, int tenantId) {
Cluster cluster = getClusterByClusterId(clusterId);
- if(cluster == null) {
+ if (cluster == null) {
log.warn(String.format("Could not remove tenant signup from cluster, cluster not found: [cluster] %s", clusterId));
}
- for(String hostName : cluster.getHostNames()) {
+ for (String hostName : cluster.getHostNames()) {
Map<Integer, Cluster> tenantIdToClusterMap = hostNameToTenantIdToClusterMap.get(hostName);
if (tenantIdToClusterMap != null) {
Cluster cluster_ = tenantIdToClusterMap.get(tenantId);
@@ -232,6 +241,7 @@ public class TopologyProvider {
/**
* Get cluster by hostname.
+ *
* @param hostName
* @return
*/
@@ -241,13 +251,14 @@ public class TopologyProvider {
/**
* Get cluster by hostname for tenant.
+ *
* @param hostName
* @param tenantId
* @return
*/
public Cluster getClusterByHostName(String hostName, int tenantId) {
Map<Integer, Cluster> tenantIdToClusterMap = hostNameToTenantIdToClusterMap.get(hostName);
- if(tenantIdToClusterMap != null) {
+ if (tenantIdToClusterMap != null) {
return tenantIdToClusterMap.get(tenantId);
}
return null;
@@ -255,27 +266,28 @@ public class TopologyProvider {
/**
* Remove a member from its cluster.
+ *
* @param clusterId
* @param memberId
*/
public void removeMember(String clusterId, String memberId) {
Cluster cluster = getClusterByClusterId(clusterId);
- if(cluster == null) {
+ if (cluster == null) {
log.warn(String.format("Could not remove member, cluster not found: [cluster] %s", clusterId));
return;
}
Member member = cluster.getMember(memberId);
- if(member != null) {
+ if (member != null) {
cluster.removeMember(memberId);
- if(memberHostNameToClusterHostNameMap.containsKey(member.getHostName())) {
+ if (memberHostNameToClusterHostNameMap.containsKey(member.getHostName())) {
memberHostNameToClusterHostNameMap.remove(member.getHostName());
}
log.info(String.format("Member removed from cluster: [cluster] %s [member] %s",
clusterId, member.getHostName()));
- if(cluster.getMembers().size() == 0) {
+ if (cluster.getMembers().size() == 0) {
log.info(String.format("No members found in cluster, removing cluster: " +
"[cluster] %s", cluster.getClusterId()));
removeCluster(cluster.getClusterId());
@@ -285,6 +297,7 @@ public class TopologyProvider {
/**
* Get cluster hostname of member by member hostname/ip address.
+ *
* @param memberHostName
* @return
*/
[10/16] stratos git commit: Formatting Logging view module
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/view.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/view.jsp b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/view.jsp
index d50d5b4..560a2c3 100755
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/view.jsp
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/view.jsp
@@ -1,303 +1,314 @@
<!--
- 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
+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
+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.
+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.
-->
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"
- prefix="carbon"%>
-<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient"%>
-<%@ page import="org.apache.axis2.context.ConfigurationContext"%>
-<%@ page import="org.wso2.carbon.ui.util.CharacterEncoder"%>
-<%@ page import="org.wso2.carbon.CarbonConstants"%>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogMessage"%>
-<%@ page import="org.wso2.carbon.utils.ServerConstants"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogMessage"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage"%>
+ prefix="carbon" %>
+<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
+<%@ page import="org.wso2.carbon.ui.util.CharacterEncoder" %>
+<%@ page import="org.wso2.carbon.CarbonConstants" %>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogMessage" %>
+<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogMessage" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
<script type="text/javascript" src="js/logviewer.js"></script>
<script type="text/javascript" src="../admin/dialog/js/dialog.js"></script>
<fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
- <carbon:breadcrumb label="View Logs"
- resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
- topPage="false" request="<%=request%>" />
-<%
- String backendServerURL = CarbonUIUtil
- .getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
- .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
+ <carbon:breadcrumb label="View Logs"
+ resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
+ topPage="false" request="<%=request%>"/>
+ <%
+ String backendServerURL = CarbonUIUtil
+ .getServerURL(config.getServletContext(), session);
+ ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
+ .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- LogViewerClient logViewerClient;
- String logIndex = "";
- String keyword;
- String action;
- String logFile;
- String type;
- String keyWordString = "";
- String serviceName = "WSO2 Stratos Manager";
- String tenantDomain = "";
- LogMessage[] logMessages;
- PaginatedLogMessage paginatedLogMsgs;
- String pageNumberStr = request.getParameter("pageNumber");
- logFile = request.getParameter("logFile");
- String parameter = "";
- if (pageNumberStr == null) {
- pageNumberStr = "0";
- }
- int pageNumber = 0;
- int numberOfPages = 0;
- try {
- pageNumber = Integer.parseInt(pageNumberStr);
- } catch (NumberFormatException ignored) {
- // page number format exception
- }
- String numberOfBottomLines = "";
- try {
- logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
- logIndex = request.getParameter("logIndex");
- keyword = request.getParameter("keyword");
- serviceName = request.getParameter("serviceName");
- tenantDomain = request.getParameter("tenantDomain");
- keyWordString = (keyword == null) ? "" : keyword;
- keyWordString = (keyWordString.equals("null")) ? "" : keyWordString;
- serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
- if (keyWordString.trim().equals("")) {
- keyword = null;
- }
- action = request.getParameter("action");
- type = request.getParameter("type");
- type = (type == null) ? "ALL" : type;
- tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
- int start = (pageNumber * 200) + 1;
- int end = (pageNumber * 200) + 200;
- int maxLines = logViewerClient.getLineNumbers(logFile, tenantDomain,serviceName);
- int maxLenPerItr = (pageNumber + 1) * 1000;
- if (maxLines > 1000) {
+ String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
+ LogViewerClient logViewerClient;
+ String logIndex = "";
+ String keyword;
+ String action;
+ String logFile;
+ String type;
+ String keyWordString = "";
+ String serviceName = "WSO2 Stratos Manager";
+ String tenantDomain = "";
+ LogMessage[] logMessages;
+ PaginatedLogMessage paginatedLogMsgs;
+ String pageNumberStr = request.getParameter("pageNumber");
+ logFile = request.getParameter("logFile");
+ String parameter = "";
+ if (pageNumberStr == null) {
+ pageNumberStr = "0";
+ }
+ int pageNumber = 0;
+ int numberOfPages = 0;
+ try {
+ pageNumber = Integer.parseInt(pageNumberStr);
+ } catch (NumberFormatException ignored) {
+ // page number format exception
+ }
+ String numberOfBottomLines = "";
+ try {
+ logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
+ logIndex = request.getParameter("logIndex");
+ keyword = request.getParameter("keyword");
+ serviceName = request.getParameter("serviceName");
+ tenantDomain = request.getParameter("tenantDomain");
+ keyWordString = (keyword == null) ? "" : keyword;
+ keyWordString = (keyWordString.equals("null")) ? "" : keyWordString;
+ serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
+ if (keyWordString.trim().equals("")) {
+ keyword = null;
+ }
+ action = request.getParameter("action");
+ type = request.getParameter("type");
+ type = (type == null) ? "ALL" : type;
+ tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
+ int start = (pageNumber * 200) + 1;
+ int end = (pageNumber * 200) + 200;
+ int maxLines = logViewerClient.getLineNumbers(logFile, tenantDomain, serviceName);
+ int maxLenPerItr = (pageNumber + 1) * 1000;
+ if (maxLines > 1000) {
- }
- String logIndex1 = Integer.toString(maxLines);
- if (logIndex != null && !logIndex.equals("null") && !logIndex.equals("")) {
- //int index = Integer.parseInt(logIndex);
- paginatedLogMsgs = logViewerClient.getPaginatedLogMessage(pageNumber, type,
- keyword, logFile, logIndex, maxLines, start, end, tenantDomain,serviceName);
- } else {
- paginatedLogMsgs = logViewerClient.getPaginatedBottomUpLogMessage(pageNumber,
- type, keyword, logFile, maxLines, start, end, tenantDomain,serviceName);
- //paginatedLogMsgs = logViewerClient.getPaginatedLogMessage(pageNumber, type, keyword, logFile, logIndex1, maxLines, start, end);
- }
- logMessages = paginatedLogMsgs.getLogInfo();
- numberOfPages = paginatedLogMsgs.getNumberOfPages();
- if (logIndex != null && !logIndex.endsWith("null")) {
- numberOfBottomLines = logIndex;
- }
- parameter = "logFile=" + logFile + "&logIndex=" + logIndex + "&type=" + type
- + "&keyword=" + keyword + "&tenantDomain=" + tenantDomain+ "&serviceName=" + serviceName;
+ }
+ String logIndex1 = Integer.toString(maxLines);
+ if (logIndex != null && !logIndex.equals("null") && !logIndex.equals("")) {
+ //int index = Integer.parseInt(logIndex);
+ paginatedLogMsgs = logViewerClient.getPaginatedLogMessage(pageNumber, type,
+ keyword, logFile, logIndex, maxLines, start, end, tenantDomain, serviceName);
+ } else {
+ paginatedLogMsgs = logViewerClient.getPaginatedBottomUpLogMessage(pageNumber,
+ type, keyword, logFile, maxLines, start, end, tenantDomain, serviceName);
+ //paginatedLogMsgs = logViewerClient.getPaginatedLogMessage(pageNumber, type, keyword, logFile, logIndex1, maxLines, start, end);
+ }
+ logMessages = paginatedLogMsgs.getLogInfo();
+ numberOfPages = paginatedLogMsgs.getNumberOfPages();
+ if (logIndex != null && !logIndex.endsWith("null")) {
+ numberOfBottomLines = logIndex;
+ }
+ parameter = "logFile=" + logFile + "&logIndex=" + logIndex + "&type=" + type
+ + "&keyword=" + keyword + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName;
- } catch (Exception e) {
- CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
- e);
-%>
-<script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
-<%
- return;
- }
-%>
+ } catch (Exception e) {
+ CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
+ e);
+ %>
+ <script type="text/javascript">
+ location.href = "../admin/error.jsp";
+ </script>
+ <%
+ return;
+ }
+ %>
+ <div id="middle">
+ <h2>
+ <fmt:message key="system.logs.view"/>
+ </h2>
- <div id="middle">
- <h2>
- <fmt:message key="system.logs.view" />
- </h2>
+ <div id="workArea">
+ <input type="hidden" id="serviceName" name="serviceName"
+ value="<%=serviceName%>"/>
+ <input type="hidden" id="logFile" name="logFile"
+ value="<%=logFile%>"/>
+ <input type="hidden" id="tenantDomain" name="tenantDomain"
+ value="<%=tenantDomain%>"/>
+ <table border="0" class="styledLeft">
+ <tbody>
+ <tr>
+ <td>
+ <table class="normal-nopadding">
+ <tr>
+ <td><fmt:message key="view"/>
+ </td>
+ <td><select class="log-select" id="logLevelID"
+ onchange="javascript:viewSingleSysLogLevel(); return false;">
+ <%
+ String[] logLevels = logViewerClient.getLogLevels();
+ if (keyword != null) {
+ type = "Custom";
+ %>
- <div id="workArea">
- <input type="hidden" id="serviceName" name="serviceName"
- value="<%=serviceName%>"/>
- <input type="hidden" id="logFile" name="logFile"
- value="<%=logFile%>"/>
- <input type="hidden" id="tenantDomain" name="tenantDomain"
- value="<%=tenantDomain%>"/>
- <table border="0" class="styledLeft">
- <tbody>
- <tr>
- <td>
- <table class="normal-nopadding" >
- <tr>
- <td><fmt:message key="view" />
- </td>
- <td><select class="log-select" id="logLevelID"
- onchange="javascript:viewSingleSysLogLevel(); return false;">
- <%
- String[] logLevels = logViewerClient.getLogLevels();
- if (keyword != null) {
- type = "Custom";
- %>
+ <option value="<%=type%>" selected="true"><%=type%>
+ </option>
- <option value="<%=type%>" selected="true"><%=type%></option>
+ <%
+ }
+ for (String logLevel : logLevels) {
+ if (logLevel.equals(type)) {
+ %>
- <%
- }
- for (String logLevel : logLevels) {
- if (logLevel.equals(type)) {
- %>
+ <option value="<%=logLevel%>" selected="true"><%=logLevel%>
+ </option>
- <option value="<%=logLevel%>" selected="true"><%=logLevel%></option>
+ <%
+ } else {
+ %>
- <%
- } else {
- %>
+ <option value="<%=logLevel%>"><%=logLevel%>
+ </option>
- <option value="<%=logLevel%>"><%=logLevel%></option>
+ <%
+ }
+ }
+ %>
+ </select>
+ </td>
+ <td style="width: 100%;"></td>
+ <td>
+ <nobr>
+ <fmt:message key="search.logs"/>
+ </nobr>
+ </td>
+ <td style="padding-right: 2px !important;"><input
+ onkeypress="submitenter(event)" value="<%=keyWordString%>" class="log-select"
+ size="30" id="keyword" type="text">
+ </td>
+ <td style="padding-left: 0px !important;"><input
+ type="button" value="Search"
+ onclick="javascript:searchTenantLog(); return false;" class="button">
+ </td>
+ <td style="width: 100%;"></td>
+ <td style="width: 100%;"></td>
+ <td style="width: 100%;"></td>
+ <td class="leftCol-med">
+ <nobr><fmt:message key="log.head"/></nobr>
+ </td>
+ <td style="padding-left: 0px !important;"><carbon:tooltips image="images/trace.png"
+ key='log.head.help'
+ noOfWordsPerLine="6"/></td>
+ <td style="padding-left: 0px !important;"><input onkeypress="submitenterbottomUp(event)"
+ value="<%=numberOfBottomLines%>"
+ id="logIndex" name="logIndex"
+ size="10" type="text">
+ </td>
+ <td style="padding-left: 0px !important;"><input
+ type="button" value="Search"
+ onclick="javascript:searchLogBottomLogs(); return false;"
+ class="button">
- <%
- }
- }
- %>
- </select>
- </td>
- <td style="width: 100%;"></td>
- <td><nobr>
- <fmt:message key="search.logs" />
- </nobr></td>
- <td style="padding-right: 2px !important;"><input
- onkeypress="submitenter(event)" value="<%=keyWordString%>" class="log-select"
- size="30" id="keyword" type="text">
- </td>
- <td style="padding-left: 0px !important;"><input
- type="button" value="Search"
- onclick="javascript:searchTenantLog(); return false;" class="button">
- </td>
- <td style="width: 100%;"></td>
- <td style="width: 100%;"></td>
- <td style="width: 100%;"></td>
- <td class="leftCol-med"><nobr><fmt:message key="log.head" /></nobr>
- </td>
- <td style="padding-left: 0px !important;"><carbon:tooltips image="images/trace.png" key='log.head.help' noOfWordsPerLine="6"/></td>
- <td style="padding-left: 0px !important;"><input onkeypress="submitenterbottomUp(event)" value="<%=numberOfBottomLines%>" id="logIndex" name="logIndex"
- size="10" type="text">
- </td>
- <td style="padding-left: 0px !important;"><input
- type="button" value="Search"
- onclick="javascript:searchLogBottomLogs(); return false;"
- class="button">
-
- </td>
- </tr>
+ </td>
+ </tr>
- </table></td>
- </tr>
- </tbody>
- </table>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
- <br />
-<%-- <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>" --%>
-<%-- page="view.jsp" pageNumberParameterName="pageNumber" parameters="<%=parameter%>"/> --%>
- <table border="1" class="styledLeft">
-
- <tbody>
+ <br/>
+ <%-- <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>" --%>
+ <%-- page="view.jsp" pageNumberParameterName="pageNumber" parameters="<%=parameter%>"/> --%>
+ <table border="1" class="styledLeft">
- <tr>
- <td class="formRow">
+ <tbody>
- <table class="styledLeft">
+ <tr>
+ <td class="formRow">
- <thead>
- <tr>
- <th><b><fmt:message key="log.type" />
- </b>
- </th>
- <th><b><fmt:message key="log.message" />
- </b>
- </th>
- </tr>
- </thead>
- <%
- int index = -1;
- int i = 0;
- for (LogMessage logMessage : logMessages) {
- ++index;
- i++;
- if (index % 2 != 0) {
- %>
- <tr>
- <%
- } else {
- %>
-
- <tr bgcolor="#eeeffb">
- <%
- }
- if (logMessage != null) {
- String logLevel = logMessage.getType();
- if (logLevel == null || logLevel.equals("")) {
- %>
- <td border-bottom="gray" width="2%"></td>
- <%
+ <table class="styledLeft">
+
+ <thead>
+ <tr>
+ <th><b><fmt:message key="log.type"/>
+ </b>
+ </th>
+ <th><b><fmt:message key="log.message"/>
+ </b>
+ </th>
+ </tr>
+ </thead>
+ <%
+ int index = -1;
+ int i = 0;
+ for (LogMessage logMessage : logMessages) {
+ ++index;
+ i++;
+ if (index % 2 != 0) {
+ %>
+ <tr>
+ <%
} else {
%>
- <td border-bottom="gray" width="2%"><img
- style="margin-right: 10px;"
- src="<%=logViewerClient.getImageName(logMessage.getType().trim())%>">
- </td>
- <%
- }
- %>
- <td>
- <%
- if (logMessage.getLogMessage().equalsIgnoreCase("NO_LOGS")) {
- %> <fmt:message key="no.logs" /> <%
- } else {
- %> <%=CharacterEncoder.getSafeText(logMessage.getLogMessage())%> <%
- }
- %>
- </td>
- </tr>
- <%
- }
- }
- %>
+ <tr bgcolor="#eeeffb">
+ <%
+ }
+ if (logMessage != null) {
+ String logLevel = logMessage.getType();
+ if (logLevel == null || logLevel.equals("")) {
+ %>
+ <td border-bottom="gray" width="2%"></td>
+ <%
+ } else {
+ %>
+ <td border-bottom="gray" width="2%"><img
+ style="margin-right: 10px;"
+ src="<%=logViewerClient.getImageName(logMessage.getType().trim())%>">
+ </td>
+ <%
+ }
+ %>
+ <td>
+ <%
+ if (logMessage.getLogMessage().equalsIgnoreCase("NO_LOGS")) {
+ %> <fmt:message key="no.logs"/> <%
+ } else {
+ %> <%=CharacterEncoder.getSafeText(logMessage.getLogMessage())%> <%
+ }
+ %>
+ </td>
+ </tr>
- </table><%
+ <%
+ }
+ }
+ %>
+
+ </table>
+ <%
if (i >= 199) {
%>
-
- <tr bgcolor="#eeeffb">
- <td> Only 200 log messages are displayed, please <a
- href="download-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
- key="download" /></a> for more ...
- <td>
- </tr>
-
- <%
- }
- %>
- </td>
- </tr>
-<%-- <tr><carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>" --%>
-<%-- page="view.jsp" pageNumberParameterName="pageNumber" parameters="<%=parameter%>"/> <tr> --%>
-
- </tbody>
- </table>
-
- </div>
- </div>
+
+ <tr bgcolor="#eeeffb">
+ <td> Only 200 log messages are displayed, please <a
+ href="download-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
+ key="download"/></a> for more ...
+ <td>
+ </tr>
+
+ <%
+ }
+ %>
+ </td>
+ </tr>
+ <%-- <tr><carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>" --%>
+ <%-- page="view.jsp" pageNumberParameterName="pageNumber" parameters="<%=parameter%>"/> <tr> --%>
+
+ </tbody>
+ </table>
+
+ </div>
+ </div>
</fmt:bundle>
[12/16] stratos git commit: Formatting Logging view module
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/index.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/index.jsp b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/index.jsp
index 919e97e..30627e7 100644
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/index.jsp
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/index.jsp
@@ -1,42 +1,42 @@
<!--
- 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.
+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.
-->
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"
- prefix="carbon"%>
-<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient"%>
-<%@ page import="org.apache.axis2.context.ConfigurationContext"%>
-<%@ page import="org.wso2.carbon.CarbonConstants"%>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogInfo"%>
+ prefix="carbon" %>
+<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
+<%@ page import="org.wso2.carbon.CarbonConstants" %>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogInfo" %>
<%-- <%@ page --%>
-<!-- import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent"%> -->
-<%@ page import="org.wso2.carbon.utils.ServerConstants"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
+<!-- import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent"%> -->
+<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage"%>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogInfo"%>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogEvent"%>
+<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogInfo" %>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogEvent" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
<%@ page import="org.wso2.carbon.ui.util.CharacterEncoder" %>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent"%>
-<%@ page import="java.util.regex.Matcher"%>
-<%@ page import="java.util.regex.Pattern"%>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent" %>
+<%@ page import="java.util.regex.Matcher" %>
+<%@ page import="java.util.regex.Pattern" %>
<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.Calendar" %>
<%@ page import="java.util.Date" %>
@@ -48,323 +48,332 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>View System Logs</title>
-<script type="text/JavaScript">
- function refresh(time) {
- setTimeout("location.reload(true);", time);
- }
- </script>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>View System Logs</title>
+ <script type="text/JavaScript">
+ function refresh(time) {
+ setTimeout("location.reload(true);", time);
+ }
+ </script>
</head>
-<body onload="JavaScript:refresh(120000);">
-<%!private boolean isArchiveFile(String fileName) {
- String archivePattern = "[a-zA-Z]*\\.log";
- CharSequence inputStr = fileName;
- Pattern pattern = Pattern.compile(archivePattern);
- Matcher matcher = pattern.matcher(inputStr);
- return matcher.find();
- }%>
- <%
- String backendServerURL = CarbonUIUtil
- .getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
- .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- LogViewerClient logViewerClient;
- LogEvent[] events = null;
- String type;
- String keyword;
- String action;
- boolean showLogFiles;
- String pageNumberStr = request.getParameter("pageNumber");
- String pageIndexNumberStr = request.getParameter("pageIndexNumber");
- String showMaxStr = request.getParameter("showMax");
- int pageNumber = 0;
- int pageIndexNumber = 0;
- int numberOfIndexPages = 0;
- int numberOfPages = 0;
- int noOfRows=0;
- boolean showMax= false;
- boolean isSuperTenant = CarbonUIUtil.isSuperTenant(request);
- boolean isManager = false;
- String tenantDomain = request.getParameter("tenantDomain");
- String serviceName = request.getParameter("serviceName");
- String serviceNames[];
- LogInfo[] logInfo = null;
- PaginatedLogInfo paginatedLogInfo = null;
- PaginatedLogEvent paginatedLogEvents = null;
- String parameter = "";
- String indexParameter = "";
- boolean isValidTenant = true;
- String collapseAdv = request.getParameter("collapse");
- boolean isCollapse = Boolean.parseBoolean(collapseAdv);
- showMax = Boolean.parseBoolean(showMaxStr);
- try {
- pageNumber = Integer.parseInt(pageNumberStr);
- } catch (NumberFormatException ignored) {
- // page number format exception
- }
- try {
- pageIndexNumber = Integer.parseInt(pageIndexNumberStr);
- } catch (NumberFormatException ignored) {
- // page number format exception
- }
- try {
- type = CharacterEncoder.getSafeText(request.getParameter("type"));
- type = (type == null) ? "" : type;
- if(tenantDomain == null) {
- tenantDomain = "";
- }
- if (serviceName == null) {
- serviceName = "";
- }
- //tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
- keyword = CharacterEncoder.getSafeText(request.getParameter("keyword"));
- keyword = (keyword == null) ? "" : keyword;
- action = CharacterEncoder.getSafeText(request.getParameter("action"));
- logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
- isValidTenant = logViewerClient.isValidTenant(tenantDomain);
- if(isValidTenant) {
- paginatedLogEvents = logViewerClient.getPaginatedLogEvents(pageNumber, type,
- keyword, tenantDomain, serviceName);
- paginatedLogInfo = logViewerClient.getLocalLogFiles(pageIndexNumber, tenantDomain, serviceName);
- }
-
- if (paginatedLogEvents != null) {
- noOfRows = paginatedLogEvents.getNumberOfPages() * 15;
- events = paginatedLogEvents.getLogInfo();
- numberOfPages = paginatedLogEvents.getNumberOfPages();
- }
- if (paginatedLogInfo != null) {
- logInfo = paginatedLogInfo.getLogInfo();
- numberOfIndexPages = paginatedLogInfo.getNumberOfPages();
- }
- isManager = logViewerClient.isManager();
- if(isManager) {
- serviceNames = logViewerClient.getSubscribedCartridgeList();
- } else {
- serviceNames = logViewerClient.getServiceNames();
- }
- showLogFiles = (logInfo != null);
- if(isManager) {
- if(isSuperTenant) {
- parameter = "type=" + type + "&keyword=" + keyword + "&serviceName=" + serviceName +
- "&tenantDomain=" + tenantDomain + "&collapse=" + isCollapse;
- indexParameter = "type=" + type + "&keyword=" + keyword+"&showMax=" + true + "&serviceName=" + serviceName +
- "&tenantDomain=" + tenantDomain + "&collapse=" + isCollapse;
- } else {
- parameter = "type=" + type + "&keyword=" + keyword + "&serviceName=" + serviceName +
- "&collapse=" + isCollapse;
- indexParameter = "type=" + type + "&keyword=" + keyword+"&showMax=" + true + "&serviceName=" + serviceName +
- "&collapse=" + isCollapse;
- }
+<body onload="JavaScript:refresh(120000);">
+<%!
+ private boolean isArchiveFile(String fileName) {
+ String archivePattern = "[a-zA-Z]*\\.log";
+ CharSequence inputStr = fileName;
+ Pattern pattern = Pattern.compile(archivePattern);
+ Matcher matcher = pattern.matcher(inputStr);
+ return matcher.find();
+ }
+%>
+<%
+ String backendServerURL = CarbonUIUtil
+ .getServerURL(config.getServletContext(), session);
+ ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
+ .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
+ String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
+ LogViewerClient logViewerClient;
+ LogEvent[] events = null;
+ String type;
+ String keyword;
+ String action;
+ boolean showLogFiles;
+ String pageNumberStr = request.getParameter("pageNumber");
+ String pageIndexNumberStr = request.getParameter("pageIndexNumber");
+ String showMaxStr = request.getParameter("showMax");
+ int pageNumber = 0;
+ int pageIndexNumber = 0;
+ int numberOfIndexPages = 0;
+ int numberOfPages = 0;
+ int noOfRows = 0;
+ boolean showMax = false;
+ boolean isSuperTenant = CarbonUIUtil.isSuperTenant(request);
+ boolean isManager = false;
+ String tenantDomain = request.getParameter("tenantDomain");
+ String serviceName = request.getParameter("serviceName");
+ String serviceNames[];
+ LogInfo[] logInfo = null;
+ PaginatedLogInfo paginatedLogInfo = null;
+ PaginatedLogEvent paginatedLogEvents = null;
+ String parameter = "";
+ String indexParameter = "";
+ boolean isValidTenant = true;
+ String collapseAdv = request.getParameter("collapse");
+ boolean isCollapse = Boolean.parseBoolean(collapseAdv);
+ showMax = Boolean.parseBoolean(showMaxStr);
+ try {
+ pageNumber = Integer.parseInt(pageNumberStr);
+ } catch (NumberFormatException ignored) {
+ // page number format exception
+ }
+ try {
+ pageIndexNumber = Integer.parseInt(pageIndexNumberStr);
+ } catch (NumberFormatException ignored) {
+ // page number format exception
+ }
+ try {
+ type = CharacterEncoder.getSafeText(request.getParameter("type"));
+ type = (type == null) ? "" : type;
+ if (tenantDomain == null) {
+ tenantDomain = "";
+ }
+ if (serviceName == null) {
+ serviceName = "";
+ }
+ //tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
+ keyword = CharacterEncoder.getSafeText(request.getParameter("keyword"));
+ keyword = (keyword == null) ? "" : keyword;
+ action = CharacterEncoder.getSafeText(request.getParameter("action"));
+ logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
+ isValidTenant = logViewerClient.isValidTenant(tenantDomain);
+ if (isValidTenant) {
+ paginatedLogEvents = logViewerClient.getPaginatedLogEvents(pageNumber, type,
+ keyword, tenantDomain, serviceName);
+ paginatedLogInfo = logViewerClient.getLocalLogFiles(pageIndexNumber, tenantDomain, serviceName);
+ }
+
+ if (paginatedLogEvents != null) {
+ noOfRows = paginatedLogEvents.getNumberOfPages() * 15;
+ events = paginatedLogEvents.getLogInfo();
+ numberOfPages = paginatedLogEvents.getNumberOfPages();
+ }
+ if (paginatedLogInfo != null) {
+ logInfo = paginatedLogInfo.getLogInfo();
+ numberOfIndexPages = paginatedLogInfo.getNumberOfPages();
+ }
+ isManager = logViewerClient.isManager();
+ if (isManager) {
+ serviceNames = logViewerClient.getSubscribedCartridgeList();
+ } else {
+ serviceNames = logViewerClient.getServiceNames();
+ }
+ showLogFiles = (logInfo != null);
+ if (isManager) {
+ if (isSuperTenant) {
+ parameter = "type=" + type + "&keyword=" + keyword + "&serviceName=" + serviceName +
+ "&tenantDomain=" + tenantDomain + "&collapse=" + isCollapse;
+ indexParameter = "type=" + type + "&keyword=" + keyword + "&showMax=" + true + "&serviceName=" + serviceName +
+ "&tenantDomain=" + tenantDomain + "&collapse=" + isCollapse;
} else {
- parameter = "type=" + type + "&keyword=" + keyword;
- indexParameter = "type=" + type + "&keyword=" + keyword+"&showMax=" + true;
+ parameter = "type=" + type + "&keyword=" + keyword + "&serviceName=" + serviceName +
+ "&collapse=" + isCollapse;
+ indexParameter = "type=" + type + "&keyword=" + keyword + "&showMax=" + true + "&serviceName=" + serviceName +
+ "&collapse=" + isCollapse;
}
-
- } catch (Exception e) {
- CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
- e);
- %>
- <script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
- <%
- return;
- }
- %>
- <fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
-
- <carbon:breadcrumb label="system.logs"
- resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
- topPage="true" request="<%=request%>" />
- <div id="middle">
- <h2>
- <fmt:message key="system.logs" />
- </h2>
- <div id="workArea">
+ } else {
+ parameter = "type=" + type + "&keyword=" + keyword;
+ indexParameter = "type=" + type + "&keyword=" + keyword + "&showMax=" + true;
+ }
+
+ } catch (Exception e) {
+ CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
+ e);
+%>
+<script type="text/javascript">
+ location.href = "../admin/error.jsp";
+</script>
+<%
+ return;
+ }
+%>
+<fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
+
+ <carbon:breadcrumb label="system.logs"
+ resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
+ topPage="true" request="<%=request%>"/>
+ <div id="middle">
+ <h2>
+ <fmt:message key="system.logs"/>
+ </h2>
+
+ <div id="workArea">
<%
if (isManager) {
%>
- <table border="0" class="styledLeft">
- <tbody>
- <tr>
-
- <%
- if(isCollapse) {
- %>
- <td class="middle-header" colspan="4"><a
- class="icon-link"
- style="background-image: url(images/minus.gif);"
- href="javascript:showQueryPropertiesSearch()"
- id="propertySymbolMaxSearch"></a> <fmt:message
- key="adv.search" /></td>
- </tr>
- <tr id="propertyTableSearch" style= "">
-
- <%
- } else {
- %>
- <td class="middle-header" colspan="4"><a
- class="icon-link"
- style="background-image: url(images/plus.gif);"
- href="javascript:showQueryPropertiesSearch()"
- id="propertySymbolMaxSearch"></a> <fmt:message
- key="adv.search" /></td>
- </tr>
- <tr id="propertyTableSearch" style= "display: none">
- <%
- }
- %>
-
+ <table border="0" class="styledLeft">
+ <tbody>
+ <tr>
+ <%
+ if (isCollapse) {
+ %>
+ <td class="middle-header" colspan="4"><a
+ class="icon-link"
+ style="background-image: url(images/minus.gif);"
+ href="javascript:showQueryPropertiesSearch()"
+ id="propertySymbolMaxSearch"></a> <fmt:message
+ key="adv.search"/></td>
+ </tr>
+ <tr id="propertyTableSearch" style="">
- <td>
- <table class="normal">
- <td style="padding-right: 2px !important;"><nobr>
- <fmt:message key="service.name" />
- </nobr>
- </td>
- <td style="padding-right: 0px !important;"><select
- name="serviceName" id="serviceName" >
- <%
- for (String name : serviceNames) {
- %>
- <%
- if (name.equals(serviceName)) {
- %>
- <option selected="selected" value="<%=name%>">
- <%=name%>
- </option>
- <%
- } else {
- %>
- <option value="<%=name%>">
- <%=name%>
- </option>
- <%
- }
- %>
- <%
- }
- %>
-
- </select></td>
<%
- if(isSuperTenant) {
- %>
- <td style="padding-right: 2px !important;">
- <nobr>
- <fmt:message key="tenant.domain" />
- </nobr>
- </td>
- <td style="padding-right: 2px !important;"><input
- value="<%=tenantDomain%>" id="tenantDomain"
- name="tenantDomain" size="20" type="text"></td>
- <td><input type="hidden" id="tenantDomain"
- name="tenantDomain" value="<%=tenantDomain%>" />
- </td>
+ } else {
+ %>
+ <td class="middle-header" colspan="4"><a
+ class="icon-link"
+ style="background-image: url(images/plus.gif);"
+ href="javascript:showQueryPropertiesSearch()"
+ id="propertySymbolMaxSearch"></a> <fmt:message
+ key="adv.search"/></td>
+ </tr>
+ <tr id="propertyTableSearch" style="display: none">
<%
}
%>
- </table>
+ <td>
+ <table class="normal">
+ <td style="padding-right: 2px !important;">
+ <nobr>
+ <fmt:message key="service.name"/>
+ </nobr>
+ </td>
+ <td style="padding-right: 0px !important;"><select
+ name="serviceName" id="serviceName">
+ <%
+ for (String name : serviceNames) {
+ %>
+ <%
+ if (name.equals(serviceName)) {
+ %>
+ <option selected="selected" value="<%=name%>">
+ <%=name%>
+ </option>
+ <%
+ } else {
+ %>
+ <option value="<%=name%>">
+ <%=name%>
+ </option>
+ <%
+ }
+ %>
+ <%
+ }
+ %>
- </td>
- </tr>
+ </select></td>
+ <%
+ if (isSuperTenant) {
+ %>
+ <td style="padding-right: 2px !important;">
+ <nobr>
+ <fmt:message key="tenant.domain"/>
+ </nobr>
+ </td>
+ <td style="padding-right: 2px !important;"><input
+ value="<%=tenantDomain%>" id="tenantDomain"
+ name="tenantDomain" size="20" type="text"></td>
+ <td><input type="hidden" id="tenantDomain"
+ name="tenantDomain" value="<%=tenantDomain%>"/>
+ </td>
+ <%
+ }
+ %>
- </tbody>
- </table>
+
+ </table>
+
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
<%
- } else {
+ } else {
%>
<input type="hidden" id="serviceName" name="serviceName"
- value="<%=serviceName%>" />
+ value="<%=serviceName%>"/>
<%
}
- if (noOfRows > 40000) {
- %>
- <br/>
- <font color="red">Maximum log limit exceeded!!!. <br/>
-
- We only list 40 000 logs through the log viewer(your latest logs will be omitted in the log display), Please download the daily archived logs, for the full log report.
- </font> <br/>
- <%
- }
- %>
- <br/>
- <table border="0" class="styledLeft">
- <tbody>
- <tr>
- <td>
- <table class="normal">
+ if (noOfRows > 40000) {
+ %>
+ <br/>
+ <font color="red">Maximum log limit exceeded!!!. <br/>
+
+ We only list 40 000 logs through the log viewer(your latest logs will be omitted in the log display),
+ Please download the daily archived logs, for the full log report.
+ </font> <br/>
+ <%
+ }
+ %>
+ <br/>
+ <table border="0" class="styledLeft">
+ <tbody>
+ <tr>
+ <td>
+ <table class="normal">
<tr>
<td style="padding-right: 2px !important;">
<nobr><fmt:message key="log.level"/></nobr>
</td>
- <td><select class="log-select" id="logLevelID" return false>
- <%
- String[] logLevels = logViewerClient.getLogLevels();
- if (keyword != null && !keyword.equals("")) {
- type = "Custom";
- %>
-
- <option value="<%=type%>" selected="true"><%=type%></option>
-
- <%
- }
- for (String logLevel : logLevels) {
- if (logLevel.equals(type)) {
- %>
-
- <option value="<%=logLevel%>" selected="true"><%=logLevel%></option>
-
- <%
- } else {
- %>
-
- <option value="<%=logLevel%>"><%=logLevel%></option>
-
- <%
- }
- }
- %>
- </select></td>
- <td style="padding-right: 2px !important;"><nobr>
- <fmt:message key="search.logs" />
- </nobr>
+ <td><select class="log-select" id="logLevelID" return false>
+ <%
+ String[] logLevels = logViewerClient.getLogLevels();
+ if (keyword != null && !keyword.equals("")) {
+ type = "Custom";
+ %>
+
+ <option value="<%=type%>" selected="true"><%=type%>
+ </option>
+
+ <%
+ }
+ for (String logLevel : logLevels) {
+ if (logLevel.equals(type)) {
+ %>
+
+ <option value="<%=logLevel%>" selected="true"><%=logLevel%>
+ </option>
+
+ <%
+ } else {
+ %>
+
+ <option value="<%=logLevel%>"><%=logLevel%>
+ </option>
+
+ <%
+ }
+ }
+ %>
+ </select></td>
+ <td style="padding-right: 2px !important;">
+ <nobr>
+ <fmt:message key="search.logs"/>
+ </nobr>
</td>
<%
- if(isManager && isSuperTenant) {
+ if (isManager && isSuperTenant) {
%>
<td style="padding-right: 2px !important;"><input onkeypress="submitenter(event)"
- value="<%=keyword%>" id="logkeyword"
- size="20" type="text"></td>
+ value="<%=keyword%>" id="logkeyword"
+ size="20" type="text"></td>
<td style="padding-right: 2px !important;">
<a
class="icon-link"
style="background-image: url(images/search.gif);"
href="javascript:searchLogs()">
- </a>
+ </a>
</td>
<td><input type="hidden" id="keyWord"
- name="keyword" value="<%=keyword%>" />
+ name="keyword" value="<%=keyword%>"/>
</td>
<%
- } else if(isManager && !isSuperTenant) {
+ } else if (isManager && !isSuperTenant) {
%>
- <td style="padding-right: 2px !important;"><input onkeypress="submitenterNormalManager(event)"
- value="<%=keyword%>" id="logkeyword"
- size="20" type="text"></td>
+ <td style="padding-right: 2px !important;"><input
+ onkeypress="submitenterNormalManager(event)"
+ value="<%=keyword%>" id="logkeyword"
+ size="20" type="text"></td>
<td style="padding-right: 2px !important;">
<a
class="icon-link"
@@ -372,12 +381,12 @@
href="javascript:searchNormalManager()"></a>
</td>
<td><input type="hidden" id="keyWord"
- name="keyword" value="<%=keyword%>" />
+ name="keyword" value="<%=keyword%>"/>
</td>
<%
- } else if(!isManager) {
- %>
+ } else if (!isManager) {
+ %>
<td style="padding-right: 2px !important;"><input onkeypress="submitenterNormal(event)"
value="<%=keyword%>" id="logkeyword"
size="20" type="text"></td>
@@ -389,13 +398,14 @@
></a>
</td>
<td><input type="hidden" id="keyWord"
- name="keyword" value="<%=keyword%>" />
+ name="keyword" value="<%=keyword%>"/>
</td>
<td style="width: 37%;"></td>
- <td style="padding-right: 2px !important;"><nobr>
- <fmt:message key="current.time" />
- </nobr>
+ <td style="padding-right: 2px !important;">
+ <nobr>
+ <fmt:message key="current.time"/>
+ </nobr>
</td>
<%
SimpleDateFormat dateFormat = new SimpleDateFormat("Z");
@@ -410,237 +420,252 @@
%>
</tr>
-
+
</table>
- </td>
- </tr>
- </tbody>
- </table>
-
-
- <br/>
-
- <table border="1" class="styledLeft">
-
- <tbody>
-
- <tr>
- <td class="formRow">
-
- <table class="styledLeft">
- <thead>
- <tr>
- <th><b><fmt:message key="log.type" />
- </b>
- </th>
- <th><b><fmt:message key="date" />
- </b>
- </th>
- <th colspan="2"><b><fmt:message key="log.message" />
- </b>
- </th>
- </tr>
- </thead>
- <%
- if(!isValidTenant) { %>
- <fmt:message key="invalid.tenant" />
-
- <%} else {
-
-
- if (events == null || events.length == 0 || events[0] == null) {
- %>
- <fmt:message key="no.logs" />
- <%
- } else {
- int index = 0;
- for (LogEvent logMessage : events) {
- index++;
- if (index % 2 != 0) {
- %>
- <tr>
- <%
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+
+ <br/>
+
+ <table border="1" class="styledLeft">
+
+ <tbody>
+
+ <tr>
+ <td class="formRow">
+
+ <table class="styledLeft">
+ <thead>
+ <tr>
+ <th><b><fmt:message key="log.type"/>
+ </b>
+ </th>
+ <th><b><fmt:message key="date"/>
+ </b>
+ </th>
+ <th colspan="2"><b><fmt:message key="log.message"/>
+ </b>
+ </th>
+ </tr>
+ </thead>
+ <%
+ if (!isValidTenant) { %>
+ <fmt:message key="invalid.tenant"/>
+
+ <%
+ } else {
+
+
+ if (events == null || events.length == 0 || events[0] == null) {
+ %>
+ <fmt:message key="no.logs"/>
+ <%
+ } else {
+ int index = 0;
+ for (LogEvent logMessage : events) {
+ index++;
+ if (index % 2 != 0) {
+ %>
+ <tr>
+ <%
} else {
%>
-
- <tr bgcolor="#eeeffb">
- <%
- }
- %>
- <td border-bottom="gray" width="2%"><img
- style="margin-right: 10px;"
- src="<%=logViewerClient.getImageName(logMessage.getPriority().trim())%>">
- </td>
- <td><nobr><%=logMessage.getLogTime()%></nobr></td>
- <td><%=CharacterEncoder.getSafeText(logMessage.getMessage())%></td>
- <%
- String imgId = "traceSymbolMax" + index;
- %>
- <td><a
- class="icon-link"
- style="background-image: url(images/plus.gif);"
- href="javascript:showTrace(<%=index%>)"
- id="<%=imgId%>"></a> <fmt:message
- key="view.stack.trace" /></td>
- </tr>
-
- <%
- String id = "traceTable" + index;
- if (index % 2 != 0) {
- %>
- <tr id="<%=id%>" style="display: none" >
- <%
+
+ <tr bgcolor="#eeeffb">
+ <%
+ }
+ %>
+ <td border-bottom="gray" width="2%"><img
+ style="margin-right: 10px;"
+ src="<%=logViewerClient.getImageName(logMessage.getPriority().trim())%>">
+ </td>
+ <td>
+ <nobr><%=logMessage.getLogTime()%>
+ </nobr>
+ </td>
+ <td><%=CharacterEncoder.getSafeText(logMessage.getMessage())%>
+ </td>
+ <%
+ String imgId = "traceSymbolMax" + index;
+ %>
+ <td><a
+ class="icon-link"
+ style="background-image: url(images/plus.gif);"
+ href="javascript:showTrace(<%=index%>)"
+ id="<%=imgId%>"></a> <fmt:message
+ key="view.stack.trace"/></td>
+ </tr>
+
+ <%
+ String id = "traceTable" + index;
+ if (index % 2 != 0) {
+ %>
+ <tr id="<%=id%>" style="display: none">
+ <%
} else {
%>
-
- <tr id="<%=id%>" style="display: none" bgcolor="#eeeffb">
- <%
- }
- %>
-
- <td colspan="4" width="100%">TID[<%=logMessage.getTenantId()%>] [<%=logMessage.getServerName()%>] [<%=logMessage.getLogTime()%>] <%=logMessage.getPriority().trim()%> {<%=logMessage.getLogger()%>} - <%=CharacterEncoder.getSafeText(logMessage.getMessage())%>
- <%=logMessage.getStacktrace()%><br/>
- </td>
- </tr>
- <%
- }
- }
+
+ <tr id="<%=id%>" style="display: none" bgcolor="#eeeffb">
+ <%
+ }
+ %>
+
+ <td colspan="4" width="100%">TID[<%=logMessage.getTenantId()%>]
+ [<%=logMessage.getServerName()%>] [<%=logMessage.getLogTime()%>
+ ] <%=logMessage.getPriority().trim()%> {<%=logMessage.getLogger()%>}
+ - <%=CharacterEncoder.getSafeText(logMessage.getMessage())%>
+ <%=logMessage.getStacktrace()%><br/>
+ </td>
+ </tr>
+ <%
+ }
+ }
}
- %>
-
- </table>
- <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>"
- page="index.jsp" pageNumberParameterName="pageNumber"
- prevKey="prev" nextKey="next"
- parameters="<%= parameter%>"/>
- </tr>
-
-
- <%
- if (showLogFiles) {
+ %>
+
+ </table>
+ <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>"
+ page="index.jsp" pageNumberParameterName="pageNumber"
+ prevKey="prev" nextKey="next"
+ parameters="<%= parameter%>"/>
+ </tr>
+
+
+ <%
+ if (showLogFiles) {
%>
- <tr>
- <%
- if(showMax) {
- %>
- <td class="middle-header" colspan="2"><a
- class="icon-link"
- style="background-image: url(images/minus.gif);"
- href="javascript:showQueryProperties()"
- id="propertySymbolMax"></a> <fmt:message
- key="archived.logs" /></td>
- <%
- } else {
+ <tr>
+ <%
+ if (showMax) {
+ %>
+ <td class="middle-header" colspan="2"><a
+ class="icon-link"
+ style="background-image: url(images/minus.gif);"
+ href="javascript:showQueryProperties()"
+ id="propertySymbolMax"></a> <fmt:message
+ key="archived.logs"/></td>
+ <%
+ } else {
+
+ %>
+ <td class="middle-header" colspan="2"><a
+ class="icon-link"
+ style="background-image: url(images/plus.gif);"
+ href="javascript:showQueryProperties()"
+ id="propertySymbolMax"></a> <fmt:message
+ key="archived.logs"/></td>
+ <%
+ }
+ %>
+ </tr>
+ <tr id="propertyTable" style="<%=(showMax) ? "" : "display:none"%>">
+
+
+ <td>
- %>
- <td class="middle-header" colspan="2"><a
- class="icon-link"
- style="background-image: url(images/plus.gif);"
- href="javascript:showQueryProperties()"
- id="propertySymbolMax"></a> <fmt:message
- key="archived.logs" /></td>
- <%
- }
- %>
- </tr>
- <tr id="propertyTable" style="<%=(showMax) ? "" : "display:none"%>">
-
-
- <td>
-
-
-
- <table border="1" class="styledLeft">
-
- <tbody>
-
- <tr>
- <td class="formRow">
- <table class="styledLeft">
- <thead>
- <tr>
- <th><b><fmt:message key="file.name" /> </b></th>
- <th><b><fmt:message key="date" /> </b></th>
- <th><b><fmt:message key="file.size" /> </b></th>
- <th><b><fmt:message key="action" /> </b></th>
- </tr>
- </thead>
- <%
- int index = -1;
- for (LogInfo logMessage : logInfo) {
- ++index;
- if (index % 2 != 0) {
- %>
- <tr>
- <%
- } else {
- %>
-
- <tr bgcolor="#eeeffb">
- <%
- }
- if (logMessage.getLogName().trim().equalsIgnoreCase("NO_LOG_FILES")) {
- %>
- <td colspan="4"><fmt:message key="no.logs" /></td>
- <%
+ <table border="1" class="styledLeft">
+
+ <tbody>
+
+ <tr>
+ <td class="formRow">
+ <table class="styledLeft">
+ <thead>
+ <tr>
+ <th><b><fmt:message key="file.name"/> </b></th>
+ <th><b><fmt:message key="date"/> </b></th>
+ <th><b><fmt:message key="file.size"/> </b></th>
+ <th><b><fmt:message key="action"/> </b></th>
+ </tr>
+ </thead>
+ <%
+ int index = -1;
+ for (LogInfo logMessage : logInfo) {
+ ++index;
+ if (index % 2 != 0) {
+ %>
+ <tr>
+ <%
} else {
- String logFile = logMessage.getLogName();
- String logDate = logMessage.getLogDate();
- String logSize = logMessage.getFileSize();
%>
- <td><%=logFile%></td>
- <td><%=logDate%></td>
- <td><%=logSize%></td>
- <td>
- <%
- if (isArchiveFile(logFile)) {
- %>
- <a class="icon-link"
- style="background-image: url(images/download.gif);"
- onclick="startDownload()"
- href="downloadgz-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
- key="download" /> </a>
- <%
- } else {
- %>
- <a class="icon-link"
- style="background-image: url(images/download.gif);"
- onclick="startDownload()"
- href="download-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
- key="download" /> </a>
- <%
- }
- %>
- </td>
-
- <%
- }
- %>
+ <tr bgcolor="#eeeffb">
+ <%
+ }
+ if (logMessage.getLogName().trim().equalsIgnoreCase("NO_LOG_FILES")) {
+ %>
+
+ <td colspan="4"><fmt:message key="no.logs"/></td>
+ <%
+ } else {
+ String logFile = logMessage.getLogName();
+ String logDate = logMessage.getLogDate();
+ String logSize = logMessage.getFileSize();
+ %>
+
+ <td><%=logFile%>
+ </td>
+ <td><%=logDate%>
+ </td>
+ <td><%=logSize%>
+ </td>
+ <td>
+ <%
+ if (isArchiveFile(logFile)) {
+ %>
+ <a class="icon-link"
+ style="background-image: url(images/download.gif);"
+ onclick="startDownload()"
+ href="downloadgz-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
+ key="download"/> </a>
+ <%
+ } else {
+ %>
+ <a class="icon-link"
+ style="background-image: url(images/download.gif);"
+ onclick="startDownload()"
+ href="download-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
+ key="download"/> </a>
+ <%
+ }
+ %>
+ </td>
+
+ <%
+ }
+ %>
+
+ </tr>
+
+ <%
+ }
+ %>
+ </table>
+ <carbon:paginator pageNumber="<%=pageIndexNumber%>"
+ numberOfPages="<%=numberOfIndexPages%>"
+ page="index.jsp" pageNumberParameterName="pageIndexNumber"
+ prevKey="prev" nextKey="next"
+ parameters="<%=indexParameter%>"/>
+ </td>
+ </tr>
- </tr>
-
- <%
- }
- %>
- </table>
- <carbon:paginator pageNumber="<%=pageIndexNumber%>" numberOfPages="<%=numberOfIndexPages%>"
- page="index.jsp" pageNumberParameterName="pageIndexNumber"
- prevKey="prev" nextKey="next"
- parameters="<%=indexParameter%>"/>
- </td>
- </tr>
-
- </tbody></table></td></tr>
-
- <%
- }
- %>
- </tbody></table>
- </div>
- </div>
- </fmt:bundle>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+
+ <%
+ }
+ %>
+ </tbody>
+ </table>
+ </div>
+ </div>
+</fmt:bundle>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/index_old.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/index_old.jsp b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/index_old.jsp
index d854cf1..48aeb71 100755
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/index_old.jsp
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/index_old.jsp
@@ -1,20 +1,20 @@
<!--
- 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.
+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.
-->
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
@@ -54,65 +54,68 @@
} catch (Exception e) {
CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request, e);
%>
- <script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
+<script type="text/javascript">
+ location.href = "../admin/error.jsp";
+</script>
<%
return;
}
%>
<fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
-<carbon:breadcrumb label="system.logs"
- resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
- topPage="true" request="<%=request%>" />
+ <carbon:breadcrumb label="system.logs"
+ resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
+ topPage="true" request="<%=request%>"/>
<div id="middle">
<h2><fmt:message key="system.logs"/></h2>
<div id="workArea">
-
- <table border="0" class="styledLeft">
- <tbody>
- <tr>
- <td>
- <table class="normal">
+
+ <table border="0" class="styledLeft">
+ <tbody>
+ <tr>
+ <td>
+ <table class="normal">
<tr>
- <td><fmt:message key="view"/></td>
- <td><select class="log-select" id="logLevelID"
- onchange="javascript:viewSingleLogLevel(); return false;">
- <%
- String[] logLevels = logViewerClient.getLogLevels();
- if(keyword != null){
- type = "Custom";
- %>
+ <td><fmt:message key="view"/></td>
+ <td><select class="log-select" id="logLevelID"
+ onchange="javascript:viewSingleLogLevel(); return false;">
+ <%
+ String[] logLevels = logViewerClient.getLogLevels();
+ if (keyword != null) {
+ type = "Custom";
+ %>
- <option value="<%=type%>" selected="true"><%=type%></option>
+ <option value="<%=type%>" selected="true"><%=type%>
+ </option>
- <%
- }
- for (String logLevel : logLevels) {
- if (logLevel.equals(type)) {
- %>
+ <%
+ }
+ for (String logLevel : logLevels) {
+ if (logLevel.equals(type)) {
+ %>
- <option value="<%=logLevel%>" selected="true"><%=logLevel%></option>
+ <option value="<%=logLevel%>" selected="true"><%=logLevel%>
+ </option>
- <%
- } else {
- %>
+ <%
+ } else {
+ %>
- <option value="<%=logLevel%>"><%=logLevel%></option>
+ <option value="<%=logLevel%>"><%=logLevel%>
+ </option>
- <% }
- }
- %>
- </select></td>
- <td style="width: 100%;"></td>
- <td>
- <nobr><fmt:message key="search.logs"/></nobr>
- </td>
+ <% }
+ }
+ %>
+ </select></td>
+ <td style="width: 100%;"></td>
+ <td>
+ <nobr><fmt:message key="search.logs"/></nobr>
+ </td>
<td style="padding-right: 2px !important;">
<input onkeypress="submitenter(event)" value="" class="log-select"
- size="40" id="logkeyword" type="text"></td>
+ size="40" id="logkeyword" type="text"></td>
<td style="padding-left: 0px !important;"><input type="button"
value="Search"
onclick="javascript:searchLog(); return false;"
@@ -120,81 +123,82 @@
</td>
</tr>
</table>
- </td>
- </tr>
- </tbody>
- </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
- <br/>
- <table border="1" class="styledLeft">
- <tbody>
- <tr>
- <td class="formRow">
- <table class="styledLeft">
+ <br/>
+ <table border="1" class="styledLeft">
+ <tbody>
+ <tr>
+ <td class="formRow">
+ <table class="styledLeft">
- <%
+ <%
int index = -1;
for (LogMessage logMessage : logMessages) {
++index;
if (index % 2 != 0) {
- %>
- <tr>
- <%
+ %>
+ <tr>
+ <%
} else {
%>
- <tr bgcolor="#eeeffb">
- <%
- }
+ <tr bgcolor="#eeeffb">
+ <%
+ }
- String logLevel = logMessage.getType();
- if (logLevel == null || logLevel.equals("")) {
- %>
+ String logLevel = logMessage.getType();
+ if (logLevel == null || logLevel.equals("")) {
+ %>
<td border-bottom="gray" width="2%"></td>
- <%
- } else {
- %>
+ <%
+ } else {
+ %>
<td border-bottom="gray" width="2%">
<img style="margin-right: 10px;"
- src="<%=logViewerClient.getImageName(logMessage.getType())%>">
- </td>
- <%
- }
- %>
- <td>
+ src="<%=logViewerClient.getImageName(logMessage.getType())%>">
+ </td>
<%
- if(logMessage.getLogMessage().equalsIgnoreCase("NO_LOGS")) {
+ }
%>
- <fmt:message key="no.logs"/>
- <%
+ <td>
+ <%
+ if (logMessage.getLogMessage().equalsIgnoreCase("NO_LOGS")) {
+ %>
+ <fmt:message key="no.logs"/>
+ <%
} else {
- %>
- <%=logMessage.getLogMessage()%>
- <% } %>
- </td>
- </tr>
-
- <%
- }
- %>
- </table>
- </td>
- </tr>
-
- <tr>
- <td class="buttonRow">
- <input onclick="javascript:clearLogEntries('<fmt:message key="clear.all.log.message"/>?');return false;"
- value="<fmt:message key="clear.all"/>" class="button"
- name="clearLogs" type="button">
- </td>
- </tr>
-
- </tbody>
- </table>
- </div>
+ %>
+ <%=logMessage.getLogMessage()%>
+ <% } %>
+ </td>
+ </tr>
+
+ <%
+ }
+ %>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="buttonRow">
+ <input onclick="javascript:clearLogEntries('<fmt:message
+ key="clear.all.log.message"/>?');return false;"
+ value="<fmt:message key="clear.all"/>" class="button"
+ name="clearLogs" type="button">
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
+ </div>
</div>
</fmt:bundle>
[02/16] stratos git commit: Formatting Kubernetes client module
Posted by la...@apache.org.
Formatting Kubernetes client module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/88ae13e8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/88ae13e8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/88ae13e8
Branch: refs/heads/master
Commit: 88ae13e82f8667d3d876eb42ee29db0c8cbab480
Parents: 6952466
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:43:32 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:43:32 2015 +0530
----------------------------------------------------------------------
.../kubernetes/client/KubernetesApiClient.java | 18 +-
.../exceptions/KubernetesClientException.java | 12 +-
.../KubernetesAPIClientInterface.java | 234 +++++++++---------
.../kubernetes/client/model/Container.java | 178 +++++++-------
.../client/model/EnvironmentVariable.java | 43 ++--
.../stratos/kubernetes/client/model/Labels.java | 24 +-
.../kubernetes/client/model/Manifest.java | 80 +++---
.../stratos/kubernetes/client/model/Pod.java | 242 +++++++++----------
.../kubernetes/client/model/PodList.java | 62 ++---
.../stratos/kubernetes/client/model/Policy.java | 22 +-
.../stratos/kubernetes/client/model/Port.java | 82 ++++---
.../client/model/ReplicationController.java | 164 ++++++-------
.../client/model/ReplicationControllerList.java | 62 ++---
.../kubernetes/client/model/Selector.java | 24 +-
.../kubernetes/client/model/Service.java | 204 ++++++++--------
.../kubernetes/client/model/ServiceList.java | 62 ++---
.../stratos/kubernetes/client/model/State.java | 179 ++++++++------
.../stratos/kubernetes/client/model/Volume.java | 26 +-
.../kubernetes/client/model/VolumeMount.java | 64 ++---
.../kubernetes/client/rest/HttpResponse.java | 5 +
.../client/rest/KubernetesResponseHandler.java | 6 +-
.../kubernetes/client/rest/RestClient.java | 66 ++---
.../stratos/kubernetes/client/LiveTests.java | 2 +-
.../stratos/kubernetes/client/UnitTests.java | 2 +-
.../client/live/AbstractLiveTest.java | 18 +-
.../client/live/KubernetesClusterCleanTest.java | 12 +-
.../kubernetes/client/unit/PodUnitTest.java | 42 ++--
27 files changed, 1003 insertions(+), 932 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
index f8f7c63..aec99eb 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
@@ -50,10 +50,11 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
/**
* Create new pod
- * @param podId Identifier of the pod
- * @param podLabel Pod name to be used by the pod label
- * @param dockerImage Docker image to be used by the pod
- * @param ports Ports exposed by the pod
+ *
+ * @param podId Identifier of the pod
+ * @param podLabel Pod name to be used by the pod label
+ * @param dockerImage Docker image to be used by the pod
+ * @param ports Ports exposed by the pod
* @param environmentVariables Environment variables to be passed to the pod
* @throws KubernetesClientException
*/
@@ -500,9 +501,10 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
/**
* Create kubernetes service
- * @param serviceId Service id
- * @param serviceLabel Service name to be used by the label name
- * @param servicePort Port to be exposed by the service
+ *
+ * @param serviceId Service id
+ * @param serviceLabel Service name to be used by the label name
+ * @param servicePort Port to be exposed by the service
* @param containerPortName Container port name defined in the port label
* @param publicIPs
* @throws KubernetesClientException
@@ -742,7 +744,7 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
}
private String extractMessageInResponse(HttpResponse response) {
- if((response != null) && (response.getKubernetesResponse() != null)) {
+ if ((response != null) && (response.getKubernetesResponse() != null)) {
return response.getKubernetesResponse().getMessage();
} else {
return "";
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/exceptions/KubernetesClientException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/exceptions/KubernetesClientException.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/exceptions/KubernetesClientException.java
index 20702f4..45ec67f 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/exceptions/KubernetesClientException.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/exceptions/KubernetesClientException.java
@@ -22,23 +22,23 @@ package org.apache.stratos.kubernetes.client.exceptions;
public class KubernetesClientException extends Exception {
- private static final long serialVersionUID = -7521673271244696906L;
+ private static final long serialVersionUID = -7521673271244696906L;
private String message;
- public KubernetesClientException(String message, Exception exception){
+ public KubernetesClientException(String message, Exception exception) {
super(message, exception);
this.message = message;
}
- public KubernetesClientException(Exception exception){
+ public KubernetesClientException(Exception exception) {
super(exception);
}
-
- public KubernetesClientException(String msg){
+
+ public KubernetesClientException(String msg) {
super(msg);
this.message = msg;
}
-
+
@Override
public String getMessage() {
return this.message;
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
index 80d4b52..739677e 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
@@ -28,124 +28,138 @@ import java.util.List;
public interface KubernetesAPIClientInterface {
- /**
- * Create pod.
- * @param podId
- * @param podLabel
- * @param dockerImage
- * @param ports
- * @throws KubernetesClientException
- */
- public void createPod(String podId, String podLabel, String dockerImage, List<Port> ports,
+ /**
+ * Create pod.
+ *
+ * @param podId
+ * @param podLabel
+ * @param dockerImage
+ * @param ports
+ * @throws KubernetesClientException
+ */
+ public void createPod(String podId, String podLabel, String dockerImage, List<Port> ports,
EnvironmentVariable[] environmentVariables)
- throws KubernetesClientException;
-
- /**
- * Get information of a Pod given the PodID
- * @param podId id of the pod
- * @return {@link Pod}
- * @throws KubernetesClientException
- */
- public Pod getPod(String podId) throws KubernetesClientException;
-
- /**
- * Get all Pods
- * @return Pods
- * @throws KubernetesClientException
- */
- public List<Pod> getPods() throws KubernetesClientException;
-
- /**
- * Run a label query and retrieve a sub set of Pods.
- * @param labels of labels for the label query
- * @return Pods selected Pods by executing the label query.
- * @throws KubernetesClientException
- */
- public List<Pod> queryPods(Labels[] labels) throws KubernetesClientException;
-
- /**
- * Delete a Pod
- * @param podId Id of the Pod to be deleted
- * @throws KubernetesClientException
- */
- public void deletePod(String podId) throws KubernetesClientException;
-
- /**
- * Create replication controller.
- * @param replicationControllerId
- * @param replicationControllerName
- * @param dockerImage
- * @param ports
- * @param replicas
- * @throws KubernetesClientException
- */
- public void createReplicationController(String replicationControllerId,
+ throws KubernetesClientException;
+
+ /**
+ * Get information of a Pod given the PodID
+ *
+ * @param podId id of the pod
+ * @return {@link Pod}
+ * @throws KubernetesClientException
+ */
+ public Pod getPod(String podId) throws KubernetesClientException;
+
+ /**
+ * Get all Pods
+ *
+ * @return Pods
+ * @throws KubernetesClientException
+ */
+ public List<Pod> getPods() throws KubernetesClientException;
+
+ /**
+ * Run a label query and retrieve a sub set of Pods.
+ *
+ * @param labels of labels for the label query
+ * @return Pods selected Pods by executing the label query.
+ * @throws KubernetesClientException
+ */
+ public List<Pod> queryPods(Labels[] labels) throws KubernetesClientException;
+
+ /**
+ * Delete a Pod
+ *
+ * @param podId Id of the Pod to be deleted
+ * @throws KubernetesClientException
+ */
+ public void deletePod(String podId) throws KubernetesClientException;
+
+ /**
+ * Create replication controller.
+ *
+ * @param replicationControllerId
+ * @param replicationControllerName
+ * @param dockerImage
+ * @param ports
+ * @param replicas
+ * @throws KubernetesClientException
+ */
+ public void createReplicationController(String replicationControllerId,
String replicationControllerName,
String dockerImage,
List<Port> ports,
EnvironmentVariable[] environmentVariables,
int replicas) throws KubernetesClientException;
- /**
- * Get a Replication Controller Info
- * @param controllerId id of the Replication Controller
- * @return {@link ReplicationController}
- * @throws KubernetesClientException
- */
- public ReplicationController getReplicationController(String controllerId) throws KubernetesClientException;
-
- /**
- * Get all Replication Controllers.
- * @return {@link ReplicationController}s
- * @throws KubernetesClientException
- */
- public List<ReplicationController> getReplicationControllers() throws KubernetesClientException;
-
- /**
- * Update a Replication Controller (update the number of replicas).
- * @param replicationController replication controller to be updated
- * @throws KubernetesClientException
- */
- public void updateReplicationController(ReplicationController replicationController) throws KubernetesClientException;
-
- /**
- * Delete a Replication Controller.
- * @param replicationControllerId controller id controller id to be deleted.
- * @throws KubernetesClientException
- */
- public void deleteReplicationController(String replicationControllerId) throws KubernetesClientException;
-
- /**
- * Create service.
- * @param serviceId
- * @param serviceLabel
- * @param servicePort
- * @param containerPortName
- * @param publicIPs
+ /**
+ * Get a Replication Controller Info
+ *
+ * @param controllerId id of the Replication Controller
+ * @return {@link ReplicationController}
+ * @throws KubernetesClientException
+ */
+ public ReplicationController getReplicationController(String controllerId) throws KubernetesClientException;
+
+ /**
+ * Get all Replication Controllers.
+ *
+ * @return {@link ReplicationController}s
+ * @throws KubernetesClientException
+ */
+ public List<ReplicationController> getReplicationControllers() throws KubernetesClientException;
+
+ /**
+ * Update a Replication Controller (update the number of replicas).
+ *
+ * @param replicationController replication controller to be updated
+ * @throws KubernetesClientException
+ */
+ public void updateReplicationController(ReplicationController replicationController) throws KubernetesClientException;
+
+ /**
+ * Delete a Replication Controller.
+ *
+ * @param replicationControllerId controller id controller id to be deleted.
+ * @throws KubernetesClientException
+ */
+ public void deleteReplicationController(String replicationControllerId) throws KubernetesClientException;
+
+ /**
+ * Create service.
+ *
+ * @param serviceId
+ * @param serviceLabel
+ * @param servicePort
+ * @param containerPortName
+ * @param publicIPs
* @throws KubernetesClientException
- */
- public void createService(String serviceId, String serviceLabel, int servicePort,
+ */
+ public void createService(String serviceId, String serviceLabel, int servicePort,
String containerPortName, String[] publicIPs) throws KubernetesClientException;
- /**
- * Get the Service with the given id.
- * @param serviceId id of the service.
- * @return {@link Service}
- * @throws KubernetesClientException
- */
- public Service getService(String serviceId) throws KubernetesClientException;
-
- /**
- * Get services.
- * @return array of {@link Service}s
- * @throws KubernetesClientException
- */
- public List<Service> getServices() throws KubernetesClientException;
-
- /**
- * Delete a service.
- * @param serviceId service id to be deleted.
- * @throws KubernetesClientException
- */
- public void deleteService(String serviceId) throws KubernetesClientException;
+ /**
+ * Get the Service with the given id.
+ *
+ * @param serviceId id of the service.
+ * @return {@link Service}
+ * @throws KubernetesClientException
+ */
+ public Service getService(String serviceId) throws KubernetesClientException;
+
+ /**
+ * Get services.
+ *
+ * @return array of {@link Service}s
+ * @throws KubernetesClientException
+ */
+ public List<Service> getServices() throws KubernetesClientException;
+
+ /**
+ * Delete a service.
+ *
+ * @param serviceId service id to be deleted.
+ * @throws KubernetesClientException
+ */
+ public void deleteService(String serviceId) throws KubernetesClientException;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
index dd10493..f8353ca 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
@@ -28,93 +28,93 @@ import org.apache.commons.lang3.ArrayUtils;
public class Container {
- private String name;
- private String image;
- private String workingDir;
- private String[] command;
- private VolumeMount[] volumeMounts;
- private List<Port> ports;
- private String imagePullPolicy;
- private EnvironmentVariable[] env;
-
- public Container() {
- ports = new ArrayList<Port>();
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getImage() {
- return image;
- }
-
- public void setImage(String image) {
- this.image = image;
- }
-
- public String getWorkingDir() {
- return workingDir;
- }
-
- public void setWorkingDir(String workingDir) {
- this.workingDir = workingDir;
- }
-
- public String[] getCommand() {
- return command;
- }
-
- public void setCommand(String[] command) {
- this.command = ArrayUtils.clone(command);
- }
-
- public VolumeMount[] getVolumeMounts() {
- return volumeMounts;
- }
-
- public void setVolumeMounts(VolumeMount[] volumeMounts) {
- this.volumeMounts = ArrayUtils.clone(volumeMounts);
- }
-
- public List<Port> getPorts() {
- return ports;
- }
-
- public void addPort(Port port) {
- this.ports.add(port);
- }
-
- public void setPorts(List<Port> ports) {
- this.ports = ports;
- }
-
- public EnvironmentVariable[] getEnv() {
- return env;
- }
-
- public void setEnv(EnvironmentVariable[] env) {
- this.env = ArrayUtils.clone(env);
- }
-
- @Override
- public String toString() {
- return "Container [name=" + name + ", image=" + image + ", workingDir="
- + workingDir + ", command=" + Arrays.toString(command)
- + ", volumeMounts=" + Arrays.toString(volumeMounts)
- + ", ports=" + ports + ", env="
- + Arrays.toString(env) + "]";
- }
-
- public String getImagePullPolicy() {
- return imagePullPolicy;
- }
-
- public void setImagePullPolicy(String imagePullPolicy) {
- this.imagePullPolicy = imagePullPolicy;
- }
+ private String name;
+ private String image;
+ private String workingDir;
+ private String[] command;
+ private VolumeMount[] volumeMounts;
+ private List<Port> ports;
+ private String imagePullPolicy;
+ private EnvironmentVariable[] env;
+
+ public Container() {
+ ports = new ArrayList<Port>();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getImage() {
+ return image;
+ }
+
+ public void setImage(String image) {
+ this.image = image;
+ }
+
+ public String getWorkingDir() {
+ return workingDir;
+ }
+
+ public void setWorkingDir(String workingDir) {
+ this.workingDir = workingDir;
+ }
+
+ public String[] getCommand() {
+ return command;
+ }
+
+ public void setCommand(String[] command) {
+ this.command = ArrayUtils.clone(command);
+ }
+
+ public VolumeMount[] getVolumeMounts() {
+ return volumeMounts;
+ }
+
+ public void setVolumeMounts(VolumeMount[] volumeMounts) {
+ this.volumeMounts = ArrayUtils.clone(volumeMounts);
+ }
+
+ public List<Port> getPorts() {
+ return ports;
+ }
+
+ public void addPort(Port port) {
+ this.ports.add(port);
+ }
+
+ public void setPorts(List<Port> ports) {
+ this.ports = ports;
+ }
+
+ public EnvironmentVariable[] getEnv() {
+ return env;
+ }
+
+ public void setEnv(EnvironmentVariable[] env) {
+ this.env = ArrayUtils.clone(env);
+ }
+
+ @Override
+ public String toString() {
+ return "Container [name=" + name + ", image=" + image + ", workingDir="
+ + workingDir + ", command=" + Arrays.toString(command)
+ + ", volumeMounts=" + Arrays.toString(volumeMounts)
+ + ", ports=" + ports + ", env="
+ + Arrays.toString(env) + "]";
+ }
+
+ public String getImagePullPolicy() {
+ return imagePullPolicy;
+ }
+
+ public void setImagePullPolicy(String imagePullPolicy) {
+ this.imagePullPolicy = imagePullPolicy;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/EnvironmentVariable.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/EnvironmentVariable.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/EnvironmentVariable.java
index 4fb9ab7..0515b5e 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/EnvironmentVariable.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/EnvironmentVariable.java
@@ -22,24 +22,27 @@ package org.apache.stratos.kubernetes.client.model;
public class EnvironmentVariable {
- private String name;
- private String value;
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getValue() {
- return value;
- }
- public void setValue(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "EnvironmentVariable [name=" + name + ", value=" + value + "]";
- }
+ private String name;
+ private String value;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return "EnvironmentVariable [name=" + name + ", value=" + value + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Labels.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Labels.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Labels.java
index 59abcdc..4ced7d1 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Labels.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Labels.java
@@ -27,20 +27,20 @@ import java.io.Serializable;
*/
public class Labels implements Serializable {
- private static final long serialVersionUID = -9019445613544931617L;
+ private static final long serialVersionUID = -9019445613544931617L;
- private String name;
+ private String name;
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- @Override
- public String toString() {
- return "Label [name=" + name + "]";
- }
+ @Override
+ public String toString() {
+ return "Label [name=" + name + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
index c4c850e..c487921 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
@@ -28,58 +28,56 @@ import org.apache.commons.lang3.ArrayUtils;
/**
* https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/doc/manifest-schema.json
- *
- *
*/
public class Manifest {
- private String version;
- private String id;
- private List<Container> containers;
- private List<Volume> volumes;
+ private String version;
+ private String id;
+ private List<Container> containers;
+ private List<Volume> volumes;
+
+ public Manifest() {
+ containers = new ArrayList<Container>();
+ volumes = new ArrayList<Volume>();
+ }
- public Manifest() {
- containers = new ArrayList<Container>();
- volumes = new ArrayList<Volume>();
- }
+ public String getVersion() {
+ return version;
+ }
- public String getVersion() {
- return version;
- }
+ public void setVersion(String version) {
+ this.version = version;
+ }
- public void setVersion(String version) {
- this.version = version;
- }
+ public String getId() {
+ return id;
+ }
- public String getId() {
- return id;
- }
+ public void setId(String id) {
+ this.id = id;
+ }
- public void setId(String id) {
- this.id = id;
- }
+ public List<Container> getContainers() {
+ return containers;
+ }
- public List<Container> getContainers() {
- return containers;
- }
+ public void addContainer(Container container) {
+ containers.add(container);
+ }
- public void addContainer(Container container) {
- containers.add(container);
- }
+ public List<Volume> getVolumes() {
+ return volumes;
+ }
- public List<Volume> getVolumes() {
- return volumes;
- }
+ public void addVolume(Volume volume) {
+ volumes.add(volume);
+ }
- public void addVolume(Volume volume) {
- volumes.add(volume);
- }
+ @Override
+ public String toString() {
+ return "Manifest [version=" + version + ", id=" + id + ", containers="
+ + containers + ", volumes="
+ + volumes + "]";
+ }
- @Override
- public String toString() {
- return "Manifest [version=" + version + ", id=" + id + ", containers="
- + containers + ", volumes="
- + volumes + "]";
- }
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java
index 4547db5..9292b4f 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java
@@ -24,131 +24,130 @@ import javax.xml.bind.annotation.XmlRootElement;
/**
* https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/doc/pod-schema.json
- *
- *
*/
@XmlRootElement
public class Pod {
- private String kind;
- private String id;
- private String creationTimestamp;
- private String selfLink;
- private String resourceVersion;
- private String apiVersion;
- private State desiredState;
- private State currentState;
- private String status;
- private String message;
- private String code;
- private Labels labels;
-
- public String getKind() {
- return kind;
- }
-
- public void setKind(String kind) {
- this.kind = kind;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCreationTimestamp() {
- return creationTimestamp;
- }
-
- public void setCreationTimestamp(String creationTimestamp) {
- this.creationTimestamp = creationTimestamp;
- }
-
- public String getSelfLink() {
- return selfLink;
- }
-
- public void setSelfLink(String selfLink) {
- this.selfLink = selfLink;
- }
-
- public State getDesiredState() {
- return desiredState;
- }
-
- public void setDesiredState(State desiredState) {
- this.desiredState = desiredState;
- }
-
- public State getCurrentState() {
- return currentState;
- }
-
- public void setCurrentState(State currentState) {
- this.currentState = currentState;
- }
-
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- public void setResourceVersion(String resourceVersion) {
- this.resourceVersion = resourceVersion;
- }
-
- public String getApiVersion() {
- return apiVersion;
- }
-
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
-
- public Labels getLabels() {
- return labels;
- }
-
- public void setLabels(Labels labels) {
- this.labels = labels;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- @Override
- public String toString() {
- return "Pod [kind=" + kind + ", id=" + id + ", creationTimestamp="
- + creationTimestamp + ", selfLink=" + selfLink
- + ", resourceVersion=" + resourceVersion + ", apiVersion="
- + apiVersion + ", desiredState=" + desiredState
- + ", currentState=" + currentState + ", status=" + status
- + ", message=" + message + ", code=" + code + ", labels="
- + labels + "]";
- }
+ private String kind;
+ private String id;
+ private String creationTimestamp;
+ private String selfLink;
+ private String resourceVersion;
+ private String apiVersion;
+ private State desiredState;
+ private State currentState;
+ private String status;
+ private String message;
+ private String code;
+ private Labels labels;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCreationTimestamp() {
+ return creationTimestamp;
+ }
+
+ public void setCreationTimestamp(String creationTimestamp) {
+ this.creationTimestamp = creationTimestamp;
+ }
+
+ public String getSelfLink() {
+ return selfLink;
+ }
+
+ public void setSelfLink(String selfLink) {
+ this.selfLink = selfLink;
+ }
+
+ public State getDesiredState() {
+ return desiredState;
+ }
+
+ public void setDesiredState(State desiredState) {
+ this.desiredState = desiredState;
+ }
+
+ public State getCurrentState() {
+ return currentState;
+ }
+
+ public void setCurrentState(State currentState) {
+ this.currentState = currentState;
+ }
+
+ public String getResourceVersion() {
+ return resourceVersion;
+ }
+
+ public void setResourceVersion(String resourceVersion) {
+ this.resourceVersion = resourceVersion;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public Labels getLabels() {
+ return labels;
+ }
+
+ public void setLabels(Labels labels) {
+ this.labels = labels;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ @Override
+ public String toString() {
+ return "Pod [kind=" + kind + ", id=" + id + ", creationTimestamp="
+ + creationTimestamp + ", selfLink=" + selfLink
+ + ", resourceVersion=" + resourceVersion + ", apiVersion="
+ + apiVersion + ", desiredState=" + desiredState
+ + ", currentState=" + currentState + ", status=" + status
+ + ", message=" + message + ", code=" + code + ", labels="
+ + labels + "]";
+ }
+
@Override
public int hashCode() {
final int prime = 31;
@@ -156,6 +155,7 @@ public class Pod {
result = prime * result + ((id == null) ? 0 : id.hashCode());
return result;
}
+
@Override
public boolean equals(Object obj) {
if (this == obj)
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
index 1fc22fb..95dfaf9 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
@@ -29,32 +29,38 @@ import org.apache.commons.lang3.ArrayUtils;
@XmlRootElement
public class PodList {
- private String kind;
- private String apiVersion;
- private Pod[] items;
-
- public String getKind() {
- return kind;
- }
- public void setKind(String kind) {
- this.kind = kind;
- }
- public String getApiVersion() {
- return apiVersion;
- }
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
- public Pod[] getItems() {
- return items;
- }
- public void setItems(Pod[] items) {
- this.items = ArrayUtils.clone(items);
- }
- @Override
- public String toString() {
- return "PodList [kind=" + kind + ", apiVersion=" + apiVersion
- + ", items=" + Arrays.toString(items) + "]";
- }
-
+ private String kind;
+ private String apiVersion;
+ private Pod[] items;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public Pod[] getItems() {
+ return items;
+ }
+
+ public void setItems(Pod[] items) {
+ this.items = ArrayUtils.clone(items);
+ }
+
+ @Override
+ public String toString() {
+ return "PodList [kind=" + kind + ", apiVersion=" + apiVersion
+ + ", items=" + Arrays.toString(items) + "]";
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java
index 9b43c2f..9e0f951 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java
@@ -22,18 +22,18 @@ package org.apache.stratos.kubernetes.client.model;
public class Policy {
- private String type;
+ private String type;
- public String getType() {
- return type;
- }
+ public String getType() {
+ return type;
+ }
- public void setType(String type) {
- this.type = type;
- }
+ public void setType(String type) {
+ this.type = type;
+ }
- @Override
- public String toString() {
- return "Policy [type=" + type + "]";
- }
+ @Override
+ public String toString() {
+ return "Policy [type=" + type + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java
index b59ad15..616da09 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java
@@ -22,41 +22,49 @@ package org.apache.stratos.kubernetes.client.model;
public class Port {
- private String name;
- private String protocol;
- private int containerPort;
- private int hostPort;
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getProtocol() {
- return protocol;
- }
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
- public int getContainerPort() {
- return containerPort;
- }
- public void setContainerPort(int containerPort) {
- this.containerPort = containerPort;
- }
- public int getHostPort() {
- return hostPort;
- }
- public void setHostPort(int hostPort) {
- this.hostPort = hostPort;
- }
- @Override
- public String toString() {
- return "Port [name=" + name + ", protocol=" + protocol
- + ", containerPort=" + containerPort + ", hostPort=" + hostPort
- + "]";
- }
-
-
+ private String name;
+ private String protocol;
+ private int containerPort;
+ private int hostPort;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public int getContainerPort() {
+ return containerPort;
+ }
+
+ public void setContainerPort(int containerPort) {
+ this.containerPort = containerPort;
+ }
+
+ public int getHostPort() {
+ return hostPort;
+ }
+
+ public void setHostPort(int hostPort) {
+ this.hostPort = hostPort;
+ }
+
+ @Override
+ public String toString() {
+ return "Port [name=" + name + ", protocol=" + protocol
+ + ", containerPort=" + containerPort + ", hostPort=" + hostPort
+ + "]";
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
index a8a757e..df9d2e4 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
@@ -31,86 +31,86 @@ import java.util.List;
@XmlRootElement
public class ReplicationController {
- private String kind;
- private String id;
- private int resourceVersion;
- private String creationTimestamp;
- private String selfLink;
- private String apiVersion;
- private Labels labels;
- private State desiredState;
-
- public String getKind() {
- return kind;
- }
-
- public void setKind(String kind) {
- this.kind = kind;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCreationTimestamp() {
- return creationTimestamp;
- }
-
- public void setCreationTimestamp(String creationTimestamp) {
- this.creationTimestamp = creationTimestamp;
- }
-
- public String getSelfLink() {
- return selfLink;
- }
-
- public void setSelfLink(String selfLink) {
- this.selfLink = selfLink;
- }
-
- public Labels getLabels() {
- return labels;
- }
-
- public void setLabels(Labels labels) {
- this.labels = labels;
- }
-
- public State getDesiredState() {
- return desiredState;
- }
-
- public void setDesiredState(State desiredState) {
- this.desiredState = desiredState;
- }
-
- public String getApiVersion() {
- return apiVersion;
- }
-
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
-
- public int getResourceVersion() {
- return resourceVersion;
- }
-
- public void setResourceVersion(int resourceVersion) {
- this.resourceVersion = resourceVersion;
- }
-
- @Override
- public String toString() {
- return "ReplicationController [kind=" + kind + ", id=" + id
- + ", resourceVersion=" + resourceVersion
- + ", creationTimestamp=" + creationTimestamp + ", selfLink="
- + selfLink + ", apiVersion=" + apiVersion + ", labels="
- + labels + ", desiredState=" + desiredState + "]";
- }
-
+ private String kind;
+ private String id;
+ private int resourceVersion;
+ private String creationTimestamp;
+ private String selfLink;
+ private String apiVersion;
+ private Labels labels;
+ private State desiredState;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCreationTimestamp() {
+ return creationTimestamp;
+ }
+
+ public void setCreationTimestamp(String creationTimestamp) {
+ this.creationTimestamp = creationTimestamp;
+ }
+
+ public String getSelfLink() {
+ return selfLink;
+ }
+
+ public void setSelfLink(String selfLink) {
+ this.selfLink = selfLink;
+ }
+
+ public Labels getLabels() {
+ return labels;
+ }
+
+ public void setLabels(Labels labels) {
+ this.labels = labels;
+ }
+
+ public State getDesiredState() {
+ return desiredState;
+ }
+
+ public void setDesiredState(State desiredState) {
+ this.desiredState = desiredState;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public int getResourceVersion() {
+ return resourceVersion;
+ }
+
+ public void setResourceVersion(int resourceVersion) {
+ this.resourceVersion = resourceVersion;
+ }
+
+ @Override
+ public String toString() {
+ return "ReplicationController [kind=" + kind + ", id=" + id
+ + ", resourceVersion=" + resourceVersion
+ + ", creationTimestamp=" + creationTimestamp + ", selfLink="
+ + selfLink + ", apiVersion=" + apiVersion + ", labels="
+ + labels + ", desiredState=" + desiredState + "]";
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
index 3e73b4f..5e43b98 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
@@ -29,32 +29,38 @@ import org.apache.commons.lang3.ArrayUtils;
@XmlRootElement
public class ReplicationControllerList {
- private String kind;
- private String apiVersion;
- private ReplicationController[] items;
-
- public String getKind() {
- return kind;
- }
- public void setKind(String kind) {
- this.kind = kind;
- }
- public String getApiVersion() {
- return apiVersion;
- }
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
- public ReplicationController[] getItems() {
- return items;
- }
- public void setItems(ReplicationController[] items) {
- this.items = ArrayUtils.clone(items);
- }
- @Override
- public String toString() {
- return "ReplicationControllerList [kind=" + kind + ", apiVersion="
- + apiVersion + ", items=" + Arrays.toString(items) + "]";
- }
-
+ private String kind;
+ private String apiVersion;
+ private ReplicationController[] items;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public ReplicationController[] getItems() {
+ return items;
+ }
+
+ public void setItems(ReplicationController[] items) {
+ this.items = ArrayUtils.clone(items);
+ }
+
+ @Override
+ public String toString() {
+ return "ReplicationControllerList [kind=" + kind + ", apiVersion="
+ + apiVersion + ", items=" + Arrays.toString(items) + "]";
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Selector.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Selector.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Selector.java
index c1d7d8d..7d82556 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Selector.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Selector.java
@@ -24,20 +24,20 @@ import java.io.Serializable;
public class Selector implements Serializable {
- private static final long serialVersionUID = 8384843252305848574L;
+ private static final long serialVersionUID = 8384843252305848574L;
- private String name;
+ private String name;
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- @Override
- public String toString() {
- return "Selector [name=" + name + "]";
- }
+ @Override
+ public String toString() {
+ return "Selector [name=" + name + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java
index 7480edf..e21c01d 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java
@@ -26,114 +26,112 @@ import java.util.Arrays;
/**
* https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/doc/service-schema.json
- *
- *
*/
@XmlRootElement
public class Service implements Serializable {
- private static final long serialVersionUID = 7766915353839414993L;
-
- private String kind;
- private String id;
- private String creationTimestamp;
- private String selfLink;
- private String name;
- private int port;
- private String containerPort;
- private Selector selector;
- private String apiVersion;
- private Labels labels;
- private String[] publicIPs;
+ private static final long serialVersionUID = 7766915353839414993L;
+
+ private String kind;
+ private String id;
+ private String creationTimestamp;
+ private String selfLink;
+ private String name;
+ private int port;
+ private String containerPort;
+ private Selector selector;
+ private String apiVersion;
+ private Labels labels;
+ private String[] publicIPs;
private String portalIP;
-
- public String getKind() {
- return kind;
- }
-
- public void setKind(String kind) {
- this.kind = kind;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCreationTimestamp() {
- return creationTimestamp;
- }
-
- public void setCreationTimestamp(String creationTimestamp) {
- this.creationTimestamp = creationTimestamp;
- }
-
- public String getSelfLink() {
- return selfLink;
- }
-
- public void setSelfLink(String selfLink) {
- this.selfLink = selfLink;
- }
-
- public String getApiVersion() {
- return apiVersion;
- }
-
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
-
- public Labels getLabels() {
- return labels;
- }
-
- public void setLabels(Labels labels) {
- this.labels = labels;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public String getContainerPort() {
- return containerPort;
- }
-
- public void setContainerPort(String containerPort) {
- this.containerPort = containerPort;
- }
-
- public Selector getSelector() {
- return selector;
- }
-
- public void setSelector(Selector selector) {
- this.selector = selector;
- }
-
- public String[] getPublicIPs() {
- return publicIPs;
- }
-
- public void setPublicIPs(String[] publicIPs) {
- this.publicIPs = publicIPs;
- }
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCreationTimestamp() {
+ return creationTimestamp;
+ }
+
+ public void setCreationTimestamp(String creationTimestamp) {
+ this.creationTimestamp = creationTimestamp;
+ }
+
+ public String getSelfLink() {
+ return selfLink;
+ }
+
+ public void setSelfLink(String selfLink) {
+ this.selfLink = selfLink;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public Labels getLabels() {
+ return labels;
+ }
+
+ public void setLabels(Labels labels) {
+ this.labels = labels;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public String getContainerPort() {
+ return containerPort;
+ }
+
+ public void setContainerPort(String containerPort) {
+ this.containerPort = containerPort;
+ }
+
+ public Selector getSelector() {
+ return selector;
+ }
+
+ public void setSelector(Selector selector) {
+ this.selector = selector;
+ }
+
+ public String[] getPublicIPs() {
+ return publicIPs;
+ }
+
+ public void setPublicIPs(String[] publicIPs) {
+ this.publicIPs = publicIPs;
+ }
public String getPortalIP() {
return portalIP;
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
index d27ec25..809c376 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
@@ -29,32 +29,38 @@ import org.apache.commons.lang3.ArrayUtils;
@XmlRootElement
public class ServiceList {
- private String kind;
- private String apiVersion;
- private Service[] items;
-
- public String getKind() {
- return kind;
- }
- public void setKind(String kind) {
- this.kind = kind;
- }
- public String getApiVersion() {
- return apiVersion;
- }
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
- public Service[] getItems() {
- return items;
- }
- public void setItems(Service[] items) {
- this.items = ArrayUtils.clone(items);
- }
- @Override
- public String toString() {
- return "ServiceList [kind=" + kind + ", apiVersion=" + apiVersion
- + ", items=" + Arrays.toString(items) + "]";
- }
-
+ private String kind;
+ private String apiVersion;
+ private Service[] items;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public Service[] getItems() {
+ return items;
+ }
+
+ public void setItems(Service[] items) {
+ this.items = ArrayUtils.clone(items);
+ }
+
+ @Override
+ public String toString() {
+ return "ServiceList [kind=" + kind + ", apiVersion=" + apiVersion
+ + ", items=" + Arrays.toString(items) + "]";
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java
index 756246a..e4bd8b6 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java
@@ -22,84 +22,103 @@ package org.apache.stratos.kubernetes.client.model;
public class State {
- private Manifest manifest;
- private String status;
- private String host;
- private String hostIP;
- private String podIP;
- private int replicas;
- private Selector replicaSelector;
- private Pod podTemplate;
- private Policy restartPolicy;
- private Object info;
-
- public Manifest getManifest() {
- return manifest;
- }
- public void setManifest(Manifest manifest) {
- this.manifest = manifest;
- }
- public String getStatus() {
- return status;
- }
- public void setStatus(String status) {
- this.status = status;
- }
- public String getHost() {
- return host;
- }
- public void setHost(String host) {
- this.host = host;
- }
- public String getHostIP() {
- return hostIP;
- }
- public void setHostIP(String hostIP) {
- this.hostIP = hostIP;
- }
- public Policy getRestartPolicy() {
- return restartPolicy;
- }
- public void setRestartPolicy(Policy restartPolicy) {
- this.restartPolicy = restartPolicy;
- }
- public String getPodIP() {
- return podIP;
- }
- public void setPodIP(String podIP) {
- this.podIP = podIP;
- }
- public int getReplicas() {
- return replicas;
- }
- public void setReplicas(int replicas) {
- this.replicas = replicas;
- }
- public Selector getReplicaSelector() {
- return replicaSelector;
- }
- public void setReplicaSelector(Selector replicaSelector) {
- this.replicaSelector = replicaSelector;
- }
- public Pod getPodTemplate() {
- return podTemplate;
- }
- public void setPodTemplate(Pod podTemplate) {
- this.podTemplate = podTemplate;
- }
- public Object getInfo() {
- return info;
- }
- public void setInfo(Object info) {
- this.info = info;
- }
-
- @Override
- public String toString() {
- return "State [manifest=" + manifest + ", status=" + status + ", host="
- + host + ", hostIP=" + hostIP + ", podIP=" + podIP
- + ", replicas=" + replicas + ", replicaSelector="
- + replicaSelector + ", podTemplate=" + podTemplate
- + ", restartPolicy=" + restartPolicy + ", info=" + info + "]";
- }
+ private Manifest manifest;
+ private String status;
+ private String host;
+ private String hostIP;
+ private String podIP;
+ private int replicas;
+ private Selector replicaSelector;
+ private Pod podTemplate;
+ private Policy restartPolicy;
+ private Object info;
+
+ public Manifest getManifest() {
+ return manifest;
+ }
+
+ public void setManifest(Manifest manifest) {
+ this.manifest = manifest;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public String getHostIP() {
+ return hostIP;
+ }
+
+ public void setHostIP(String hostIP) {
+ this.hostIP = hostIP;
+ }
+
+ public Policy getRestartPolicy() {
+ return restartPolicy;
+ }
+
+ public void setRestartPolicy(Policy restartPolicy) {
+ this.restartPolicy = restartPolicy;
+ }
+
+ public String getPodIP() {
+ return podIP;
+ }
+
+ public void setPodIP(String podIP) {
+ this.podIP = podIP;
+ }
+
+ public int getReplicas() {
+ return replicas;
+ }
+
+ public void setReplicas(int replicas) {
+ this.replicas = replicas;
+ }
+
+ public Selector getReplicaSelector() {
+ return replicaSelector;
+ }
+
+ public void setReplicaSelector(Selector replicaSelector) {
+ this.replicaSelector = replicaSelector;
+ }
+
+ public Pod getPodTemplate() {
+ return podTemplate;
+ }
+
+ public void setPodTemplate(Pod podTemplate) {
+ this.podTemplate = podTemplate;
+ }
+
+ public Object getInfo() {
+ return info;
+ }
+
+ public void setInfo(Object info) {
+ this.info = info;
+ }
+
+ @Override
+ public String toString() {
+ return "State [manifest=" + manifest + ", status=" + status + ", host="
+ + host + ", hostIP=" + hostIP + ", podIP=" + podIP
+ + ", replicas=" + replicas + ", replicaSelector="
+ + replicaSelector + ", podTemplate=" + podTemplate
+ + ", restartPolicy=" + restartPolicy + ", info=" + info + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java
index fd389c1..91b59b0 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java
@@ -22,20 +22,20 @@ package org.apache.stratos.kubernetes.client.model;
public class Volume {
- private String name;
+ private String name;
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return "Volume [name=" + name + "]";
+ }
- public void setName(String name) {
- this.name = name;
- }
- @Override
- public String toString() {
- return "Volume [name=" + name + "]";
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java
index 098d03e..1534988 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java
@@ -22,33 +22,39 @@ package org.apache.stratos.kubernetes.client.model;
public class VolumeMount {
- private String name;
- private String mountPath;
- private boolean readOnly;
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getMountPath() {
- return mountPath;
- }
- public void setMountPath(String mountPath) {
- this.mountPath = mountPath;
- }
- public boolean isReadOnly() {
- return readOnly;
- }
- public void setReadOnly(boolean readOnly) {
- this.readOnly = readOnly;
- }
- @Override
- public String toString() {
- return "VolumeMount [name=" + name + ", mountPath=" + mountPath
- + ", readOnly=" + readOnly + "]";
- }
-
-
+ private String name;
+ private String mountPath;
+ private boolean readOnly;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getMountPath() {
+ return mountPath;
+ }
+
+ public void setMountPath(String mountPath) {
+ this.mountPath = mountPath;
+ }
+
+ public boolean isReadOnly() {
+ return readOnly;
+ }
+
+ public void setReadOnly(boolean readOnly) {
+ this.readOnly = readOnly;
+ }
+
+ @Override
+ public String toString() {
+ return "VolumeMount [name=" + name + ", mountPath=" + mountPath
+ + ", readOnly=" + readOnly + "]";
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/HttpResponse.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/HttpResponse.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/HttpResponse.java
index 1a8ab86..6a287c1 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/HttpResponse.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/HttpResponse.java
@@ -31,18 +31,23 @@ public class HttpResponse {
public int getStatusCode() {
return statusCode;
}
+
public void setStatusCode(int statusCode) {
this.statusCode = statusCode;
}
+
public String getContent() {
return content;
}
+
public void setContent(String content) {
this.content = content;
}
+
public String getReason() {
return reason;
}
+
public void setReason(String reason) {
this.reason = reason;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
index 35a15be..6530a09 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
@@ -38,7 +38,7 @@ import java.io.InputStreamReader;
/**
* Handles a HttpResponse and returns a {@link HttpResponse}
*/
-public class KubernetesResponseHandler implements ResponseHandler<HttpResponse>{
+public class KubernetesResponseHandler implements ResponseHandler<HttpResponse> {
private static final Log log = LogFactory.getLog(KubernetesResponseHandler.class);
@Override
@@ -63,13 +63,13 @@ public class KubernetesResponseHandler implements ResponseHandler<HttpResponse>{
HttpResponse httpResponse = new HttpResponse();
httpResponse.setStatusCode(statusLine.getStatusCode());
httpResponse.setContent(result);
- if(StringUtils.isNotBlank(result) && (isJson(result))) {
+ if (StringUtils.isNotBlank(result) && (isJson(result))) {
httpResponse.setKubernetesResponse(parseKubernetesResponse(result));
}
httpResponse.setReason(statusLine.getReasonPhrase());
if (log.isDebugEnabled()) {
- log.debug("Extracted Kubernetes Response: "+httpResponse.toString());
+ log.debug("Extracted Kubernetes Response: " + httpResponse.toString());
}
return httpResponse;
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
index 090dae0..ba532a4 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
@@ -1,20 +1,20 @@
/**
- * 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.
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.kubernetes.client.rest;
@@ -32,18 +32,18 @@ import org.apache.http.impl.conn.PoolingClientConnectionManager;
public class RestClient {
private DefaultHttpClient httpClient;
-
+
public RestClient() {
PoolingClientConnectionManager cm = new PoolingClientConnectionManager();
// Increase max total connection to 200
cm.setMaxTotal(200);
// Increase default max connection per route to 50
cm.setDefaultMaxPerRoute(50);
-
+
httpClient = new DefaultHttpClient(cm);
}
- /**
+ /**
* Handle http post request. Return String
*
* @param resourcePath This should be REST endpoint
@@ -51,7 +51,7 @@ public class RestClient {
* @return The HttpResponse
* @throws Exception if any errors occur when executing the request
*/
- public HttpResponse doPost(URI resourcePath, String jsonParamString) throws Exception{
+ public HttpResponse doPost(URI resourcePath, String jsonParamString) throws Exception {
HttpPost postRequest = null;
try {
postRequest = new HttpPost(resourcePath);
@@ -74,7 +74,7 @@ public class RestClient {
* @throws org.apache.http.client.ClientProtocolException and IOException
* if any errors occur when executing the request
*/
- public HttpResponse doGet(URI resourcePath) throws Exception{
+ public HttpResponse doGet(URI resourcePath) throws Exception {
HttpGet getRequest = null;
try {
getRequest = new HttpGet(resourcePath);
@@ -85,7 +85,7 @@ public class RestClient {
releaseConnection(getRequest);
}
}
-
+
public HttpResponse doDelete(URI resourcePath) throws Exception {
HttpDelete httpDelete = null;
try {
@@ -94,26 +94,26 @@ public class RestClient {
return httpClient.execute(httpDelete, new KubernetesResponseHandler());
} finally {
- releaseConnection(httpDelete);
+ releaseConnection(httpDelete);
}
}
public HttpResponse doPut(URI resourcePath, String jsonParamString) throws Exception {
HttpPut putRequest = null;
- try {
- putRequest = new HttpPut(resourcePath);
+ try {
+ putRequest = new HttpPut(resourcePath);
- StringEntity input = new StringEntity(jsonParamString);
- input.setContentType("application/json");
- putRequest.setEntity(input);
+ StringEntity input = new StringEntity(jsonParamString);
+ input.setContentType("application/json");
+ putRequest.setEntity(input);
- return httpClient.execute(putRequest, new KubernetesResponseHandler());
- } finally {
- releaseConnection(putRequest);
- }
+ return httpClient.execute(putRequest, new KubernetesResponseHandler());
+ } finally {
+ releaseConnection(putRequest);
+ }
}
-
+
private void releaseConnection(HttpRequestBase request) {
if (request != null) {
request.releaseConnection();
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/LiveTests.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/LiveTests.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/LiveTests.java
index 888898b..1799d6b 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/LiveTests.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/LiveTests.java
@@ -26,5 +26,5 @@ import org.junit.experimental.categories.Category;
* Set {@link Category} of all Live tests to be this class.
*/
public interface LiveTests {
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/UnitTests.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/UnitTests.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/UnitTests.java
index d869a7d..1cb57e0 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/UnitTests.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/UnitTests.java
@@ -26,5 +26,5 @@ import org.junit.experimental.categories.Category;
* Set {@link Category} of all Unit tests to be this class.
*/
public interface UnitTests {
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/AbstractLiveTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/AbstractLiveTest.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/AbstractLiveTest.java
index 6cf30cf..faab5ab 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/AbstractLiveTest.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/AbstractLiveTest.java
@@ -64,7 +64,7 @@ public class AbstractLiveTest extends TestCase {
protected int containerPort;
protected boolean testPodActivation;
protected boolean testServiceSocket;
- protected String[] minionPublicIPs = { "172.17.8.102" };
+ protected String[] minionPublicIPs = {"172.17.8.102"};
protected List<String> podIdList = new ArrayList<String>();
protected List<String> serviceIdList = new ArrayList<String>();
@@ -108,7 +108,7 @@ public class AbstractLiveTest extends TestCase {
log.info(TEST_SERVICE_SOCKET + ": " + testServiceSocket);
String minionPublicIPsStr = System.getProperty(MINION_PUBLIC_IPS);
- if(StringUtils.isNotBlank(minionPublicIPsStr)) {
+ if (StringUtils.isNotBlank(minionPublicIPsStr)) {
minionPublicIPs = minionPublicIPsStr.split(",");
}
log.info(MINION_PUBLIC_IPS + ": " + minionPublicIPsStr);
@@ -137,17 +137,17 @@ public class AbstractLiveTest extends TestCase {
if (testPodActivation) {
boolean activated = false;
long startTime = System.currentTimeMillis();
- while(!activated) {
- if((System.currentTimeMillis() - startTime) > POD_ACTIVATION_WAIT_TIME) {
+ while (!activated) {
+ if ((System.currentTimeMillis() - startTime) > POD_ACTIVATION_WAIT_TIME) {
log.info(String.format("Pod did not activate within %d seconds: [pod] %s",
- POD_ACTIVATION_WAIT_TIME/1000, podId));
+ POD_ACTIVATION_WAIT_TIME / 1000, podId));
break;
}
log.info("Waiting pod status to be changed to running: [pod] " + podId);
sleep(2000);
pod = client.getPod(podId);
- if((pod != null) && (pod.getCurrentState().getStatus().equals(KubernetesConstants.POD_STATUS_RUNNING))) {
+ if ((pod != null) && (pod.getCurrentState().getStatus().equals(KubernetesConstants.POD_STATUS_RUNNING))) {
activated = true;
log.info("Pod state changed to running: [pod]" + pod.getId());
}
@@ -170,7 +170,7 @@ public class AbstractLiveTest extends TestCase {
public void deletePods() {
try {
- for(String podId : podIdList) {
+ for (String podId : podIdList) {
deletePod(podId);
}
} catch (KubernetesClientException e) {
@@ -179,7 +179,7 @@ public class AbstractLiveTest extends TestCase {
}
protected void createService(String serviceId, String serviceName, int servicePort, String containerPortName,
- String[] publicIPs) throws KubernetesClientException, InterruptedException, IOException {
+ String[] publicIPs) throws KubernetesClientException, InterruptedException, IOException {
log.info("Creating service...");
client.createService(serviceId, serviceName, servicePort, containerPortName, publicIPs);
serviceIdList.add(serviceId);
@@ -202,7 +202,7 @@ public class AbstractLiveTest extends TestCase {
protected void deleteServices() {
try {
- for(String serviceId : serviceIdList) {
+ for (String serviceId : serviceIdList) {
deleteService(serviceId);
}
} catch (KubernetesClientException e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesClusterCleanTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesClusterCleanTest.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesClusterCleanTest.java
index 1104e0f..eea90b4 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesClusterCleanTest.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesClusterCleanTest.java
@@ -41,16 +41,16 @@ public class KubernetesClusterCleanTest extends AbstractLiveTest {
try {
log.info("Cleaning kubernetes cluster...");
List<Pod> podList = client.getPods();
- while((podList != null) && (podList.size() > 0)) {
- for(Pod pod : podList) {
+ while ((podList != null) && (podList.size() > 0)) {
+ for (Pod pod : podList) {
deletePod(pod.getId());
}
podList = client.getPods();
}
List<Service> serviceList = getServices();
- while((serviceList != null) && (serviceList.size() > 0)) {
- for(Service service : serviceList) {
+ while ((serviceList != null) && (serviceList.size() > 0)) {
+ for (Service service : serviceList) {
deleteService(service.getId());
}
serviceList = getServices();
@@ -63,8 +63,8 @@ public class KubernetesClusterCleanTest extends AbstractLiveTest {
private List<Service> getServices() throws KubernetesClientException {
List<Service> serviceList = new ArrayList<Service>();
- for(Service service : client.getServices()) {
- if(!service.getId().startsWith("kubernetes")) {
+ for (Service service : client.getServices()) {
+ if (!service.getId().startsWith("kubernetes")) {
serviceList.add(service);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
index 8c374ac..b42b72b 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
@@ -33,17 +33,17 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
@Category(org.apache.stratos.kubernetes.client.UnitTests.class)
-public class PodUnitTest extends TestCase{
+public class PodUnitTest extends TestCase {
- @Before
- public void setUp() {
- }
-
- @Test
- public void testPods() throws Exception {
- String podId = "nirmal-test-pod";
- String time = "2014/11/02";
- String selfLink = "link";
+ @Before
+ public void setUp() {
+ }
+
+ @Test
+ public void testPods() throws Exception {
+ String podId = "nirmal-test-pod";
+ String time = "2014/11/02";
+ String selfLink = "link";
Pod pod = new Pod();
String apiVersion = "v1beta1";
pod.setApiVersion(apiVersion);
@@ -72,7 +72,7 @@ public class PodUnitTest extends TestCase{
pod.setDesiredState(desiredState);
State currentState = desiredState;
pod.setCurrentState(currentState);
-
+
assertEquals(podId, pod.getId());
assertEquals(apiVersion, pod.getApiVersion());
assertEquals(apiVersion, pod.getResourceVersion());
@@ -82,31 +82,31 @@ public class PodUnitTest extends TestCase{
assertEquals(selfLink, pod.getSelfLink());
assertEquals(desiredState, pod.getDesiredState());
assertEquals(time, pod.getCreationTimestamp());
-
+
assertEquals(true, pod.equals(pod));
-
+
Pod pod2 = new Pod();
pod2.setId(podId);
-
+
assertEquals(true, pod.equals(pod2));
assertEquals(true, pod.hashCode() == pod2.hashCode());
-
+
pod2.setId("aa");
assertEquals(false, pod.equals(pod2));
-
+
pod2.setId(null);
assertEquals(false, pod.equals(pod2));
-
+
assertEquals(false, pod.equals(null));
assertEquals(false, pod.equals(desiredState));
-
+
pod.setId(null);
pod2.setId(podId);
assertEquals(false, pod.equals(pod2));
-
+
pod2.setId(null);
assertEquals(true, pod.equals(pod2));
assertEquals(true, pod.hashCode() == pod2.hashCode());
-
- }
+
+ }
}
[13/16] stratos git commit: Formatting Logging view module
Posted by la...@apache.org.
Formatting Logging view module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f3355d97
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f3355d97
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f3355d97
Branch: refs/heads/master
Commit: f3355d970eb21822259ddaad42393c18488b3bc7
Parents: 76b39e1
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 08:49:12 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 08:49:12 2015 +0530
----------------------------------------------------------------------
.../logging/view/ui/LogViewerClient.java | 34 +-
.../src/main/resources/META-INF/component.xml | 6 +-
.../web/log-view/application_log_viewer.jsp | 477 ++++----
.../web/log-view/cassandra_log_viewer.jsp | 885 +++++++-------
.../resources/web/log-view/docs/userguide.html | 61 +-
.../web/log-view/download-ajaxprocessor.jsp | 126 +-
.../web/log-view/downloadgz-ajaxprocessor.jsp | 96 +-
.../src/main/resources/web/log-view/index.jsp | 1081 +++++++++---------
.../main/resources/web/log-view/index_old.jsp | 228 ++--
.../main/resources/web/log-view/js/logviewer.js | 726 ++++++------
.../resources/web/log-view/syslog_index.jsp | 650 +++++------
.../src/main/resources/web/log-view/view.jsp | 547 ++++-----
12 files changed, 2497 insertions(+), 2420 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/java/org/apache/stratos/logging/view/ui/LogViewerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/java/org/apache/stratos/logging/view/ui/LogViewerClient.java b/components/org.apache.stratos.logging.view.ui/src/main/java/org/apache/stratos/logging/view/ui/LogViewerClient.java
index 5b0a9c5..c3da7cb 100644
--- a/components/org.apache.stratos.logging.view.ui/src/main/java/org/apache/stratos/logging/view/ui/LogViewerClient.java
+++ b/components/org.apache.stratos.logging.view.ui/src/main/java/org/apache/stratos/logging/view/ui/LogViewerClient.java
@@ -1,20 +1,20 @@
/**
- * 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.
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.logging.view.ui;
@@ -73,7 +73,7 @@ public class LogViewerClient {
public void downloadArchivedLogFiles(String logFile, HttpServletResponse response, String domain, String serverKey)
throws Exception {
try {
- logFile=logFile.replace(".gz", "");
+ logFile = logFile.replace(".gz", "");
ServletOutputStream outputStream = response.getOutputStream();
response.setContentType("application/txt");
response.setHeader("Content-Disposition",
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/META-INF/component.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/META-INF/component.xml b/components/org.apache.stratos.logging.view.ui/src/main/resources/META-INF/component.xml
index af9eb40..5ce1b15 100644
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/META-INF/component.xml
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/META-INF/component.xml
@@ -17,7 +17,7 @@
under the License.
-->
<component xmlns="http://products.wso2.org/carbon">
- <!-- sample menu configuration -->
+ <!-- sample menu configuration -->
<menus>
<menu>
<id>logs_menu</id>
@@ -32,7 +32,7 @@
<require-permission>/permission/admin/monitor/logging</require-permission>
<!--require-super-tenant>true</require-super-tenant-->
</menu>
- <menu>
+ <menu>
<id>app_log_menu</id>
<i18n-key>applogsmenutext</i18n-key>
<i18n-bundle>org.apache.stratos.logging.view.ui.i18n.Resources</i18n-bundle>
@@ -43,7 +43,7 @@
<style-class>monitor</style-class>
<icon>../log-view/images/script_gear.gif</icon>
<require-permission>/permission/admin/monitor/logging</require-permission>
-
+
</menu>
</menus>
</component>
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/application_log_viewer.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/application_log_viewer.jsp b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/application_log_viewer.jsp
index e8b1657..592c8d7 100644
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/application_log_viewer.jsp
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/application_log_viewer.jsp
@@ -1,36 +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.
+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.
-->
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"
- prefix="carbon"%>
-<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient"%>
-<%@ page import="org.apache.axis2.context.ConfigurationContext"%>
-<%@ page import="org.wso2.carbon.CarbonConstants"%>
+ prefix="carbon" %>
+<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
+<%@ page import="org.wso2.carbon.CarbonConstants" %>
<%-- <%@ page --%>
-<!-- import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent"%> -->
-<%@ page import="org.wso2.carbon.utils.ServerConstants"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogEvent"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
+<!-- import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent"%> -->
+<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogEvent" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
<%@ page import="org.wso2.carbon.ui.util.CharacterEncoder" %>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent"%>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent" %>
<%@ page import="java.text.SimpleDateFormat" %>
<script type="text/javascript" src="js/logviewer.js"></script>
<script type="text/javascript" src="../admin/dialog/js/dialog.js"></script>
@@ -39,111 +39,111 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<script type="text/JavaScript">
- function refresh(time) {
- setTimeout("location.reload(true);", time);
- }
-</script>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>View Application Logs</title>
+ <script type="text/JavaScript">
+ function refresh(time) {
+ setTimeout("location.reload(true);", time);
+ }
+ </script>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>View Application Logs</title>
</head>
<body onload="JavaScript:refresh(120000);">
-
- <%
- String backendServerURL = CarbonUIUtil
- .getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
- .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- LogViewerClient logViewerClient;
- LogEvent[] events = null;
- String type;
- String keyword;
- String action;
- String pageNumberStr = request.getParameter("pageNumber");
- int pageNumber = 0;
- int numberOfPages = 0;
- PaginatedLogEvent paginatedLogEvents = null;
- String parameter = "";
- boolean isSuperTenant = CarbonUIUtil.isSuperTenant(request);
- boolean isManager = false;
- String tenantDomain = request.getParameter("tenantDomain");
- String serviceName = request.getParameter("serviceName");
- String showMaxStr = request.getParameter("showMax");
- String serviceNames[];
- boolean isValidTenant = true;
- boolean showMax= false;
- showMax = Boolean.parseBoolean(showMaxStr);
- try {
- pageNumber = Integer.parseInt(pageNumberStr);
- } catch (NumberFormatException ignored) {
- // page number format exception
- }
- String appName;
- String applicationNames[] = null;
- try {
- type = CharacterEncoder.getSafeText(request.getParameter("type"));
- type = (type == null) ? "":type;
- keyword = CharacterEncoder.getSafeText(request.getParameter("keyword"));
- keyword = (keyword == null )? "":keyword;
- action = CharacterEncoder.getSafeText(request.getParameter("action"));
- appName = request.getParameter("appName");
- logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
- isValidTenant = logViewerClient.isValidTenant(tenantDomain);
- if (tenantDomain == null) {
- tenantDomain = "";
- }
- if (serviceName == null) {
- serviceName = "";
- }
- if(isValidTenant) {
- applicationNames = logViewerClient.getApplicationNames(tenantDomain, serviceName);
- if (appName == null && applicationNames !=null && applicationNames.length > 0) {
- appName = applicationNames[0];
- }
- if (applicationNames == null) {
- applicationNames = new String[]{"No applications"};
- appName = applicationNames[0];
- } else if(applicationNames != null && applicationNames.length == 0) {
- applicationNames = new String[]{"No applications"};
- appName = applicationNames[0];
- }
- paginatedLogEvents = logViewerClient.getPaginatedApplicationLogEvents(pageNumber,type,keyword,appName, tenantDomain, serviceName);
+
+<%
+ String backendServerURL = CarbonUIUtil
+ .getServerURL(config.getServletContext(), session);
+ ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
+ .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
+ String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
+ LogViewerClient logViewerClient;
+ LogEvent[] events = null;
+ String type;
+ String keyword;
+ String action;
+ String pageNumberStr = request.getParameter("pageNumber");
+ int pageNumber = 0;
+ int numberOfPages = 0;
+ PaginatedLogEvent paginatedLogEvents = null;
+ String parameter = "";
+ boolean isSuperTenant = CarbonUIUtil.isSuperTenant(request);
+ boolean isManager = false;
+ String tenantDomain = request.getParameter("tenantDomain");
+ String serviceName = request.getParameter("serviceName");
+ String showMaxStr = request.getParameter("showMax");
+ String serviceNames[];
+ boolean isValidTenant = true;
+ boolean showMax = false;
+ showMax = Boolean.parseBoolean(showMaxStr);
+ try {
+ pageNumber = Integer.parseInt(pageNumberStr);
+ } catch (NumberFormatException ignored) {
+ // page number format exception
+ }
+ String appName;
+ String applicationNames[] = null;
+ try {
+ type = CharacterEncoder.getSafeText(request.getParameter("type"));
+ type = (type == null) ? "" : type;
+ keyword = CharacterEncoder.getSafeText(request.getParameter("keyword"));
+ keyword = (keyword == null) ? "" : keyword;
+ action = CharacterEncoder.getSafeText(request.getParameter("action"));
+ appName = request.getParameter("appName");
+ logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
+ isValidTenant = logViewerClient.isValidTenant(tenantDomain);
+ if (tenantDomain == null) {
+ tenantDomain = "";
+ }
+ if (serviceName == null) {
+ serviceName = "";
+ }
+ if (isValidTenant) {
+ applicationNames = logViewerClient.getApplicationNames(tenantDomain, serviceName);
+ if (appName == null && applicationNames != null && applicationNames.length > 0) {
+ appName = applicationNames[0];
}
if (applicationNames == null) {
applicationNames = new String[]{"No applications"};
appName = applicationNames[0];
+ } else if (applicationNames != null && applicationNames.length == 0) {
+ applicationNames = new String[]{"No applications"};
+ appName = applicationNames[0];
}
- isManager = logViewerClient.isManager();
- serviceNames = logViewerClient.getServiceNames();
- if (paginatedLogEvents != null) {
- events = paginatedLogEvents.getLogInfo();
- numberOfPages = paginatedLogEvents.getNumberOfPages();
- }
-
- parameter = "type=" + type + "&keyword=" + keyword+ "&appName="+appName;
- } catch (Exception e) {
- CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
- e);
- %>
- <script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
- <%
- return;
- }
- %>
- <fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
-
- <carbon:breadcrumb label="app.logs"
- resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
- topPage="true" request="<%=request%>" />
- <div id="middle">
- <h2>
- <fmt:message key="app.logs" />
- </h2>
- <div id="workArea">
+ paginatedLogEvents = logViewerClient.getPaginatedApplicationLogEvents(pageNumber, type, keyword, appName, tenantDomain, serviceName);
+ }
+ if (applicationNames == null) {
+ applicationNames = new String[]{"No applications"};
+ appName = applicationNames[0];
+ }
+ isManager = logViewerClient.isManager();
+ serviceNames = logViewerClient.getServiceNames();
+ if (paginatedLogEvents != null) {
+ events = paginatedLogEvents.getLogInfo();
+ numberOfPages = paginatedLogEvents.getNumberOfPages();
+ }
+
+ parameter = "type=" + type + "&keyword=" + keyword + "&appName=" + appName;
+ } catch (Exception e) {
+ CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
+ e);
+%>
+<script type="text/javascript">
+ location.href = "../admin/error.jsp";
+</script>
+<%
+ return;
+ }
+%>
+<fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
+
+ <carbon:breadcrumb label="app.logs"
+ resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
+ topPage="true" request="<%=request%>"/>
+ <div id="middle">
+ <h2>
+ <fmt:message key="app.logs"/>
+ </h2>
+ <div id="workArea">
<table border="0" class="styledLeft">
@@ -162,7 +162,8 @@
type = "Custom";
%>
- <option value="<%=type%>" selected="true"><%=type%></option>
+ <option value="<%=type%>" selected="true"><%=type%>
+ </option>
<%
}
@@ -170,13 +171,15 @@
if (logLevel.equals(type)) {
%>
- <option value="<%=logLevel%>" selected="true"><%=logLevel%></option>
+ <option value="<%=logLevel%>" selected="true"><%=logLevel%>
+ </option>
<%
} else {
%>
- <option value="<%=logLevel%>"><%=logLevel%></option>
+ <option value="<%=logLevel%>"><%=logLevel%>
+ </option>
<%
}
@@ -186,7 +189,7 @@
<td style="padding-right: 2px !important;">
<nobr><fmt:message key="application.name"/></nobr>
</td>
- <td ><select
+ <td><select
name="appName" id="appName" return false;">
<%
for (String name : applicationNames) {
@@ -211,9 +214,10 @@
%>
</select></td>
- <td style="padding-right: 2px !important;"><nobr>
- <fmt:message key="search.logs" />
- </nobr>
+ <td style="padding-right: 2px !important;">
+ <nobr>
+ <fmt:message key="search.logs"/>
+ </nobr>
</td>
<td style="padding-right: 2px !important;">
<input onkeypress="appSubmitenter(event)" value="<%=keyword%>"
@@ -231,12 +235,13 @@
class="button"-->
</td>
<td><input type="hidden" id="logkeyword"
- name="KeyWord" value="<%=keyword%>" />
+ name="KeyWord" value="<%=keyword%>"/>
</td>
<td style="width: 17%;"></td>
- <td style="padding-right: 2px !important;"><nobr>
- <fmt:message key="current.time" />
- </nobr>
+ <td style="padding-right: 2px !important;">
+ <nobr>
+ <fmt:message key="current.time"/>
+ </nobr>
</td>
<%
SimpleDateFormat dateFormat = new SimpleDateFormat("Z");
@@ -253,111 +258,119 @@
</table>
+ <br/>
+ <table border="1" class="styledLeft">
- <br/>
- <table border="1" class="styledLeft">
-
- <tbody>
+ <tbody>
- <tr>
- <td class="formRow">
+ <tr>
+ <td class="formRow">
- <table class="styledLeft">
+ <table class="styledLeft">
- <%
- if(!isValidTenant) { %>
- <fmt:message key="invalid.tenant" />
-
- <%} else {
-
-
- if (events == null || events.length == 0 || events[0] == null) {
- %>
- <fmt:message key="no.logs" />
- <%
- } else {
- int index = 0;
- for (LogEvent logMessage : events) {
- index++;
- if (index % 2 != 0) {
- %>
- <thead>
- <tr>
- <th><b><fmt:message key="log.type" />
- </b>
- </th>
- <th><b><fmt:message key="date" />
- </b>
- </th>
- <th colspan="2"><b><fmt:message key="log.message" />
- </b>
- </th>
- </tr>
- </thead>
- <tr>
- <%
+ <%
+ if (!isValidTenant) { %>
+ <fmt:message key="invalid.tenant"/>
+
+ <%
+ } else {
+
+
+ if (events == null || events.length == 0 || events[0] == null) {
+ %>
+ <fmt:message key="no.logs"/>
+ <%
+ } else {
+ int index = 0;
+ for (LogEvent logMessage : events) {
+ index++;
+ if (index % 2 != 0) {
+ %>
+ <thead>
+ <tr>
+ <th><b><fmt:message key="log.type"/>
+ </b>
+ </th>
+ <th><b><fmt:message key="date"/>
+ </b>
+ </th>
+ <th colspan="2"><b><fmt:message key="log.message"/>
+ </b>
+ </th>
+ </tr>
+ </thead>
+ <tr>
+ <%
} else {
%>
-
- <tr bgcolor="#eeeffb">
- <%
- }
- %>
- <td border-bottom="gray" width="2%"><img
- style="margin-right: 10px;"
- src="<%=logViewerClient.getImageName(logMessage.getPriority().trim())%>">
- </td>
- <td><nobr><%=logMessage.getLogTime()%></nobr></td>
- <td><%=CharacterEncoder.getSafeText(logMessage.getMessage())%></td>
- <%
- String imgId = "traceSymbolMax" + index;
- %>
- <td><a
- class="icon-link"
- style="background-image: url(images/plus.gif);"
- href="javascript:showTrace(<%=index%>)"
- id="<%=imgId%>"></a> <fmt:message
- key="view.stack.trace" /></td>
- </tr>
-
- <%
- String id = "traceTable" + index;
- if (index % 2 != 0) {
- %>
- <tr id="<%=id%>" style="display: none" >
- <%
+
+ <tr bgcolor="#eeeffb">
+ <%
+ }
+ %>
+ <td border-bottom="gray" width="2%"><img
+ style="margin-right: 10px;"
+ src="<%=logViewerClient.getImageName(logMessage.getPriority().trim())%>">
+ </td>
+ <td>
+ <nobr><%=logMessage.getLogTime()%>
+ </nobr>
+ </td>
+ <td><%=CharacterEncoder.getSafeText(logMessage.getMessage())%>
+ </td>
+ <%
+ String imgId = "traceSymbolMax" + index;
+ %>
+ <td><a
+ class="icon-link"
+ style="background-image: url(images/plus.gif);"
+ href="javascript:showTrace(<%=index%>)"
+ id="<%=imgId%>"></a> <fmt:message
+ key="view.stack.trace"/></td>
+ </tr>
+
+ <%
+ String id = "traceTable" + index;
+ if (index % 2 != 0) {
+ %>
+ <tr id="<%=id%>" style="display: none">
+ <%
} else {
%>
-
- <tr id="<%=id%>" style="display: none" bgcolor="#eeeffb">
- <%
- }
- %>
- <td colspan="4" width="100%">TID[<%=logMessage.getTenantId()%>] AppID[<%=logMessage.getAppName()%>] [<%=logMessage.getServerName()%>] [<%=logMessage.getLogTime()%>] <%=logMessage.getPriority().trim()%> {<%=logMessage.getLogger()%>} - <%=CharacterEncoder.getSafeText(logMessage.getMessage())%>
- <%=logMessage.getStacktrace()%><br/>
- </td>
- </tr>
- <%
- }
- }
+ <tr id="<%=id%>" style="display: none" bgcolor="#eeeffb">
+ <%
+ }
+ %>
+
+ <td colspan="4" width="100%">TID[<%=logMessage.getTenantId()%>]
+ AppID[<%=logMessage.getAppName()%>] [<%=logMessage.getServerName()%>]
+ [<%=logMessage.getLogTime()%>] <%=logMessage.getPriority().trim()%>
+ {<%=logMessage.getLogger()%>}
+ - <%=CharacterEncoder.getSafeText(logMessage.getMessage())%>
+ <%=logMessage.getStacktrace()%><br/>
+ </td>
+ </tr>
+ <%
+ }
+ }
}
- %>
-
- </table>
- <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>"
- page="application_log_viewer.jsp" pageNumberParameterName="pageNumber"
- prevKey="prev" nextKey="next"
- parameters="<%= parameter%>"/>
- </tr>
-
- </tbody>
- </table>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </fmt:bundle>
+ %>
+
+ </table>
+ <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>"
+ page="application_log_viewer.jsp" pageNumberParameterName="pageNumber"
+ prevKey="prev" nextKey="next"
+ parameters="<%= parameter%>"/>
+ </tr>
+
+ </tbody>
+ </table>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+</fmt:bundle>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/cassandra_log_viewer.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/cassandra_log_viewer.jsp b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/cassandra_log_viewer.jsp
index bc6f2b4..5f44c0d 100644
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/cassandra_log_viewer.jsp
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/cassandra_log_viewer.jsp
@@ -1,35 +1,35 @@
<!--
- 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.
+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.
-->
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"
- prefix="carbon"%>
-<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient"%>
-<%@ page import="org.apache.axis2.context.ConfigurationContext"%>
-<%@ page import="org.wso2.carbon.CarbonConstants"%>
+ prefix="carbon" %>
+<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
+<%@ page import="org.wso2.carbon.CarbonConstants" %>
<%-- <%@ page --%>
-<!-- import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent"%> -->
-<%@ page import="org.wso2.carbon.utils.ServerConstants"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
+<!-- import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent"%> -->
+<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent"%>
+<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
+<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent" %>
<script type="text/javascript" src="js/logviewer.js"></script>
<script type="text/javascript" src="../admin/dialog/js/dialog.js"></script>
@@ -37,411 +37,446 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>View System Logs</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>View System Logs</title>
</head>
<body>
- <%
- String backendServerURL = CarbonUIUtil
- .getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
- .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- LogViewerClient logViewerClient;
- LogEvent[] events;
- String tenantDomain = "";
- String serviceName = "WSO2 Stratos Manager";
- boolean isLogsFromSyslog;
- boolean isSTSyslog = false;
- String serviceNames[];
- boolean isManager = false;
- boolean showManager = false;
- String logIndex = request.getParameter("logIndex");
- String start = request.getParameter("start");
-
- String end = request.getParameter("end");
- boolean showTenantDomain = false;
- boolean isStratosService = false;
- tenantDomain = request.getParameter("tenantDomain");
- serviceName = request.getParameter("serviceName");
- Boolean isDateGiven=false;
- String priority = request.getParameter("priority");
- String logger = request.getParameter("logger");
- String keyWord = request.getParameter("keyword");
+<%
+ String backendServerURL = CarbonUIUtil
+ .getServerURL(config.getServletContext(), session);
+ ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
+ .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
+ String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
+ LogViewerClient logViewerClient;
+ LogEvent[] events;
+ String tenantDomain = "";
+ String serviceName = "WSO2 Stratos Manager";
+ boolean isLogsFromSyslog;
+ boolean isSTSyslog = false;
+ String serviceNames[];
+ boolean isManager = false;
+ boolean showManager = false;
+ String logIndex = request.getParameter("logIndex");
+ String start = request.getParameter("start");
+
+ String end = request.getParameter("end");
+ boolean showTenantDomain = false;
+ boolean isStratosService = false;
+ tenantDomain = request.getParameter("tenantDomain");
+ serviceName = request.getParameter("serviceName");
+ Boolean isDateGiven = false;
+ String priority = request.getParameter("priority");
+ String logger = request.getParameter("logger");
+ String keyWord = request.getParameter("keyword");
// LogEvent logs[];
- if (start != null && !start.equals("null")&& !start.equals("")) {
- isDateGiven=true;
- }
- int returnRows;
- logIndex = (logIndex == null) ? "20" : logIndex;
- tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
- start = (start == null) ? "" : start;
- end = (end == null) ? "" : end;
- priority = (priority == null) ? "ALL" : priority;
- keyWord = (keyWord == null) ? "" : keyWord;
- logger = (logger == null) ? "" : logger;
- try {
- returnRows = (logIndex == null) ? 20 : Integer.parseInt(logIndex);
- logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
- isLogsFromSyslog = logViewerClient.isDataFromSysLog(tenantDomain);
- isSTSyslog = logViewerClient.isSTSyslogConfig(tenantDomain);
- isManager = logViewerClient.isManager();
- serviceNames = logViewerClient.getServiceNames();;
- serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
- tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
- isStratosService = logViewerClient.isStratosService();
- showTenantDomain = (isSTSyslog && isLogsFromSyslog && isStratosService);
- showManager = (isManager && isLogsFromSyslog);
- events = logViewerClient.getSystemLogs(start, end,
- logger, priority, "", serviceName, "", Integer.parseInt(logIndex));
- System.out.println("events "+events);
- System.out.println("Return Rows "+logIndex);
- System.out.println("isDateGiven "+isDateGiven);
- System.out.println("start "+start+" : "+start);
- System.out.println("end "+end+" : "+end);
- System.out.println("Priority "+priority);
- System.out.println("Logger "+logger);
- System.out.println("Keyword "+keyWord);
-
- System.out.println();
- System.out.println();
-
- // logs = logViewerClient.getAllLogs();
- } catch (Exception e) {
- CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
- e);
- %>
- <script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
- <%
- return;
- }
- %>
- <fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
-
- <carbon:breadcrumb label="system.logs"
- resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
- topPage="true" request="<%=request%>" />
- <div id="middle">
- <h2>
- <fmt:message key="system.logs" />
- </h2>
- <div id="workArea">
-
- <%
- if (showTenantDomain || showManager) {
- %> <br /> <br />
- <table border="0" class="styledLeft">
- <tbody>
- <tr>
- <td>
-
- <table class="normal">
- <tr>
- <%
- if (showTenantDomain) {
- %>
+ if (start != null && !start.equals("null") && !start.equals("")) {
+ isDateGiven = true;
+ }
+ int returnRows;
+ logIndex = (logIndex == null) ? "20" : logIndex;
+ tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
+ start = (start == null) ? "" : start;
+ end = (end == null) ? "" : end;
+ priority = (priority == null) ? "ALL" : priority;
+ keyWord = (keyWord == null) ? "" : keyWord;
+ logger = (logger == null) ? "" : logger;
+ try {
+ returnRows = (logIndex == null) ? 20 : Integer.parseInt(logIndex);
+ logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
+ isLogsFromSyslog = logViewerClient.isDataFromSysLog(tenantDomain);
+ isSTSyslog = logViewerClient.isSTSyslogConfig(tenantDomain);
+ isManager = logViewerClient.isManager();
+ serviceNames = logViewerClient.getServiceNames();
+ ;
+ serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
+ tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
+ isStratosService = logViewerClient.isStratosService();
+ showTenantDomain = (isSTSyslog && isLogsFromSyslog && isStratosService);
+ showManager = (isManager && isLogsFromSyslog);
+ events = logViewerClient.getSystemLogs(start, end,
+ logger, priority, "", serviceName, "", Integer.parseInt(logIndex));
+ System.out.println("events " + events);
+ System.out.println("Return Rows " + logIndex);
+ System.out.println("isDateGiven " + isDateGiven);
+ System.out.println("start " + start + " : " + start);
+ System.out.println("end " + end + " : " + end);
+ System.out.println("Priority " + priority);
+ System.out.println("Logger " + logger);
+ System.out.println("Keyword " + keyWord);
- <td style="padding-right: 2px !important;"><nobr>
- <fmt:message key="tenant.domain" />
- </nobr>
- </td>
- <td style="padding-right: 2px !important;"><input
- value="<%=tenantDomain%>" id="tenantDomain"
- name="tenantDomain" size="20" type="text"></td>
-
- <td style="padding-left: 0px !important;"><input
- type="button" value="Get Tenant Logs"
- onclick="javascript:getTenantSpecificIndex(); return false;"
- class="button"></td>
- <%
- } else {
- %>
- <td><input type="hidden" id="tenantDomain"
- name="tenantDomain" value="<%=tenantDomain%>" />
- </td>
- <%
- }
- if (showManager) {
- %>
- <td style="width: 100%;"></td>
- <td style="width: 100%;"></td>
- <td style="width: 100%;"></td>
- <td style="padding-left: 0px !important;"><nobr>
- <fmt:message key="service.name" />
- </nobr>
- </td>
- <td style="width: 100%;"></td>
- <td style="padding-left: 0px !important;"><select
- name="serviceName" id="serviceName"
- onchange="getProductTenantSpecificIndex()">
- <%
- for (String name : serviceNames) {
- %>
- <%
- if (name.equals(serviceName)) {
- %>
- <option selected="selected" value="<%=name%>">
- <%=name%>
- </option>
- <%
- } else {
- %>
- <option value="<%=name%>">
- <%=name%>
- </option>
- <%
- }
- %>
- <%
- }
- %>
-
- </select></td>
- <%
- } else {
- %>
- <input type="hidden" id="serviceName" name="serviceName"
- value="<%=serviceName%>" />
- <%
- }
- %>
- </tr>
-
-
- </table></td>
- </tr>
- </tbody>
- </table><br /> <br />
- <%
- }
- %>
-
- <table border="0" class="styledLeft">
-
- <tbody>
- <tr>
- <td class="middle-header" colspan="2"><fmt:message key="filter.system.logs" />
- </td>
- </tr>
- <tr>
- <td>
- <table class="normal-nopadding" width="100%">
- <tr>
- <td>
- <table width="50%">
- <tr>
- <td><fmt:message key="return.rows" />
- </td>
- <td><select class="log-select" id="logIndex"
- size="3">
-
- <%
- for (int i = 1; i < 201; i++) {
- if (returnRows == i) {
- %>
- <option value="<%=i%>" selected="true"><%=i%></option>
- <%
- } else {
- %>
- <option value="<%=i%>"><%=i%></option>
- <%
- }
- }
- %>
- </select>
- </br></td>
- </tr>
- <tr>
-
- <td><nobr>
- <fmt:message key="show.at.or.before" />
- </nobr></td>
- <td style="padding-right: 2px !important;">
- <%
- if (!isDateGiven) {
- %> <input type="radio" id="NowradioDate" name="radioDate" value="Now" checked>Now<br>
- <nobr> <input type="radio" name="radioDate" id="NotNowradioDate"
- value="<%=start+"_"+end%>"><input type="text"
- id="start" name="start" value="<%=start%>" size="8" /> - <input
- type="text" id=end name="end" value="<%=end%>"
- size="8" /><fmt:message key="date.format" /> <br> <fmt:message key="date.example" /></nobr> <br> <%
- } else {
-
- %> <input type="radio" id="NowradioDate" name="radioDate" value="Now"> Now<br>
- <nobr> <input type="radio" name="radioDate" id="NotNowradioDate"
- value="<%=start+"_"+end%>" checked><input type="text"
- id="start" name="start" value="<%=start%>" size="8" /> - <input
- type="text" id="end" name="end" value="<%=end%>"
- size="8" /><fmt:message key="date.format" /> <br> <fmt:message key="date.example" /></nobr> <br><%
-
- }
- %>
- </td>
-
-
- </tr>
-
- </table>
- </td>
- </tr>
- <tr>
- <td class="middle-header" colspan="2"><a
- class="icon-link"
- style="background-image: url(images/plus.gif);"
- href="javascript:showQueryProperties()"
- id="propertySymbolMax"></a> <fmt:message
- key="advanced.properties" /></td>
- </tr>
- <tr id="propertyTable" style="display: none">
- <td>
- <table width="50%">
- <tr>
- <td><fmt:message key="logger" /></td>
- <td><input type="text" size="30" id="logger"
- name="logger" value="<%=logger%>" /></td>
- </tr>
- <tr>
- <td><fmt:message key="priority" /></td>
- <td><select class="log-select" id="logLevelID"
- onchange="javascript:viewSingleSysLogLevel(); return false;">
-
- <%
- String[] logLevels = logViewerClient.getLogLevels();
- for (String logLevel : logLevels) {
- if (logLevel.equals(priority)) {
- %>
- <option value="<%=logLevel%>" selected="true"><%=logLevel%></option>
- <%
- } else {
- %>
- <option value="<%=logLevel%>"><%=logLevel%></option>
- <%
- }
- }
- %>
- </select></td>
- </tr>
- <tr>
- <td><fmt:message key="keyword" /></td>
- <td><input type="text" id="keyword" name="keyword"
- value="<%=keyWord%>" /></td>
- </tr>
-
- </table>
- </td>
- </tr>
- <tr>
- <td style="padding-left: 0px !important;"><input
- type="button" value="Search"
- onclick="javascript:getFilteredLogs(); return false;"
- class="button">
- </td>
- </tr>
- </table></td>
- <br />
-<%-- <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>" --%>
-<%-- page="view.jsp" pageNumberParameterName="pageNumber" parameters="<%=parameter%>"/> --%>
- <%
- if (!isDateGiven) {
- %>
- <font color="blue"><fmt:message
- key="view.logs.within.the.past.thirty.mins" />
- </font>
- <%
- } else {
- %>
- <font color="blue"><fmt:message
- key="view.logs.between" /><%=start%> and <%=end%>
- </font>
- <%
- }
- %><br/>
- <table border="1" class="styledLeft">
-
- <tbody>
-
- <tr>
- <td class="formRow">
-
- <table class="styledLeft">
- <thead>
- <tr>
- <th><b><fmt:message key="log.type" />
- </b>
- </th>
- <th><b><fmt:message key="date" />
- </b>
- </th>
- <th colspan="2"><b><fmt:message key="log.message" />
- </b>
- </th>
- </tr>
- </thead>
- <%
- if (events == null || events.length==0 || events[0] == null) {%>
- <fmt:message key="no.logs" />
- <%} else {
- int index=0;
- for (LogEvent logMessage : events) {
- index++;
- if (index % 2 != 0) {
- %>
- <tr>
- <%
+ System.out.println();
+ System.out.println();
+
+ // logs = logViewerClient.getAllLogs();
+ } catch (Exception e) {
+ CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
+ e);
+%>
+<script type="text/javascript">
+ location.href = "../admin/error.jsp";
+</script>
+<%
+ return;
+ }
+%>
+<fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
+
+ <carbon:breadcrumb label="system.logs"
+ resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
+ topPage="true" request="<%=request%>"/>
+ <div id="middle">
+ <h2>
+ <fmt:message key="system.logs"/>
+ </h2>
+
+ <div id="workArea">
+
+ <%
+ if (showTenantDomain || showManager) {
+ %> <br/> <br/>
+ <table border="0" class="styledLeft">
+ <tbody>
+ <tr>
+ <td>
+
+ <table class="normal">
+ <tr>
+ <%
+ if (showTenantDomain) {
+ %>
+
+ <td style="padding-right: 2px !important;">
+ <nobr>
+ <fmt:message key="tenant.domain"/>
+ </nobr>
+ </td>
+ <td style="padding-right: 2px !important;"><input
+ value="<%=tenantDomain%>" id="tenantDomain"
+ name="tenantDomain" size="20" type="text"></td>
+
+ <td style="padding-left: 0px !important;"><input
+ type="button" value="Get Tenant Logs"
+ onclick="javascript:getTenantSpecificIndex(); return false;"
+ class="button"></td>
+ <%
+ } else {
+ %>
+ <td><input type="hidden" id="tenantDomain"
+ name="tenantDomain" value="<%=tenantDomain%>"/>
+ </td>
+ <%
+ }
+ if (showManager) {
+ %>
+ <td style="width: 100%;"></td>
+ <td style="width: 100%;"></td>
+ <td style="width: 100%;"></td>
+ <td style="padding-left: 0px !important;">
+ <nobr>
+ <fmt:message key="service.name"/>
+ </nobr>
+ </td>
+ <td style="width: 100%;"></td>
+ <td style="padding-left: 0px !important;"><select
+ name="serviceName" id="serviceName"
+ onchange="getProductTenantSpecificIndex()">
+ <%
+ for (String name : serviceNames) {
+ %>
+ <%
+ if (name.equals(serviceName)) {
+ %>
+ <option selected="selected" value="<%=name%>">
+ <%=name%>
+ </option>
+ <%
+ } else {
+ %>
+ <option value="<%=name%>">
+ <%=name%>
+ </option>
+ <%
+ }
+ %>
+ <%
+ }
+ %>
+
+ </select></td>
+ <%
+ } else {
+ %>
+ <input type="hidden" id="serviceName" name="serviceName"
+ value="<%=serviceName%>"/>
+ <%
+ }
+ %>
+ </tr>
+
+
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <br/> <br/>
+ <%
+ }
+ %>
+
+ <table border="0" class="styledLeft">
+
+ <tbody>
+ <tr>
+ <td class="middle-header" colspan="2"><fmt:message key="filter.system.logs"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <table class="normal-nopadding" width="100%">
+ <tr>
+ <td>
+ <table width="50%">
+ <tr>
+ <td><fmt:message key="return.rows"/>
+ </td>
+ <td><select class="log-select" id="logIndex"
+ size="3">
+
+ <%
+ for (int i = 1; i < 201; i++) {
+ if (returnRows == i) {
+ %>
+ <option value="<%=i%>" selected="true"><%=i%>
+ </option>
+ <%
+ } else {
+ %>
+ <option value="<%=i%>"><%=i%>
+ </option>
+ <%
+ }
+ }
+ %>
+ </select>
+ </br></td>
+ </tr>
+ <tr>
+
+ <td>
+ <nobr>
+ <fmt:message key="show.at.or.before"/>
+ </nobr>
+ </td>
+ <td style="padding-right: 2px !important;">
+ <%
+ if (!isDateGiven) {
+ %> <input type="radio" id="NowradioDate" name="radioDate" value="Now"
+ checked>Now<br>
+ <nobr><input type="radio" name="radioDate" id="NotNowradioDate"
+ value="<%=start+"_"+end%>"><input type="text"
+ id="start" name="start"
+ value="<%=start%>"
+ size="8"/> - <input
+ type="text" id=end name="end" value="<%=end%>"
+ size="8"/><fmt:message key="date.format"/> <br> <fmt:message
+ key="date.example"/></nobr>
+ <br> <%
+ } else {
+
+ %> <input type="radio" id="NowradioDate" name="radioDate" value="Now">
+ Now<br>
+ <nobr><input type="radio" name="radioDate" id="NotNowradioDate"
+ value="<%=start+"_"+end%>" checked><input type="text"
+ id="start"
+ name="start"
+ value="<%=start%>"
+ size="8"/> -
+ <input
+ type="text" id="end" name="end" value="<%=end%>"
+ size="8"/><fmt:message key="date.format"/> <br> <fmt:message
+ key="date.example"/></nobr>
+ <br><%
+
+ }
+ %>
+ </td>
+
+
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="middle-header" colspan="2"><a
+ class="icon-link"
+ style="background-image: url(images/plus.gif);"
+ href="javascript:showQueryProperties()"
+ id="propertySymbolMax"></a> <fmt:message
+ key="advanced.properties"/></td>
+ </tr>
+ <tr id="propertyTable" style="display: none">
+ <td>
+ <table width="50%">
+ <tr>
+ <td><fmt:message key="logger"/></td>
+ <td><input type="text" size="30" id="logger"
+ name="logger" value="<%=logger%>"/></td>
+ </tr>
+ <tr>
+ <td><fmt:message key="priority"/></td>
+ <td><select class="log-select" id="logLevelID"
+ onchange="javascript:viewSingleSysLogLevel(); return false;">
+
+ <%
+ String[] logLevels = logViewerClient.getLogLevels();
+ for (String logLevel : logLevels) {
+ if (logLevel.equals(priority)) {
+ %>
+ <option value="<%=logLevel%>" selected="true"><%=logLevel%>
+ </option>
+ <%
+ } else {
+ %>
+ <option value="<%=logLevel%>"><%=logLevel%>
+ </option>
+ <%
+ }
+ }
+ %>
+ </select></td>
+ </tr>
+ <tr>
+ <td><fmt:message key="keyword"/></td>
+ <td><input type="text" id="keyword" name="keyword"
+ value="<%=keyWord%>"/></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td style="padding-left: 0px !important;"><input
+ type="button" value="Search"
+ onclick="javascript:getFilteredLogs(); return false;"
+ class="button">
+ </td>
+ </tr>
+ </table>
+ </td>
+ <br/>
+ <%-- <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>" --%>
+ <%-- page="view.jsp" pageNumberParameterName="pageNumber" parameters="<%=parameter%>"/> --%>
+ <%
+ if (!isDateGiven) {
+ %>
+ <font color="blue"><fmt:message
+ key="view.logs.within.the.past.thirty.mins"/>
+ </font>
+ <%
+ } else {
+ %>
+ <font color="blue"><fmt:message
+ key="view.logs.between"/><%=start%> and <%=end%>
+ </font>
+ <%
+ }
+ %><br/>
+ <table border="1" class="styledLeft">
+
+ <tbody>
+
+ <tr>
+ <td class="formRow">
+
+ <table class="styledLeft">
+ <thead>
+ <tr>
+ <th><b><fmt:message key="log.type"/>
+ </b>
+ </th>
+ <th><b><fmt:message key="date"/>
+ </b>
+ </th>
+ <th colspan="2"><b><fmt:message key="log.message"/>
+ </b>
+ </th>
+ </tr>
+ </thead>
+ <%
+ if (events == null || events.length == 0 || events[0] == null) {%>
+ <fmt:message key="no.logs"/>
+ <%
+ } else {
+ int index = 0;
+ for (LogEvent logMessage : events) {
+ index++;
+ if (index % 2 != 0) {
+ %>
+ <tr>
+ <%
} else {
%>
-
- <tr bgcolor="#eeeffb">
- <%
- }%>
- <td border-bottom="gray" width="2%"><img
- style="margin-right: 10px;"
- src="<%=logViewerClient.getImageName(logMessage.getPriority().trim())%>">
- </td>
- <td><nobr><%=logMessage.getLogTime()%></nobr></td>
- <td><%=logMessage.getMessage()%></td>
- <%String imgId = "traceSymbolMax"+index; %>
- <td><a
- class="icon-link"
- style="background-image: url(images/plus.gif);"
- href="javascript:showTrace(<%=index%>)"
- id="<%=imgId%>"></a> <fmt:message
- key="view.stack.trace" /></td>
- </tr>
-
- <%String id = "traceTable"+index; if (index % 2 != 0) {
- %>
- <tr id="<%=id%>" style="display: none" >
- <%
+
+ <tr bgcolor="#eeeffb">
+ <%
+ }%>
+ <td border-bottom="gray" width="2%"><img
+ style="margin-right: 10px;"
+ src="<%=logViewerClient.getImageName(logMessage.getPriority().trim())%>">
+ </td>
+ <td>
+ <nobr><%=logMessage.getLogTime()%>
+ </nobr>
+ </td>
+ <td><%=logMessage.getMessage()%>
+ </td>
+ <%String imgId = "traceSymbolMax" + index; %>
+ <td><a
+ class="icon-link"
+ style="background-image: url(images/plus.gif);"
+ href="javascript:showTrace(<%=index%>)"
+ id="<%=imgId%>"></a> <fmt:message
+ key="view.stack.trace"/></td>
+ </tr>
+
+ <%
+ String id = "traceTable" + index;
+ if (index % 2 != 0) {
+ %>
+ <tr id="<%=id%>" style="display: none">
+ <%
} else {
%>
-
- <tr id="<%=id%>" style="display: none" bgcolor="#eeeffb">
- <%
- }%>
-
- <td colspan="4" width="100%">[<%=logMessage.getServerName()%>] [<%=logMessage.getLogTime()%>] <%=logMessage.getPriority().trim()%> {<%=logMessage.getLogger()%>} - <%=logMessage.getMessage()%>
- <%=logMessage.getStacktrace()%><br/>
- </td>
- </tr>
- <%}
- }
- %>
-
- </table>
- </tr>
-<%-- <tr><carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>" --%>
-<%-- page="view.jsp" pageNumberParameterName="pageNumber" parameters="<%=parameter%>"/> <tr> --%>
-
- </tbody>
- </table>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </fmt:bundle>
+
+ <tr id="<%=id%>" style="display: none" bgcolor="#eeeffb">
+ <%
+ }%>
+
+ <td colspan="4" width="100%">[<%=logMessage.getServerName()%>]
+ [<%=logMessage.getLogTime()%>] <%=logMessage.getPriority().trim()%>
+ {<%=logMessage.getLogger()%>} - <%=logMessage.getMessage()%>
+ <%=logMessage.getStacktrace()%><br/>
+ </td>
+ </tr>
+ <%
+ }
+ }
+ %>
+
+ </table>
+ </tr>
+ <%-- <tr><carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>" --%>
+ <%-- page="view.jsp" pageNumberParameterName="pageNumber" parameters="<%=parameter%>"/> <tr> --%>
+
+ </tbody>
+ </table>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+</fmt:bundle>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/docs/userguide.html
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/docs/userguide.html b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/docs/userguide.html
index 0311f3a..41a9a3c 100644
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/docs/userguide.html
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/docs/userguide.html
@@ -19,59 +19,72 @@
-->
<html>
<head>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"/>
- <title>Monitor Logs - User Guide</title>
- <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all" />
-</head>
-
+ <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"/>
+ <title>Monitor Logs - User Guide</title>
+ <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all"/>
+</head>
+
<body>
<h1>Monitor Logs</h1>
-<p>Logs can be displayed as System logs or application logs.System Logs shows the log events of the system logs depending on the product. Application logs filter logs by the application, it can be services or web applications. There are two ways to configure system logs, 1) through Memory Appender where logs will be taken from the memory, 2) BAMLogEventAppender where logs will be published to bam and log events will be taken from BAM storages. Only the latest daily logs messages will be displayed in the UI where the logs events can be filtered accordingly. Log events are archived daily per tenant per product per date and can be downloaded for further analysis.
+<p>Logs can be displayed as System logs or application logs.System Logs shows the log events of the system logs
+ depending on the product. Application logs filter logs by the application, it can be services or web applications.
+ There are two ways to configure system logs, 1) through Memory Appender where logs will be taken from the memory, 2)
+ BAMLogEventAppender where logs will be published to bam and log events will be taken from BAM storages. Only the
+ latest daily logs messages will be displayed in the UI where the logs events can be filtered accordingly. Log events
+ are archived daily per tenant per product per date and can be downloaded for further analysis.
</p>
+
<p>The log messages, displayed in this page are obtained from a memory appender. Hence, the severity(log level) of the
displayed log messages are equal or higher than the threshold of the memory appender. For more information on
appenders, loggers and their log levels, please visit <a href="http://logging.apache.org/log4j/">here</a>. </p>
<h3><strong>Log files on disk</strong></h3>
+
<p>The location of the log files on disk is specified in the log4j.configuration file.</p>
<h2>View Logs</h2>
<p>This log events are displayed from bottom-up manner. You can also search for a
-particular log by a keyword using the <span style="font-weight: bold;">Search Logs</span>
-feature. <span style="color: red;"></span></p>
+ particular log by a keyword using the <span style="font-weight: bold;">Search Logs</span>
+ feature. <span style="color: red;"></span></p>
<ol>
- <li>In the navigator, under Monitor, click <span
- style="font-weight: bold;">Logs</span>. The <span
- style="font-style: italic; font-weight: bold;">System Logs/Application Logs</span> page
- appears.�</li>
+ <li>In the navigator, under Monitor, click <span
+ style="font-weight: bold;">Logs</span>. The <span
+ style="font-style: italic; font-weight: bold;">System Logs/Application Logs</span> page
+ appears.�
+ </li>
- <li>In the <span style="font-weight: bold;">View</span> list, select the
- category of logs you want to view. The available categories are, </li>
+ <li>In the <span style="font-weight: bold;">View</span> list, select the
+ category of logs you want to view. The available categories are,
+ </li>
</ol>
<div style="margin-left: 40px;">
-INFO �- Information messages
-WARN �- Warning messages
-ERROR �- Error messages
-DEBUG �- Debug messages
-TRACE �- Trace messages
-FATAL -�Fatal error messages </div>
+ INFO �- Information messages
+ WARN �- Warning messages
+ ERROR �- Error messages
+ DEBUG �- Debug messages
+ TRACE �- Trace messages
+ FATAL -�Fatal error messages
+</div>
<ol>
</ol>
-<p><img alt="" src="images/logview.jpg" /></p>
+<p><img alt="" src="images/logview.jpg"/></p>
<p style="text-align:left;">Figure 1: Monitor Logs</p>
-<p><img alt="" src="images/logIndex.jpg" /></p>
+<p><img alt="" src="images/logIndex.jpg"/></p>
+
<p style="text-align:left;">Figure 2: Archived Logs</p>
-<p>To filter out application specific logs, go to Monitor -> Application Logs. This will display application specific logs.</p>
+<p>To filter out application specific logs, go to Monitor -> Application Logs. This will display application specific
+ logs.</p>
+
+<p><img alt="" src="images/application.jpg"/></p>
-<p><img alt="" src="images/application.jpg" /></p>
<p style="text-align:left;">Figure 3: Application Logs</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/download-ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/download-ajaxprocessor.jsp b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/download-ajaxprocessor.jsp
index 171a80a..1faff1c 100755
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/download-ajaxprocessor.jsp
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/download-ajaxprocessor.jsp
@@ -1,23 +1,23 @@
<!--
- 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
+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
+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.
+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.
-->
-<%@page import="java.io.OutputStreamWriter"%>
+<%@page import="java.io.OutputStreamWriter" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient" %>
@@ -31,58 +31,58 @@
<script type="text/javascript" src="js/logviewer.js"></script>
<script type="text/javascript" src="../admin/dialog/js/dialog.js"></script>
<%
- String backendServerURL = CarbonUIUtil
- .getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
- .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- LogViewerClient logViewerClient;
- String message = "";
- String tenantDomain ="";
- String serviceName = "WSO2 Stratos Manager";
- String downloadFile = request.getParameter("logFile");
- try {
- out.clear();
- out = pageContext.pushBody();
- out.clearBuffer();
- ServletOutputStream outputStream = response.getOutputStream();
- response.setContentType("application/txt");
- response.setHeader("Content-Disposition", "attachment;filename=" + downloadFile.replaceAll("\\s", "_"));
- logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
- OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
- tenantDomain = request.getParameter("tenantDomain");
- serviceName = request.getParameter("serviceName");
- tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
- serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
- int fileSize = logViewerClient.getLineNumbers(downloadFile) + 1;
- System.out.println("fileSize "+fileSize);
- int pages = (int) Math.ceil((double) fileSize / 2000);
-
- for (int i = 0; i < pages; i++) {
- int start = (i * 2000) + 1;
- int end = start + 2000;
- String logIndex = Integer.toString(fileSize);
- String logs[] = logViewerClient.getLogLinesFromFile(downloadFile, fileSize,
- start, end);
- for (String logMessage : logs) {
- outputStreamWriter.write(logMessage + "\n");
- }
+ String backendServerURL = CarbonUIUtil
+ .getServerURL(config.getServletContext(), session);
+ ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
+ .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
+ String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
+ LogViewerClient logViewerClient;
+ String message = "";
+ String tenantDomain = "";
+ String serviceName = "WSO2 Stratos Manager";
+ String downloadFile = request.getParameter("logFile");
+ try {
+ out.clear();
+ out = pageContext.pushBody();
+ out.clearBuffer();
+ ServletOutputStream outputStream = response.getOutputStream();
+ response.setContentType("application/txt");
+ response.setHeader("Content-Disposition", "attachment;filename=" + downloadFile.replaceAll("\\s", "_"));
+ logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
+ OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
+ tenantDomain = request.getParameter("tenantDomain");
+ serviceName = request.getParameter("serviceName");
+ tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
+ serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
+ int fileSize = logViewerClient.getLineNumbers(downloadFile) + 1;
+ System.out.println("fileSize " + fileSize);
+ int pages = (int) Math.ceil((double) fileSize / 2000);
- }
- outputStreamWriter.flush();
- outputStream.flush();
- out.flush();
+ for (int i = 0; i < pages; i++) {
+ int start = (i * 2000) + 1;
+ int end = start + 2000;
+ String logIndex = Integer.toString(fileSize);
+ String logs[] = logViewerClient.getLogLinesFromFile(downloadFile, fileSize,
+ start, end);
+ for (String logMessage : logs) {
+ outputStreamWriter.write(logMessage + "\n");
+ }
+
+ }
+ outputStreamWriter.flush();
+ outputStream.flush();
+ out.flush();
outputStreamWriter.close();
outputStream.close();
out.close();
- } catch (Exception e) {
- CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
- e);
+ } catch (Exception e) {
+ CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
+ e);
%>
- <script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
+<script type="text/javascript">
+ location.href = "../admin/error.jsp";
+</script>
<%
- return;
- }
+ return;
+ }
%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3355d97/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/downloadgz-ajaxprocessor.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/downloadgz-ajaxprocessor.jsp b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/downloadgz-ajaxprocessor.jsp
index 23164ec..26bfee8 100755
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/downloadgz-ajaxprocessor.jsp
+++ b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/downloadgz-ajaxprocessor.jsp
@@ -1,23 +1,23 @@
<!--
- 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
+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
+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.
+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.
-->
-<%@page import="java.io.OutputStreamWriter"%>
+<%@page import="java.io.OutputStreamWriter" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient" %>
@@ -31,39 +31,39 @@
<script type="text/javascript" src="js/logviewer.js"></script>
<script type="text/javascript" src="../admin/dialog/js/dialog.js"></script>
<%
- String backendServerURL = CarbonUIUtil
- .getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
- .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- LogViewerClient logViewerClient;
- String message = "";
- String tenantDomain ="";
- String serviceName = "WSO2 Stratos Manager";
- String downloadFile = request.getParameter("logFile");
- String fileName = downloadFile;
- //String fileName = downloadFile.replace(".gz","");
- try {
- out.clear();
- out = pageContext.pushBody();
- out.clearBuffer();
- tenantDomain = request.getParameter("tenantDomain");
- serviceName = request.getParameter("serviceName");
- tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
- serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
- logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
- logViewerClient.downloadArchivedLogFiles(fileName,response, tenantDomain, serviceName);
-
- //out.flush();
- // out.close();
- } catch (Exception e) {
- CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
- e);
+ String backendServerURL = CarbonUIUtil
+ .getServerURL(config.getServletContext(), session);
+ ConfigurationContext configContext = (ConfigurationContext) config.getServletContext()
+ .getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
+ String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
+ LogViewerClient logViewerClient;
+ String message = "";
+ String tenantDomain = "";
+ String serviceName = "WSO2 Stratos Manager";
+ String downloadFile = request.getParameter("logFile");
+ String fileName = downloadFile;
+ //String fileName = downloadFile.replace(".gz","");
+ try {
+ out.clear();
+ out = pageContext.pushBody();
+ out.clearBuffer();
+ tenantDomain = request.getParameter("tenantDomain");
+ serviceName = request.getParameter("serviceName");
+ tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
+ serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
+ logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
+ logViewerClient.downloadArchivedLogFiles(fileName, response, tenantDomain, serviceName);
+
+ //out.flush();
+ // out.close();
+ } catch (Exception e) {
+ CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
+ e);
%>
- <script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
+<script type="text/javascript">
+ location.href = "../admin/error.jsp";
+</script>
<%
- return;
- }
+ return;
+ }
%>
[03/16] stratos git commit: Organize imports of Kubernetes client
module
Posted by la...@apache.org.
Organize imports of Kubernetes client module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/13e979e6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/13e979e6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/13e979e6
Branch: refs/heads/master
Commit: 13e979e60d026e8f865dc038537c8841b1a5b744
Parents: 88ae13e
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:44:45 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:44:45 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/kubernetes/client/model/Container.java | 4 ++--
.../apache/stratos/kubernetes/client/model/Manifest.java | 3 ---
.../apache/stratos/kubernetes/client/model/PodList.java | 5 ++---
.../kubernetes/client/model/ReplicationController.java | 2 --
.../client/model/ReplicationControllerList.java | 5 ++---
.../stratos/kubernetes/client/model/ServiceList.java | 5 ++---
.../apache/stratos/kubernetes/client/rest/RestClient.java | 10 +++-------
.../stratos/kubernetes/client/unit/PodUnitTest.java | 8 +-------
8 files changed, 12 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/13e979e6/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
index f8353ca..45e4bca 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
@@ -20,12 +20,12 @@
*/
package org.apache.stratos.kubernetes.client.model;
+import org.apache.commons.lang3.ArrayUtils;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.lang3.ArrayUtils;
-
public class Container {
private String name;
http://git-wip-us.apache.org/repos/asf/stratos/blob/13e979e6/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
index c487921..7a3161e 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
@@ -21,11 +21,8 @@
package org.apache.stratos.kubernetes.client.model;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
-import org.apache.commons.lang3.ArrayUtils;
-
/**
* https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/doc/manifest-schema.json
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/13e979e6/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
index 95dfaf9..128fc72 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
@@ -20,11 +20,10 @@
*/
package org.apache.stratos.kubernetes.client.model;
-import java.util.Arrays;
+import org.apache.commons.lang3.ArrayUtils;
import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.commons.lang3.ArrayUtils;
+import java.util.Arrays;
@XmlRootElement
public class PodList {
http://git-wip-us.apache.org/repos/asf/stratos/blob/13e979e6/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
index df9d2e4..f2d8539 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
@@ -21,8 +21,6 @@
package org.apache.stratos.kubernetes.client.model;
import javax.xml.bind.annotation.XmlRootElement;
-import java.util.ArrayList;
-import java.util.List;
/**
*
http://git-wip-us.apache.org/repos/asf/stratos/blob/13e979e6/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
index 5e43b98..12c615a 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
@@ -20,11 +20,10 @@
*/
package org.apache.stratos.kubernetes.client.model;
-import java.util.Arrays;
+import org.apache.commons.lang3.ArrayUtils;
import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.commons.lang3.ArrayUtils;
+import java.util.Arrays;
@XmlRootElement
public class ReplicationControllerList {
http://git-wip-us.apache.org/repos/asf/stratos/blob/13e979e6/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
index 809c376..ecf396a 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
@@ -20,11 +20,10 @@
*/
package org.apache.stratos.kubernetes.client.model;
-import java.util.Arrays;
+import org.apache.commons.lang3.ArrayUtils;
import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.commons.lang3.ArrayUtils;
+import java.util.Arrays;
@XmlRootElement
public class ServiceList {
http://git-wip-us.apache.org/repos/asf/stratos/blob/13e979e6/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
index ba532a4..6de8a1f 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
@@ -18,17 +18,13 @@
*/
package org.apache.stratos.kubernetes.client.rest;
-import java.net.URI;
-
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.client.methods.*;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import java.net.URI;
+
public class RestClient {
private DefaultHttpClient httpClient;
http://git-wip-us.apache.org/repos/asf/stratos/blob/13e979e6/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
index b42b72b..27c2f54 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
@@ -21,13 +21,7 @@
package org.apache.stratos.kubernetes.client.unit;
import junit.framework.TestCase;
-
-import org.apache.stratos.kubernetes.client.model.Container;
-import org.apache.stratos.kubernetes.client.model.Labels;
-import org.apache.stratos.kubernetes.client.model.Manifest;
-import org.apache.stratos.kubernetes.client.model.Pod;
-import org.apache.stratos.kubernetes.client.model.Port;
-import org.apache.stratos.kubernetes.client.model.State;
+import org.apache.stratos.kubernetes.client.model.*;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
[08/16] stratos git commit: Formatting Load balancer extension module
Posted by la...@apache.org.
Formatting Load balancer extension module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e60d7515
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e60d7515
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e60d7515
Branch: refs/heads/master
Commit: e60d7515c2729aae75afc56d54abd3ff58820745
Parents: 2d54dbc
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:47:46 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:47:46 2015 +0530
----------------------------------------------------------------------
.../pom.xml | 5 +-
.../balancer/extension/api/LoadBalancer.java | 3 +-
.../extension/api/LoadBalancerExtension.java | 136 ++++++++++---------
...oadBalancerExtensionAPIServiceComponent.java | 2 +-
4 files changed, 75 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e60d7515/components/org.apache.stratos.load.balancer.extension.api/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/pom.xml b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
index 34c4d5a..c54c674 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/pom.xml
+++ b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
@@ -18,9 +18,10 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/e60d7515/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
index a4911f3..68641ad 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
+++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancer.java
@@ -23,7 +23,7 @@ import org.apache.stratos.load.balancer.extension.api.exception.LoadBalancerExte
import org.apache.stratos.load.balancer.common.domain.Topology;
/**
- * A generic load balancer life-cycle definition.
+ * A generic load balancer life-cycle definition.
*/
public interface LoadBalancer {
@@ -42,6 +42,7 @@ public interface LoadBalancer {
/**
* Configure the load balancer using the given topology.
* Throw an exception is the configure operation fails.
+ *
* @param topology
* @return Returns true if configured correctly
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/e60d7515/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
index fe0c199..5d99191 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
+++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/LoadBalancerExtension.java
@@ -44,13 +44,13 @@ import java.util.concurrent.ExecutorService;
* received from the message broker.
*/
public class LoadBalancerExtension {
- private static final Log log = LogFactory.getLog(LoadBalancerExtension.class);
+ private static final Log log = LogFactory.getLog(LoadBalancerExtension.class);
- private LoadBalancer loadBalancer;
- private LoadBalancerStatisticsReader statsReader;
- private boolean loadBalancerStarted;
- private LoadBalancerStatisticsNotifier statisticsNotifier;
- private ExecutorService executorService;
+ private LoadBalancer loadBalancer;
+ private LoadBalancerStatisticsReader statsReader;
+ private boolean loadBalancerStarted;
+ private LoadBalancerStatisticsNotifier statisticsNotifier;
+ private ExecutorService executorService;
private TopologyProvider topologyProvider;
private LoadBalancerCommonTopologyEventReceiver topologyEventReceiver;
@@ -58,48 +58,48 @@ public class LoadBalancerExtension {
private LoadBalancerCommonApplicationSignUpEventReceiver applicationSignUpEventReceiver;
/**
- * Load balancer extension constructor.
- *
- * @param loadBalancer Load balancer instance: Mandatory.
- * @param statsReader Statistics reader: If null statistics notifier thread will not be started.
- */
- public LoadBalancerExtension(LoadBalancer loadBalancer, LoadBalancerStatisticsReader statsReader,
+ * Load balancer extension constructor.
+ *
+ * @param loadBalancer Load balancer instance: Mandatory.
+ * @param statsReader Statistics reader: If null statistics notifier thread will not be started.
+ */
+ public LoadBalancerExtension(LoadBalancer loadBalancer, LoadBalancerStatisticsReader statsReader,
TopologyProvider topologyProvider) {
this.loadBalancer = loadBalancer;
- this.statsReader = statsReader;
+ this.statsReader = statsReader;
this.topologyProvider = topologyProvider;
- }
+ }
- public void execute() {
- try {
- if (log.isInfoEnabled()) {
- log.info("Load balancer extension started");
- }
+ public void execute() {
+ try {
+ if (log.isInfoEnabled()) {
+ log.info("Load balancer extension started");
+ }
- // Start topology receiver thread
- startTopologyEventReceiver(executorService, topologyProvider);
+ // Start topology receiver thread
+ startTopologyEventReceiver(executorService, topologyProvider);
startApplicationSignUpEventReceiver(executorService, topologyProvider);
startDomainMappingEventReceiver(executorService, topologyProvider);
- if (statsReader != null) {
- // Start stats notifier thread
- statisticsNotifier = new LoadBalancerStatisticsNotifier(statsReader, topologyProvider);
- Thread statsNotifierThread = new Thread(statisticsNotifier);
- statsNotifierThread.start();
- } else {
- if (log.isWarnEnabled()) {
- log.warn("Load balancer statistics reader not found");
- }
- }
+ if (statsReader != null) {
+ // Start stats notifier thread
+ statisticsNotifier = new LoadBalancerStatisticsNotifier(statsReader, topologyProvider);
+ Thread statsNotifierThread = new Thread(statisticsNotifier);
+ statsNotifierThread.start();
+ } else {
+ if (log.isWarnEnabled()) {
+ log.warn("Load balancer statistics reader not found");
+ }
+ }
log.info("Waiting for complete topology event...");
} catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("Could not start load balancer extension", e);
- }
- }
- }
+ if (log.isErrorEnabled()) {
+ log.error("Could not start load balancer extension", e);
+ }
+ }
+ }
private void startTopologyEventReceiver(ExecutorService executorService, TopologyProvider topologyProvider) {
@@ -112,17 +112,17 @@ public class LoadBalancerExtension {
}
if (log.isInfoEnabled()) {
- if(TopologyServiceFilter.getInstance().isActive()) {
+ if (TopologyServiceFilter.getInstance().isActive()) {
log.info(String.format("Service filter activated: [filter] %s",
TopologyServiceFilter.getInstance().toString()));
}
- if(TopologyClusterFilter.getInstance().isActive()) {
+ if (TopologyClusterFilter.getInstance().isActive()) {
log.info(String.format("Cluster filter activated: [filter] %s",
TopologyClusterFilter.getInstance().toString()));
}
- if(TopologyMemberFilter.getInstance().isActive()) {
+ if (TopologyMemberFilter.getInstance().isActive()) {
log.info(String.format("Member filter activated: [filter] %s",
TopologyMemberFilter.getInstance().toString()));
}
@@ -148,7 +148,7 @@ public class LoadBalancerExtension {
}
private void addTopologyEventListeners(final LoadBalancerCommonTopologyEventReceiver topologyEventReceiver) {
- topologyEventReceiver.addEventListener(new CompleteTopologyEventListener() {
+ topologyEventReceiver.addEventListener(new CompleteTopologyEventListener() {
@Override
protected void onEvent(Event event) {
@@ -176,39 +176,40 @@ public class LoadBalancerExtension {
reloadConfiguration();
}
});
- topologyEventReceiver.addEventListener(new MemberTerminatedEventListener() {
+ topologyEventReceiver.addEventListener(new MemberTerminatedEventListener() {
@Override
protected void onEvent(Event event) {
reloadConfiguration();
}
});
- topologyEventReceiver.addEventListener(new ClusterRemovedEventListener() {
+ topologyEventReceiver.addEventListener(new ClusterRemovedEventListener() {
@Override
protected void onEvent(Event event) {
reloadConfiguration();
}
});
- topologyEventReceiver.addEventListener(new ServiceRemovedEventListener() {
+ topologyEventReceiver.addEventListener(new ServiceRemovedEventListener() {
@Override
protected void onEvent(Event event) {
reloadConfiguration();
}
});
- }
+ }
/**
* Configure and start load balancer
+ *
* @throws LoadBalancerExtensionException
*/
private void configureAndStart() throws LoadBalancerExtensionException {
// Initialize topology
- if(!topologyEventReceiver.isInitialized()) {
+ if (!topologyEventReceiver.isInitialized()) {
topologyEventReceiver.initializeTopology();
}
// Configure load balancer
Topology topology = topologyProvider.getTopology();
- if(topologyPopulated(topology) && loadBalancer.configure(topology)) {
+ if (topologyPopulated(topology) && loadBalancer.configure(topology)) {
// Start load balancer
loadBalancer.start();
loadBalancerStarted = true;
@@ -217,11 +218,12 @@ public class LoadBalancerExtension {
/**
* Configure and reload
+ *
* @throws LoadBalancerExtensionException
*/
private void configureAndReload() throws LoadBalancerExtensionException {
// Configure load balancer
- if(loadBalancer.configure(topologyProvider.getTopology())) {
+ if (loadBalancer.configure(topologyProvider.getTopology())) {
// Reload the load balancer
loadBalancer.reload();
}
@@ -229,13 +231,14 @@ public class LoadBalancerExtension {
/**
* Returns true if topology has populated
+ *
* @param topology
* @return
*/
private boolean topologyPopulated(Topology topology) {
- for(Service service : topology.getServices()) {
- for(Cluster cluster : service.getClusters()) {
- if(cluster.getMembers().size() > 0) {
+ for (Service service : topology.getServices()) {
+ for (Cluster cluster : service.getClusters()) {
+ if (cluster.getMembers().size() > 0) {
return true;
}
}
@@ -247,25 +250,24 @@ public class LoadBalancerExtension {
* Configure and reload load balancer configuration.
*/
private void reloadConfiguration() {
- try {
+ try {
if (!loadBalancerStarted) {
configureAndStart();
- }
- else {
+ } else {
configureAndReload();
}
- } catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("Could not reload load balancer configuration", e);
- }
- }
- }
+ } catch (Exception e) {
+ if (log.isErrorEnabled()) {
+ log.error("Could not reload load balancer configuration", e);
+ }
+ }
+ }
/**
* Stop load balancer instance.
*/
- public void stop() {
+ public void stop() {
try {
if (topologyEventReceiver != null) {
topologyEventReceiver.terminate();
@@ -284,13 +286,13 @@ public class LoadBalancerExtension {
loadBalancer.stop();
} catch (Exception ignore) {
}
- }
+ }
- public ExecutorService getExecutorService() {
- return executorService;
- }
+ public ExecutorService getExecutorService() {
+ return executorService;
+ }
- public void setExecutorService(ExecutorService executorService) {
- this.executorService = executorService;
- }
+ public void setExecutorService(ExecutorService executorService) {
+ this.executorService = executorService;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e60d7515/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
index c44419e..57633bc 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
+++ b/components/org.apache.stratos.load.balancer.extension.api/src/main/java/org/apache/stratos/load/balancer/extension/api/internal/LoadBalancerExtensionAPIServiceComponent.java
@@ -36,7 +36,7 @@ public class LoadBalancerExtensionAPIServiceComponent {
protected void activate(ComponentContext context) {
try {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Load Balancer Extension API Service bundle activated");
}
} catch (Exception e) {
[05/16] stratos git commit: Organize imports of Load banacer module
Posted by la...@apache.org.
Organize imports of Load banacer module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bf56f15e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bf56f15e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bf56f15e
Branch: refs/heads/master
Commit: bf56f15e780f90da00f99de945f5ebd9ff90c734
Parents: 7d6d933
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:46:07 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:46:07 2015 +0530
----------------------------------------------------------------------
.../stratos/load/balancer/algorithm/LoadBalanceAlgorithm.java | 2 +-
.../org/apache/stratos/load/balancer/algorithm/RoundRobin.java | 2 +-
.../apache/stratos/load/balancer/endpoint/RequestDelegator.java | 2 +-
.../load/balancer/test/LoadBalancerConfigurationTest.java | 2 +-
.../load/balancer/test/LoadBalancerStatisticsCollectorTest.java | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bf56f15e/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/algorithm/LoadBalanceAlgorithm.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/algorithm/LoadBalanceAlgorithm.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/algorithm/LoadBalanceAlgorithm.java
index 1344c0b..4a305aa 100755
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/algorithm/LoadBalanceAlgorithm.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/algorithm/LoadBalanceAlgorithm.java
@@ -19,8 +19,8 @@
package org.apache.stratos.load.balancer.algorithm;
-import org.apache.stratos.load.balancer.context.AlgorithmContext;
import org.apache.stratos.load.balancer.common.domain.Member;
+import org.apache.stratos.load.balancer.context.AlgorithmContext;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/stratos/blob/bf56f15e/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/algorithm/RoundRobin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/algorithm/RoundRobin.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/algorithm/RoundRobin.java
index af08f79..bfc03c2 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/algorithm/RoundRobin.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/algorithm/RoundRobin.java
@@ -21,8 +21,8 @@ package org.apache.stratos.load.balancer.algorithm;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.load.balancer.context.AlgorithmContext;
import org.apache.stratos.load.balancer.common.domain.Member;
+import org.apache.stratos.load.balancer.context.AlgorithmContext;
import java.util.List;
import java.util.concurrent.locks.Lock;
http://git-wip-us.apache.org/repos/asf/stratos/blob/bf56f15e/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/RequestDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/RequestDelegator.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/RequestDelegator.java
index 5047fc6..686f9e9 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/RequestDelegator.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/endpoint/RequestDelegator.java
@@ -22,9 +22,9 @@ package org.apache.stratos.load.balancer.endpoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.load.balancer.algorithm.LoadBalanceAlgorithm;
-import org.apache.stratos.load.balancer.common.topology.TopologyProvider;
import org.apache.stratos.load.balancer.common.domain.Cluster;
import org.apache.stratos.load.balancer.common.domain.Member;
+import org.apache.stratos.load.balancer.common.topology.TopologyProvider;
import org.apache.stratos.load.balancer.conf.LoadBalancerConfiguration;
import org.apache.stratos.load.balancer.context.AlgorithmContext;
import org.apache.stratos.load.balancer.context.ClusterContext;
http://git-wip-us.apache.org/repos/asf/stratos/blob/bf56f15e/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java
index 7e867dd..3a92d81 100755
--- a/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java
+++ b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerConfigurationTest.java
@@ -18,10 +18,10 @@
*/
package org.apache.stratos.load.balancer.test;
-import org.apache.stratos.load.balancer.common.topology.TopologyProvider;
import org.apache.stratos.load.balancer.common.domain.Cluster;
import org.apache.stratos.load.balancer.common.domain.Member;
import org.apache.stratos.load.balancer.common.domain.Port;
+import org.apache.stratos.load.balancer.common.topology.TopologyProvider;
import org.apache.stratos.load.balancer.conf.LoadBalancerConfiguration;
import org.apache.stratos.load.balancer.conf.domain.TenantIdentifier;
import org.junit.Assert;
http://git-wip-us.apache.org/repos/asf/stratos/blob/bf56f15e/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerStatisticsCollectorTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerStatisticsCollectorTest.java b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerStatisticsCollectorTest.java
index 594b9a4..92c6da8 100644
--- a/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerStatisticsCollectorTest.java
+++ b/components/org.apache.stratos.load.balancer/src/test/java/org/apache/stratos/load/balancer/test/LoadBalancerStatisticsCollectorTest.java
@@ -19,11 +19,11 @@
package org.apache.stratos.load.balancer.test;
+import org.apache.stratos.load.balancer.statistics.InFlightRequestDecrementCallable;
import org.apache.stratos.load.balancer.statistics.InFlightRequestIncrementCallable;
import org.apache.stratos.load.balancer.statistics.LoadBalancerStatisticsCollector;
-import org.junit.Assert;
-import org.apache.stratos.load.balancer.statistics.InFlightRequestDecrementCallable;
import org.apache.stratos.load.balancer.statistics.LoadBalancerStatisticsExecutor;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
[15/16] stratos git commit: Formatting Stratos manager module
Posted by la...@apache.org.
Formatting Stratos manager module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/779eb767
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/779eb767
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/779eb767
Branch: refs/heads/master
Commit: 779eb76742c9f116933f8b470f3b6523131dd674
Parents: f3355d9
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 08:49:50 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 08:49:50 2015 +0530
----------------------------------------------------------------------
.../components/ApplicationSignUpHandler.java | 4 +-
.../ArtifactDistributionCoordinator.java | 21 +-
.../components/DomainMappingHandler.java | 32 +-
.../manager/context/StratosManagerContext.java | 370 +++++++++----------
.../exception/AlreadySubscribedException.java | 38 +-
.../ApplicationSubscriptionException.java | 2 +-
.../InvalidCartridgeAliasException.java | 50 +--
.../exception/StratosManagerException.java | 38 +-
.../internal/ServiceReferenceHolder.java | 7 +-
.../StratosManagerServiceComponent.java | 59 +--
.../publisher/DomainMappingEventPublisher.java | 4 +-
.../InstanceNotificationPublisher.java | 58 +--
.../publisher/TenantEventPublisher.java | 140 +++----
.../ApplicationSignUpEventSynchronizer.java | 2 +-
.../synchronizer/TenantEventSynchronizer.java | 82 ++--
.../StratosManagerApplicationEventReceiver.java | 22 +-
...ratosManagerInstanceStatusEventReceiver.java | 2 +-
.../StratosManagerTopologyEventReceiver.java | 4 +-
.../manager/registry/RegistryManager.java | 21 +-
.../manager/services/StratosManagerService.java | 45 ++-
.../impl/StratosManagerServiceImpl.java | 152 ++++----
.../CartridgeSubscriptionDataPublisher.java | 256 ++++++-------
.../user/management/TenantUserRoleManager.java | 51 +--
.../utils/ApplicationManagementUtil.java | 4 +-
.../manager/utils/CartridgeConstants.java | 38 +-
.../stratos/manager/utils/UserRoleCreator.java | 24 +-
.../src/main/resources/META-INF/services.xml | 16 +-
.../src/main/resources/policies.xsd | 66 ++--
28 files changed, 816 insertions(+), 792 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ApplicationSignUpHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ApplicationSignUpHandler.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ApplicationSignUpHandler.java
index 84c3c64..c52f367 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ApplicationSignUpHandler.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ApplicationSignUpHandler.java
@@ -59,7 +59,7 @@ public class ApplicationSignUpHandler {
int tenantId = applicationSignUp.getTenantId();
String[] clusterIdArray = applicationSignUp.getClusterIds();
List<String> clusterIdList = new ArrayList<String>();
- if(clusterIdArray != null) {
+ if (clusterIdArray != null) {
for (String clusterId : clusterIdArray) {
clusterIdList.add(clusterId);
}
@@ -95,6 +95,7 @@ public class ApplicationSignUpHandler {
/**
* Check application signup availability.
+ *
* @param applicationId
* @param tenantId
* @return
@@ -214,6 +215,7 @@ public class ApplicationSignUpHandler {
/**
* Get all application signups.
+ *
* @return
* @throws ApplicationSignUpException
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java
index e996a6f..8a71a1c 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java
@@ -48,6 +48,7 @@ public class ArtifactDistributionCoordinator {
/**
* Notify artifact updated event for an application signup.
+ *
* @param applicationId
* @param tenantId
* @throws ArtifactDistributionCoordinatorException
@@ -58,6 +59,7 @@ public class ArtifactDistributionCoordinator {
/**
* Notify artifact updated event for an application signup, cluster.
+ *
* @param applicationId
* @param tenantId
* @param clusterId
@@ -81,7 +83,7 @@ public class ArtifactDistributionCoordinator {
for (ArtifactRepository artifactRepository : applicationSignUp.getArtifactRepositories()) {
if (artifactRepository != null) {
String artifactRepositoryClusterId = findClusterId(applicationId, artifactRepository.getAlias());
- if(StringUtils.isBlank(clusterId) || (clusterId.equals(artifactRepositoryClusterId))) {
+ if (StringUtils.isBlank(clusterId) || (clusterId.equals(artifactRepositoryClusterId))) {
publisher.publishArtifactUpdatedEvent(artifactRepositoryClusterId,
String.valueOf(applicationSignUp.getTenantId()),
@@ -103,30 +105,31 @@ public class ArtifactDistributionCoordinator {
}
}
} catch (Exception e) {
- String message = "Could not notify artifact updated event";
- log.error(message, e);
+ String message = "Could not notify artifact updated event";
+ log.error(message, e);
throw new ArtifactDistributionCoordinatorException(message, e);
}
}
/**
* Notify artifact updated event for artifact repository.
+ *
* @param repoUrl
*/
public void notifyArtifactUpdatedEventForRepository(String repoUrl) throws ArtifactDistributionCoordinatorException {
try {
List<ApplicationSignUp> applicationSignUps = applicationSignUpManager.getApplicationSignUpsForRepository(repoUrl);
- if((applicationSignUps == null) || (applicationSignUps.size() == 0)) {
- if(log.isWarnEnabled()) {
+ if ((applicationSignUps == null) || (applicationSignUps.size() == 0)) {
+ if (log.isWarnEnabled()) {
log.warn(String.format("Artifact updated event not sent, " +
"application signups not found for repository: [repo-url] %s", repoUrl));
return;
}
- for(ApplicationSignUp applicationSignUp : applicationSignUps) {
- if(applicationSignUp.getArtifactRepositories() != null) {
- for(ArtifactRepository artifactRepository : applicationSignUp.getArtifactRepositories()) {
- if((artifactRepository != null) && (artifactRepository.getRepoUrl().equals(repoUrl))) {
+ for (ApplicationSignUp applicationSignUp : applicationSignUps) {
+ if (applicationSignUp.getArtifactRepositories() != null) {
+ for (ArtifactRepository artifactRepository : applicationSignUp.getArtifactRepositories()) {
+ if ((artifactRepository != null) && (artifactRepository.getRepoUrl().equals(repoUrl))) {
String applicationId = applicationSignUp.getApplicationId();
int tenantId = applicationSignUp.getTenantId();
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
index 8f1012c..cbf3fa2 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
@@ -55,7 +55,7 @@ public class DomainMappingHandler {
// Add domain name to application signup
ApplicationSignUp applicationSignUp = applicationSignUpHandler.getApplicationSignUp(applicationId, tenantId);
DomainMapping[] domainMappingArray = applicationSignUp.getDomainMappings();
- if(domainMappingArray == null) {
+ if (domainMappingArray == null) {
domainMappingArray = new DomainMapping[1];
domainMappingArray[0] = domainMapping;
} else {
@@ -71,7 +71,7 @@ public class DomainMappingHandler {
domainMapping.getServiceName(), domainMapping.getClusterId(),
domainMapping.getDomainName(), domainMapping.getContextPath());
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Domain mapping added successfully: [application-id] %s [tenant-id] %d " +
"[domain-name] %s", applicationId, tenantId, domainName));
}
@@ -84,8 +84,8 @@ public class DomainMappingHandler {
private List<DomainMapping> convertDomainMappingArrayToList(DomainMapping[] domainMappingArray) {
List<DomainMapping> domainMappingList = new ArrayList<DomainMapping>();
- for(DomainMapping arrayItem : domainMappingArray) {
- if(arrayItem != null) {
+ for (DomainMapping arrayItem : domainMappingArray) {
+ if (arrayItem != null) {
domainMappingList.add(arrayItem);
}
}
@@ -93,7 +93,7 @@ public class DomainMappingHandler {
}
private void checkDomainNameAvailability(String domainName) throws DomainMappingException {
- if(domainNameExist(domainName)) {
+ if (domainNameExist(domainName)) {
throw new RuntimeException(String.format("Domain name is already mapped: [domain-name] %s", domainName));
}
}
@@ -101,12 +101,12 @@ public class DomainMappingHandler {
public boolean domainNameExist(String domainName) throws DomainMappingException {
try {
List<ApplicationSignUp> applicationSignUps = applicationSignUpHandler.getApplicationSignUps();
- if(applicationSignUps != null) {
- for(ApplicationSignUp applicationSignUp : applicationSignUps) {
- if(applicationSignUp.getDomainMappings() != null) {
- for(DomainMapping domainMapping : applicationSignUp.getDomainMappings()) {
- if((domainMapping != null) && (domainMapping.getDomainName().equals(domainName))) {
- return true;
+ if (applicationSignUps != null) {
+ for (ApplicationSignUp applicationSignUp : applicationSignUps) {
+ if (applicationSignUp.getDomainMappings() != null) {
+ for (DomainMapping domainMapping : applicationSignUp.getDomainMappings()) {
+ if ((domainMapping != null) && (domainMapping.getDomainName().equals(domainName))) {
+ return true;
}
}
}
@@ -123,7 +123,7 @@ public class DomainMappingHandler {
public DomainMapping[] getDomainMappings(String applicationId, int tenantId) throws DomainMappingException {
try {
ApplicationSignUp applicationSignUp = applicationSignUpHandler.getApplicationSignUp(applicationId, tenantId);
- if(applicationSignUp != null) {
+ if (applicationSignUp != null) {
return applicationSignUp.getDomainMappings();
}
return null;
@@ -143,9 +143,9 @@ public class DomainMappingHandler {
List<DomainMapping> domainMappingList = convertDomainMappingArrayToList(domainMappingArray);
Iterator<DomainMapping> iterator = domainMappingList.iterator();
- while(iterator.hasNext()) {
+ while (iterator.hasNext()) {
DomainMapping domainMapping = iterator.next();
- if(domainMapping.getDomainName().equals(domainName)) {
+ if (domainMapping.getDomainName().equals(domainName)) {
iterator.remove();
domainMappingArray = domainMappingList.toArray(new DomainMapping[domainMappingList.size()]);
@@ -155,7 +155,7 @@ public class DomainMappingHandler {
DomainMappingEventPublisher.publishDomainNameRemovedEvent(applicationId, tenantId,
domainMapping.getServiceName(), domainMapping.getClusterId(), domainName);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
String.format("Domain mapping removed: [application-id] %s [tenant-id] %d " +
"[domain-name] %s", applicationId, tenantId, domainName);
}
@@ -164,7 +164,7 @@ public class DomainMappingHandler {
}
} catch (Exception e) {
String message = String.format("Could not remove domain mappings: [application-id] %s [tenant-id] %d " +
- "[domain-name] %s", applicationId, tenantId, domainName);
+ "[domain-name] %s", applicationId, tenantId, domainName);
log.error(message, e);
throw new DomainMappingException(message, e);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
index 44d44d9..856c9db 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
@@ -38,47 +38,47 @@ import org.wso2.carbon.registry.core.exceptions.RegistryException;
*/
public class StratosManagerContext implements Serializable {
- private static volatile StratosManagerContext instance;
-
+ private static volatile StratosManagerContext instance;
+
private static final String SM_CARTRIDGE_TYPE_TO_CARTIDGE_GROUPS_MAP = "SM_CARTRIDGE_TYPE_TO_CARTIDGE_GROUPS_MAP";
private static final String SM_CARTRIDGE_TYPE_TO_APPLICATIONS_MAP = "SM_CARTRIDGE_TYPE_TO_APPLICATIONS_MAP";
private static final String SM_CARTRIDGE_GROUP_TO_CARTIDGE_GROUPS_MAP = "SM_CARTRIDGE_GROUP_TO_CARTIDGE_GROUPS_MAP";
private static final String SM_CARTRIDGE_GROUP_TO_APPLICATIONS_MAP = "SM_CARTRIDGE_GROUP_TO_APPLICATIONS_MAP";
-
+
private static final String SM_CARTRIDGES_CARTRIDGEGROUPS_WRITE_LOCK = "SM_CARTRIDGES_CARTRIDGEGROUPS_WRITE_LOCK";
private static final String SM_CARTRIDGES_APPLICATIONS_WRITE_LOCK = "SM_CARTRIDGES_APPLICATIONS_WRITE_LOCK";
private static final String SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK = "SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK";
private static final String SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK = "SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK";
-
+
public static final String DATA_RESOURCE = "/stratos.manager/data";
-
+
private final transient DistributedObjectProvider distributedObjectProvider;
private static final Log log = LogFactory.getLog(StratosManagerContext.class);
-
+
/**
* Key - cartridge type
* Value - list of cartridgeGroupNames
*/
private Map<String, Set<String>> cartridgeTypeToCartridgeGroupsMap;
-
+
/**
* Key - cartridge type
* Value - list of ApplicationNames
*/
private Map<String, Set<String>> cartridgeTypeToApplicationsMap;
-
+
/**
* Key - cartridge group name
* Value - list of cartridgeGroupNames
*/
private Map<String, Set<String>> cartridgeGroupToCartridgeSubGroupsMap;
-
+
/**
* Key - cartridge group name
* Value - list of ApplicationNames
*/
private Map<String, Set<String>> cartridgeGroupToApplicationsMap;
-
+
private boolean clustered;
private boolean coordinator;
@@ -93,22 +93,22 @@ public class StratosManagerContext implements Serializable {
return instance;
}
- private StratosManagerContext(){
+ private StratosManagerContext() {
// Initialize clustering status
AxisConfiguration axisConfiguration = ServiceReferenceHolder.getInstance().getAxisConfiguration();
if ((axisConfiguration != null) && (axisConfiguration.getClusteringAgent() != null)) {
clustered = true;
}
-
+
// Initialize distributed object provider
distributedObjectProvider = ServiceReferenceHolder.getInstance().getDistributedObjectProvider();
-
+
// Get maps from distributed object provider
cartridgeTypeToCartridgeGroupsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_TYPE_TO_CARTIDGE_GROUPS_MAP);
cartridgeTypeToApplicationsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_TYPE_TO_APPLICATIONS_MAP);
cartridgeGroupToCartridgeSubGroupsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_GROUP_TO_CARTIDGE_GROUPS_MAP);
cartridgeGroupToApplicationsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_GROUP_TO_APPLICATIONS_MAP);
-
+
// Update context from the registry
updateContextFromRegistry();
}
@@ -124,7 +124,7 @@ public class StratosManagerContext implements Serializable {
public boolean isClustered() {
return clustered;
}
-
+
private Lock acquireWriteLock(String object) {
return distributedObjectProvider.acquireLock(object);
}
@@ -132,11 +132,11 @@ public class StratosManagerContext implements Serializable {
public void releaseWriteLock(Lock lock) {
distributedObjectProvider.releaseLock(lock);
}
-
+
public Lock acquireCartridgesCartridgeGroupsWriteLock() {
return acquireWriteLock(SM_CARTRIDGES_CARTRIDGEGROUPS_WRITE_LOCK);
}
-
+
public Lock acquireCartridgesApplicationsWriteLock() {
return acquireWriteLock(SM_CARTRIDGES_APPLICATIONS_WRITE_LOCK);
}
@@ -144,199 +144,199 @@ public class StratosManagerContext implements Serializable {
public Lock acquireCartridgeGroupsCartridgeSubGroupsWriteLock() {
return acquireWriteLock(SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK);
}
-
+
public Lock acquireCartridgeGroupsApplicationsWriteLock() {
return acquireWriteLock(SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK);
}
-
+
public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) {
- if(cartridgeNames == null) {
- return;
- }
-
- for(String cartridgeName : cartridgeNames) {
- Set<String> cartridgeGroupNames = null;
- if(cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeName)) {
- cartridgeGroupNames = cartridgeTypeToCartridgeGroupsMap.get(cartridgeName);
- } else {
- cartridgeGroupNames = new HashSet<String>();
- cartridgeTypeToCartridgeGroupsMap.put(cartridgeName, cartridgeGroupNames);
- }
- cartridgeGroupNames.add(cartridgeGroupName);
- }
+ if (cartridgeNames == null) {
+ return;
+ }
+
+ for (String cartridgeName : cartridgeNames) {
+ Set<String> cartridgeGroupNames = null;
+ if (cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeName)) {
+ cartridgeGroupNames = cartridgeTypeToCartridgeGroupsMap.get(cartridgeName);
+ } else {
+ cartridgeGroupNames = new HashSet<String>();
+ cartridgeTypeToCartridgeGroupsMap.put(cartridgeName, cartridgeGroupNames);
+ }
+ cartridgeGroupNames.add(cartridgeGroupName);
+ }
}
-
+
public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames) {
- if(cartridgeNames == null) {
- return;
- }
-
- for(String cartridgeName : cartridgeNames) {
- Set<String> cartridgeGroupNames = null;
- if(cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeName)) {
- cartridgeGroupNames = cartridgeTypeToCartridgeGroupsMap.get(cartridgeName);
- // Remove current cartridge group name
- cartridgeGroupNames.remove(cartridgeGroupName);
- // Remove entry if there are no more cartridge group names for that cartridge type
- if (cartridgeGroupNames.isEmpty()) {
- cartridgeGroupNames = null;
- cartridgeTypeToCartridgeGroupsMap.remove(cartridgeName);
- }
- }
- }
+ if (cartridgeNames == null) {
+ return;
+ }
+
+ for (String cartridgeName : cartridgeNames) {
+ Set<String> cartridgeGroupNames = null;
+ if (cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeName)) {
+ cartridgeGroupNames = cartridgeTypeToCartridgeGroupsMap.get(cartridgeName);
+ // Remove current cartridge group name
+ cartridgeGroupNames.remove(cartridgeGroupName);
+ // Remove entry if there are no more cartridge group names for that cartridge type
+ if (cartridgeGroupNames.isEmpty()) {
+ cartridgeGroupNames = null;
+ cartridgeTypeToCartridgeGroupsMap.remove(cartridgeName);
+ }
+ }
+ }
}
-
+
public boolean isCartridgeIncludedInCartridgeGroups(String cartridgeName) {
- if(cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeName)) {
- if(!cartridgeTypeToCartridgeGroupsMap.get(cartridgeName).isEmpty()) {
- return true;
- }
- return false;
- }
- return false;
+ if (cartridgeTypeToCartridgeGroupsMap.containsKey(cartridgeName)) {
+ if (!cartridgeTypeToCartridgeGroupsMap.get(cartridgeName).isEmpty()) {
+ return true;
+ }
+ return false;
+ }
+ return false;
}
-
+
public void addUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) {
- if(cartridgeNames == null) {
- return;
- }
-
- for(String cartridgeName : cartridgeNames) {
- Set<String> applicationNames = null;
- if(cartridgeTypeToApplicationsMap.containsKey(cartridgeName)) {
- applicationNames = cartridgeTypeToApplicationsMap.get(cartridgeName);
- } else {
- applicationNames = new HashSet<String>();
- cartridgeTypeToApplicationsMap.put(cartridgeName, applicationNames);
- }
- applicationNames.add(applicationName);
- }
+ if (cartridgeNames == null) {
+ return;
+ }
+
+ for (String cartridgeName : cartridgeNames) {
+ Set<String> applicationNames = null;
+ if (cartridgeTypeToApplicationsMap.containsKey(cartridgeName)) {
+ applicationNames = cartridgeTypeToApplicationsMap.get(cartridgeName);
+ } else {
+ applicationNames = new HashSet<String>();
+ cartridgeTypeToApplicationsMap.put(cartridgeName, applicationNames);
+ }
+ applicationNames.add(applicationName);
+ }
}
-
+
public void removeUsedCartridgesInApplications(String applicationName, String[] cartridgeNames) {
- if(cartridgeNames == null) {
- return;
- }
-
- for(String cartridgeName : cartridgeNames) {
- Set<String> applicationNames = null;
- if(cartridgeTypeToApplicationsMap.containsKey(cartridgeName)) {
- applicationNames = cartridgeTypeToApplicationsMap.get(cartridgeName);
- // Remove current application name
- applicationNames.remove(applicationName);
- // Remove entry if there are no more cartridge group names for that cartridge type
- if (applicationNames.isEmpty()) {
- applicationNames = null;
- cartridgeTypeToApplicationsMap.remove(cartridgeName);
- }
- }
- }
+ if (cartridgeNames == null) {
+ return;
+ }
+
+ for (String cartridgeName : cartridgeNames) {
+ Set<String> applicationNames = null;
+ if (cartridgeTypeToApplicationsMap.containsKey(cartridgeName)) {
+ applicationNames = cartridgeTypeToApplicationsMap.get(cartridgeName);
+ // Remove current application name
+ applicationNames.remove(applicationName);
+ // Remove entry if there are no more cartridge group names for that cartridge type
+ if (applicationNames.isEmpty()) {
+ applicationNames = null;
+ cartridgeTypeToApplicationsMap.remove(cartridgeName);
+ }
+ }
+ }
}
-
+
public boolean isCartridgeIncludedInApplications(String cartridgeName) {
- if(cartridgeTypeToApplicationsMap.containsKey(cartridgeName)) {
- if(!cartridgeTypeToApplicationsMap.get(cartridgeName).isEmpty()) {
- return true;
- }
- return false;
- }
- return false;
+ if (cartridgeTypeToApplicationsMap.containsKey(cartridgeName)) {
+ if (!cartridgeTypeToApplicationsMap.get(cartridgeName).isEmpty()) {
+ return true;
+ }
+ return false;
+ }
+ return false;
}
-
+
public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) {
- if(cartridgeGroupNames == null) {
- return;
- }
-
- for(String cartridgeGroupName : cartridgeGroupNames) {
- Set<String> cartridgeSubGroupNames = null;
- if(cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupName)) {
- cartridgeSubGroupNames = cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupName);
- } else {
- cartridgeSubGroupNames = new HashSet<String>();
- cartridgeGroupToCartridgeSubGroupsMap.put(cartridgeSubGroupName, cartridgeSubGroupNames);
- }
- cartridgeSubGroupNames.add(cartridgeGroupName);
- }
+ if (cartridgeGroupNames == null) {
+ return;
+ }
+
+ for (String cartridgeGroupName : cartridgeGroupNames) {
+ Set<String> cartridgeSubGroupNames = null;
+ if (cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupName)) {
+ cartridgeSubGroupNames = cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupName);
+ } else {
+ cartridgeSubGroupNames = new HashSet<String>();
+ cartridgeGroupToCartridgeSubGroupsMap.put(cartridgeSubGroupName, cartridgeSubGroupNames);
+ }
+ cartridgeSubGroupNames.add(cartridgeGroupName);
+ }
}
-
+
public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) {
- if(cartridgeGroupNames == null) {
- return;
- }
-
- for(String cartridgeGroupName : cartridgeGroupNames) {
- Set<String> cartridgeSubGroupNames = null;
- if(cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupName)) {
- cartridgeSubGroupNames = cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupName);
- // Remove current cartridge group name
- cartridgeSubGroupNames.remove(cartridgeGroupName);
- // Remove entry if there are no more cartridge group names for that cartridge type
- if (cartridgeSubGroupNames.isEmpty()) {
- cartridgeSubGroupNames = null;
- cartridgeGroupToCartridgeSubGroupsMap.remove(cartridgeGroupName);
- }
- }
- }
+ if (cartridgeGroupNames == null) {
+ return;
+ }
+
+ for (String cartridgeGroupName : cartridgeGroupNames) {
+ Set<String> cartridgeSubGroupNames = null;
+ if (cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupName)) {
+ cartridgeSubGroupNames = cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupName);
+ // Remove current cartridge group name
+ cartridgeSubGroupNames.remove(cartridgeGroupName);
+ // Remove entry if there are no more cartridge group names for that cartridge type
+ if (cartridgeSubGroupNames.isEmpty()) {
+ cartridgeSubGroupNames = null;
+ cartridgeGroupToCartridgeSubGroupsMap.remove(cartridgeGroupName);
+ }
+ }
+ }
}
-
+
public boolean isCartridgeGroupIncludedInCartridgeSubGroups(String cartridgeGroupName) {
- if(cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupName)) {
- if(!cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupName).isEmpty()) {
- return true;
- }
- return false;
- }
- return false;
+ if (cartridgeGroupToCartridgeSubGroupsMap.containsKey(cartridgeGroupName)) {
+ if (!cartridgeGroupToCartridgeSubGroupsMap.get(cartridgeGroupName).isEmpty()) {
+ return true;
+ }
+ return false;
+ }
+ return false;
}
-
+
public void addUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) {
- if(cartridgeGroupNames == null) {
- return;
- }
-
- for(String cartridgeGroupName : cartridgeGroupNames) {
- Set<String> applicationNames = null;
- if(cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupName)) {
- applicationNames = cartridgeGroupToApplicationsMap.get(cartridgeGroupName);
- } else {
- applicationNames = new HashSet<String>();
- cartridgeGroupToApplicationsMap.put(cartridgeGroupName, applicationNames);
- }
- applicationNames.add(applicationName);
- }
+ if (cartridgeGroupNames == null) {
+ return;
+ }
+
+ for (String cartridgeGroupName : cartridgeGroupNames) {
+ Set<String> applicationNames = null;
+ if (cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupName)) {
+ applicationNames = cartridgeGroupToApplicationsMap.get(cartridgeGroupName);
+ } else {
+ applicationNames = new HashSet<String>();
+ cartridgeGroupToApplicationsMap.put(cartridgeGroupName, applicationNames);
+ }
+ applicationNames.add(applicationName);
+ }
}
-
+
public void removeUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames) {
- if(cartridgeGroupNames == null) {
- return;
- }
-
- for(String cartridgeGroupName : cartridgeGroupNames) {
- Set<String> applicationNames = null;
- if(cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupName)) {
- applicationNames = cartridgeGroupToApplicationsMap.get(cartridgeGroupName);
- // Remove current application name
- applicationNames.remove(applicationName);
- // Remove entry if there are no more cartridge group names for that cartridge type
- if (applicationNames.isEmpty()) {
- applicationNames = null;
- cartridgeGroupToApplicationsMap.remove(cartridgeGroupName);
- }
- }
- }
+ if (cartridgeGroupNames == null) {
+ return;
+ }
+
+ for (String cartridgeGroupName : cartridgeGroupNames) {
+ Set<String> applicationNames = null;
+ if (cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupName)) {
+ applicationNames = cartridgeGroupToApplicationsMap.get(cartridgeGroupName);
+ // Remove current application name
+ applicationNames.remove(applicationName);
+ // Remove entry if there are no more cartridge group names for that cartridge type
+ if (applicationNames.isEmpty()) {
+ applicationNames = null;
+ cartridgeGroupToApplicationsMap.remove(cartridgeGroupName);
+ }
+ }
+ }
}
-
+
public boolean isCartridgeGroupIncludedInApplications(String cartridgeGroupName) {
- if(cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupName)) {
- if(!cartridgeGroupToApplicationsMap.get(cartridgeGroupName).isEmpty()) {
- return true;
- }
- return false;
- }
- return false;
+ if (cartridgeGroupToApplicationsMap.containsKey(cartridgeGroupName)) {
+ if (!cartridgeGroupToApplicationsMap.get(cartridgeGroupName).isEmpty()) {
+ return true;
+ }
+ return false;
+ }
+ return false;
}
-
+
private void updateContextFromRegistry() {
if ((!isClustered()) || (isCoordinator())) {
try {
@@ -368,11 +368,11 @@ public class StratosManagerContext implements Serializable {
}
private void copyMap(Map sourceMap, Map destinationMap) {
- for(Object key : sourceMap.keySet()) {
+ for (Object key : sourceMap.keySet()) {
destinationMap.put(key, sourceMap.get(key));
}
}
-
+
public void persist() {
if ((!isClustered()) || (isCoordinator())) {
try {
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/AlreadySubscribedException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/AlreadySubscribedException.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/AlreadySubscribedException.java
index 32786b9..d82a4c2 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/AlreadySubscribedException.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/AlreadySubscribedException.java
@@ -20,29 +20,29 @@ package org.apache.stratos.manager.exception;
public class AlreadySubscribedException extends Exception {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- private final String message;
+ private final String message;
- private final String cartridgeType;
+ private final String cartridgeType;
- public AlreadySubscribedException(String message, String cartridgeType, Throwable cause) {
- super(message, cause);
- this.message = message;
- this.cartridgeType = cartridgeType;
- }
+ public AlreadySubscribedException(String message, String cartridgeType, Throwable cause) {
+ super(message, cause);
+ this.message = message;
+ this.cartridgeType = cartridgeType;
+ }
- public AlreadySubscribedException(String message, String cartridgeType) {
- super(message);
- this.message = message;
- this.cartridgeType = cartridgeType;
- }
+ public AlreadySubscribedException(String message, String cartridgeType) {
+ super(message);
+ this.message = message;
+ this.cartridgeType = cartridgeType;
+ }
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public String getCartridgeType() {
- return cartridgeType;
- }
+ public String getCartridgeType() {
+ return cartridgeType;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/ApplicationSubscriptionException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/ApplicationSubscriptionException.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/ApplicationSubscriptionException.java
index c24ffb7..facf4fb 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/ApplicationSubscriptionException.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/ApplicationSubscriptionException.java
@@ -21,7 +21,7 @@ package org.apache.stratos.manager.exception;
public class ApplicationSubscriptionException extends Exception {
- private static final long serialVersionUID = 603387881177162687L;
+ private static final long serialVersionUID = 603387881177162687L;
private String message;
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/InvalidCartridgeAliasException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/InvalidCartridgeAliasException.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/InvalidCartridgeAliasException.java
index 44481a4..ca640fb 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/InvalidCartridgeAliasException.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/InvalidCartridgeAliasException.java
@@ -20,29 +20,29 @@ package org.apache.stratos.manager.exception;
public class InvalidCartridgeAliasException extends Exception {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- private final String message;
+ private final String message;
- private final String cartridgeType;
+ private final String cartridgeType;
- private final String cartridgeAlias;
+ private final String cartridgeAlias;
private int tenantId;
- public InvalidCartridgeAliasException(String message, String cartridgeType, String cartridgeAlias, Throwable cause) {
- super(message, cause);
- this.message = message;
- this.cartridgeType = cartridgeType;
- this.cartridgeAlias = cartridgeAlias;
- }
+ public InvalidCartridgeAliasException(String message, String cartridgeType, String cartridgeAlias, Throwable cause) {
+ super(message, cause);
+ this.message = message;
+ this.cartridgeType = cartridgeType;
+ this.cartridgeAlias = cartridgeAlias;
+ }
- public InvalidCartridgeAliasException(String message, String cartridgeType, String cartridgeAlias) {
- super(message);
- this.message = message;
- this.cartridgeType = cartridgeType;
- this.cartridgeAlias = cartridgeAlias;
- }
+ public InvalidCartridgeAliasException(String message, String cartridgeType, String cartridgeAlias) {
+ super(message);
+ this.message = message;
+ this.cartridgeType = cartridgeType;
+ this.cartridgeAlias = cartridgeAlias;
+ }
public InvalidCartridgeAliasException(String message, int tenantId, String cartridgeType, String cartridgeAlias) {
super(message);
@@ -52,16 +52,16 @@ public class InvalidCartridgeAliasException extends Exception {
this.cartridgeAlias = cartridgeAlias;
}
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public String getCartridgeType() {
- return cartridgeType;
- }
+ public String getCartridgeType() {
+ return cartridgeType;
+ }
- public String getCartridgeAlias() {
- return cartridgeAlias;
- }
+ public String getCartridgeAlias() {
+ return cartridgeAlias;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/StratosManagerException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/StratosManagerException.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/StratosManagerException.java
index 095bcd5..3f6ebbf 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/StratosManagerException.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/exception/StratosManagerException.java
@@ -20,30 +20,30 @@ package org.apache.stratos.manager.exception;
public class StratosManagerException extends Exception {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- private String message;
+ private String message;
- public StratosManagerException() {
- super();
- }
+ public StratosManagerException() {
+ super();
+ }
- public StratosManagerException(String message, Throwable cause) {
- super(message, cause);
- this.message = message;
- }
+ public StratosManagerException(String message, Throwable cause) {
+ super(message, cause);
+ this.message = message;
+ }
- public StratosManagerException(String message) {
- super(message);
- this.message = message;
- }
+ public StratosManagerException(String message) {
+ super(message);
+ this.message = message;
+ }
- public StratosManagerException(Throwable cause) {
- super(cause);
- }
+ public StratosManagerException(Throwable cause) {
+ super(cause);
+ }
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ServiceReferenceHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ServiceReferenceHolder.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ServiceReferenceHolder.java
index 221891d..c03ba09 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ServiceReferenceHolder.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/ServiceReferenceHolder.java
@@ -45,11 +45,12 @@ public class ServiceReferenceHolder {
private DistributedObjectProvider distributedObjectProvider;
private ComponentStartUpSynchronizer componentStartUpSynchronizer;
- private ServiceReferenceHolder() { }
+ private ServiceReferenceHolder() {
+ }
public static ServiceReferenceHolder getInstance() {
if (instance == null) {
- synchronized (ServiceReferenceHolder .class){
+ synchronized (ServiceReferenceHolder.class) {
if (instance == null) {
instance = new ServiceReferenceHolder();
}
@@ -115,7 +116,7 @@ public class ServiceReferenceHolder {
public AxisConfiguration getAxisConfiguration() {
return axisConfiguration;
}
-
+
public void setDistributedObjectProvider(DistributedObjectProvider distributedObjectProvider) {
this.distributedObjectProvider = distributedObjectProvider;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
index 796d8b6..bb8f0ff 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
@@ -54,33 +54,33 @@ import java.util.concurrent.TimeUnit;
/**
* @scr.component name="org.wso2.carbon.hosting.mgt.internal.StratosManagerServiceComponent"
- * immediate="true"
+ * immediate="true"
* @scr.reference name="hazelcast.instance.service" interface="com.hazelcast.core.HazelcastInstance"
- * cardinality="0..1"policy="dynamic" bind="setHazelcastInstance" unbind="unsetHazelcastInstance"
+ * cardinality="0..1"policy="dynamic" bind="setHazelcastInstance" unbind="unsetHazelcastInstance"
* @scr.reference name="config.context.service"
- * interface="org.wso2.carbon.utils.ConfigurationContextService"
- * cardinality="1..1" policy="dynamic"
- * bind="setConfigurationContextService"
- * unbind="unsetConfigurationContextService"
+ * interface="org.wso2.carbon.utils.ConfigurationContextService"
+ * cardinality="1..1" policy="dynamic"
+ * bind="setConfigurationContextService"
+ * unbind="unsetConfigurationContextService"
* @scr.reference name="user.realmservice.default"
- * interface="org.wso2.carbon.user.core.service.RealmService"
- * cardinality="1..1" policy="dynamic" bind="setRealmService"
- * unbind="unsetRealmService"
+ * interface="org.wso2.carbon.user.core.service.RealmService"
+ * cardinality="1..1" policy="dynamic" bind="setRealmService"
+ * unbind="unsetRealmService"
* @scr.reference name="registry.service"
- * interface="org.wso2.carbon.registry.core.service.RegistryService"
- * cardinality="1..1" policy="dynamic" bind="setRegistryService"
- * unbind="unsetRegistryService"
+ * interface="org.wso2.carbon.registry.core.service.RegistryService"
+ * cardinality="1..1" policy="dynamic" bind="setRegistryService"
+ * unbind="unsetRegistryService"
* @scr.reference name="ntask.component" interface="org.wso2.carbon.ntask.core.service.TaskService"
- * cardinality="1..1" policy="dynamic" bind="setTaskService"
- * unbind="unsetTaskService"
+ * cardinality="1..1" policy="dynamic" bind="setTaskService"
+ * unbind="unsetTaskService"
* @scr.reference name="distributedObjectProvider" interface="org.apache.stratos.common.services.DistributedObjectProvider"
- * cardinality="1..1" policy="dynamic" bind="setDistributedObjectProvider" unbind="unsetDistributedObjectProvider"
+ * cardinality="1..1" policy="dynamic" bind="setDistributedObjectProvider" unbind="unsetDistributedObjectProvider"
* @scr.reference name="componentStartUpSynchronizer" interface="org.apache.stratos.common.services.ComponentStartUpSynchronizer"
- * cardinality="1..1" policy="dynamic" bind="setComponentStartUpSynchronizer" unbind="unsetComponentStartUpSynchronizer"
+ * cardinality="1..1" policy="dynamic" bind="setComponentStartUpSynchronizer" unbind="unsetComponentStartUpSynchronizer"
*/
public class StratosManagerServiceComponent {
- private static final Log log = LogFactory.getLog(StratosManagerServiceComponent.class);
+ private static final Log log = LogFactory.getLog(StratosManagerServiceComponent.class);
private static final String THREAD_POOL_ID = "stratos.manager.thread.pool";
private static final String SCHEDULER_THREAD_POOL_ID = "stratos.manager.scheduler.thread.pool";
@@ -91,11 +91,11 @@ public class StratosManagerServiceComponent {
private StratosManagerTopologyEventReceiver topologyEventReceiver;
private StratosManagerInstanceStatusEventReceiver instanceStatusEventReceiver;
private StratosManagerApplicationEventReceiver applicationEventReceiver;
- private ExecutorService executorService;
+ private ExecutorService executorService;
private ScheduledExecutorService scheduler;
protected void activate(final ComponentContext componentContext) throws Exception {
- try {
+ try {
executorService = StratosThreadPool.getExecutorService(THREAD_POOL_ID, THREAD_POOL_SIZE);
scheduler = StratosThreadPool.getScheduledExecutorService(SCHEDULER_THREAD_POOL_ID,
SCHEDULER_THREAD_POOL_SIZE);
@@ -160,13 +160,14 @@ public class StratosManagerServiceComponent {
};
Thread stratosManagerActivatorThread = new Thread(stratosManagerActivator);
stratosManagerActivatorThread.start();
- } catch (Exception e) {
+ } catch (Exception e) {
log.error("Could not activate stratos manager service component", e);
- }
- }
+ }
+ }
/**
* Execute coordinator tasks
+ *
* @param componentContext
* @throws UserStoreException
* @throws UserManagerException
@@ -211,6 +212,7 @@ public class StratosManagerServiceComponent {
/**
* Create internal user role if not exists.
+ *
* @param componentContext
* @throws UserStoreException
* @throws UserManagerException
@@ -229,18 +231,19 @@ public class StratosManagerServiceComponent {
/**
* Schedule complete tenant event synchronizer and initialize tenant event publisher
+ *
* @param componentContext
*/
private void initializeTenantEventPublisher(ComponentContext componentContext) {
// Register tenant event publisher
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Initializing tenant event publisher...");
}
final TenantEventPublisher tenantEventPublisher = new TenantEventPublisher();
componentContext.getBundleContext().registerService(
org.apache.stratos.common.listeners.TenantMgtListener.class.getName(),
tenantEventPublisher, null);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info("Tenant event publisher initialized");
}
}
@@ -251,7 +254,7 @@ public class StratosManagerServiceComponent {
componentStartUpSynchronizer.addEventListener(new ComponentActivationEventListener() {
@Override
public void activated(Component component) {
- if(component == Component.StratosManager) {
+ if (component == Component.StratosManager) {
Runnable tenantSynchronizer = new TenantEventSynchronizer();
scheduler.scheduleAtFixedRate(tenantSynchronizer, 0, 1, TimeUnit.MINUTES);
@@ -314,7 +317,7 @@ public class StratosManagerServiceComponent {
}
ServiceReferenceHolder.getInstance().setTaskService(null);
}
-
+
protected void setDistributedObjectProvider(DistributedObjectProvider distributedObjectProvider) {
ServiceReferenceHolder.getInstance().setDistributedObjectProvider(distributedObjectProvider);
}
@@ -342,14 +345,14 @@ public class StratosManagerServiceComponent {
private void shutdownExecutorService(String executorServiceId) {
ExecutorService executorService = StratosThreadPool.getExecutorService(executorServiceId, 1);
- if(executorService != null) {
+ if (executorService != null) {
shutdownExecutorService(executorService);
}
}
private void shutdownScheduledExecutorService(String executorServiceId) {
ExecutorService executorService = StratosThreadPool.getScheduledExecutorService(executorServiceId, 1);
- if(executorService != null) {
+ if (executorService != null) {
shutdownExecutorService(executorService);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/DomainMappingEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/DomainMappingEventPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/DomainMappingEventPublisher.java
index afebbd6..421d2aa 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/DomainMappingEventPublisher.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/DomainMappingEventPublisher.java
@@ -47,7 +47,7 @@ public class DomainMappingEventPublisher {
serviceName, clusterId, domainName, contextPath);
publish(domainMappingAddedEvent);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Domain mapping added event published: %s", domainMappingAddedEvent.toString()));
}
}
@@ -58,7 +58,7 @@ public class DomainMappingEventPublisher {
serviceName, clusterId, domainName);
publish(domainNameRemovedEvent);
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info(String.format("Domain mapping removed event published: %s", domainNameRemovedEvent.toString()));
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/InstanceNotificationPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/InstanceNotificationPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/InstanceNotificationPublisher.java
index c2d3195..971ec85 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/InstanceNotificationPublisher.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/InstanceNotificationPublisher.java
@@ -32,38 +32,38 @@ import org.apache.stratos.messaging.util.MessagingUtil;
*/
public class InstanceNotificationPublisher {
- private static final Log log = LogFactory.getLog(InstanceNotificationPublisher.class);
+ private static final Log log = LogFactory.getLog(InstanceNotificationPublisher.class);
- public InstanceNotificationPublisher() {
- }
+ public InstanceNotificationPublisher() {
+ }
- private void publish(Event event) {
- String topic = MessagingUtil.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
- eventPublisher.publish(event);
- }
+ private void publish(Event event) {
+ String topic = MessagingUtil.getMessageTopicName(event);
+ EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
+ eventPublisher.publish(event);
+ }
- /**
- * Publishing the artifact update event to the instances
- *
- * @param clusterId
- * @param tenantId
- * @param repoUrl
- * @param repoUsername
- * @param repoPassword
- * @param isCommitEnabled
- */
- public void publishArtifactUpdatedEvent(String clusterId, String tenantId, String repoUrl, String repoUsername,
- String repoPassword, boolean isCommitEnabled) {
+ /**
+ * Publishing the artifact update event to the instances
+ *
+ * @param clusterId
+ * @param tenantId
+ * @param repoUrl
+ * @param repoUsername
+ * @param repoPassword
+ * @param isCommitEnabled
+ */
+ public void publishArtifactUpdatedEvent(String clusterId, String tenantId, String repoUrl, String repoUsername,
+ String repoPassword, boolean isCommitEnabled) {
- ArtifactUpdatedEvent artifactUpdateEvent = new ArtifactUpdatedEvent();
- artifactUpdateEvent.setClusterId(clusterId);
- artifactUpdateEvent.setRepoUserName(repoUsername);
- artifactUpdateEvent.setRepoPassword(repoPassword);
- artifactUpdateEvent.setRepoURL(repoUrl);
- artifactUpdateEvent.setTenantId(tenantId);
- artifactUpdateEvent.setCommitEnabled(isCommitEnabled);
+ ArtifactUpdatedEvent artifactUpdateEvent = new ArtifactUpdatedEvent();
+ artifactUpdateEvent.setClusterId(clusterId);
+ artifactUpdateEvent.setRepoUserName(repoUsername);
+ artifactUpdateEvent.setRepoPassword(repoPassword);
+ artifactUpdateEvent.setRepoURL(repoUrl);
+ artifactUpdateEvent.setTenantId(tenantId);
+ artifactUpdateEvent.setCommitEnabled(isCommitEnabled);
- publish(artifactUpdateEvent);
- }
+ publish(artifactUpdateEvent);
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/TenantEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/TenantEventPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/TenantEventPublisher.java
index 5ad1b33..863050f 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/TenantEventPublisher.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/TenantEventPublisher.java
@@ -39,84 +39,84 @@ import org.apache.stratos.messaging.util.MessagingUtil;
*/
public class TenantEventPublisher implements TenantMgtListener {
- private static final Log log = LogFactory.getLog(TenantEventPublisher.class);
- private static final int EXEC_ORDER = 1;
+ private static final Log log = LogFactory.getLog(TenantEventPublisher.class);
+ private static final int EXEC_ORDER = 1;
- private void publish(Event event) {
- String topic = MessagingUtil.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
- eventPublisher.publish(event);
- }
+ private void publish(Event event) {
+ String topic = MessagingUtil.getMessageTopicName(event);
+ EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
+ eventPublisher.publish(event);
+ }
- @Override
- public void onTenantCreate(TenantInfoBean tenantInfo) throws ApacheStratosException {
- try {
- if (log.isDebugEnabled()) {
- log.debug(String.format("Publishing tenant created event: [tenant-id] %d [tenant-domain] %s",
- tenantInfo.getTenantId(), tenantInfo.getTenantDomain()));
- }
- Tenant tenant = new Tenant(tenantInfo.getTenantId(), tenantInfo.getTenantDomain());
- TenantCreatedEvent event = new TenantCreatedEvent(tenant);
- publish(event);
- } catch (Exception e) {
- log.error(String.format("Could not publish tenant created event [tenant-id] %d [tenant-domain] %s ",
- tenantInfo.getTenantId(),
- tenantInfo.getTenantDomain()), e);
- }
- }
+ @Override
+ public void onTenantCreate(TenantInfoBean tenantInfo) throws ApacheStratosException {
+ try {
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Publishing tenant created event: [tenant-id] %d [tenant-domain] %s",
+ tenantInfo.getTenantId(), tenantInfo.getTenantDomain()));
+ }
+ Tenant tenant = new Tenant(tenantInfo.getTenantId(), tenantInfo.getTenantDomain());
+ TenantCreatedEvent event = new TenantCreatedEvent(tenant);
+ publish(event);
+ } catch (Exception e) {
+ log.error(String.format("Could not publish tenant created event [tenant-id] %d [tenant-domain] %s ",
+ tenantInfo.getTenantId(),
+ tenantInfo.getTenantDomain()), e);
+ }
+ }
- @Override
- public void onTenantUpdate(TenantInfoBean tenantInfo) throws ApacheStratosException {
- try {
- if (log.isInfoEnabled()) {
- log.info(String.format("Publishing tenant updated event: [tenant-id] %d [tenant-domain] %s",
- tenantInfo.getTenantId(), tenantInfo.getTenantDomain()));
- }
- TenantUpdatedEvent event = new TenantUpdatedEvent(tenantInfo.getTenantId(),
- tenantInfo.getTenantDomain());
- publish(event);
- } catch (Exception e) {
- log.error(String.format("Could not publish tenant updated event:[tenant-id] %d [tenant-domain] %s ",
- tenantInfo.getTenantId(),
- tenantInfo.getTenantDomain()), e);
- }
- }
+ @Override
+ public void onTenantUpdate(TenantInfoBean tenantInfo) throws ApacheStratosException {
+ try {
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Publishing tenant updated event: [tenant-id] %d [tenant-domain] %s",
+ tenantInfo.getTenantId(), tenantInfo.getTenantDomain()));
+ }
+ TenantUpdatedEvent event = new TenantUpdatedEvent(tenantInfo.getTenantId(),
+ tenantInfo.getTenantDomain());
+ publish(event);
+ } catch (Exception e) {
+ log.error(String.format("Could not publish tenant updated event:[tenant-id] %d [tenant-domain] %s ",
+ tenantInfo.getTenantId(),
+ tenantInfo.getTenantDomain()), e);
+ }
+ }
- @Override
- public void onTenantDelete(int tenantId) {
- try {
- if (log.isInfoEnabled()) {
- log.info(String.format("Publishing tenant removed event: [tenant-id] %d", tenantId));
- }
- TenantRemovedEvent event = new TenantRemovedEvent(tenantId);
- publish(event);
- } catch (Exception e) {
- log.error(String.format("Could not publish tenant removed event [tenant-id] %d", tenantId),e);
- }
- }
+ @Override
+ public void onTenantDelete(int tenantId) {
+ try {
+ if (log.isInfoEnabled()) {
+ log.info(String.format("Publishing tenant removed event: [tenant-id] %d", tenantId));
+ }
+ TenantRemovedEvent event = new TenantRemovedEvent(tenantId);
+ publish(event);
+ } catch (Exception e) {
+ log.error(String.format("Could not publish tenant removed event [tenant-id] %d", tenantId), e);
+ }
+ }
- @Override
- public void onTenantRename(int tenantId, String oldDomainName, String newDomainName) throws ApacheStratosException {
- }
+ @Override
+ public void onTenantRename(int tenantId, String oldDomainName, String newDomainName) throws ApacheStratosException {
+ }
- @Override
- public void onTenantInitialActivation(int tenantId) throws ApacheStratosException {
- }
+ @Override
+ public void onTenantInitialActivation(int tenantId) throws ApacheStratosException {
+ }
- @Override
- public void onTenantActivation(int tenantId) throws ApacheStratosException {
- }
+ @Override
+ public void onTenantActivation(int tenantId) throws ApacheStratosException {
+ }
- @Override
- public void onTenantDeactivation(int tenantId) throws ApacheStratosException {
- }
+ @Override
+ public void onTenantDeactivation(int tenantId) throws ApacheStratosException {
+ }
- @Override
- public void onSubscriptionPlanChange(int tenantId, String oldPlan, String newPlan) throws ApacheStratosException {
- }
+ @Override
+ public void onSubscriptionPlanChange(int tenantId, String oldPlan, String newPlan) throws ApacheStratosException {
+ }
- @Override
- public int getListenerOrder() {
- return EXEC_ORDER;
- }
+ @Override
+ public int getListenerOrder() {
+ return EXEC_ORDER;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/ApplicationSignUpEventSynchronizer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/ApplicationSignUpEventSynchronizer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/ApplicationSignUpEventSynchronizer.java
index c64c5e8..5bc7f75 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/ApplicationSignUpEventSynchronizer.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/ApplicationSignUpEventSynchronizer.java
@@ -44,7 +44,7 @@ public class ApplicationSignUpEventSynchronizer implements Runnable {
public void run() {
try {
List<ApplicationSignUp> applicationSignUps = applicationSignUpHandler.getApplicationSignUps();
- if((applicationSignUps != null) && (applicationSignUps.size() > 0)) {
+ if ((applicationSignUps != null) && (applicationSignUps.size() > 0)) {
log.debug("Publishing complete application signup event");
ApplicationSignUpEventPublisher.publishCompleteApplicationSignUpsEvent(applicationSignUps);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
index 380bf69..390663d 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
@@ -37,48 +37,48 @@ import java.util.*;
*/
public class TenantEventSynchronizer implements Runnable {
- private static final Log log = LogFactory.getLog(TenantEventSynchronizer.class);
+ private static final Log log = LogFactory.getLog(TenantEventSynchronizer.class);
- @Override
- public void run() {
- try {
- if (log.isDebugEnabled()) {
- log.debug(String.format("Publishing complete tenant event"));
- }
- Tenant tenant;
- List<Tenant> tenants = new ArrayList<Tenant>();
- TenantManager tenantManager = ServiceReferenceHolder.getRealmService().getTenantManager();
- org.wso2.carbon.user.api.Tenant[] carbonTenants = tenantManager.getAllTenants();
- for (org.wso2.carbon.user.api.Tenant carbonTenant : carbonTenants) {
- // Create tenant
- if (log.isDebugEnabled()) {
- log.debug(String.format("Tenant found: [tenant-id] %d [tenant-domain] %s",
- carbonTenant.getId(), carbonTenant.getDomain()));
- }
- tenant = new Tenant(carbonTenant.getId(), carbonTenant.getDomain());
+ @Override
+ public void run() {
+ try {
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Publishing complete tenant event"));
+ }
+ Tenant tenant;
+ List<Tenant> tenants = new ArrayList<Tenant>();
+ TenantManager tenantManager = ServiceReferenceHolder.getRealmService().getTenantManager();
+ org.wso2.carbon.user.api.Tenant[] carbonTenants = tenantManager.getAllTenants();
+ for (org.wso2.carbon.user.api.Tenant carbonTenant : carbonTenants) {
+ // Create tenant
+ if (log.isDebugEnabled()) {
+ log.debug(String.format("Tenant found: [tenant-id] %d [tenant-domain] %s",
+ carbonTenant.getId(), carbonTenant.getDomain()));
+ }
+ tenant = new Tenant(carbonTenant.getId(), carbonTenant.getDomain());
- if (!org.apache.stratos.messaging.message.receiver.tenant.TenantManager.getInstance()
- .tenantExists(carbonTenant.getId())) {
- // if the tenant is not already there in TenantManager,
- // trigger TenantCreatedEvent
- TenantInfoBean tenantBean = new TenantInfoBean();
- tenantBean.setTenantId(carbonTenant.getId());
- tenantBean.setTenantDomain(carbonTenant.getDomain());
+ if (!org.apache.stratos.messaging.message.receiver.tenant.TenantManager.getInstance()
+ .tenantExists(carbonTenant.getId())) {
+ // if the tenant is not already there in TenantManager,
+ // trigger TenantCreatedEvent
+ TenantInfoBean tenantBean = new TenantInfoBean();
+ tenantBean.setTenantId(carbonTenant.getId());
+ tenantBean.setTenantDomain(carbonTenant.getDomain());
- // Add tenant to Tenant Manager
- org.apache.stratos.messaging.message.receiver.tenant.TenantManager.getInstance()
- .addTenant(tenant);
- }
- tenants.add(tenant);
- }
- CompleteTenantEvent event = new CompleteTenantEvent(tenants);
- String topic = MessagingUtil.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
- eventPublisher.publish(event);
- } catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("Could not publish complete tenant event", e);
- }
- }
- }
+ // Add tenant to Tenant Manager
+ org.apache.stratos.messaging.message.receiver.tenant.TenantManager.getInstance()
+ .addTenant(tenant);
+ }
+ tenants.add(tenant);
+ }
+ CompleteTenantEvent event = new CompleteTenantEvent(tenants);
+ String topic = MessagingUtil.getMessageTopicName(event);
+ EventPublisher eventPublisher = EventPublisherPool.getPublisher(topic);
+ eventPublisher.publish(event);
+ } catch (Exception e) {
+ if (log.isErrorEnabled()) {
+ log.error("Could not publish complete tenant event", e);
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerApplicationEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerApplicationEventReceiver.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerApplicationEventReceiver.java
index d928a3a..b6ce035 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerApplicationEventReceiver.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerApplicationEventReceiver.java
@@ -28,21 +28,21 @@ import org.apache.stratos.messaging.message.receiver.application.ApplicationsEve
*/
public class StratosManagerApplicationEventReceiver extends ApplicationsEventReceiver {
- private static final Log log = LogFactory.getLog(StratosManagerApplicationEventReceiver.class);
+ private static final Log log = LogFactory.getLog(StratosManagerApplicationEventReceiver.class);
- public StratosManagerApplicationEventReceiver() {
- addEventListeners();
+ public StratosManagerApplicationEventReceiver() {
+ addEventListeners();
- }
+ }
- @Override
- public void execute() {
- super.execute();
+ @Override
+ public void execute() {
+ super.execute();
- if (log.isInfoEnabled()) {
- log.info("Stratos manager application event receiver thread started");
- }
- }
+ if (log.isInfoEnabled()) {
+ log.info("Stratos manager application event receiver thread started");
+ }
+ }
private void addEventListeners() {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerInstanceStatusEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerInstanceStatusEventReceiver.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerInstanceStatusEventReceiver.java
index 4f30258..1da448e 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerInstanceStatusEventReceiver.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerInstanceStatusEventReceiver.java
@@ -56,7 +56,7 @@ public class StratosManagerInstanceStatusEventReceiver extends InstanceStatusEve
public void execute() {
super.execute();
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info("Stratos manager instance status event receiver thread started");
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerTopologyEventReceiver.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerTopologyEventReceiver.java
index 1008a77..08ca3d6 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/receiver/StratosManagerTopologyEventReceiver.java
@@ -32,9 +32,9 @@ public class StratosManagerTopologyEventReceiver extends TopologyEventReceiver {
@Override
public void execute() {
- super.execute();
+ super.execute();
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info("Stratos manager topology event receiver thread started");
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
index 44a4b6f..3a86e79 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
@@ -45,7 +45,7 @@ public class RegistryManager {
public static RegistryManager getInstance() {
return instance;
}
-
+
private RegistryManager() {
}
@@ -55,7 +55,7 @@ public class RegistryManager {
* @param serializableObject object to be persisted.
*/
public synchronized void persist(String resourcePath, Serializable serializableObject) throws RegistryException {
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Persisting resource in registry: [resource-path] %s", resourcePath));
}
@@ -63,8 +63,8 @@ public class RegistryManager {
try {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
- ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+ ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+ ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
registry.beginTransaction();
@@ -74,7 +74,7 @@ public class RegistryManager {
registry.commitTransaction();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Resource persisted successfully in registry: [resource-path] %s",
resourcePath));
}
@@ -88,6 +88,7 @@ public class RegistryManager {
/**
* Returns an object stored in the given resource path.
+ *
* @param resourcePath
* @return
* @throws org.wso2.carbon.registry.core.exceptions.RegistryException
@@ -97,8 +98,8 @@ public class RegistryManager {
Registry registry = getRegistry();
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
- ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
- ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+ ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+ ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
Resource resource = registry.get(resourcePath);
Object content = resource.getContent();
if ((content != null) && (content instanceof byte[])) {
@@ -119,7 +120,7 @@ public class RegistryManager {
}
}
- public synchronized void remove(String resourcePath) throws RegistryException{
+ public synchronized void remove(String resourcePath) throws RegistryException {
Registry registry = getRegistry();
try {
@@ -144,11 +145,12 @@ public class RegistryManager {
/**
* Serialize an object to a byte array.
+ *
* @param serializableObject
* @return
* @throws java.io.IOException
*/
- private byte[] serializeToByteArray(Serializable serializableObject) throws IOException {
+ private byte[] serializeToByteArray(Serializable serializableObject) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutput out = null;
@@ -168,6 +170,7 @@ public class RegistryManager {
/**
* Deserialize a byte array and retrieve the object.
+ *
* @param bytes bytes to be deserialized
* @return the deserialized {@link Object}
* @throws Exception if the deserialization is failed.
http://git-wip-us.apache.org/repos/asf/stratos/blob/779eb767/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
index f884a01..cc8dc12 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
@@ -34,6 +34,7 @@ public interface StratosManagerService {
/**
* Add application signup
+ *
* @param applicationSignUp
* @throws ApplicationSignUpException
*/
@@ -41,6 +42,7 @@ public interface StratosManagerService {
/**
* Remove application signup.
+ *
* @param applicationId
* @param tenantId
*/
@@ -48,6 +50,7 @@ public interface StratosManagerService {
/**
* Get application signup.
+ *
* @param applicationId
* @param tenantId
* @return
@@ -56,12 +59,14 @@ public interface StratosManagerService {
/**
* Get application signups available for an application.
+ *
* @return
*/
public ApplicationSignUp[] getApplicationSignUps(String applicationId) throws ApplicationSignUpException;
/**
* Notify artifact updated event for application signup.
+ *
* @param applicationId
* @param tenantId
* @throws ArtifactDistributionCoordinatorException
@@ -71,6 +76,7 @@ public interface StratosManagerService {
/**
* Notify artifact updated event for artifact repository.
+ *
* @param repoUrl
* @throws ArtifactDistributionCoordinatorException
*/
@@ -78,6 +84,7 @@ public interface StratosManagerService {
/**
* Add domain mapping
+ *
* @param domainMapping
* @throws DomainMappingException
*/
@@ -85,6 +92,7 @@ public interface StratosManagerService {
/**
* Get domain mappings available for application signup.
+ *
* @param applicationId
* @param tenantId
* @return
@@ -94,45 +102,46 @@ public interface StratosManagerService {
/**
* Remove domain mapping by domain name.
+ *
* @param applicationId
* @param tenantId
* @param domainName
* @throws DomainMappingException
*/
public void removeDomainMapping(String applicationId, int tenantId, String domainName) throws DomainMappingException;
-
+
/**
* Adds the used cartridges in cartridge groups to cache structure.
*
* @param cartridgeGroupName the cartridge group name
- * @param cartridgeNames the cartridge names
+ * @param cartridgeNames the cartridge names
*/
public void addUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames);
-
+
/**
* Removes the used cartridges in cartridge groups from cache structure.
*
* @param cartridgeGroupName the cartridge group name
- * @param cartridgeNames the cartridge names
+ * @param cartridgeNames the cartridge names
*/
public void removeUsedCartridgesInCartridgeGroups(String cartridgeGroupName, String[] cartridgeNames);
-
+
/**
* Adds the used cartridges in applications to cache structure.
*
* @param applicationName the application name
- * @param cartridgeNames the cartridge names
+ * @param cartridgeNames the cartridge names
*/
public void addUsedCartridgesInApplications(String applicationName, String[] cartridgeNames);
-
+
/**
* Removes the used cartridges in applications from cache structure.
*
* @param applicationName the application name
- * @param cartridgeNames the cartridge names
+ * @param cartridgeNames the cartridge names
*/
public void removeUsedCartridgesInApplications(String applicationName, String[] cartridgeNames);
-
+
/**
* Verifies whether a cartridge can be removed.
*
@@ -140,39 +149,39 @@ public interface StratosManagerService {
* @return true, if successful
*/
public boolean canCartridgeBeRemoved(String cartridgeName);
-
+
/**
* Adds the used cartridge groups in cartridge sub groups to cache structure.
*
* @param cartridgeSubGroupName the cartridge sub group name
- * @param cartridgeGroupNames the cartridge group names
+ * @param cartridgeGroupNames the cartridge group names
*/
public void addUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames);
-
+
/**
* Removes the used cartridge groups in cartridge sub groups from cache structure.
*
* @param cartridgeSubGroupName the cartridge sub group name
- * @param cartridgeGroupNames the cartridge group names
+ * @param cartridgeGroupNames the cartridge group names
*/
public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames);
-
+
/**
* Adds the used cartridge groups in applications to cache structure.
*
- * @param applicationName the application name
+ * @param applicationName the application name
* @param cartridgeGroupNames the cartridge group names
*/
public void addUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames);
-
+
/**
* Removes the used cartridge groups in applications from cache structure.
*
- * @param applicationName the application name
+ * @param applicationName the application name
* @param cartridgeGroupNames the cartridge group names
*/
public void removeUsedCartridgeGroupsInApplications(String applicationName, String[] cartridgeGroupNames);
-
+
/**
* Verifies whether a cartridge group can be removed.
*