Author: davsclaus
Date: Tue Aug 24 07:52:46 2010
New Revision: 988419
URL: http://svn.apache.org/viewvc?rev=988419&view=rev
Log:
Fixed test and polished code a bit.
Modified:
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipComponent.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipEndpoint.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPresenceAgent.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPublisher.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipSubscriber.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java
camel/trunk/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java
camel/trunk/components/camel-sip/src/test/resources/log4j.properties
Modified:
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipComponent.java?rev=988419&r1=988418&r2=988419&view=diff
==============================================================================
---
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipComponent.java
(original)
+++
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipComponent.java
Tue Aug 24 07:52:46 2010
@@ -23,11 +23,10 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
public class SipComponent extends DefaultComponent {
- private SipConfiguration config;
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
- config = new SipConfiguration();
+ SipConfiguration config = new SipConfiguration();
config.initialize(new URI(uri), parameters, this);
SipEndpoint sipEndpoint = new SipEndpoint(remaining, this, config);
Modified:
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java?rev=988419&r1=988418&r2=988419&view=diff
==============================================================================
---
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
(original)
+++
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
Tue Aug 24 07:52:46 2010
@@ -274,7 +274,6 @@ public class SipConfiguration {
createExpiresHeader();
}
extensionHeader =
component.resolveAndRemoveReferenceParameter(parameters, "extensionHeader",
ExtensionHeader.class, null);
-
}
public Request createSipRequest(long sequenceNumber, String requestMethod,
Object body) throws ParseException, InvalidArgumentException {
@@ -411,7 +410,6 @@ public class SipConfiguration {
this.sipStack = sipStack;
}
-
public String getProtocol() {
return protocol;
}
Modified:
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipEndpoint.java?rev=988419&r1=988418&r2=988419&view=diff
==============================================================================
---
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipEndpoint.java
(original)
+++
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipEndpoint.java
Tue Aug 24 07:52:46 2010
@@ -54,5 +54,4 @@ public class SipEndpoint extends Default
this.configuration = configuration;
}
-
}
\ No newline at end of file
Modified:
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPresenceAgent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPresenceAgent.java?rev=988419&r1=988418&r2=988419&view=diff
==============================================================================
---
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPresenceAgent.java
(original)
+++
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPresenceAgent.java
Tue Aug 24 07:52:46 2010
@@ -34,7 +34,7 @@ public class SipPresenceAgent extends De
public SipPresenceAgent(SipEndpoint sipEndpoint, Processor processor,
SipConfiguration configuration) {
super(sipEndpoint, processor);
- this.configuration = sipEndpoint.getConfiguration();
+ this.configuration = configuration;
this.configuration.setConsumer(true);
}
Modified:
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPublisher.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPublisher.java?rev=988419&r1=988418&r2=988419&view=diff
==============================================================================
---
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPublisher.java
(original)
+++
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipPublisher.java
Tue Aug 24 07:52:46 2010
@@ -23,7 +23,7 @@ import javax.sip.SipProvider;
import javax.sip.SipStack;
import javax.sip.message.Request;
-import org.apache.camel.CamelException;
+import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.ServicePoolAware;
import org.apache.camel.component.sip.listener.SipPublishListener;
@@ -83,13 +83,12 @@ public class SipPublisher extends Defaul
public void process(Exchange exchange) throws Exception {
String requestMethod = exchange.getIn().getHeader("REQUEST_METHOD",
String.class);
if (requestMethod == null) {
- throw new CamelException("Missing mandatory Header in
REQUEST_HEADER in exchange");
+ throw new CamelExchangeException("Missing mandatory Header:
REQUEST_HEADER", exchange);
}
Object body = exchange.getIn().getBody();
Request request = configuration.createSipRequest(sequenceNumber,
requestMethod, body);
provider.sendRequest(request);
-
}
public void setConfiguration(SipConfiguration configuration) {
@@ -107,4 +106,5 @@ public class SipPublisher extends Defaul
public SipStack getSipStack() {
return sipStack;
}
+
}
Modified:
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipSubscriber.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipSubscriber.java?rev=988419&r1=988418&r2=988419&view=diff
==============================================================================
---
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipSubscriber.java
(original)
+++
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipSubscriber.java
Tue Aug 24 07:52:46 2010
@@ -38,9 +38,8 @@ public class SipSubscriber extends Defau
public SipSubscriber(SipEndpoint sipEndpoint, Processor processor,
SipConfiguration configuration) {
super(sipEndpoint, processor);
- this.configuration = sipEndpoint.getConfiguration();
+ this.configuration = configuration;
this.configuration.setConsumer(true);
-
}
@Override
Modified:
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java?rev=988419&r1=988418&r2=988419&view=diff
==============================================================================
---
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
(original)
+++
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
Tue Aug 24 07:52:46 2010
@@ -47,7 +47,6 @@ public class SipPresenceAgentListener im
protected int notifyCount;
private SipPresenceAgent sipPresenceAgent;
-
public SipPresenceAgentListener(SipPresenceAgent sipPresenceAgent) {
this.sipPresenceAgent = sipPresenceAgent;
}
@@ -195,7 +194,7 @@ public class SipPresenceAgentListener im
}
public synchronized void processResponse(ResponseEvent
responseReceivedEvent) {
- Response response = (Response) responseReceivedEvent.getResponse();
+ Response response = responseReceivedEvent.getResponse();
Integer statusCode = response.getStatusCode();
if (SIP_MESSAGE_CODES.containsKey(statusCode)) {
LOG.debug(SIP_MESSAGE_CODES.get(statusCode) + " received from
Subscriber");
Modified:
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java?rev=988419&r1=988418&r2=988419&view=diff
==============================================================================
---
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java
(original)
+++
camel/trunk/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipSubscriptionListener.java
Tue Aug 24 07:52:46 2010
@@ -79,7 +79,6 @@ public class SipSubscriptionListener imp
if (request.getMethod().equals(Request.NOTIFY)) {
processNotify(requestReceivedEvent, serverTransactionId);
}
-
}
public synchronized void processNotify(RequestEvent requestEvent,
@@ -128,7 +127,7 @@ public class SipSubscriptionListener imp
if (LOG.isDebugEnabled()) {
LOG.debug("Response received at Subscriber");
}
- Response response = (Response) responseReceivedEvent.getResponse();
+ Response response = responseReceivedEvent.getResponse();
Transaction clientTransactionId =
responseReceivedEvent.getClientTransaction();
if (LOG.isDebugEnabled()) {
@@ -136,7 +135,7 @@ public class SipSubscriptionListener imp
}
if (clientTransactionId == null) {
if (LOG.isWarnEnabled()) {
- LOG.warn("Stray response -- dropping ");
+ LOG.warn("Stray response -- dropping");
}
return;
}
Modified:
camel/trunk/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java?rev=988419&r1=988418&r2=988419&view=diff
==============================================================================
---
camel/trunk/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java
(original)
+++
camel/trunk/components/camel-sip/src/test/java/org/apache/camel/component/sip/PublishSubscribeTest.java
Tue Aug 24 07:52:46 2010
@@ -42,28 +42,25 @@ public class PublishSubscribeTest extend
@Test
public void testPresenceAgentBasedPubSub() throws Exception {
-
if (LOG.isDebugEnabled()) {
LOG.debug("Beginning Test --->
testStatefulTransactionalTCPRequestReply()");
}
unreachableEndpoint.expectedMessageCount(0);
+ // we get a header and a body hence 2 messages
resultEndpoint.expectedMessageCount(2);
producerTemplate.sendBodyAndHeader(
"sip://ag...@localhost:5152?stackName=client&eventHeaderName=evtHdrName&eventId=evtid&fromUser=user2&fromHost=localhost&fromPort=3534",
"EVENT_A",
"REQUEST_METHOD", Request.PUBLISH);
-
- unreachableEndpoint.assertIsSatisfied();
- resultEndpoint.setResultWaitTime(15000);
- resultEndpoint.assertIsSatisfied();
+
+ assertMockEndpointsSatisfied();
if (LOG.isDebugEnabled()) {
LOG.debug("Completed Test --->
testStatefulTransactionalTCPRequestReply()");
}
-
- }
+ }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -75,12 +72,10 @@ public class PublishSubscribeTest extend
.to("mock:neverland");
from("sip://john...@localhost:5154?stackName=Subscriber&toUser=agent&toHost=localhost&toPort=5152&eventHeaderName=evtHdrName&eventId=evtid")
- .to("log:ReceivedEvent?level=DEBUG")
+ .to("log:ReceivedEvent")
.to("mock:notification");
-
}
};
}
-
}
Modified: camel/trunk/components/camel-sip/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sip/src/test/resources/log4j.properties?rev=988419&r1=988418&r2=988419&view=diff
==============================================================================
--- camel/trunk/components/camel-sip/src/test/resources/log4j.properties
(original)
+++ camel/trunk/components/camel-sip/src/test/resources/log4j.properties Tue
Aug 24 07:52:46 2010
@@ -18,12 +18,12 @@
#
# The logging properties used for eclipse testing, We want to see debug output
on the console.
#
-log4j.rootLogger=TRACE, file
+log4j.rootLogger=INFO, file
# uncomment the following to enable camel debugging
log4j.logger.org.apache.camel.component.sip=TRACE
-log4j.logger.org.apache.camel=DEBUG
-log4j.logger.org.apache.commons.net=TRACE
+#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.commons.net=TRACE
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
