asterisk-java-cvs — Asterisk-Java Commit Logs

[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/manager/impl A.java,NONE,1.1 UserEventDEvent.java,NONE,1.1 BEvent.java,NONE,1.1 UserEventC.java,NONE,1.1 EventBuilderImplTest.java,1.1,1.2

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4812/src/test/net/sf/asterisk/manager/impl

Modified Files:
	EventBuilderImplTest.java 
Added Files:
	A.java UserEventDEvent.java BEvent.java UserEventC.java 
Log Message:
Fixed UserEvent registration

--- NEW FILE: A.java ---
/*
 * Copyright  2004-2005 Stefan Reuter
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 *
 */
package net.sf.asterisk.manager.impl;

import net.sf.asterisk.manager.event.UserEvent;

public class A extends UserEvent
{
    private static final long serialVersionUID = 3545240219457894199L;

    public A(Object source)
    {
        super(source);
    }
}

--- NEW FILE: UserEventDEvent.java ---
/*
 * Copyright  2004-2005 Stefan Reuter
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 *
 */
package net.sf.asterisk.manager.impl;

import net.sf.asterisk.manager.event.UserEvent;

public class UserEventDEvent extends UserEvent
{
    private static final long serialVersionUID = 3545240219457894199L;

    public UserEventDEvent(Object source)
    {
        super(source);
    }
}

--- NEW FILE: BEvent.java ---
/*
 * Copyright  2004-2005 Stefan Reuter
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 *
 */
package net.sf.asterisk.manager.impl;

import net.sf.asterisk.manager.event.UserEvent;

public class BEvent extends UserEvent
{
    private static final long serialVersionUID = 3545240219457894199L;

    public BEvent(Object source)
    {
        super(source);
    }
}

--- NEW FILE: UserEventC.java ---
/*
 * Copyright  2004-2005 Stefan Reuter
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing, software
 *  distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 *
 */
package net.sf.asterisk.manager.impl;

import net.sf.asterisk.manager.event.UserEvent;

public class UserEventC extends UserEvent
{
    private static final long serialVersionUID = 3545240219457894199L;

    public UserEventC(Object source)
    {
        super(source);
    }
}

Index: EventBuilderImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/impl/EventBuilderImplTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- EventBuilderImplTest.java	11 Mar 2005 15:27:24 -0000	1.1
+++ EventBuilderImplTest.java	15 Mar 2005 18:01:45 -0000	1.2
@@ -48,6 +48,54 @@ public class EventBuilderImplTest extend
         eventBuilder.registerEventClass(NewChannelEvent.class);
     }
 
+    public void testRegisterUserEventWithA()
+    {
+        Map properties = new HashMap();
+        ManagerEvent event;
+
+        eventBuilder.registerEventClass(A.class);
+        properties.put("event", "UserEventA");
+        event = eventBuilder.buildEvent(this, properties);
+
+        assertTrue("Wrong type", event instanceof A);
+    }
+
+    public void testRegisterUserEventWithBEvent()
+    {
+        Map properties = new HashMap();
+        ManagerEvent event;
+
+        eventBuilder.registerEventClass(BEvent.class);
+        properties.put("event", "UserEventB");
+        event = eventBuilder.buildEvent(this, properties);
+
+        assertTrue("Wrong type", event instanceof BEvent);
+    }
+
+    public void testRegisterUserEventWithUserEventC()
+    {
+        Map properties = new HashMap();
+        ManagerEvent event;
+
+        eventBuilder.registerEventClass(UserEventC.class);
+        properties.put("event", "UserEventC");
+        event = eventBuilder.buildEvent(this, properties);
+
+        assertTrue("Wrong type", event instanceof UserEventC);
+    }
+
+    public void testRegisterUserEventWithUserEventDEvent()
+    {
+        Map properties = new HashMap();
+        ManagerEvent event;
+
+        eventBuilder.registerEventClass(UserEventDEvent.class);
+        properties.put("event", "UserEventD");
+        event = eventBuilder.buildEvent(this, properties);
+
+        assertTrue("Wrong type", event instanceof UserEventDEvent);
+    }
+
     public void testRegisterEventWithAbstractEvent()
     {
         try
@@ -74,11 +122,9 @@ public class EventBuilderImplTest extend
 
     /*
      * public void testGetSetters() { Map setters; EventBuilderImpl eventBuilder =
-     * getEventBuilder();
-     * 
-     * setters = eventBuilder.getSetters(NewChannelEvent.class);
-     * 
-     * assertTrue("Setter not found", setters.containsKey("callerid")); }
+     * getEventBuilder(); setters =
+     * eventBuilder.getSetters(NewChannelEvent.class); assertTrue("Setter not
+     * found", setters.containsKey("callerid")); }
      */
 
     public void testBuildEventWithMixedCaseSetter()
@@ -92,8 +138,10 @@ public class EventBuilderImplTest extend
         event = (NewChannelEvent) eventBuilder.buildEvent(this, properties);
 
         assertNotNull(event);
-        assertEquals("Returned event is of wrong type", NewChannelEvent.class, event.getClass());
-        assertEquals("String property not set correctly", callerid, event.getCallerId());
+        assertEquals("Returned event is of wrong type", NewChannelEvent.class,
+                event.getClass());
+        assertEquals("String property not set correctly", callerid, event
+                .getCallerId());
         assertEquals("Source not set correctly", this, event.getSource());
     }
 
@@ -110,9 +158,12 @@ public class EventBuilderImplTest extend
         event = (NewExtenEvent) eventBuilder.buildEvent(this, properties);
 
         assertNotNull(event);
