Author: davsclaus
Date: Tue Dec 14 13:55:08 2010
New Revision: 1049089
URL: http://svn.apache.org/viewvc?rev=1049089&view=rev
Log:
Fixed IRC component. Every component must have a default no-arg ctr.
Modified:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
Modified:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java?rev=1049089&r1=1049088&r2=1049089&view=diff
==============================================================================
---
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
(original)
+++
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
Tue Dec 14 13:55:08 2010
@@ -37,11 +37,7 @@ public class IrcComponent extends Defaul
private static final transient Log LOG =
LogFactory.getLog(IrcComponent.class);
private final Map<String, IRCConnection> connectionCache = new
HashMap<String, IRCConnection>();
- public IrcComponent(CamelContext context) {
- super(context);
- }
-
- protected IrcEndpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
+ public IrcEndpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
// every endpoint gets it's own configuration
IrcConfiguration config = new IrcConfiguration();
config.configure(uri);
@@ -117,7 +113,7 @@ public class IrcComponent extends Defaul
}
@Override
- protected synchronized void doStop() throws Exception {
+ protected void doStop() throws Exception {
// lets use a copy so we can clear the connections eagerly in case of
exceptions
Map<String, IRCConnection> map = new HashMap<String,
IRCConnection>(connectionCache);
connectionCache.clear();
Modified:
camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java?rev=1049089&r1=1049088&r2=1049089&view=diff
==============================================================================
---
camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
(original)
+++
camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
Tue Dec 14 13:55:08 2010
@@ -19,18 +19,14 @@ package org.apache.camel.component.irc;
import java.util.Dictionary;
import java.util.List;
-import junit.framework.TestCase;
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class IrcConfigurationTest extends TestCase {
+public class IrcConfigurationTest extends CamelTestSupport {
@Test
public void testConfigureFormat1() throws Exception {
-
- CamelContext camel = new DefaultCamelContext();
- IrcComponent component = new IrcComponent(camel);
+ IrcComponent component = context.getComponent("irc",
IrcComponent.class);
// irc:n...@host[:port]/#room[?options]
IrcEndpoint endpoint = (IrcEndpoint)
component.createEndpoint("irc://camel...@irc.freenode.net/#camel");
@@ -44,9 +40,7 @@ public class IrcConfigurationTest extend
@Test
public void testConfigureFormat2() throws Exception {
-
- CamelContext camel = new DefaultCamelContext();
- IrcComponent component = new IrcComponent(camel);
+ IrcComponent component = context.getComponent("irc",
IrcComponent.class);
// irc:n...@host[:port]/#room[?options]
IrcEndpoint endpoint = (IrcEndpoint)
component.createEndpoint("irc://camel...@irc.freenode.net?channels=#camel");
@@ -61,9 +55,7 @@ public class IrcConfigurationTest extend
@Test
public void testConfigureFormat3() throws Exception {
-
- CamelContext camel = new DefaultCamelContext();
- IrcComponent component = new IrcComponent(camel);
+ IrcComponent component = context.getComponent("irc",
IrcComponent.class);
// irc:n...@host[:port]/#room[?options]
IrcEndpoint endpoint = (IrcEndpoint)
component.createEndpoint("irc://irc.freenode.net?channels=#camel&nickname=camelbot");
@@ -78,9 +70,7 @@ public class IrcConfigurationTest extend
@Test
public void testConfigureFormat4() throws Exception {
-
- CamelContext camel = new DefaultCamelContext();
- IrcComponent component = new IrcComponent(camel);
+ IrcComponent component = context.getComponent("irc",
IrcComponent.class);
// irc:n...@host[:port]/#room[?options]
IrcEndpoint endpoint = (IrcEndpoint)
component.createEndpoint("irc://irc.freenode.net?keys=,foo&channels=#camel,#smx&nickname=camelbot");
@@ -98,9 +88,7 @@ public class IrcConfigurationTest extend
@Test
public void testConfigureFormat5() throws Exception {
-
- CamelContext camel = new DefaultCamelContext();
- IrcComponent component = new IrcComponent(camel);
+ IrcComponent component = context.getComponent("irc",
IrcComponent.class);
// irc:n...@host[:port]/#room[?options]
IrcEndpoint endpoint = (IrcEndpoint) component.
@@ -120,9 +108,7 @@ public class IrcConfigurationTest extend
@Test
public void testConfigureFormat6() throws Exception {
-
- CamelContext camel = new DefaultCamelContext();
- IrcComponent component = new IrcComponent(camel);
+ IrcComponent component = context.getComponent("irc",
IrcComponent.class);
// irc:n...@host[:port]/#room[?options]
IrcEndpoint endpoint = (IrcEndpoint) component.
