Index: source/java/org/xmpp/component/ComponentManager.java
===================================================================
--- source/java/org/xmpp/component/ComponentManager.java	(revision 11085)
+++ source/java/org/xmpp/component/ComponentManager.java	(working copy)
@@ -20,7 +20,6 @@
 
 package org.xmpp.component;
 
-import org.jivesoftware.whack.IQResultListener;
 import org.xmpp.packet.IQ;
 import org.xmpp.packet.Packet;
 
Index: sample/weather/source/java/org/jivesoftware/weather/WeatherComponent.java
===================================================================
--- sample/weather/source/java/org/jivesoftware/weather/WeatherComponent.java	(revision 11085)
+++ sample/weather/source/java/org/jivesoftware/weather/WeatherComponent.java	(working copy)
@@ -22,6 +22,8 @@
  */
 public class WeatherComponent implements Component {
 
+    private ComponentManager componentManager;
+
     public String getName() {
         return "US Weather";
     }
@@ -91,12 +93,13 @@
             try {
                 ComponentManagerFactory.getComponentManager().sendPacket(this, reply);
             } catch (ComponentException e) {
-                Log.error(e);
+                componentManager.getLog().error(e);
             }
         }
     }
 
     public void initialize(JID jid, ComponentManager componentManager) {
+        this.componentManager = componentManager;
     }
 
     public void start() {
Index: sample/weather/source/java/org/jivesoftware/weather/ExternalWeatherComponent.java
===================================================================
--- sample/weather/source/java/org/jivesoftware/weather/ExternalWeatherComponent.java	(revision 11085)
+++ sample/weather/source/java/org/jivesoftware/weather/ExternalWeatherComponent.java	(working copy)
@@ -23,7 +23,7 @@
         manager.setSecretKey("weather", "test");
         // Set the manager to tag components as being allowed to connect multiple times to te same
         // JID.
-        manager.setAllowMultiple(true);
+        manager.setMultipleAllowed("weather", true);
         try {
             // Register that this component will be serving the given subdomain of the server
             manager.addComponent("weather", new WeatherComponent());