-        assertEquals("Returned event is of wrong type", NewExtenEvent.class, event.getClass());
-        assertEquals("String property not set correctly", channel, event.getChannel());
-        assertEquals("Integer property not set correctly", priority, event.getPriority());
+        assertEquals("Returned event is of wrong type", NewExtenEvent.class,
+                event.getClass());
+        assertEquals("String property not set correctly", channel, event
+                .getChannel());
+        assertEquals("Integer property not set correctly", priority, event
+                .getPriority());
     }
 
     public void testBuildEventWithBooleanProperty()
@@ -126,8 +177,10 @@ public class EventBuilderImplTest extend
         event = (ShutdownEvent) eventBuilder.buildEvent(this, properties);
 
         assertNotNull(event);
-        assertEquals("Returned event is of wrong type", ShutdownEvent.class, event.getClass());
-        assertEquals("Boolean property not set correctly", Boolean.TRUE, event.getRestart());
+        assertEquals("Returned event is of wrong type", ShutdownEvent.class,
+                event.getClass());
+        assertEquals("Boolean property not set correctly", Boolean.TRUE, event
+                .getRestart());
     }
 
     public void testBuildEventWithUnregisteredEvent()
@@ -161,8 +214,10 @@ public class EventBuilderImplTest extend
         event = eventBuilder.buildEvent(this, properties);
 
         assertNotNull(event);
-        assertEquals("Returned event is of wrong type", StatusCompleteEvent.class, event.getClass());
-        assertEquals("ActionId not set correctly", "origId", ((ResponseEvent) event).getActionId());
+        assertEquals("Returned event is of wrong type",
+                StatusCompleteEvent.class, event.getClass());
+        assertEquals("ActionId not set correctly", "origId",
+                ((ResponseEvent) event).getActionId());
     }
 
     public void testBuildEventWithSourceProperty()
@@ -175,6 +230,7 @@ public class EventBuilderImplTest extend
         event = eventBuilder.buildEvent(this, properties);
 
         assertNotNull(event);
-        assertEquals("Src property not set correctly", "source value", ((CdrEvent) event).getSrc());
+        assertEquals("Src property not set correctly", "source value",
+                ((CdrEvent) event).getSrc());
     }
 }

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/impl EventBuilderImpl.java,1.1,1.2

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4593/src/java/net/sf/asterisk/manager/impl

Modified Files:
	EventBuilderImpl.java 
Log Message:
Fixed UserEvent registration

Index: EventBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/EventBuilderImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- EventBuilderImpl.java	11 Mar 2005 15:27:23 -0000	1.1
+++ EventBuilderImpl.java	15 Mar 2005 18:00:58 -0000	1.2
@@ -65,6 +65,7 @@ import net.sf.asterisk.manager.event.Shu
 import net.sf.asterisk.manager.event.StatusCompleteEvent;
 import net.sf.asterisk.manager.event.StatusEvent;
 import net.sf.asterisk.manager.event.UnlinkEvent;
+import net.sf.asterisk.manager.event.UserEvent;
 import net.sf.asterisk.manager.event.ZapShowChannelsCompleteEvent;
 import net.sf.asterisk.manager.event.ZapShowChannelsEvent;
 
@@ -146,6 +147,11 @@ public class EventBuilderImpl implements
             eventType = eventType.substring(0, eventType.length() - "event".length());
         }
 
+        if (UserEvent.class.isAssignableFrom(clazz) && ! eventType.startsWith("userevent"))
+        {
+            eventType = "userevent" + eventType;
+        }
+        
         registerEventClass(eventType, clazz);
     }
 

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event UserEvent.java,1.1,1.2

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10908/src/java/net/sf/asterisk/manager/event

Modified Files:
	UserEvent.java 
Log Message:
Clarified javadoc about naming of UserEvents and the need to register them

Index: UserEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/UserEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- UserEvent.java	5 Mar 2005 02:27:58 -0000	1.1
+++ UserEvent.java	15 Mar 2005 16:29:02 -0000	1.2
@@ -23,8 +23,10 @@ package net.sf.asterisk.manager.event;
  * specifying an event body.<br>
  * To add your own user events you must subclass this class and name it corresponding to your event.
  * If you plan to send an event by <code>UserEvent(VIPCall)</code> you will create a new class
- * called VIPCallEvent that extends UserEvent. To pass additional data create appropriate attributes
- * with getter and setter methods in your new class.<br>
+ * called VIPCallEvent that extends UserEvent. The name of this class is important: Just use the
+ * name of the event you will send (VIPCall in this example) and append "Event".<br> 
+ * To pass additional data create appropriate attributes with getter and setter methods in your 
+ * new class.<br>
  * Example:
  * <pre>
  * public class VIPCallEvent extends UserEvent
@@ -48,7 +50,11 @@ package net.sf.asterisk.manager.event;
  * }
  * </pre>
  * To send this event use <code>UserEvent(VIPCall|firstName: Jon)</code> in your dialplan.<br>
- * The UserEvent is implemented in <code>apps/app_userevent.c</code>.
+ * The UserEvent is implemented in <code>apps/app_userevent.c</code>.<br>
+ * Note that you must register your UserEvent with the ManagerConnection you are using in order
+ * to be recognized.
+ * 
+ * @see net.sf.asterisk.manager.ManagerConnection#registerUserEventClass(Class)
  * 
  * @author srt
  * @version $Id$

