Added:
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/SenderFactory.java
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/http/
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/http/HTTPClient.java
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/http/HTTPSender.java
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/http/HTTPSenderFactory.java
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/jms/JMSSender.java
(contents, props changed)
- copied, changed from r182,
/trunk/sipana-agent/src/main/java/org/sipana/agent/sender/jms/MessageSenderJMS.java
Log:
Interfaces to implement the HTTPSender using RESTful WS.
Added:
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/SenderFactory.java
==============================================================================
--- (empty file)
+++
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/SenderFactory.java
Tue May 12 22:50:48 2009
@@ -0,0 +1,14 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.sipana.agent.sender;
+
+/**
+ *
+ * @author mhack
+ */
+public interface SenderFactory {
+ public Sender createSender();
+}
Added:
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/http/HTTPClient.java
==============================================================================
--- (empty file)
+++
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/http/HTTPClient.java
Tue May 12 22:50:48 2009
@@ -0,0 +1,14 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.sipana.agent.sender.http;
+
+/**
+ *
+ * @author mhack
+ */
+public class HTTPClient {
+
+}
Added:
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/http/HTTPSender.java
==============================================================================
--- (empty file)
+++
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/http/HTTPSender.java
Tue May 12 22:50:48 2009
@@ -0,0 +1,34 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.sipana.agent.sender.http;
+
+import org.sipana.agent.sender.Sender;
+import org.sipana.protocol.sip.SIPMessage;
+import org.sipana.protocol.sip.SIPSession;
+
+/**
+ *
+ * @author mhack
+ */
+public class HTTPSender implements Sender {
+
+ public void send(SIPMessage message) throws Exception {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void send(SIPSession session) throws Exception {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void start() throws Exception {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public void stop() throws Exception {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+}
Added:
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/http/HTTPSenderFactory.java
==============================================================================
--- (empty file)
+++
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/http/HTTPSenderFactory.java
Tue May 12 22:50:48 2009
@@ -0,0 +1,21 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.sipana.agent.sender.http;
+
+import org.sipana.agent.sender.Sender;
+import org.sipana.agent.sender.SenderFactory;
+
+/**
+ *
+ * @author mhack
+ */
+public class HTTPSenderFactory implements SenderFactory {
+
+ public Sender createSender() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+}
Copied:
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/jms/JMSSender.java
(from r182,
/trunk/sipana-agent/src/main/java/org/sipana/agent/sender/jms/MessageSenderJMS.java)
==============================================================================
---
/trunk/sipana-agent/src/main/java/org/sipana/agent/sender/jms/MessageSenderJMS.java
(original)
+++
trunk/sipana-agent/src/main/java/org/sipana/agent/sender/jms/JMSSender.java
Tue May 12 22:50:48 2009
@@ -38,7 +38,7 @@
import org.sipana.protocol.sip.SIPMessage;
import org.sipana.protocol.sip.SIPSession;
-public class MessageSenderJMS implements Sender, ExceptionListener {
+public class JMSSender implements Sender, ExceptionListener {
public static final int STATE_STOPED = 0;
public static final int STATE_RUNNING = 1;
public static final int STATE_FAILED = 2;
@@ -61,19 +61,19 @@
private String destinationName;
- public MessageSenderJMS() throws Exception {
+ public JMSSender() throws Exception {
state = new AtomicInteger();
sessions = new ConcurrentLinkedQueue<SIPSession>();
messages = new ConcurrentLinkedQueue<SIPMessage>();
discardedSessions = new AtomicInteger(0);
- logger = Logger.getLogger(MessageSenderJMS.class);
+ logger = Logger.getLogger(JMSSender.class);
configManager = ConfigManager.getInstance();
bufferSize = configManager.getBufferSize();
isDelayed = configManager.isSenderModeDelayed();
destinationName = configManager.getSenderDestination();
- setState(MessageSenderJMS.STATE_STOPED);
+ setState(JMSSender.STATE_STOPED);
}
public void send(SIPSession session) throws Exception {
@@ -144,7 +144,7 @@
try {
logger.debug("Starting message Sender");
- if (getState() == MessageSenderJMS.STATE_RUNNING) {
+ if (getState() == JMSSender.STATE_RUNNING) {
logger.debug("Sender already running");
}
@@ -168,7 +168,7 @@
session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
producer = session.createProducer(destination);
- setState(MessageSenderJMS.STATE_RUNNING);
+ setState(JMSSender.STATE_RUNNING);
if (isDelayed) {
startDelayedSender();
@@ -178,7 +178,7 @@
} catch (Exception e) {
logger.error("Fail starting SIPSession sender", e);
- setState(MessageSenderJMS.STATE_FAILED);
+ setState(JMSSender.STATE_FAILED);
if (reconnector == null || !(reconnector.isRunning())) {
startSenderReconnector();
@@ -195,7 +195,7 @@
}
// Close connection if it's running
- if (getState() == MessageSenderJMS.STATE_RUNNING) {
+ if (getState() == JMSSender.STATE_RUNNING) {
logger.debug("Closing sender connection");
connection.close();
}
@@ -230,7 +230,7 @@
logger.error("Sender connection fail", e);
if (isRunning()) {
- setState(MessageSenderJMS.STATE_FAILED);
+ setState(JMSSender.STATE_FAILED);
if (delayedSender != null && delayedSender.isRunning()) {
delayedSender.stop();
@@ -250,7 +250,7 @@
}
private boolean isRunning() {
- return (getState() == MessageSenderJMS.STATE_RUNNING);
+ return (getState() == JMSSender.STATE_RUNNING);
}
private class DelayedSender implements Runnable {
@@ -336,7 +336,7 @@
public void run() {
running.set(true);
- while (getState() == MessageSenderJMS.STATE_FAILED &&
running.get()) {
+ while (getState() == JMSSender.STATE_FAILED && running.get()) {
try {
logger.info("Waiting " + retryInterval + " seconds to
retry");