Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastInstanceAware.java URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastInstanceAware.java?rev=1151091&r1=1151090&r2=1151091&view=diff ============================================================================== --- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastInstanceAware.java (original) +++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastInstanceAware.java Tue Jul 26 13:34:00 2011 @@ -1,10 +1,20 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.karaf.cellar.hazelcast; import com.hazelcast.core.HazelcastInstance; -/** - * @author: iocanel - */ public class HazelcastInstanceAware { protected HazelcastInstance instance; @@ -24,4 +34,5 @@ public class HazelcastInstanceAware { public void setInstance(HazelcastInstance instance) { this.instance = instance; } + }
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java?rev=1151091&r1=1151090&r2=1151091&view=diff ============================================================================== --- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java (original) +++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java Tue Jul 26 13:34:00 2011 @@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit; */ public class HazelcastServiceFactory implements BundleContextAware { - private static final Logger logger = LoggerFactory.getLogger(HazelcastServiceFactory.class); + private static final transient Logger LOGGER = LoggerFactory.getLogger(HazelcastServiceFactory.class); private String username = GroupConfig.DEFAULT_GROUP_NAME; private String password = GroupConfig.DEFAULT_GROUP_PASSWORD; @@ -71,7 +71,7 @@ public class HazelcastServiceFactory imp //Make sure that an the properties will be applied before an instance is created. semaphore.acquire(); } catch (InterruptedException e) { - logger.error("Failed to acquire intialization semaphore.", e); + LOGGER.error("Failed to acquire initialization semaphore.", e); } } @@ -155,7 +155,6 @@ public class HazelcastServiceFactory imp } } - public void updateMemberList() { HazelcastInstance instance = lookupInstance(); if (instance != null) { @@ -165,12 +164,11 @@ public class HazelcastServiceFactory imp instance.getConfig().getNetworkConfig().getJoin().setTcpIpConfig(buildTcpIpConfig()); instance.getLifecycleService().restart(); } catch (Exception ex) { - logger.error("Error while restarting Hazelcast instance.", ex); + LOGGER.error("Error while restarting Hazelcast instance.", ex); } } } - /** * Returs a Hazelcast instance from service registry. * @@ -185,12 +183,11 @@ public class HazelcastServiceFactory imp bundleContext.ungetService(reference); } } catch (Exception ex) { - logger.warn("No hazelcast instance found in service registry."); + LOGGER.warn("No Hazelcast instance found in service registry."); } return instance; } - /** * Builds a {@link HazelcastInstance} * @@ -200,12 +197,11 @@ public class HazelcastServiceFactory imp try { semaphore.acquire(); } catch (InterruptedException e) { - logger.error("Failed to acquire instance semaphore", e); + LOGGER.error("Failed to acquire instance semaphore", e); } return Hazelcast.newHazelcastInstance(buildConfig()); } - /** * Builds a Hazelcast {@link Config} * @@ -231,7 +227,6 @@ public class HazelcastServiceFactory imp return groupConfig; } - /** * Builds a {@link MulticastConfig} * @@ -246,7 +241,6 @@ public class HazelcastServiceFactory imp return multicastConfig; } - /** * Builds a {@link TcpIpConfig}. * @@ -314,7 +308,6 @@ public class HazelcastServiceFactory imp } } - public String getUsername() { return username; } @@ -386,4 +379,5 @@ public class HazelcastServiceFactory imp public void setDiscoveryTask(DiscoveryTask discoveryTask) { this.discoveryTask = discoveryTask; } + } Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java?rev=1151091&r1=1151090&r2=1151091&view=diff ============================================================================== --- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java (original) +++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStartCommand.java Tue Jul 26 13:34:00 2011 @@ -44,4 +44,5 @@ public class HandlersStartCommand extend protected Object doExecute() throws Exception { return doExecute(handler, nodes, Boolean.TRUE); } + } Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java?rev=1151091&r1=1151090&r2=1151091&view=diff ============================================================================== --- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java (original) +++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStatusCommand.java Tue Jul 26 13:34:00 2011 @@ -44,4 +44,5 @@ public class HandlersStatusCommand exten protected Object doExecute() throws Exception { return doExecute(handler, nodes, null); } + } Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java?rev=1151091&r1=1151090&r2=1151091&view=diff ============================================================================== --- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java (original) +++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersStopCommand.java Tue Jul 26 13:34:00 2011 @@ -44,4 +44,5 @@ public class HandlersStopCommand extends protected Object doExecute() throws Exception { return doExecute(handler, nodes, Boolean.FALSE); } + } Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java?rev=1151091&r1=1151090&r2=1151091&view=diff ============================================================================== --- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java (original) +++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java Tue Jul 26 13:34:00 2011 @@ -67,4 +67,5 @@ public abstract class HandlersSupport ex } return null; } + } Modified: karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java?rev=1151091&r1=1151090&r2=1151091&view=diff ============================================================================== --- karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java (original) +++ karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java Tue Jul 26 13:34:00 2011 @@ -34,9 +34,6 @@ import java.io.PrintWriter; import java.net.URL; import java.util.Set; -/** - * @author: iocanel - */ public class CellarPlugin extends AbstractWebConsolePlugin { /** @@ -44,7 +41,7 @@ public class CellarPlugin extends Abstra */ private static final long serialVersionUID = 1L; - private final Logger log = LoggerFactory.getLogger(CellarPlugin.class); + private static final transient Logger LOGGER = LoggerFactory.getLogger(CellarPlugin.class); public static final String NAME = "cellar"; @@ -54,13 +51,11 @@ public class CellarPlugin extends Abstra private String cellarJs = "/cellar/res/ui/cellar.js"; - private ClusterManager clusterManager; private GroupManager groupManager; private BundleContext bundleContext; - // // Blueprint lifecycle callback methods // @@ -70,16 +65,14 @@ public class CellarPlugin extends Abstra this.classLoader = this.getClass().getClassLoader(); - this.log.info(LABEL + " plugin activated"); + this.LOGGER.info("{} plugin activated", LABEL); } - public void stop() { - this.log.info(LABEL + " plugin deactivated"); + this.LOGGER.info("{} plugin deactivated", LABEL); super.deactivate(); } - // // AbstractWebConsolePlugin interface // @@ -88,12 +81,10 @@ public class CellarPlugin extends Abstra return NAME; } - public String getTitle() { return LABEL; } - protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { boolean success = false; @@ -126,7 +117,6 @@ public class CellarPlugin extends Abstra } } - protected void renderContent(HttpServletRequest request, HttpServletResponse response) throws IOException { // get request info from request attribute final PrintWriter pw = response.getWriter(); @@ -153,7 +143,6 @@ public class CellarPlugin extends Abstra pw.println("</script>"); } - // // Additional methods // @@ -165,18 +154,18 @@ public class CellarPlugin extends Abstra try { ins = url.openStream(); if (ins == null) { - this.log.error("failed to open " + url); + this.LOGGER.error("Failed to open {}", url); url = null; } } catch (IOException e) { - this.log.error(e.getMessage(), e); + this.LOGGER.error(e.getMessage(), e); url = null; } finally { if (ins != null) { try { ins.close(); } catch (IOException e) { - this.log.error(e.getMessage(), e); + this.LOGGER.error(e.getMessage(), e); } } } @@ -192,7 +181,6 @@ public class CellarPlugin extends Abstra writeJSON(pw); } - private void writeJSON(final PrintWriter pw) throws IOException { final Set<Group> groups = groupManager.listAllGroups(); final Set<Node> nodes = clusterManager.listNodes(); @@ -247,7 +235,6 @@ public class CellarPlugin extends Abstra jw.endObject(); } - private String getStatusLine(final Set<Group> groups, Set<Node> members) { int groupCount = 0; int memberCount = 0; @@ -265,7 +252,6 @@ public class CellarPlugin extends Abstra return builder.toString(); } - public void setBundleContext(BundleContext bundleContext) { this.bundleContext = bundleContext; } @@ -277,4 +263,5 @@ public class CellarPlugin extends Abstra public void setClusterManager(ClusterManager clusterManager) { this.clusterManager = clusterManager; } + } \ No newline at end of file