[Asterisk-java-cvs] CVS: asterisk-java/xdocs tutorial.xml,1.5,1.6

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21681/xdocs

Modified Files:
	tutorial.xml 
Log Message:
Fixed timeout (30 seconds instead of 3 seconds) in HelloManager example

Index: tutorial.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/tutorial.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- tutorial.xml	14 Mar 2005 18:54:52 -0000	1.5
+++ tutorial.xml	14 Mar 2005 19:42:46 -0000	1.6
@@ -248,14 +248,14 @@ public class HelloManager
         originateAction.setContext("default");
         originateAction.setExten("1300");
         originateAction.setPriority(new Integer(1));
-        originateAction.setTimeout(new Integer(3000));
+        originateAction.setTimeout(new Integer(30000));
 
         // connect to Asterisk and log in
         managerConnection.login();
 
         // send the originate action and wait for a maximum of 30 seconds for Asterisk
         // to send a reply
-        originateResponse = managerConnection.sendAction(originateAction, 3000);
+        originateResponse = managerConnection.sendAction(originateAction, 30000);
 
         // print out whether the originate succeeded or not
         System.out.println(originateResponse.getResponse());

[Asterisk-java-cvs] CVS: asterisk-java/xdocs tutorial.xml,1.4,1.5

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7347/xdocs

Modified Files:
	tutorial.xml 
Log Message:
Added liks to javadoc

Index: tutorial.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/tutorial.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- tutorial.xml	14 Mar 2005 18:44:00 -0000	1.4
+++ tutorial.xml	14 Mar 2005 18:54:52 -0000	1.5
@@ -134,8 +134,9 @@ INFO: End AGIScript HelloAGIScript on AG
 					there you will find additional methods that you can use for your own scripts.
 					If you want to use commands that do not yet have a corresponding method in
 					AbstractAGIScript or if you want to extend the FastAGI protocol by adding your
-					own commands you can also use the channel.sendCommand(AGICommand) method to send
-					arbitrary commands.</p>
+					own commands you can also use the 
+					<a href="apidocs/net/sf/asterisk/fastagi/AGIChannel.html">channel</a>.sendCommand(<a href="apidocs/net/sf/asterisk/fastagi/AGICommand.html">AGICommand</a>)
+					method to send arbitrary commands.</p>
 				<p>If you are about to write more complex scripts please note that your AGIScript 
 					must be threadsafe. Only one instance will be used to serve all requests.
 					This is kind of similar to the constraints a servlet engine places on the 
@@ -272,7 +273,9 @@ public class HelloManager
     }
 }
 ]]></source>
-				<p></p>
+				<p>A list of the other <a href="apidocs/net/sf/asterisk/manager/action/package-summary.html">Actions</a>
+					povided by the Manager API is available in the
+					<a href="apidocs/index.html">javadocs</a>.</p>
 			</subsection>
 		</section>
 	</body>

[Asterisk-java-cvs] CVS: asterisk-java/xdocs tutorial.xml,1.3,1.4

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4509/xdocs

Modified Files:
	tutorial.xml 
Log Message:
Added HelloManager example with OriginateAction

Index: tutorial.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/tutorial.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- tutorial.xml	14 Mar 2005 16:28:16 -0000	1.3
+++ tutorial.xml	14 Mar 2005 18:44:00 -0000	1.4
@@ -204,7 +204,75 @@ write=system,call,log,verbose,agent,comm
 			<p>This will enable the Manager AP, allow access from any IP address using the
 				username "manager" and the password "pa55w0rd".</p>
 			<subsection name="Hello Manager!">
-				<p>to be done.</p>
+				<p>Assume we have a phone connected via SIP that is available at SIP/john and
+					we want to initiate a call from that phone to extension 1300 in the default
+					context.</p>
+				<p>We have to obtain a
+					<a href="apidocs/net/sf/asterisk/manager/ManagerConnection.html">ManagerConnection</a>
+					providing the hostname Asterisk is running on and the username and password
+					as configured in <code>manager.conf</code>. Next we log in and send an
+					<a href="apidocs/net/sf/asterisk/manager/action/OriginateCallAction.html">OriginateCallAction</a>
+					and finally we disconnect.</p>
+				<p>An example that does this is shown below.</p>
+<source><![CDATA[
+import java.io.IOException;
+
+import net.sf.asterisk.manager.AuthenticationFailedException;
+import net.sf.asterisk.manager.ManagerConnection;
+import net.sf.asterisk.manager.ManagerConnectionFactory;
+import net.sf.asterisk.manager.TimeoutException;
+import net.sf.asterisk.manager.action.OriginateAction;
+import net.sf.asterisk.manager.response.ManagerResponse;
+
+public class HelloManager
+{
+    private ManagerConnection managerConnection;
+
+    public HelloManager() throws IOException
+    {
+        ManagerConnectionFactory factory = new ManagerConnectionFactory();
+
+        this.managerConnection = factory.getManagerConnection("localhost",
+                "manager", "pa55w0rd");
+    }
+
+    public void run() throws IOException, AuthenticationFailedException,
+            TimeoutException
+    {
+        OriginateAction originateAction;
+        ManagerResponse originateResponse;
+
+        originateAction = new OriginateAction();
+        originateAction.setChannel("SIP/John");
+        originateAction.setContext("default");
+        originateAction.setExten("1300");
+        originateAction.setPriority(new Integer(1));
+        originateAction.setTimeout(new Integer(3000));
+
+        // connect to Asterisk and log in
+        managerConnection.login();
+
+        // send the originate action and wait for a maximum of 30 seconds for Asterisk
+        // to send a reply
+        originateResponse = managerConnection.sendAction(originateAction, 3000);
+
+        // print out whether the originate succeeded or not
+        System.out.println(originateResponse.getResponse());
+
+        // and finally log off and disconnect
+        managerConnection.logoff();
+    }
+
+    public static void main(String[] args) throws Exception
+    {
+        HelloManager helloManager;
+
+        helloManager = new HelloManager();
+        helloManager.run();
+    }
+}
+]]></source>
+				<p></p>
 			</subsection>
 		</section>
 	</body>

