Author: anierbeck
Date: Wed Mar 20 00:21:30 2013
New Revision: 1458588
URL: http://svn.apache.org/r1458588
Log:
Minor tweaks for better logging
Modified:
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/RemoteConfigurationEvent.java
karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/RemoteEventHandler.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
Modified:
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java?rev=1458588&r1=1458587&r2=1458588&view=diff
==============================================================================
---
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
(original)
+++
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
Wed Mar 20 00:21:30 2013
@@ -50,7 +50,7 @@ public class BundleEventHandler extends
if (groupManager == null) {
//in rare cases for example right after installation this
happens!
- LOGGER.error("CELLAR FEATURES: retrieved event {} while
groupManager is not available yet!", event);
+ LOGGER.error("CELLAR BUNDLE: retrieved event {} while
groupManager is not available yet!", event);
return;
}
Modified:
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java?rev=1458588&r1=1458587&r2=1458588&view=diff
==============================================================================
---
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
(original)
+++
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
Wed Mar 20 00:21:30 2013
@@ -51,7 +51,7 @@ public class ConfigurationEventHandler e
if (groupManager == null) {
//in rare cases for example right after installation this
happens!
- LOGGER.error("CELLAR FEATURES: retrieved event {} while
groupManager is not available yet!", event);
+ LOGGER.error("CELLAR CONFIG: retrieved event {} while
groupManager is not available yet!", event);
return;
}
Modified:
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/RemoteConfigurationEvent.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/RemoteConfigurationEvent.java?rev=1458588&r1=1458587&r2=1458588&view=diff
==============================================================================
---
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/RemoteConfigurationEvent.java
(original)
+++
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/RemoteConfigurationEvent.java
Wed Mar 20 00:21:30 2013
@@ -20,7 +20,12 @@ import org.apache.karaf.cellar.core.even
*/
public class RemoteConfigurationEvent extends Event {
- private int type;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private int type;
public RemoteConfigurationEvent(String id) {
super(id);
@@ -34,4 +39,17 @@ public class RemoteConfigurationEvent ex
this.type = type;
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "RemoteConfigurationEvent [type=" + type + ", id=" + id
+ + ", sourceNode=" + sourceNode + ",
sourceGroup=" + sourceGroup
+ + ", destination=" + destination + ", force=" +
force
+ + ", postPublish=" + postPublish + "]";
+ }
+
+
+
}
Modified:
karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/RemoteEventHandler.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/RemoteEventHandler.java?rev=1458588&r1=1458587&r2=1458588&view=diff
==============================================================================
---
karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/RemoteEventHandler.java
(original)
+++
karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/RemoteEventHandler.java
Wed Mar 20 00:21:30 2013
@@ -43,7 +43,7 @@ public class RemoteEventHandler extends
if (groupManager == null) {
//in rare cases for example right after installation this
happens!
- LOGGER.error("CELLAR FEATURES: retrieved event {} while
groupManager is not available yet!", event);
+ LOGGER.error("CELLAR EVENT: retrieved event {} while
groupManager is not available yet!", event);
return;
}
Modified:
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java?rev=1458588&r1=1458587&r2=1458588&view=diff
==============================================================================
---
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java
(original)
+++
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java
Wed Mar 20 00:21:30 2013
@@ -81,4 +81,13 @@ public class HazelcastNode implements No
return id != null ? id.hashCode() : 0;
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "HazelcastNode [id=" + id + ", host=" + host + ", port="
+ port
+ + "]";
+ }
+
}
Modified:
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java?rev=1458588&r1=1458587&r2=1458588&view=diff
==============================================================================
---
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
(original)
+++
karaf/cellar/trunk/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
Wed Mar 20 00:21:30 2013
@@ -186,7 +186,7 @@ public class CellarTestSupport {
@Configuration
public Option[] config() {
return new Option[]{
- cellarDistributionConfiguration(), keepRuntimeFolder(),
logLevel(LogLevelOption.LogLevel.ERROR),
+ cellarDistributionConfiguration(), keepRuntimeFolder(),
logLevel(LogLevelOption.LogLevel.INFO),
editConfigurationFileExtend("etc/system.properties",
"cellar.feature.url",
maven().groupId("org.apache.karaf.cellar").artifactId("apache-karaf-cellar").versionAsInProject().classifier("features").type("xml").getURL())};
}
Modified:
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java?rev=1458588&r1=1458587&r2=1458588&view=diff
==============================================================================
---
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
(original)
+++
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
Wed Mar 20 00:21:30 2013
@@ -121,7 +121,7 @@ public class ObrBundleEventHandler exten
if (groupManager == null) {
//in rare cases for example right after installation this
happens!
- LOGGER.error("CELLAR FEATURES: retrieved event {} while
groupManager is not available yet!", event);
+ LOGGER.error("CELLAR OBR: retrieved event {} while groupManager
is not available yet!", event);
return;
}
Modified:
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
URL:
http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java?rev=1458588&r1=1458587&r2=1458588&view=diff
==============================================================================
---
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
(original)
+++
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
Wed Mar 20 00:21:30 2013
@@ -60,7 +60,7 @@ public class ObrUrlEventHandler extends
if (groupManager == null) {
//in rare cases for example right after installation this
happens!
- LOGGER.error("CELLAR FEATURES: retrieved event {} while
groupManager is not available yet!", obrUrlEvent);
+ LOGGER.error("CELLAR OBR: retrieved event {} while groupManager
is not available yet!", obrUrlEvent);
return;
}
