Author: dkulp
Date: Fri Jul 8 21:06:35 2011
New Revision: 1144516
URL: http://svn.apache.org/viewvc?rev=1144516&view=rev
Log:
Fix compile failures after all the merges.
Modified:
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java
Modified:
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java?rev=1144516&r1=1144515&r2=1144516&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
(original)
+++
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
Fri Jul 8 21:06:35 2011
@@ -63,6 +63,10 @@ public class DefaultManagementStrategy i
this.eventNotifiers.add(eventNotifier);
}
+ public boolean removeEventNotifier(EventNotifier eventNotifier) {
+ return eventNotifiers.remove(eventNotifier);
+ }
+
public void setEventNotifiers(List<EventNotifier> eventNotifiers) {
this.eventNotifiers = eventNotifiers;
}
Modified:
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java?rev=1144516&r1=1144515&r2=1144516&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java
(original)
+++
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java
Fri Jul 8 21:06:35 2011
@@ -51,12 +51,23 @@ public interface ManagementStrategy exte
/**
* Adds the event notifier to use.
+ * <p/>
+ * Ensure the event notifier has been started if its a {@link Service}, as
otherwise
+ * it would not be used.
*
* @param eventNotifier event notifier
*/
void addEventNotifier(EventNotifier eventNotifier);
/**
+ * Removes the event notifier
+ *
+ * @param eventNotifier event notifier to remove
+ * @return <tt>true</tt> if removed, <tt>false</tt> if already removed
+ */
+ boolean removeEventNotifier(EventNotifier eventNotifier);
+
+ /**
* Gets the event factory
*
* @return event factory
Modified:
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java?rev=1144516&r1=1144515&r2=1144516&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
Fri Jul 8 21:06:35 2011
@@ -20,10 +20,14 @@ import java.util.Enumeration;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
+import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
+import org.apache.camel.Exchange;
+import org.apache.camel.NoTypeConversionAvailableException;
+import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
import static org.apache.camel.component.jms.JmsConfiguration.QUEUE_PREFIX;
Modified:
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java?rev=1144516&r1=1144515&r2=1144516&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentIntegrationTest.java
Fri Jul 8 21:06:35 2011
@@ -22,6 +22,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.smpp.SmppBinding;
+import org.apache.camel.component.smpp.SmppMessageType;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
import org.junit.Test;
@@ -38,10 +39,10 @@ import org.junit.Test;
*
* @version
*/
+@Ignore("Must be manually tested")
public class SmppComponentIntegrationTest extends CamelTestSupport {
@Test
- @Ignore("Must be manually tested")
public void sendInOut() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedMessageCount(1);
@@ -55,6 +56,7 @@ public class SmppComponentIntegrationTes
assertMockEndpointsSatisfied();
Exchange resultExchange = result.getExchanges().get(0);
+ assertEquals(SmppMessageType.DeliveryReceipt.toString(),
resultExchange.getIn().getHeader(SmppBinding.MESSAGE_TYPE));
assertEquals("Hello SMPP World!", resultExchange.getIn().getBody());
assertNotNull(resultExchange.getIn().getHeader(SmppBinding.ID));
assertEquals(1,
resultExchange.getIn().getHeader(SmppBinding.SUBMITTED));
@@ -67,7 +69,6 @@ public class SmppComponentIntegrationTes
}
@Test
- @Ignore("Must be manually tested")
public void sendInOnly() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedMessageCount(1);
@@ -81,6 +82,7 @@ public class SmppComponentIntegrationTes
assertMockEndpointsSatisfied();
Exchange resultExchange = result.getExchanges().get(0);
+ assertEquals(SmppMessageType.DeliveryReceipt.toString(),
resultExchange.getIn().getHeader(SmppBinding.MESSAGE_TYPE));
assertEquals("Hello SMPP World!", resultExchange.getIn().getBody());
assertNotNull(resultExchange.getIn().getHeader(SmppBinding.ID));
assertEquals(1,
resultExchange.getIn().getHeader(SmppBinding.SUBMITTED));
Modified:
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java?rev=1144516&r1=1144515&r2=1144516&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java
(original)
+++
camel/branches/camel-2.7.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/integration/SmppComponentSpringIntegrationTest.java
Fri Jul 8 21:06:35 2011
@@ -21,6 +21,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.smpp.SmppBinding;
+import org.apache.camel.component.smpp.SmppMessageType;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Ignore;
import org.junit.Test;
@@ -38,10 +39,10 @@ import org.springframework.context.suppo
*
* @version
*/
+@Ignore("Must be manually tested")
public class SmppComponentSpringIntegrationTest extends CamelSpringTestSupport
{
@Test
- @Ignore("Must be manually tested")
public void sendInOut() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedMessageCount(1);
@@ -55,6 +56,7 @@ public class SmppComponentSpringIntegrat
assertMockEndpointsSatisfied();
Exchange resultExchange = result.getExchanges().get(0);
+ assertEquals(SmppMessageType.DeliveryReceipt.toString(),
resultExchange.getIn().getHeader(SmppBinding.MESSAGE_TYPE));
assertEquals("Hello SMPP World!", resultExchange.getIn().getBody());
assertNotNull(resultExchange.getIn().getHeader(SmppBinding.ID));
assertEquals(1,
resultExchange.getIn().getHeader(SmppBinding.SUBMITTED));
@@ -67,7 +69,6 @@ public class SmppComponentSpringIntegrat
}
@Test
- @Ignore("Must be manually tested")
public void sendInOnly() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedMessageCount(1);
@@ -81,6 +82,7 @@ public class SmppComponentSpringIntegrat
assertMockEndpointsSatisfied();
Exchange resultExchange = result.getExchanges().get(0);
+ assertEquals(SmppMessageType.DeliveryReceipt.toString(),
resultExchange.getIn().getHeader(SmppBinding.MESSAGE_TYPE));
assertEquals("Hello SMPP World!", resultExchange.getIn().getBody());
assertNotNull(resultExchange.getIn().getHeader(SmppBinding.ID));
assertEquals(1,
resultExchange.getIn().getHeader(SmppBinding.SUBMITTED));