[Asterisk-java-cvs] CVS: asterisk-java/xdocs index.xml,1.8,1.9

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30634/xdocs

Modified Files:
	index.xml 
Log Message:
Added link to download a snapshot.

Index: index.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/index.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- index.xml	13 Mar 2005 11:31:51 -0000	1.8
+++ index.xml	14 Mar 2005 16:29:36 -0000	1.9
@@ -25,7 +25,7 @@
 	<meta name="keywords" content="Asterisk,asterisk,Java,java,Manager API,FastAGI,AGI"/>
 	<body>
 		<section name="Asterisk Java">
-			<subsection name="What is asterisk-java?">
+			<subsection name="What is Asterisk-java?">
 				<p>The Asterisk-java package consists of a set of Java classes 
 					that allow you to easily build Java applications that interact with an <a 
 					href="http://www.asterisk.org/">Asterisk PBX Server</a>. Asterisk-java
@@ -64,7 +64,7 @@
 					changes.</p>
 			</subsection>
 			<subsection name="Download">
-				<p>Asterisk-java is currently available via cvs only.</p>
+				<p>Asterisk-java is available via cvs from sourcforge:</p>
 <source><![CDATA[
 cvs -d:pserver:ano...@cv...:/cvsroot/asterisk-java login
 cvs -z3 -d:pserver:ano...@cv...:/cvsroot/asterisk-java co asterisk-java
@@ -74,6 +74,8 @@ cvs -z3 -d:pserver:ano...@cv...urcef
 				<p>More information is available on the <a 
 					href="http://sourceforge.net/projects/asterisk-java/">sourceforge 
 					project page</a>.</p>
+				<p>You can also download a 
+					<a href="http://maven.reucon.com/maven/asterisk-java/distributions/">snapshot</a>.</p>
 			</subsection>
 			<subsection name="Related Projects">
 				<p><a href="http://tanesha.net/Wiki/JastAgi.html">Jast Agi</a> 

[Asterisk-java-cvs] CVS: asterisk-java/xdocs tutorial.xml,1.2,1.3

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30295/xdocs

Modified Files:
	tutorial.xml 
Log Message:
Added general information about the Manager API

Index: tutorial.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/tutorial.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- tutorial.xml	13 Mar 2005 11:32:47 -0000	1.2
+++ tutorial.xml	14 Mar 2005 16:28:16 -0000	1.3
@@ -127,6 +127,20 @@ Mar 11, 2005 10:22:48 PM net.sf.asterisk
 INFO: End AGIScript HelloAGIScript on AGIServer-TaskThread-0
 ]]></source>
 			</subsection>
+
+			<subsection name="Extending the Example">
+				<p>Have a look at the documentation of 
+					<a href="apidocs/net/sf/asterisk/fastagi/AbstractAGIScript.html">AbstractAGIScript</a>
+					there you will find additional methods that you can use for your own scripts.
+					If you want to use commands that do not yet have a corresponding method in
+					AbstractAGIScript or if you want to extend the FastAGI protocol by adding your
+					own commands you can also use the channel.sendCommand(AGICommand) method to send
+					arbitrary commands.</p>
+				<p>If you are about to write more complex scripts please note that your AGIScript 
+					must be threadsafe. Only one instance will be used to serve all requests.
+					This is kind of similar to the constraints a servlet engine places on the 
+					implementation of servlets.</p>
+			</subsection>
 			
 			<subsection name="Configuration">
 				<p>You can tune the DefaultAGIServer by setting two properties: The bindPort
@@ -153,5 +167,45 @@ poolSize = 20
 ]]></source>
 			</subsection>
 		</section>
+		<section name="The Manager API">
+			<p>The Manager API is the other way for remote interaction with an Asterisk server.
+				In contrast to the FastAGI protocol Asterisk does not explicitly pass control
+				to your application when using the Manager API but allows you to
+				query and change its state at any time.</p>
+			<p>The Manager API is made up of three concepts: Actions, Responses and	Events.</p>
+			<p>Actions can be sent to Asterisk and instruct it to do someting. For example your
+				application can send an Action to Asterisk requesting it to dial a number and
+				direct the dialed party to one of your phones. In reply to an
+				Action Asterisk sends a Reply that contains the results of the operation 
+				performed.</p>
+			<p>Events are sent by Asterisk without a direct relation to the Actions your
+				application is sending.
+				Events inform you about the relevant changes in Asterisk's state. For example
+				Events are used to inform your application about incoming calls or users joining
+				or leaving MeetMe conference rooms.</p>
+			<p>The connection to the Asterisk server via Manager API occurs over TCP/IP usually
+				on the default port 5038.</p>
+			<p>To enable the Manager API on Asterisk you must edit your <code>manager.conf</code>
+				configuration file and restart Asterisk. The <code>manager.conf</code> also contains
+				constraints on the range of IP addresses that are allowed to connect and username
+				and passwords for authentication. A sample might look like:</p>
+<source><![CDATA[
+[general]
+enabled = yes
+port = 5038
+bindaddr = 0.0.0.0
+
+[manager]
+secret=pa55w0rd
+permit=0.0.0.0/0.0.0.0
+read=system,call,log,verbose,agent,command,user
+write=system,call,log,verbose,agent,command,user
+]]></source>
+			<p>This will enable the Manager AP, allow access from any IP address using the
+				username "manager" and the password "pa55w0rd".</p>
+			<subsection name="Hello Manager!">
+				<p>to be done.</p>
+			</subsection>
+		</section>
 	</body>
 </document>
\ No newline at end of file

[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/fastagi/impl AGIChannelImplTest.java,1.1,1.2

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/fastagi/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24063/src/test/net/sf/asterisk/fastagi/impl

Modified Files:
	AGIChannelImplTest.java 
Log Message:
Added tests for sendCommand() receiving error replies

Index: AGIChannelImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/fastagi/impl/AGIChannelImplTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- AGIChannelImplTest.java	11 Mar 2005 15:20:39 -0000	1.1
+++ AGIChannelImplTest.java	14 Mar 2005 14:04:44 -0000	1.2
@@ -20,6 +20,8 @@ import junit.framework.TestCase;
 import net.sf.asterisk.fastagi.AGIChannel;
 import net.sf.asterisk.fastagi.AGIReader;
 import net.sf.asterisk.fastagi.AGIWriter;
+import net.sf.asterisk.fastagi.InvalidCommandSyntaxException;
+import net.sf.asterisk.fastagi.InvalidOrUnknownCommandException;
 import net.sf.asterisk.fastagi.command.NoopCommand;
 import net.sf.asterisk.fastagi.reply.AGIReply;
 
@@ -67,4 +69,73 @@ public class AGIChannelImplTest extends 
         agiWriterMC.verify();
         agiReaderMC.verify();        
     }
+
+    public void testSendCommandWithInvalidOrUnknownCommandResponse() throws Exception
+    {
+        AGIReply reply;
+        NoopCommand command;
+        
+        reply = new AGIReply();
+        reply.setStatus(AGIReply.SC_INVALID_OR_UNKNOWN_COMMAND);
+        reply.setResult("0");
+        
+        command = new NoopCommand();
+        
+        agiWriter.sendCommand(command);
+        agiReader.readReply();
+        agiReaderMC.setReturnValue(reply);
+        
+        agiWriterMC.replay();
+        agiReaderMC.replay();
+        
+        try
+        {
+            agiChannel.sendCommand(command);
+            fail ("must throw InvalidOrUnknownCommandException");
+        }
+        catch (InvalidOrUnknownCommandException e)
+        {
+            assertEquals("Incorrect message", "Invalid or unknown command: NOOP", e.getMessage());
+        }
+        
+        agiWriterMC.verify();
+        agiReaderMC.verify();        
+    }
+
+
+    public void testSendCommandWithInvalidCommandSyntaxResponse() throws Exception
+    {
+        AGIReply reply;
+        NoopCommand command;
+        
+        reply = new AGIReply();
+        reply.setStatus(AGIReply.SC_INVALID_COMMAND_SYNTAX);
+        reply.setSynopsis("NOOP Synopsis");
+        reply.setUsage("NOOP Usage");
+        reply.setResult("0");
+        
+        command = new NoopCommand();
+        
+        agiWriter.sendCommand(command);
+        agiReader.readReply();
+        agiReaderMC.setReturnValue(reply);
+        
+        agiWriterMC.replay();
+        agiReaderMC.replay();
+        
+        try
+        {
+            agiChannel.sendCommand(command);
+            fail ("must throw InvalidCommandSyntaxException");
+        }
+        catch (InvalidCommandSyntaxException e)
+        {
+            assertEquals("Incorrect message", "Invalid command syntax: NOOP Synopsis", e.getMessage());
+            assertEquals("Incorrect sysnopsis", "NOOP Synopsis", e.getSynopsis());
+            assertEquals("Incorrect usage", "NOOP Usage", e.getUsage());
+        }
+        
+        agiWriterMC.verify();
+        agiReaderMC.verify();        
+    }
 }

[Asterisk-java-cvs] CVS: asterisk-java/src/integrationtest/net/sf/asterisk/manager TestDefaultManagerConnection.java,NONE,1.1 TestMultiAsteriskManager.java,NONE,1.1 TestDefaultAsteriskManager.java,NONE,1.1

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23666/src/integrationtest/net/sf/asterisk/manager

Added Files:
	TestDefaultManagerConnection.java 
	TestMultiAsteriskManager.java TestDefaultAsteriskManager.java 
Log Message:
Moved java files for integrationtest to src/integrationtest (was integrationtest)

--- NEW FILE: TestDefaultManagerConnection.java ---
/*
 * (c) 2004 Stefan Reuter
 *
 * Created on Sep 24, 2004
 */
package net.sf.asterisk.manager;

import junit.framework.TestCase;
import net.sf.asterisk.manager.action.StatusAction;
import net.sf.asterisk.manager.event.ManagerEvent;

/**
 * @author srt
 * @version $Id: TestDefaultManagerConnection.java,v 1.1 2005/03/13 11:39:06 srt Exp $
 */
public class TestDefaultManagerConnection extends TestCase
{
    private DefaultManagerConnection getDefaultManagerConnection()
    {
        DefaultManagerConnection dmc;

//        dmc = new DefaultManagerConnection("deprecated", 5038, "manager", "obelisk");
        dmc = new DefaultManagerConnection();
        dmc.setUsername("manager");
        dmc.setPassword("obelisk");
        dmc.setHostname("deprecated");

        return dmc;
    }

    public void testLogin() throws Exception
    {
        DefaultManagerConnection dmc;

        dmc = getDefaultManagerConnection();
        dmc.login();
        dmc.addEventHandler(new ManagerEventHandler()
        {
            public void handleEvent(ManagerEvent event)
            {
                System.out.println(event);
            }
        });
        dmc.sendAction(new StatusAction());

        // wait for 3 seconds to receive events
        Thread.sleep(3000);
        dmc.logoff();
    }

    public void testLoginAuthenticationFailure() throws Exception
    {
        DefaultManagerConnection dmc;

        dmc = getDefaultManagerConnection();
        dmc.setPassword("");
        
        try
        {
            dmc.login();
            fail("No AuthenticationFailedException received.");
        }
        catch (AuthenticationFailedException e)
        {
        }
        dmc.logoff();
    }
}

--- NEW FILE: TestMultiAsteriskManager.java ---
/*
 * (c) 2004 Stefan Reuter
 *
 * Created on Oct 28, 2004
 */
package net.sf.asterisk.manager;

import junit.framework.TestCase;

/**
 * @author PY
 * @version $Id: TestMultiAsteriskManager.java,v 1.1 2005/03/13 11:39:06 srt Exp $
 */
public class TestMultiAsteriskManager extends TestCase
{
    protected MultiAsterisksManager getDefaultManager()
    {
        MultiAsterisksManager mam = new MultiAsterisksManager();

        DefaultManagerConnection dmc1 = new DefaultManagerConnection();
        dmc1.setHostname("asterisk1");
        dmc1.setUsername("username");
        dmc1.setPassword("password");
        mam.addManagerConnection(dmc1);

        DefaultManagerConnection dmc2 = new DefaultManagerConnection();
        dmc2.setHostname("asterisk2");
        dmc2.setUsername("username");
        dmc2.setPassword("password");
        mam.addManagerConnection(dmc2);

        return mam;
    }

    public void testInit() throws Exception
    {
        MultiAsterisksManager mam = getDefaultManager();

        mam.initialize();

        try
        {
            Thread.sleep(5000);
        }
        catch (InterruptedException e)
        {
        }

        System.out.println(mam.getChannels());
    }

}

--- NEW FILE: TestDefaultAsteriskManager.java ---
/*
 * (c) 2004 Stefan Reuter
 *
 * Created on Oct 28, 2004
 */
package net.sf.asterisk.manager;

import junit.framework.TestCase;

/**
 * @author srt
 * @version $Id: TestDefaultAsteriskManager.java,v 1.1 2005/03/13 11:39:06 srt Exp $
 */
public class TestDefaultAsteriskManager extends TestCase
{
    protected DefaultAsteriskManager getDefaultManager()
    {
        DefaultAsteriskManager dm = new DefaultAsteriskManager();
        DefaultManagerConnection dmc = new DefaultManagerConnection();
        dmc.setHostname("deprecated");
        dmc.setUsername("manager");
        dmc.setPassword("obelisk");
        dm.setManagerConnection(dmc);

        return dm;
    }

    public void testInit() throws Exception
    {
        DefaultAsteriskManager dm = getDefaultManager();

        dm.initialize();

        try
        {
            Thread.sleep(30000);
        }
        catch (InterruptedException e)
        {
        }

        System.out.println(dm.getChannels());
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/integrationtest/net/sf/asterisk/manager TestDefaultManagerConnection.java,1.1,NONE TestDefaultAsteriskManager.java,1.1,NONE TestMultiAsteriskManager.java,1.1,NONE

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/integrationtest/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23666/integrationtest/net/sf/asterisk/manager

Removed Files:
	TestDefaultManagerConnection.java 
	TestDefaultAsteriskManager.java TestMultiAsteriskManager.java 
Log Message:
Moved java files for integrationtest to src/integrationtest (was integrationtest)

--- TestDefaultManagerConnection.java DELETED ---

--- TestDefaultAsteriskManager.java DELETED ---

--- TestMultiAsteriskManager.java DELETED ---

[Asterisk-java-cvs] CVS: asterisk-java/src/integrationtest - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/integrationtest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23540/src/integrationtest

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/src/integrationtest added to the repository

[Asterisk-java-cvs] CVS: asterisk-java/src/integrationtest/net/sf/asterisk/manager - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23540/src/integrationtest/net/sf/asterisk/manager

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf/asterisk/manager added to the repository

[Asterisk-java-cvs] CVS: asterisk-java/src/integrationtest/net/sf/asterisk - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf/asterisk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23540/src/integrationtest/net/sf/asterisk

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf/asterisk added to the repository

[Asterisk-java-cvs] CVS: asterisk-java/src/integrationtest/net - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23540/src/integrationtest/net

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net added to the repository

[Asterisk-java-cvs] CVS: asterisk-java/src/integrationtest/net/sf - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23540/src/integrationtest/net/sf

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf added to the repository

[Asterisk-java-cvs] CVS: asterisk-java/xdocs tutorial.xml,1.1,1.2

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22243/xdocs

Modified Files:
	tutorial.xml 
Log Message:


Index: tutorial.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/tutorial.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- tutorial.xml	11 Mar 2005 23:17:46 -0000	1.1
+++ tutorial.xml	13 Mar 2005 11:32:47 -0000	1.2
@@ -60,13 +60,13 @@ public class HelloAGIScript extends Abst
     public void service(AGIRequest request, AGIChannel channel)
             throws AGIException
     {
-		// Answer the channel...
+        // Answer the channel...
         answer(channel);
 		
-		// ...say hello...
+        // ...say hello...
         streamFile(channel, "welcome");
 		
-		// ...and hangup.
+        // ...and hangup.
         hangup(channel);
     }
 }
@@ -133,8 +133,8 @@ INFO: End AGIScript HelloAGIScript on AG
 					and the poolSize.</p>
 				<p>The bindPort determines the TCP port the server will listen on. By default
 					this is the FastAGI port 4573. If you change it make sure to include the
-					new port in your URLs used in <code>extensions.conf</code>. When using
-					bindPort 1234 your <code>extensions.conf</code> will look like:</p>
+					new port in the URLs used in <code>extensions.conf</code>. When using
+					bindPort 1234 your <code>extensions.conf</code> will contain:</p>
 <source><![CDATA[
 exten => 1300,1,Agi(agi://localhost:1234/hello.agi)
 ]]></source>
@@ -142,7 +142,7 @@ exten => 1300,1,Agi(agi://localhost:1234
 					DefaultAGIServer uses a fixed size thread pool to serve your AGIScripts.
 					The poolSize determines how many threads are spawned at startup and thus
 					limits the number of AGIScripts that can run at the same time. So you
-					should set the poolSize to at least the number of concurrent calls your
+					should set the poolSize to at least the number of concurrent calls the
 					AGIServer should be able to handle. The default value is 10.</p>
 				<p>These configuration properties can be set by providing a
 					<code>fastagi.properties</code> file on the classpath.</p>

[Asterisk-java-cvs] CVS: asterisk-java/xdocs index.xml,1.7,1.8

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22069/xdocs

Modified Files:
	index.xml 
Log Message:
Changed asterisk-java to Asterisk-java

Index: index.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/index.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- index.xml	11 Mar 2005 23:39:29 -0000	1.7
+++ index.xml	13 Mar 2005 11:31:51 -0000	1.8
@@ -20,14 +20,14 @@
 <document>
 	<properties>
 		<author email="srt at users.sourceforge.net">Stefan Reuter</author>
-		<title>The asterisk-java Library</title>
+		<title>The Asterisk-java Library</title>
 	</properties>
 	<meta name="keywords" content="Asterisk,asterisk,Java,java,Manager API,FastAGI,AGI"/>
 	<body>
 		<section name="Asterisk Java">
 			<subsection name="What is asterisk-java?">
-				<p>The asterisk-java package consists of a set of Java classes 
-					that allow you to easily build Java application that interact with an <a 
+				<p>The Asterisk-java package consists of a set of Java classes 
+					that allow you to easily build Java applications that interact with an <a 
 					href="http://www.asterisk.org/">Asterisk PBX Server</a>. Asterisk-java
 					supports both interfaces that Asterisk provides for this scenario:
 					The <a href="http://www.voip-info.org/wiki-Asterisk+AGI">FastAGI</a>
@@ -78,12 +78,12 @@ cvs -z3 -d:pserver:ano...@cv...urcef
 			<subsection name="Related Projects">
 				<p><a href="http://tanesha.net/Wiki/JastAgi.html">Jast Agi</a> 
 					is another toolkit for writing Java applications that connect to
-					Asterisk using the FastAGI protocol. Available under Apache License.</p>
+					Asterisk using the FastAGI protocol. The lastest version introduces
+					a statemachine approach to handle AGI requests.
+					Available under Apache License.</p>
 				<p><a href="http://www.voip-info.org/wiki-JAGIServer">JAGIServer</a> is
-					a 100% Pure Java application server for Asterisk using the 
-					FastAGI protocol, which is a TCP/IP wrapper around the 
-					Asterisk Gateway Interface AGI protocol for call handling 
-					and processing caller input. Available under GNU General Public License.</p>
+					also supports writing Java based AGI Scripts using FastAGI.
+					Available under GNU General Public License.</p>
 				<p><a href="http://sourceforge.net/projects/jasterisk/">JAsterisk</a> 
 					is a set of JNI classes providing direct access to Asterisk 
 					PBX functionality from Java. It is not a socket-level 

[Asterisk-java-cvs] CVS: asterisk-java .cvsignore,1.3,1.4

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21596

Modified Files:
	.cvsignore 
Log Message:
Ignoring eclipse specific .settings directory

Index: .cvsignore
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- .cvsignore	2 Mar 2005 11:33:06 -0000	1.3
+++ .cvsignore	13 Mar 2005 11:29:47 -0000	1.4
@@ -7,3 +7,4 @@ velocity.log
 target
 .classpath
 .project
+.settings

[Asterisk-java-cvs] CVS: asterisk-java/integrationtest/net/sf/asterisk/manager TestDefaultManagerConnection.java,NONE,1.1 TestDefaultAsteriskManager.java,NONE,1.1 TestMultiAsteriskManager.java,NONE,1.1

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/integrationtest/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21276/integrationtest/net/sf/asterisk/manager

Added Files:
	TestDefaultManagerConnection.java 
	TestDefaultAsteriskManager.java TestMultiAsteriskManager.java 
Log Message:
Separated unit and integration tests

--- NEW FILE: TestDefaultManagerConnection.java ---
/*
 * (c) 2004 Stefan Reuter
 *
 * Created on Sep 24, 2004
 */
package net.sf.asterisk.manager;

import junit.framework.TestCase;
import net.sf.asterisk.manager.action.StatusAction;
import net.sf.asterisk.manager.event.ManagerEvent;

/**
 * @author srt
 * @version $Id: TestDefaultManagerConnection.java,v 1.1 2005/03/13 11:28:15 srt Exp $
 */
public class TestDefaultManagerConnection extends TestCase
{
    private DefaultManagerConnection getDefaultManagerConnection()
    {
        DefaultManagerConnection dmc;

//        dmc = new DefaultManagerConnection("deprecated", 5038, "manager", "obelisk");
        dmc = new DefaultManagerConnection();
        dmc.setUsername("manager");
        dmc.setPassword("obelisk");
        dmc.setHostname("deprecated");

        return dmc;
    }

    public void testLogin() throws Exception
    {
        DefaultManagerConnection dmc;

        dmc = getDefaultManagerConnection();
        dmc.login();
        dmc.addEventHandler(new ManagerEventHandler()
        {
            public void handleEvent(ManagerEvent event)
            {
                System.out.println(event);
            }
        });
        dmc.sendAction(new StatusAction());

        // wait for 3 seconds to receive events
        Thread.sleep(3000);
        dmc.logoff();
    }

    public void testLoginAuthenticationFailure() throws Exception
    {
        DefaultManagerConnection dmc;

        dmc = getDefaultManagerConnection();
        dmc.setPassword("");
        
        try
        {
            dmc.login();
            fail("No AuthenticationFailedException received.");
        }
        catch (AuthenticationFailedException e)
        {
        }
        dmc.logoff();
    }
}

--- NEW FILE: TestDefaultAsteriskManager.java ---
/*
 * (c) 2004 Stefan Reuter
 *
 * Created on Oct 28, 2004
 */
package net.sf.asterisk.manager;

import junit.framework.TestCase;

/**
 * @author srt
 * @version $Id: TestDefaultAsteriskManager.java,v 1.1 2005/03/13 11:28:15 srt Exp $
 */
public class TestDefaultAsteriskManager extends TestCase
{
    protected DefaultAsteriskManager getDefaultManager()
    {
        DefaultAsteriskManager dm = new DefaultAsteriskManager();
        DefaultManagerConnection dmc = new DefaultManagerConnection();
        dmc.setHostname("deprecated");
        dmc.setUsername("manager");
        dmc.setPassword("obelisk");
        dm.setManagerConnection(dmc);

        return dm;
    }

    public void testInit() throws Exception
    {
        DefaultAsteriskManager dm = getDefaultManager();

        dm.initialize();

        try
        {
            Thread.sleep(30000);
        }
        catch (InterruptedException e)
        {
        }

        System.out.println(dm.getChannels());
    }
}

--- NEW FILE: TestMultiAsteriskManager.java ---
/*
 * (c) 2004 Stefan Reuter
 *
 * Created on Oct 28, 2004
 */
package net.sf.asterisk.manager;

import junit.framework.TestCase;

/**
 * @author PY
 * @version $Id: TestMultiAsteriskManager.java,v 1.1 2005/03/13 11:28:15 srt Exp $
 */
public class TestMultiAsteriskManager extends TestCase
{
    protected MultiAsterisksManager getDefaultManager()
    {
        MultiAsterisksManager mam = new MultiAsterisksManager();

        DefaultManagerConnection dmc1 = new DefaultManagerConnection();
        dmc1.setHostname("asterisk1");
        dmc1.setUsername("username");
        dmc1.setPassword("password");
        mam.addManagerConnection(dmc1);

        DefaultManagerConnection dmc2 = new DefaultManagerConnection();
        dmc2.setHostname("asterisk2");
        dmc2.setUsername("username");
        dmc2.setPassword("password");
        mam.addManagerConnection(dmc2);

        return mam;
    }

    public void testInit() throws Exception
    {
        MultiAsterisksManager mam = getDefaultManager();

        mam.initialize();

        try
        {
            Thread.sleep(5000);
        }
        catch (InterruptedException e)
        {
        }

        System.out.println(mam.getChannels());
    }

}

[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/manager TestDefaultManagerConnection.java,1.2,NONE TestDefaultAsteriskManager.java,1.1,NONE TestMultiAsteriskManager.java,1.1,NONE

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21276/src/test/net/sf/asterisk/manager

Removed Files:
	TestDefaultManagerConnection.java 
	TestDefaultAsteriskManager.java TestMultiAsteriskManager.java 
Log Message:
Separated unit and integration tests

--- TestDefaultManagerConnection.java DELETED ---

--- TestDefaultAsteriskManager.java DELETED ---

--- TestMultiAsteriskManager.java DELETED ---

[Asterisk-java-cvs] CVS: asterisk-java/integrationtest/net/sf/asterisk - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/integrationtest/net/sf/asterisk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21155/integrationtest/net/sf/asterisk

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/integrationtest/net/sf/asterisk added to the repository

[Asterisk-java-cvs] CVS: asterisk-java/integrationtest/net/sf/asterisk/manager - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/integrationtest/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21155/integrationtest/net/sf/asterisk/manager

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/integrationtest/net/sf/asterisk/manager added to the repository

[Asterisk-java-cvs] CVS: asterisk-java/integrationtest/net/sf - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/integrationtest/net/sf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21155/integrationtest/net/sf

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/integrationtest/net/sf added to the repository

[Asterisk-java-cvs] CVS: asterisk-java/integrationtest/net - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/integrationtest/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21155/integrationtest/net

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/integrationtest/net added to the repository