asterisk-java-cvs — Asterisk-Java Commit Logs

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/impl ManagerWriterImpl.java,1.3,1.4 ActionBuilderImpl.java,1.4,1.5

[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-serv3410/src/java/net/sf/asterisk/manager/impl

Modified Files:
	ManagerWriterImpl.java ActionBuilderImpl.java 
Log Message:
Sending an Action no longer modifies its ActionId so the same action object can be reused.

Index: ManagerWriterImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/ManagerWriterImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- ManagerWriterImpl.java	29 Oct 2005 12:00:11 -0000	1.3
+++ ManagerWriterImpl.java	8 Nov 2005 15:25:18 -0000	1.4
@@ -65,7 +65,7 @@ public class ManagerWriterImpl implement
         this.socket = socket;
     }
 
-    public synchronized void sendAction(final ManagerAction action) throws IOException
+    public synchronized void sendAction(final ManagerAction action, final String internalActionId) throws IOException
     {
         final String actionString;
 
@@ -74,7 +74,7 @@ public class ManagerWriterImpl implement
             throw new IllegalStateException("Unable to send action: socket is null");
         }
 
-        actionString = actionBuilder.buildAction(action);
+        actionString = actionBuilder.buildAction(action, internalActionId);
 
         socket.write(actionString);
         socket.flush();

Index: ActionBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/ActionBuilderImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- ActionBuilderImpl.java	29 Oct 2005 12:00:11 -0000	1.4
+++ ActionBuilderImpl.java	8 Nov 2005 15:25:18 -0000	1.5
@@ -58,12 +58,32 @@ public class ActionBuilderImpl implement
         this.targetVersion = targetVersion;
     }
 
-    public final String buildAction(final ManagerAction action)
+    public String buildAction(final ManagerAction action)
+    {
+        return buildAction(action, null);
+    }
+
+    public String buildAction(final ManagerAction action, final String internalActionId)
     {
         StringBuffer sb;
         Map getters;
 
-        sb = new StringBuffer();
+        sb = new StringBuffer("action: ");
+        sb.append(action.getAction());
+        sb.append(LINE_SEPARATOR);
+        if (internalActionId != null)
+        {
+            sb.append("actionid: ");
+            sb.append(Util.addInternalActionId(action.getActionId(), internalActionId));
+            sb.append(LINE_SEPARATOR);
+        }
+        else if (action.getActionId() != null)
+        {
+            sb.append("actionid: ");
+            sb.append(action.getActionId());
+            sb.append(LINE_SEPARATOR);
+        }
+        
         getters = getGetters(action.getClass());
 
         Iterator i = getters.keySet().iterator();
@@ -72,11 +92,10 @@ public class ActionBuilderImpl implement
             String name;
             Method getter;
             Object value;
-            String stringValue;
 
             name = (String) i.next();
 
-            if ("class".equals(name))
+            if ("class".equals(name) || "action".equals(name) || "actionid".equals(name))
             {
                 continue;
             }
@@ -174,7 +193,6 @@ public class ActionBuilderImpl implement
 
     protected void appendMap(StringBuffer sb, String key, Map values)
     {
-        Iterator entryIterator;
         String singularKey;
 
         // strip plural s (i.e. use "variable: " instead of "variables: "

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager ActionBuilder.java,1.6,1.7 ManagerWriter.java,1.5,1.6 DefaultManagerConnection.java,1.33,1.34

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

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

Modified Files:
	ActionBuilder.java ManagerWriter.java 
	DefaultManagerConnection.java 
Log Message:
Sending an Action no longer modifies its ActionId so the same action object can be reused.

Index: ActionBuilder.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ActionBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- ActionBuilder.java	29 Oct 2005 12:00:11 -0000	1.6
+++ ActionBuilder.java	8 Nov 2005 15:25:18 -0000	1.7
@@ -46,4 +46,16 @@ public interface ActionBuilder
      * @return a String representing the given action in an asterisk compatible format
      */
     String buildAction(final ManagerAction action);
+
+    /**
+     * Builds a String suitable to be sent to Asterisk based on the given action object.<br>
+     * Asterisk actions consist of an unordered set of key value pairs corresponding to the
+     * attributes of the ManagerActions. Key and value are separated by a colon (":"), key value
+     * pairs by a CR/NL ("\r\n"). An action is terminated by an empty line ("\r\n\r\n").
+     * 
+     * @param action the action to transform
+     * @param internalActionId the internal action id to add
+     * @return a String representing the given action in an asterisk compatible format
+     */
+    String buildAction(final ManagerAction action, final String internalActionId);
 }

Index: ManagerWriter.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ManagerWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- ManagerWriter.java	29 Oct 2005 12:00:11 -0000	1.5
+++ ManagerWriter.java	8 Nov 2005 15:25:18 -0000	1.6
@@ -53,8 +53,8 @@ public interface ManagerWriter
      * Sends the given action to the asterisk server.
      * 
      * @param action the action to send to the asterisk server.
+     * @param internalActionId the internal action id to add.
      * @throws IOException if there is a problem sending the action.
      */
-    void sendAction(final ManagerAction action) throws IOException;
-
+    void sendAction(final ManagerAction action, String internalActionId) throws IOException;
 }

Index: DefaultManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultManagerConnection.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -p -r1.33 -r1.34
--- DefaultManagerConnection.java	8 Nov 2005 11:20:45 -0000	1.33
+++ DefaultManagerConnection.java	8 Nov 2005 15:25:18 -0000	1.34
@@ -658,8 +658,6 @@ public class DefaultManagerConnection im
         }
 
         internalActionId = createInternalActionId();
-        action.setActionId(Util.addInternalActionId(action.getActionId(),
-                internalActionId));
 
         // if the callbackHandler is null the user is obviously not interested
         // in the response, thats fine.
@@ -671,7 +669,7 @@ public class DefaultManagerConnection im
             }
         }
 
-        writer.sendAction(action);
+        writer.sendAction(action, internalActionId);
     }
 
     public ResponseEvents sendEventGeneratingAction(EventGeneratingAction action)
@@ -720,8 +718,6 @@ public class DefaultManagerConnection im
                 .getActionCompleteEventClass(), Thread.currentThread());
 
         internalActionId = createInternalActionId();
-        action.setActionId(Util.addInternalActionId(action.getActionId(),
-                internalActionId));
 
         // register response handler...
         synchronized (this.responseHandlers)
@@ -736,7 +732,7 @@ public class DefaultManagerConnection im
                     responseEventHandler);
         }
 
-        writer.sendAction(action);
+        writer.sendAction(action, internalActionId);
 
         // let's wait to see what we get
         start = System.currentTimeMillis();

[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/manager ManagerWriterMock.java,1.6,1.7 DefaultManagerConnectionTest.java,1.13,1.14

[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-serv3410/src/test/net/sf/asterisk/manager

Modified Files:
	ManagerWriterMock.java DefaultManagerConnectionTest.java 
Log Message:
Sending an Action no longer modifies its ActionId so the same action object can be reused.

Index: ManagerWriterMock.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/ManagerWriterMock.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- ManagerWriterMock.java	29 Oct 2005 12:00:11 -0000	1.6
+++ ManagerWriterMock.java	8 Nov 2005 15:25:18 -0000	1.7
@@ -25,6 +25,7 @@ import net.sf.asterisk.manager.action.Lo
 import net.sf.asterisk.manager.action.LogoffAction;
 import net.sf.asterisk.manager.action.ManagerAction;
 import net.sf.asterisk.manager.event.ConnectEvent;
+import net.sf.asterisk.manager.impl.Util;
 import net.sf.asterisk.manager.response.ChallengeResponse;
 import net.sf.asterisk.manager.response.ManagerError;
 import net.sf.asterisk.manager.response.ManagerResponse;
@@ -95,7 +96,7 @@ public class ManagerWriterMock implement
         }
     }
 
-    public void sendAction(ManagerAction action) throws IOException
+    public void sendAction(ManagerAction action, String internalActionId) throws IOException
     {
         if (action instanceof ChallengeAction)
         {
@@ -114,7 +115,7 @@ public class ManagerWriterMock implement
                 ChallengeResponse challengeResponse;
 
                 challengeResponse = new ChallengeResponse();
-                challengeResponse.setActionId(action.getActionId());
+                challengeResponse.setActionId(Util.addInternalActionId(action.getActionId(), internalActionId));
                 challengeResponse.setChallenge(CHALLENGE);
                 dispatcher.dispatchResponse(challengeResponse);
             }
@@ -156,7 +157,7 @@ public class ManagerWriterMock implement
                     loginResponse.setResponse("Error");
                     loginResponse.setMessage("Authentication failed");
                 }
-                loginResponse.setActionId(action.getActionId());
+                loginResponse.setActionId(Util.addInternalActionId(action.getActionId(), internalActionId));
                 dispatcher.dispatchResponse(loginResponse);
             }
         }
@@ -169,7 +170,7 @@ public class ManagerWriterMock implement
                 ManagerResponse response;
 
                 response = new ManagerResponse();
-                response.setActionId(action.getActionId());
+                response.setActionId(Util.addInternalActionId(action.getActionId(), internalActionId));
                 response.setResponse("Success");
                 dispatcher.dispatchResponse(response);
             }
@@ -183,7 +184,7 @@ public class ManagerWriterMock implement
                 ManagerResponse response;
 
                 response = new ManagerResponse();
-                response.setActionId(action.getActionId());
+                response.setActionId(Util.addInternalActionId(action.getActionId(), internalActionId));
                 response.setResponse("Success");
                 dispatcher.dispatchResponse(response);
             }

Index: DefaultManagerConnectionTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/DefaultManagerConnectionTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -p -r1.13 -r1.14
--- DefaultManagerConnectionTest.java	29 Oct 2005 12:00:11 -0000	1.13
+++ DefaultManagerConnectionTest.java	8 Nov 2005 15:25:18 -0000	1.14
@@ -404,8 +404,8 @@ public class DefaultManagerConnectionTes
         dmc.connect();
         response = dmc.sendAction(statusAction);
 
-        assertEquals("incorrect actionId in response", "123", response
-                .getActionId());
+        assertEquals("incorrect actionId in action", "123", statusAction.getActionId());
+        assertEquals("incorrect actionId in response", "123", response.getActionId());
         assertEquals("incorrect response", "Success", response.getResponse());
 
         assertEquals("other actions not sent 1 time", 1,

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action SetVarAction.java,1.3,1.4

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

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

Modified Files:
	SetVarAction.java 
Log Message:
updated javadoc for global variables

Index: SetVarAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/SetVarAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- SetVarAction.java	7 Aug 2005 16:55:18 -0000	1.3
+++ SetVarAction.java	8 Nov 2005 11:37:22 -0000	1.4
@@ -17,9 +17,11 @@
 package net.sf.asterisk.manager.action;
 
 /**
- * The SetVar action sets the value of a channel variable for a given channel.
+ * The SetVarAction sets the value of a global or local channel variable.<br>
+ * Setting global variables is supported since Asterisk 1.2.
  * 
  * @author Asteria Solutions Group, Inc. <http://www.asteriasgi.com>
+ * @author srt
  * @version $Id$
  */
 public class SetVarAction extends AbstractManagerAction
@@ -53,6 +55,19 @@ public class SetVarAction extends Abstra
     }
 
     /**
+     * Creates a new SetVarAction that sets the given global variable to a new value.
+     * 
+     * @param variable the name of the global variable to set
+     * @param value the new value
+     * @since 0.2
+     */
+    public SetVarAction(String variable, String value)
+    {
+        this.variable = variable;
+        this.value = value;
+    }
+    
+    /**
      * Creates a new SetVarAction that sets the given channel variable of the
      * given channel to a new value.
      * 

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager DefaultManagerConnection.java,1.32,1.33

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

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

Modified Files:
	DefaultManagerConnection.java 
Log Message:
increased timeout in determine version

Index: DefaultManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultManagerConnection.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -p -r1.32 -r1.33
--- DefaultManagerConnection.java	29 Oct 2005 12:00:11 -0000	1.32
+++ DefaultManagerConnection.java	8 Nov 2005 11:20:45 -0000	1.33
@@ -489,7 +489,9 @@ public class DefaultManagerConnection im
     {
         ManagerResponse showVersionFilesResponse;
 
-        showVersionFilesResponse = sendAction(new CommandAction("show version files"));
+        // increase timeout as output is quite large
+        showVersionFilesResponse = sendAction(new CommandAction("show version files"), 
+                defaultResponseTimeout * 2);
         if (showVersionFilesResponse instanceof CommandResponse)
         {
             List showVersionFilesResult;

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action HangupAction.java,1.3,1.4

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

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

Modified Files:
	HangupAction.java 
Log Message:
added convenience constructor

Index: HangupAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/HangupAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- HangupAction.java	16 Jul 2005 13:19:34 -0000	1.3
+++ HangupAction.java	8 Nov 2005 10:14:09 -0000	1.4
@@ -1,57 +1,80 @@
-/*
- * 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.action;
-
-/**
- * The HangupAction causes the pbx to hang up a given channel.
- * 
- * @author srt
- * @version $Id$
- */
-public class HangupAction extends AbstractManagerAction
-{
-    /**
-     * Serializable version identifier
-     */
-    static final long serialVersionUID = 3479615884618713986L;
-
-    private String channel;
-
-    /**
-     * Returns the name of this action, i.e. "Hangup".
-     */
-    public String getAction()
-    {
-        return "Hangup";
-    }
-
-    /**
-     * Returns the channel to hangup.
-     */
-    public String getChannel()
-    {
-        return channel;
-    }
-
-    /**
-     * Sets the channel to hangup.
-     */
-    public void setChannel(String channel)
-    {
-        this.channel = channel;
-    }
-}
+/*
+ * 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.action;
+
+/**
+ * The HangupAction causes the pbx to hang up a given channel.
+ * 
+ * @author srt
+ * @version $Id$
+ */
+public class HangupAction extends AbstractManagerAction
+{
+    /**
+     * Serializable version identifier
+     */
+    static final long serialVersionUID = 3479615884618713986L;
+
+    private String channel;
+
+    /**
+     * Creates a new empty HangupAction.
+     */
+    public HangupAction()
+    {
+
+    }
+
+    /**
+     * Creates a new HangupAction that hangs up the given channel.
+     * 
+     * @param channel the name of the channel to hangup.
+     * @since 0.2
+     */
+    public HangupAction(String channel)
+    {
+        this.channel = channel;
+    }
+
+    /**
+     * Returns the name of this action, i.e. "Hangup".
+     */
+    public String getAction()
+    {
+        return "Hangup";
+    }
+
+    /**
+     * Returns the name of the channel to hangup.
+     * 
+     * @return the name of the channel to hangup.
+     */
+    public String getChannel()
+    {
+        return channel;
+    }
+
+    /**
+     * Sets the name of the channel to hangup.
+     * 
+     * @param channel the name of the channel to hangup.
+     */
+    public void setChannel(String channel)
+    {
+        this.channel = channel;
+    }
+}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/fastagi/impl AGIRequestImpl.java,1.8,1.9

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

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

Modified Files:
	AGIRequestImpl.java 
Log Message:
getDnid() and getRdnis() now return null if unknown for concistency

Index: AGIRequestImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/impl/AGIRequestImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- AGIRequestImpl.java	8 Nov 2005 00:25:39 -0000	1.8
+++ AGIRequestImpl.java	8 Nov 2005 00:31:28 -0000	1.9
@@ -333,12 +333,30 @@ public class AGIRequestImpl implements S
 
     public String getDnid()
     {
-        return (String) request.get("dnid");
+        String dnid;
+        
+        dnid = (String) request.get("dnid");
+        
+        if (dnid == null || "unknown".equals(dnid))
+        {
+            return null;
+        }
+        
+        return dnid; 
     }
 
     public String getRdnis()
     {
-        return (String) request.get("rdnis");
+        String rdnis;
+        
+        rdnis = (String) request.get("rdnis");
+        
+        if (rdnis == null || "unknown".equals(rdnis))
+        {
+            return null;
+        }
+        
+        return rdnis; 
     }
 
     /**

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

[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-serv5661/src/test/net/sf/asterisk/fastagi/impl

Modified Files:
	AGIRequestImplTest.java 
Log Message:
getDnid() and getRdnis() now return null if unknown for concistency

Index: AGIRequestImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/fastagi/impl/AGIRequestImplTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- AGIRequestImplTest.java	8 Nov 2005 00:25:42 -0000	1.2
+++ AGIRequestImplTest.java	8 Nov 2005 00:31:28 -0000	1.3
@@ -44,7 +44,7 @@ public class AGIRequestImplTest extends 
         lines.add("agi_uniqueid: 1110023416.6");
         lines.add("agi_callerid: John Doe<1234>");
         lines.add("agi_dnid: 8870");
-        lines.add("agi_rdnis: unknown");
+        lines.add("agi_rdnis: 9876");
         lines.add("agi_context: local");
         lines.add("agi_extension: 8870");
         lines.add("agi_priority: 1");
@@ -63,7 +63,7 @@ public class AGIRequestImplTest extends 
         assertEquals("incorrect callerId", "1234", request.getCallerId());
         assertEquals("incorrect callerIdName", "John Doe", request.getCallerIdName());
         assertEquals("incorrect dnid", "8870", request.getDnid());
-        assertEquals("incorrect rdnis", "unknown", request.getRdnis());
+        assertEquals("incorrect rdnis", "9876", request.getRdnis());
         assertEquals("incorrect context", "local", request.getContext());
         assertEquals("incorrect extension", "8870", request.getExtension());
         assertEquals("incorrect priority", new Integer(1), request.getPriority());
@@ -196,7 +196,35 @@ public class AGIRequestImplTest extends 
         assertEquals("incorrect callerId", "1234", request.getCallerId());
         assertNull("callerIdName must not be set if \"unknown\"", request.getCallerIdName());
     }
-    
+
+    public void testBuildRequestCallerIdWithUnknownDnid()
+    {
+        Collection lines;
+        AGIRequest request;
+
+        lines = new ArrayList();
+
+        lines.add("agi_dnid: unknown");
+
+        request = new AGIRequestImpl(lines);
+
+        assertNull("dnid must not be set if \"unknown\"", request.getDnid());
+    }
+
+    public void testBuildRequestCallerIdWithUnknownRdnis()
+    {
+        Collection lines;
+        AGIRequest request;
+
+        lines = new ArrayList();
+
+        lines.add("agi_rdnis: unknown");
+
+        request = new AGIRequestImpl(lines);
+
+        assertNull("rdnis must not be set if \"unknown\"", request.getRdnis());
+    }
+
     public void testBuildRequestWithNullEnvironment()
     {
         try

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/fastagi AGIRequest.java,1.7,1.8

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

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

Modified Files:
	AGIRequest.java 
Log Message:
getDnid() and getRdnis() now return null if unknown for concistency

Index: AGIRequest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/AGIRequest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- AGIRequest.java	8 Nov 2005 00:25:42 -0000	1.7
+++ AGIRequest.java	8 Nov 2005 00:31:28 -0000	1.8
@@ -100,7 +100,8 @@ public interface AGIRequest
     /**
      * Returns the number, that has been dialed by the user.
      * 
-     * @return the dialed number.
+     * @return the dialed number, if no DNID is available or it is "unknown"
+     *         <code>null</code> is returned.
      */
     String getDnid();
 
@@ -109,7 +110,8 @@ public interface AGIRequest
      * redirect is returned (Redirected dialed number identification service).<br>
      * This is usally only only available on PRI.
      * 
-     * @return the number of the person doing the redirect.
+     * @return the number of the person doing the redirect, , if no RDNIS is
+     *         available or it is "unknown" <code>null</code> is returned.
      */
     String getRdnis();
 

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/fastagi AGIRequest.java,1.6,1.7

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

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

Modified Files:
	AGIRequest.java 
Log Message:
Fixed Caller*ID with Asterisk 1.2 (AJ-21)

Index: AGIRequest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/AGIRequest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- AGIRequest.java	27 Sep 2005 21:07:26 -0000	1.6
+++ AGIRequest.java	8 Nov 2005 00:25:42 -0000	1.7
@@ -31,7 +31,7 @@ public interface AGIRequest
 {
     /**
      * Returns a Map containing the raw request name/value pairs.
-     *
+     * 
      * @return Map contain raw request name/value pairs.
      */
     Map getRequest();
@@ -92,7 +92,8 @@ public interface AGIRequest
     /**
      * Returns the the Caller*ID Name, for example "John Doe".
      * 
-     * @return the the Caller*ID Name, for example "John Doe".
+     * @return the the Caller*ID Name, for example "John Doe", if no Caller*ID
+     *         Name is set or it is "unknown" <code>null</code> is returned.
      */
     String getCallerIdName();
 

[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/fastagi/impl AGIRequestImplTest.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-serv2957/src/test/net/sf/asterisk/fastagi/impl

Modified Files:
	AGIRequestImplTest.java 
Log Message:
Fixed Caller*ID with Asterisk 1.2 (AJ-21)

Index: AGIRequestImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/fastagi/impl/AGIRequestImplTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- AGIRequestImplTest.java	15 Apr 2005 04:47:02 -0000	1.1
+++ AGIRequestImplTest.java	8 Nov 2005 00:25:42 -0000	1.2
@@ -161,6 +161,42 @@ public class AGIRequestImplTest extends 
         assertNull("callerIdName must not be set", request.getCallerIdName());
     }
 
+    /*
+     * Asterisk 1.2 now uses agi_callerid and agi_calleridname so we don't need to process
+     * it ourselves.
+     */
+    public void testBuildRequestCallerIdAsterisk12()
+    {
+        Collection lines;
+        AGIRequest request;
+
+        lines = new ArrayList();
+
+        lines.add("agi_callerid: 1234");
+        lines.add("agi_calleridname: John Doe");
+
+        request = new AGIRequestImpl(lines);
+
+        assertEquals("incorrect callerId", "1234", request.getCallerId());
+        assertEquals("incorrect callerIdName", "John Doe", request.getCallerIdName());
+    }
+
+    public void testBuildRequestCallerIdAsterisk12WithUnknownCallerIdName()
+    {
+        Collection lines;
+        AGIRequest request;
+
+        lines = new ArrayList();
+
+        lines.add("agi_callerid: 1234");
+        lines.add("agi_calleridname: unknown");
+
+        request = new AGIRequestImpl(lines);
+
+        assertEquals("incorrect callerId", "1234", request.getCallerId());
+        assertNull("callerIdName must not be set if \"unknown\"", request.getCallerIdName());
+    }
+    
     public void testBuildRequestWithNullEnvironment()
     {
         try

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/fastagi/impl AGIRequestImpl.java,1.7,1.8

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

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

Modified Files:
	AGIRequestImpl.java 
Log Message:
Fixed Caller*ID with Asterisk 1.2 (AJ-21)

Index: AGIRequestImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/impl/AGIRequestImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- AGIRequestImpl.java	27 Sep 2005 21:07:26 -0000	1.7
+++ AGIRequestImpl.java	8 Nov 2005 00:25:39 -0000	1.8
@@ -206,21 +206,11 @@ public class AGIRequestImpl implements S
         return (String) request.get("uniqueid");
     }
 
-    /**
-     * Returns the type of the channel, for example "SIP".
-     * 
-     * @return the type of the channel, for example "SIP".
-     */
     public String getType()
     {
         return (String) request.get("type");
     }
 
-    /**
-     * Returns the language, for example "en".
-     * 
-     * @return the language, for example "en".
-     */
     public String getLanguage()
     {
         return (String) request.get("language");
@@ -228,6 +218,50 @@ public class AGIRequestImpl implements S
 
     public String getCallerId()
     {
+        String callerIdName;
+
+        callerIdName = (String) request.get("calleridname");
+        if (callerIdName != null)
+        {
+            // Asterisk 1.2
+            return (String) request.get("callerid");
+        }
+        else
+        {
+            // Asterisk 1.0
+            return getCallerId10();
+        }
+    }
+
+    public String getCallerIdName()
+    {
+        String callerIdName;
+
+        callerIdName = (String) request.get("calleridname");
+        if (callerIdName != null)
+        {
+            // Asterisk 1.2
+            if ("unknown".equals(callerIdName))
+            {
+                return null;
+            }
+
+            return callerIdName;
+        }
+        else
+        {
+            // Asterisk 1.0
+            return getCallerIdName10();
+        }
+    }
+
+    /**
+     * Returns the Caller*ID using Asterisk 1.0 logic.
+     * 
+     * @return the Caller*ID
+     */
+    private String getCallerId10()
+    {
         int lbPosition;
         int rbPosition;
 
@@ -253,7 +287,12 @@ public class AGIRequestImpl implements S
         return rawCallerId.substring(lbPosition + 1, rbPosition);
     }
 
-    public String getCallerIdName()
+    /**
+     * Returns the Caller*ID using Asterisk 1.0 logic.
+     * 
+     * @return the Caller*ID Name
+     */
+    private String getCallerIdName10()
     {
         int lbPosition;
         String callerIdName;

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/fastagi DefaultAGIServer.java,1.8,1.9

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

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

Modified Files:
	DefaultAGIServer.java 
Log Message:
changed name of property bindPort to port

Index: DefaultAGIServer.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/DefaultAGIServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- DefaultAGIServer.java	25 Oct 2005 22:43:25 -0000	1.8
+++ DefaultAGIServer.java	6 Nov 2005 00:54:38 -0000	1.9
@@ -55,7 +55,7 @@ public class DefaultAGIServer implements
     /**
      * The port to listen on.
      */
-    private int bindPort;
+    private int port;
 
     /**
      * The thread pool that contains the worker threads to process incoming
@@ -86,7 +86,7 @@ public class DefaultAGIServer implements
      */
     public DefaultAGIServer()
     {
-        this.bindPort = DEFAULT_BIND_PORT;
+        this.port = DEFAULT_BIND_PORT;
         this.poolSize = DEFAULT_POOL_SIZE;
         this.mappingStrategy = new ResourceBundleMappingStrategy();
         
@@ -108,13 +108,26 @@ public class DefaultAGIServer implements
 
     /**
      * Sets the TCP port to listen on for new connections.<br>
-     * The default bind port is 4573.
+     * The default port is 4573.
      * 
      * @param bindPort the port to bind to.
+     * @deprecated use {@see #setPort(int)} instead
      */
     public void setBindPort(int bindPort)
     {
-        this.bindPort = bindPort;
+        this.port = bindPort;
+    }
+    
+    /**
+     * Sets the TCP port to listen on for new connections.<br>
+     * The default port is 4573.
+     * 
+     * @param port the port to bind to.
+     * @since 0.2
+     */
+    public void setPort(int port)
+    {
+        this.port = port;
     }
 
     /**
@@ -146,10 +159,15 @@ public class DefaultAGIServer implements
         
         try
         {
-            String bindPortString;
+            String portString;
 
-            bindPortString = resourceBundle.getString("bindPort");
-            bindPort = Integer.parseInt(bindPortString);
+            portString = resourceBundle.getString("port");
+            if (portString == null)
+            {
+                // for backward compatibility only
+                portString = resourceBundle.getString("bindPort");
+            }
+            port = Integer.parseInt(portString);
         }
         catch(Exception e)
         {
@@ -171,7 +189,7 @@ public class DefaultAGIServer implements
 
     protected ServerSocketFacade createServerSocket() throws IOException
     {
-        return new ServerSocketFacadeImpl(bindPort, 0, null);
+        return new ServerSocketFacadeImpl(port, 0, null);
     }
 
     public void startup() throws IOException, IllegalStateException
@@ -190,7 +208,7 @@ public class DefaultAGIServer implements
         try
         {
             serverSocket = createServerSocket();
-            logger.info("Listening on *:" + bindPort + ".");
+            logger.info("Listening on *:" + port + ".");
 
             while ((socket = serverSocket.accept()) != null)
             {

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/fastagi ResourceBundleMappingStrategy.java,1.3,1.4 AGIConnectionHandler.java,1.12,1.13

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

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

Modified Files:
	ResourceBundleMappingStrategy.java AGIConnectionHandler.java 
Log Message:
enhanced logging to make tracking mapping errors easier

Index: ResourceBundleMappingStrategy.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/ResourceBundleMappingStrategy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- ResourceBundleMappingStrategy.java	14 Oct 2005 21:42:33 -0000	1.3
+++ ResourceBundleMappingStrategy.java	4 Nov 2005 21:49:01 -0000	1.4
@@ -76,7 +76,7 @@ public class ResourceBundleMappingStrate
         }
         catch (MissingResourceException e)
         {
-            logger.error("Resource bundle " + resourceBundleName + " is missing.");
+            logger.error("Resource bundle '" + resourceBundleName + "' is missing.");
             return;
         }
 
@@ -98,6 +98,7 @@ public class ResourceBundleMappingStrate
             }
 
             mappings.put(scriptName, agiScript);
+            logger.info("Added mapping for '" + scriptName + "' to class " + agiScript.getClass());
         }
     }
 

Index: AGIConnectionHandler.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/AGIConnectionHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -p -r1.12 -r1.13
--- AGIConnectionHandler.java	6 Aug 2005 18:43:25 -0000	1.12
+++ AGIConnectionHandler.java	4 Nov 2005 21:49:01 -0000	1.13
@@ -111,7 +111,9 @@ public class AGIConnectionHandler implem
             {
                 String error;
 
-                error = "No script configured for " + request.getRequestURL();
+                error = "No script configured for URL '"
+                        + request.getRequestURL() + "' (script '"
+                        + request.getScript() + "')";
                 channel.sendCommand(new VerboseCommand(error, 1));
                 logger.error(error);
             }

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action GetVarAction.java,1.3,1.4

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

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

Modified Files:
	GetVarAction.java 
Log Message:
Added information about support for global variables since Asterisk 1.2

Index: GetVarAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/GetVarAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- GetVarAction.java	16 Jul 2005 13:19:34 -0000	1.3
+++ GetVarAction.java	2 Nov 2005 20:02:37 -0000	1.4
@@ -17,7 +17,8 @@
 package net.sf.asterisk.manager.action;
 
 /**
- * The GetVarAction queries for a channel variable.
+ * The GetVarAction queries for a global or local channel variable.<br>
+ * Reading global variables is supported since Asterisk 1.2.
  * 
  * @author srt
  * @version $Id$
@@ -32,6 +33,39 @@ public class GetVarAction extends Abstra
     private String variable;
 
     /**
+     * Creates a new empty GetVarAction.
+     */
+    public GetVarAction()
+    {
+
+    }
+
+    /**
+     * Creates a new GetVarAction that queries for the given global variable.
+     * 
+     * @param variable the name of the global variable to query.
+     * @since 0.2
+     */
+    public GetVarAction(String variable)
+    {
+        this.variable = variable;
+    }
+
+    /**
+     * Creates a new GetVarAction that queries for the given local channel
+     * variable.
+     * 
+     * @param channel the name of the channel, for example "SIP/1234-9cd".
+     * @param variable the name of the variable to query.
+     * @since 0.2
+     */
+    public GetVarAction(String channel, String variable)
+    {
+        this.channel = channel;
+        this.variable = variable;
+    }
+
+    /**
      * Returns the name of this action, i.e. "GetVar".
      */
     public String getAction()
@@ -40,7 +74,8 @@ public class GetVarAction extends Abstra
     }
 
     /**
-     * Returns the name of the channel.
+     * Returns the name of the channel if you query for a local channel variable
+     * or <code>null</code> if it is a global variable.
      */
     public String getChannel()
     {
@@ -48,7 +83,11 @@ public class GetVarAction extends Abstra
     }
 
     /**
-     * Sets the name of the channel.
+     * Sets the name of the channel if you query for a local channel variable.
+     * Leave empty to query for a global variable.
+     * 
+     * @param channel the channel if you query for a local channel variable or
+     *            <code>null</code> to query for a gloabl variable.
      */
     public void setChannel(String channel)
     {

[Asterisk-java-cvs] CVS: asterisk-java project.xml,1.24,1.25

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

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

Modified Files:
	project.xml 
Log Message:
Changed URL to asteriskjava.org

Index: project.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/project.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -p -r1.24 -r1.25
--- project.xml	29 Oct 2005 12:43:54 -0000	1.24
+++ project.xml	1 Nov 2005 01:07:02 -0000	1.25
@@ -23,7 +23,7 @@
     <currentVersion>0.2-SNAPSHOT</currentVersion>
     <organization>
         <name>Stefan Reuter</name>
-        <url>http://sourceforge.net/projects/asterisk-java/</url>
+        <url>http://www.asterisk-java.org/</url>
         <logo>http://sourceforge.net/sflogo.php?group_id=118998&amp;type=5</logo>
     </organization>
     <inceptionYear>2004</inceptionYear>
@@ -32,7 +32,7 @@
     <gumpRepositoryId>asterisk-java</gumpRepositoryId>
     <description>Asterisk-java consists of a set of Java classes that allow you to control an Asterisk PBX via Asterisk's Manager API from Java applications.</description>
     <shortDescription>Java Connector for Asterisk PBX</shortDescription>
-    <url>http://asterisk-java.sourceforge.net/</url>
+    <url>http://www.asteriskjava.org/</url>
     <siteAddress>maven.reucon.com</siteAddress>
     <siteDirectory>/var/www/www.asterisk-java.org/htdocs/0.2-SNAPSHOT</siteDirectory>
     <distributionSite>maven.reucon.com</distributionSite>

[Asterisk-java-cvs] CVS: asterisk-java ANNOUNCEMENT,1.2,1.3

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

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

Modified Files:
	ANNOUNCEMENT 
Log Message:
Updated for 0.2-rc2

Index: ANNOUNCEMENT
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/ANNOUNCEMENT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ANNOUNCEMENT	31 Aug 2005 07:37:59 -0000	1.2
+++ ANNOUNCEMENT	29 Oct 2005 13:07:50 -0000	1.3
@@ -1,6 +1,6 @@
-ANNOUNCEMENT: Asterisk-Java 0.2-rc1 released
+ANNOUNCEMENT: Asterisk-Java 0.2-rc2 released
 
-Asterisk-Java 0.2-rc1, a Java control for the Asterisk PBX, has been 
+Asterisk-Java 0.2-rc2, a Java control for the Asterisk PBX, has been 
 released.
 
 The Asterisk-Java package consists of a set of Java classes that allow
@@ -8,19 +8,13 @@ you to easily build Java applications th
 PBX Server. Asterisk-Java supports both interfaces that Asterisk 
 provides for this scenario: The FastAGI protocol and the Manager API.
 
-The 0.2-rc1 release candidate focuses on the new features of 
-Asterisk 1.2-beta1 though it still supports Asterisk 1.0.x.
+The 0.2-rc2 release candidate focuses on the new features of 
+the Asterisk 1.2 series though it still supports Asterisk 1.0.x.
 The changes include
-	* Support for the new Actions, Events and Commands of Asterisk 1.2
-	* New support for event generating Actions, i.e. Actions
-	  that send their result as a series of Event rather than
-	  the usual ManagerResults. See the sendEventGeneratingAction()
-	  methods in ManagerConnection for more information.
-	* New base class for AGI scripts that allows you write cleaner 
-	  AGI scripts as you don't have to pass the channel variable
-	  to all methods.
-	* New convenience constructors for manager actions
-	* Some minor bug fixes
+	* Bug fix for variables in OriginateAction (AJ-15)
+	* Support for FaxReceived event from spandsp (AJ-20)
+	* Better integration with Spring Framework via
+	  SimpleMappingStrategy and AGIServerThread
 
 Asterisk-Java is used in several commercial environments and by
 the following Open Source projects:
@@ -35,4 +29,4 @@ the following Open Source projects:
 	  and more.
 
 Asterisk-Java is available under Apache 2.0 license at
-http://asterisk-java.sourceforge.net
+http://www.asteriskjava.org

[Asterisk-java-cvs] CVS: asterisk-java project.xml,1.23,1.24

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

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

Modified Files:
	project.xml 
Log Message:
Changed version to 0.2-SNAPSHOT

Index: project.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/project.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -p -r1.23 -r1.24
--- project.xml	29 Oct 2005 12:18:47 -0000	1.23
+++ project.xml	29 Oct 2005 12:43:54 -0000	1.24
@@ -1,159 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <project>
-  <pomVersion>3</pomVersion>
-  <artifactId>asterisk-java</artifactId>
-  <groupId>org.asteriskjava</groupId>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-    </license>
-  </licenses>
-  <reports>
-    <report>maven-clover-plugin</report>
-    <report>maven-jdepend-plugin</report>
-    <report>maven-junit-report-plugin</report>
-    <report>maven-license-plugin</report>
-    <report>maven-jxr-plugin</report>
-    <report>maven-javadoc-plugin</report>
-    <report>maven-pmd-plugin</report>
-  </reports>
-  <id>asterisk-java</id>
-  <name>Asterisk-Java</name>
-  <currentVersion>0.2-rc2</currentVersion>
-  <organization>
-    <name>Stefan Reuter</name>
-    <url>http://sourceforge.net/projects/asterisk-java/</url>
-    <logo>http://sourceforge.net/sflogo.php?group_id=118998&amp;type=5</logo>
-  </organization>
-  <inceptionYear>2004</inceptionYear>
-  <package>net.sf.asterisk</package>
-  <!-- Gump integration -->
-
-  <gumpRepositoryId>asterisk-java</gumpRepositoryId>
-  <description>Asterisk-java consists of a set of Java classes that allow you to control an Asterisk PBX via Asterisk's Manager API from Java applications.</description>
-  <shortDescription>Java Connector for Asterisk PBX</shortDescription>
-  <url>http://asterisk-java.sourceforge.net/</url>
-  <siteAddress>maven.reucon.com</siteAddress>
-  <siteDirectory>/var/www/www.asterisk-java.org/htdocs/0.2-rc2</siteDirectory>
-  <distributionSite>maven.reucon.com</distributionSite>
-  <distributionDirectory>/var/www/maven.reucon.com/htdocs/maven</distributionDirectory>
-  <repository>
-    <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/asterisk-java:asterisk-java</connection>
-    <developerConnection>scm:cvs:ext:${maven.username}@cvs1.sourceforge.net:/cvsroot/asterisk-java:asterisk-java</developerConnection>
-    <url>http://cvs.sourceforge.net/viewcvs.py/asterisk-java/asterisk-java/</url>
-  </repository>
-  <versions>
-    <version>
-      <id>0.2-SNAPSHOT</id>
-      <name>0.2-SNAPSHOT</name>
-      <tag>HEAD</tag>
-    </version>
-    <version>
-      <id>0.1-rc1</id>
-      <name>0.1-rc1</name>
-      <tag>RC_0_1_1</tag>
-    </version>
-    <version>
-      <id>0.1</id>
-      <name>0.1</name>
-      <tag>REL_0_1</tag>
-    </version>
-    <version>
-      <id>0.2-rc1</id>
-      <name>0.2-rc1</name>
-      <tag>RC_0_2_1</tag>
-    </version>
-    <version>
-      <id>0.2-rc2</id>
-      <name>0.2-rc2</name>
-      <tag>RC_0_2_2</tag>
-    </version>
-  </versions>
-  <mailingLists>
-    <mailingList>
-      <name>Asterisk-java User List</name>
-      <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-users</subscribe>
-      <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-users</unsubscribe>
-      <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-users</archive>
-    </mailingList>
-    <mailingList>
-      <name>Asterisk-java Developer List</name>
-      <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-devel</subscribe>
-      <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-devel</unsubscribe>
-      <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-devel</archive>
-    </mailingList>
-    <mailingList>
-      <name>Asterisk-java CVS Commit List</name>
-      <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-cvs</subscribe>
-      <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-cvs</unsubscribe>
-      <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-cvs</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <name>Stefan Reuter</name>
-      <id>srt</id>
-      <email>srt at users.sourceforge.net</email>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <name>Pierre-Yves Roger</name>
-      <id>partoutatis</id>
-      <email>partoutatis at users.sourceforge.net</email>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <name>John Hood</name>
-      <id>squinky86</id>
-      <email>john at asteriasgi.com</email>
-      <organization>Asteria Soulutions Group, Inc.</organization>
-      <timezone>-6</timezone>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
-      <type>jar</type>
-      <url>http://logging.apache.org/log4j/</url>
-    </dependency>
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>1.1</version>
-      <type>jar</type>
-      <url>http://www.easymock.org/</url>
-    </dependency>
-  </dependencies>
-  <build>
-    <nagEmailAddress>sr...@re...</nagEmailAddress>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-    <!-- Unit test cases -->
-
-    <unitTest>
-      <includes>
-        <include>**/*Test.java</include>
-      </includes>
-      <resources>
-        <resource>
-          <directory>${basedir}/src/resources/fastagi</directory>
-          <includes>
-            <include>test-mapping.properties</include>
-          </includes>
-          <filtering>false</filtering>
-        </resource>
-        <resource>
-          <directory>${basedir}/src/resources/log4j</directory>
-          <includes>
-            <include>log4j.properties</include>
-          </includes>
-          <filtering>false</filtering>
-        </resource>
-      </resources>
-    </unitTest>
-  </build>
+    <pomVersion>3</pomVersion>
+    <artifactId>asterisk-java</artifactId>
+    <groupId>org.asteriskjava</groupId>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+    </licenses>
+    <reports>
+        <report>maven-clover-plugin</report>
+        <report>maven-jdepend-plugin</report>
+        <report>maven-junit-report-plugin</report>
+        <report>maven-license-plugin</report>
+        <report>maven-jxr-plugin</report>
+        <report>maven-javadoc-plugin</report>
+        <report>maven-pmd-plugin</report>
+    </reports>
+    <id>asterisk-java</id>
+    <name>Asterisk-Java</name>
+    <currentVersion>0.2-SNAPSHOT</currentVersion>
+    <organization>
+        <name>Stefan Reuter</name>
+        <url>http://sourceforge.net/projects/asterisk-java/</url>
+        <logo>http://sourceforge.net/sflogo.php?group_id=118998&amp;type=5</logo>
+    </organization>
+    <inceptionYear>2004</inceptionYear>
+    <package>net.sf.asterisk</package>
+    <!-- Gump integration -->
+    <gumpRepositoryId>asterisk-java</gumpRepositoryId>
+    <description>Asterisk-java consists of a set of Java classes that allow you to control an Asterisk PBX via Asterisk's Manager API from Java applications.</description>
+    <shortDescription>Java Connector for Asterisk PBX</shortDescription>
+    <url>http://asterisk-java.sourceforge.net/</url>
+    <siteAddress>maven.reucon.com</siteAddress>
+    <siteDirectory>/var/www/www.asterisk-java.org/htdocs/0.2-SNAPSHOT</siteDirectory>
+    <distributionSite>maven.reucon.com</distributionSite>
+    <distributionDirectory>/var/www/maven.reucon.com/htdocs/maven</distributionDirectory>
+    <repository>
+        <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/asterisk-java:asterisk-java</connection>
+        <developerConnection>scm:cvs:ext:${maven.username}@cvs1.sourceforge.net:/cvsroot/asterisk-java:asterisk-java</developerConnection>
+        <url>http://cvs.sourceforge.net/viewcvs.py/asterisk-java/asterisk-java/</url>
+    </repository>
+    <versions>
+        <version>
+            <id>0.2-SNAPSHOT</id>
+            <name>0.2-SNAPSHOT</name>
+            <tag>HEAD</tag>
+        </version>
+        <version>
+            <id>0.1-rc1</id>
+            <name>0.1-rc1</name>
+            <tag>RC_0_1_1</tag>
+        </version>
+        <version>
+            <id>0.1</id>
+            <name>0.1</name>
+            <tag>REL_0_1</tag>
+        </version>
+        <version>
+            <id>0.2-rc1</id>
+            <name>0.2-rc1</name>
+            <tag>RC_0_2_1</tag>
+        </version>
+        <version>
+            <id>0.2-rc2</id>
+            <name>0.2-rc2</name>
+            <tag>RC_0_2_2</tag>
+        </version>
+    </versions>
+    <mailingLists>
+        <mailingList>
+            <name>Asterisk-java User List</name>
+            <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-users</subscribe>
+            <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-users</unsubscribe>
+            <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-users</archive>
+        </mailingList>
+        <mailingList>
+            <name>Asterisk-java Developer List</name>
+            <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-devel</subscribe>
+            <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-devel</unsubscribe>
+            <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-devel</archive>
+        </mailingList>
+        <mailingList>
+            <name>Asterisk-java CVS Commit List</name>
+            <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-cvs</subscribe>
+            <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-cvs</unsubscribe>
+            <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-cvs</archive>
+        </mailingList>
+    </mailingLists>
+    <developers>
+        <developer>
+            <name>Stefan Reuter</name>
+            <id>srt</id>
+            <email>srt at users.sourceforge.net</email>
+            <timezone>+1</timezone>
+        </developer>
+        <developer>
+            <name>Pierre-Yves Roger</name>
+            <id>partoutatis</id>
+            <email>partoutatis at users.sourceforge.net</email>
+            <timezone>+1</timezone>
+        </developer>
+        <developer>
+            <name>John Hood</name>
+            <id>squinky86</id>
+            <email>john at asteriasgi.com</email>
+            <organization>Asteria Soulutions Group, Inc.</organization>
+            <timezone>-6</timezone>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.8</version>
+            <type>jar</type>
+            <url>http://logging.apache.org/log4j/</url>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>1.1</version>
+            <type>jar</type>
+            <url>http://www.easymock.org/</url>
+        </dependency>
+    </dependencies>
+    <build>
+        <nagEmailAddress>sr...@re...</nagEmailAddress>
+        <sourceDirectory>src/java</sourceDirectory>
+        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+        <!-- Unit test cases -->
+        <unitTest>
+            <includes>
+                <include>**/*Test.java</include>
+            </includes>
+            <resources>
+                <resource>
+                    <directory>${basedir}/src/resources/fastagi</directory>
+                    <includes>
+                        <include>test-mapping.properties</include>
+                    </includes>
+                    <filtering>false</filtering>
+                </resource>
+                <resource>
+                    <directory>${basedir}/src/resources/log4j</directory>
+                    <includes>
+                        <include>log4j.properties</include>
+                    </includes>
+                    <filtering>false</filtering>
+                </resource>
+            </resources>
+        </unitTest>
+    </build>
 </project>
+

[Asterisk-java-cvs] CVS: asterisk-java project.xml,1.22,1.23

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

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

Modified Files:
	project.xml 
Log Message:
[maven-scm-plugin] prepare release 0.2-rc2

Index: project.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/project.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -p -r1.22 -r1.23
--- project.xml	29 Oct 2005 12:16:27 -0000	1.22
+++ project.xml	29 Oct 2005 12:18:47 -0000	1.23
@@ -1,152 +1,159 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <project>
-    <pomVersion>3</pomVersion>
-    <artifactId>asterisk-java</artifactId>
-    <groupId>org.asteriskjava</groupId>
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-    <reports>
-        <report>maven-clover-plugin</report>
-        <report>maven-jdepend-plugin</report>
-        <report>maven-junit-report-plugin</report>
-        <report>maven-license-plugin</report>
-        <report>maven-jxr-plugin</report>
-        <report>maven-javadoc-plugin</report>
-        <report>maven-pmd-plugin</report>
-    </reports>
-    <id>asterisk-java</id>
-    <name>Asterisk-Java</name>
-    <currentVersion>0.2-SNAPSHOT</currentVersion>
-    <organization>
-        <name>Stefan Reuter</name>
-        <url>http://sourceforge.net/projects/asterisk-java/</url>
-        <logo>http://sourceforge.net/sflogo.php?group_id=118998&amp;type=5</logo>
-    </organization>
-    <inceptionYear>2004</inceptionYear>
-    <package>net.sf.asterisk</package>
-    <!-- Gump integration -->
-    <gumpRepositoryId>asterisk-java</gumpRepositoryId>
-    <description>Asterisk-java consists of a set of Java classes that allow you to control an Asterisk PBX via Asterisk's Manager API from Java applications.</description>
-    <shortDescription>Java Connector for Asterisk PBX</shortDescription>
-    <url>http://asterisk-java.sourceforge.net/</url>
-    <siteAddress>maven.reucon.com</siteAddress>
-    <siteDirectory>/var/www/www.asterisk-java.org/htdocs/0.2-rc2</siteDirectory>
-    <distributionSite>maven.reucon.com</distributionSite>
-    <distributionDirectory>/var/www/maven.reucon.com/htdocs/maven</distributionDirectory>
-    <repository>
-        <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/asterisk-java:asterisk-java</connection>
-        <developerConnection>scm:cvs:ext:${maven.username}@cvs1.sourceforge.net:/cvsroot/asterisk-java:asterisk-java</developerConnection>
-        <url>http://cvs.sourceforge.net/viewcvs.py/asterisk-java/asterisk-java/</url>
-    </repository>
-    <versions>
-        <version>
-            <id>0.2-SNAPSHOT</id>
-            <name>0.2-SNAPSHOT</name>
-            <tag>HEAD</tag>
-        </version>
-        <version>
-            <id>0.1-rc1</id>
-            <name>0.1-rc1</name>
-            <tag>RC_0_1_1</tag>
-        </version>
-        <version>
-            <id>0.1</id>
-            <name>0.1</name>
-            <tag>REL_0_1</tag>
-        </version>
-        <version>
-            <id>0.2-rc1</id>
-            <name>0.2-rc1</name>
-            <tag>RC_0_2_1</tag>
-        </version>
-    </versions>
-    <mailingLists>
-        <mailingList>
-            <name>Asterisk-java User List</name>
-            <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-users</subscribe>
-            <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-users</unsubscribe>
-            <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-users</archive>
-        </mailingList>
-        <mailingList>
-            <name>Asterisk-java Developer List</name>
-            <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-devel</subscribe>
-            <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-devel</unsubscribe>
-            <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-devel</archive>
-        </mailingList>
-        <mailingList>
-            <name>Asterisk-java CVS Commit List</name>
-            <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-cvs</subscribe>
-            <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-cvs</unsubscribe>
-            <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-cvs</archive>
-        </mailingList>
-    </mailingLists>
-    <developers>
-        <developer>
-            <name>Stefan Reuter</name>
-            <id>srt</id>
-            <email>srt at users.sourceforge.net</email>
-            <timezone>+1</timezone>
-        </developer>
-        <developer>
-            <name>Pierre-Yves Roger</name>
-            <id>partoutatis</id>
-            <email>partoutatis at users.sourceforge.net</email>
-            <timezone>+1</timezone>
-        </developer>
-        <developer>
-            <name>John Hood</name>
-            <id>squinky86</id>
-            <email>john at asteriasgi.com</email>
-            <organization>Asteria Soulutions Group, Inc.</organization>
-            <timezone>-6</timezone>
-        </developer>
-    </developers>
-    <dependencies>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.8</version>
-            <type>jar</type>
-            <url>http://logging.apache.org/log4j/</url>
-        </dependency>
-        <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>1.1</version>
-            <type>jar</type>
-            <url>http://www.easymock.org/</url>
-        </dependency>
-    </dependencies>
-    <build>
-        <nagEmailAddress>sr...@re...</nagEmailAddress>
-        <sourceDirectory>src/java</sourceDirectory>
-        <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-        <!-- Unit test cases -->
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>
-            </includes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/resources/fastagi</directory>
-                    <includes>
-                        <include>test-mapping.properties</include>
-                    </includes>
-                    <filtering>false</filtering>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/resources/log4j</directory>
-                    <includes>
-                        <include>log4j.properties</include>
-                    </includes>
-                    <filtering>false</filtering>
-                </resource>
-            </resources>
-        </unitTest>
-    </build>
-</project>
+  <pomVersion>3</pomVersion>
+  <artifactId>asterisk-java</artifactId>
+  <groupId>org.asteriskjava</groupId>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+    </license>
+  </licenses>
+  <reports>
+    <report>maven-clover-plugin</report>
+    <report>maven-jdepend-plugin</report>
+    <report>maven-junit-report-plugin</report>
+    <report>maven-license-plugin</report>
+    <report>maven-jxr-plugin</report>
+    <report>maven-javadoc-plugin</report>
+    <report>maven-pmd-plugin</report>
+  </reports>
+  <id>asterisk-java</id>
+  <name>Asterisk-Java</name>
+  <currentVersion>0.2-rc2</currentVersion>
+  <organization>
+    <name>Stefan Reuter</name>
+    <url>http://sourceforge.net/projects/asterisk-java/</url>
+    <logo>http://sourceforge.net/sflogo.php?group_id=118998&amp;type=5</logo>
+  </organization>
+  <inceptionYear>2004</inceptionYear>
+  <package>net.sf.asterisk</package>
+  <!-- Gump integration -->
+
+  <gumpRepositoryId>asterisk-java</gumpRepositoryId>
+  <description>Asterisk-java consists of a set of Java classes that allow you to control an Asterisk PBX via Asterisk's Manager API from Java applications.</description>
+  <shortDescription>Java Connector for Asterisk PBX</shortDescription>
+  <url>http://asterisk-java.sourceforge.net/</url>
+  <siteAddress>maven.reucon.com</siteAddress>
+  <siteDirectory>/var/www/www.asterisk-java.org/htdocs/0.2-rc2</siteDirectory>
+  <distributionSite>maven.reucon.com</distributionSite>
+  <distributionDirectory>/var/www/maven.reucon.com/htdocs/maven</distributionDirectory>
+  <repository>
+    <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/asterisk-java:asterisk-java</connection>
+    <developerConnection>scm:cvs:ext:${maven.username}@cvs1.sourceforge.net:/cvsroot/asterisk-java:asterisk-java</developerConnection>
+    <url>http://cvs.sourceforge.net/viewcvs.py/asterisk-java/asterisk-java/</url>
+  </repository>
+  <versions>
+    <version>
+      <id>0.2-SNAPSHOT</id>
+      <name>0.2-SNAPSHOT</name>
+      <tag>HEAD</tag>
+    </version>
+    <version>
+      <id>0.1-rc1</id>
+      <name>0.1-rc1</name>
+      <tag>RC_0_1_1</tag>
+    </version>
+    <version>
+      <id>0.1</id>
+      <name>0.1</name>
+      <tag>REL_0_1</tag>
+    </version>
+    <version>
+      <id>0.2-rc1</id>
+      <name>0.2-rc1</name>
+      <tag>RC_0_2_1</tag>
+    </version>
+    <version>
+      <id>0.2-rc2</id>
+      <name>0.2-rc2</name>
+      <tag>RC_0_2_2</tag>
+    </version>
+  </versions>
+  <mailingLists>
+    <mailingList>
+      <name>Asterisk-java User List</name>
+      <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-users</subscribe>
+      <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-users</unsubscribe>
+      <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-users</archive>
+    </mailingList>
+    <mailingList>
+      <name>Asterisk-java Developer List</name>
+      <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-devel</subscribe>
+      <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-devel</unsubscribe>
+      <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-devel</archive>
+    </mailingList>
+    <mailingList>
+      <name>Asterisk-java CVS Commit List</name>
+      <subscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-cvs</subscribe>
+      <unsubscribe>http://lists.sourceforge.net/mailman/listinfo/asterisk-java-cvs</unsubscribe>
+      <archive>http://sourceforge.net/mailarchive/forum.php?forum=asterisk-java-cvs</archive>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <name>Stefan Reuter</name>
+      <id>srt</id>
+      <email>srt at users.sourceforge.net</email>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>Pierre-Yves Roger</name>
+      <id>partoutatis</id>
+      <email>partoutatis at users.sourceforge.net</email>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>John Hood</name>
+      <id>squinky86</id>
+      <email>john at asteriasgi.com</email>
+      <organization>Asteria Soulutions Group, Inc.</organization>
+      <timezone>-6</timezone>
+    </developer>
+  </developers>
+  <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.8</version>
+      <type>jar</type>
+      <url>http://logging.apache.org/log4j/</url>
+    </dependency>
+    <dependency>
+      <groupId>easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>1.1</version>
+      <type>jar</type>
+      <url>http://www.easymock.org/</url>
+    </dependency>
+  </dependencies>
+  <build>
+    <nagEmailAddress>sr...@re...</nagEmailAddress>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <!-- Unit test cases -->
 
+    <unitTest>
+      <includes>
+        <include>**/*Test.java</include>
+      </includes>
+      <resources>
+        <resource>
+          <directory>${basedir}/src/resources/fastagi</directory>
+          <includes>
+            <include>test-mapping.properties</include>
+          </includes>
+          <filtering>false</filtering>
+        </resource>
+        <resource>
+          <directory>${basedir}/src/resources/log4j</directory>
+          <includes>
+            <include>log4j.properties</include>
+          </includes>
+          <filtering>false</filtering>
+        </resource>
+      </resources>
+    </unitTest>
+  </build>
+</project>

[Asterisk-java-cvs] CVS: asterisk-java project.xml,1.21,1.22

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

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

Modified Files:
	project.xml 
Log Message:
Changed site directory to /var/www/www.asterisk-java.org/htdocs/0.2-rc2 for release of Asterisk-Java 0.2-rc2

Index: project.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -p -r1.21 -r1.22
--- project.xml	26 Oct 2005 18:24:08 -0000	1.21
+++ project.xml	29 Oct 2005 12:16:27 -0000	1.22
@@ -34,7 +34,7 @@
     <shortDescription>Java Connector for Asterisk PBX</shortDescription>
     <url>http://asterisk-java.sourceforge.net/</url>
     <siteAddress>maven.reucon.com</siteAddress>
-    <siteDirectory>/var/www/www.asterisk-java.org/htdocs/0.2-SNAPSHOT</siteDirectory>
+    <siteDirectory>/var/www/www.asterisk-java.org/htdocs/0.2-rc2</siteDirectory>
     <distributionSite>maven.reucon.com</distributionSite>
     <distributionDirectory>/var/www/maven.reucon.com/htdocs/maven</distributionDirectory>
     <repository>

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager DefaultAsteriskManager.java,1.22,1.23 Originate.java,1.2,1.3

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

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

Modified Files:
	DefaultAsteriskManager.java Originate.java 
Log Message:
Deprecated getVariableString() in Originate (AJ-15)

Index: DefaultAsteriskManager.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultAsteriskManager.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -p -r1.22 -r1.23
--- DefaultAsteriskManager.java	1 Sep 2005 20:15:41 -0000	1.22
+++ DefaultAsteriskManager.java	29 Oct 2005 12:09:05 -0000	1.23
@@ -247,7 +247,7 @@ public class DefaultAsteriskManager
         originateAction.setExten(originate.getExten());
         originateAction.setPriority(originate.getPriority());
         originateAction.setTimeout(timeout);
-        originateAction.setVariable(originate.getVariableString());
+        originateAction.setVariables(originate.getVariables());
 
         // must set async to true to receive OriginateEvents.
         originateAction.setAsync(Boolean.TRUE);

Index: Originate.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/Originate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- Originate.java	16 Jul 2005 23:27:11 -0000	1.2
+++ Originate.java	29 Oct 2005 12:09:05 -0000	1.3
@@ -219,6 +219,9 @@ public class Originate
      * Returns the variables to set on the originated call in native asterisk
      * format.<br>
      * Example: "VAR1=abc|VAR2=def".
+     * 
+     * @deprecated This method is no longer needed and will be removed in the
+     *             next version of Asterisk-Java.
      */
     public String getVariableString()
     {

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk AsteriskVersion.java,NONE,1.1

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

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

Added Files:
	AsteriskVersion.java 
Log Message:
Fixed mapping of Variable property in OriginateAction for Asterisk 1.2 (AJ-15)

--- NEW FILE: AsteriskVersion.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;

import java.io.Serializable;

/**
 * Represents the version of an Asterisk server.
 * 
 * @since 0.2
 * @author srt
 * @version $Id: AsteriskVersion.java,v 1.1 2005/10/29 12:00:11 srt Exp $
 */
public class AsteriskVersion implements Comparable, Serializable
{
    private int version;
    private String versionString;

    /**
     * Represents the Asterisk 1.0 series.
     */
    public static final AsteriskVersion ASTERISK_1_0 = new AsteriskVersion(100,
            "Asterisk 1.0");

    /**
     * Represents the Asterisk 1.2 series.
     */
    public static final AsteriskVersion ASTERISK_1_2 = new AsteriskVersion(120,
            "Asterisk 1.2");

    /**
     * Serial version identifier.
     */
    private static final long serialVersionUID = -5696160640576385797L;

    private AsteriskVersion(int version, String versionString)
    {
        this.version = version;
        this.versionString = versionString;
    }

    /**
     * Returns <code>true</code> if this version is equal to or higher than
     * the given version.
     * 
     * @param o the version to compare to
     * @return <code>true</code> if this version is equal to or higher than
     *         the given version.
     */
    public boolean isAtLeast(AsteriskVersion o)
    {
        if (version >= o.version)
        {
            return true;
        }
        else
        {
            return false;
        }
    }

    public int compareTo(Object o)
    {
        int otherVersion;

        otherVersion = ((AsteriskVersion) o).version;
        if (version < otherVersion)
        {
            return -1;
        }
        else if (version > otherVersion)
        {
            return 1;
        }
        else
        {
            return 0;
        }
    }

    public String toString()
    {
        return versionString;
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/manager/impl ActionBuilderImplTest.java,1.4,1.5

[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-serv32341/src/test/net/sf/asterisk/manager/impl

Modified Files:
	ActionBuilderImplTest.java 
Log Message:
Fixed mapping of Variable property in OriginateAction for Asterisk 1.2 (AJ-15)

Index: ActionBuilderImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/impl/ActionBuilderImplTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- ActionBuilderImplTest.java	29 Oct 2005 10:07:14 -0000	1.4
+++ ActionBuilderImplTest.java	29 Oct 2005 12:00:11 -0000	1.5
@@ -16,7 +16,11 @@
  */
 package net.sf.asterisk.manager.impl;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import junit.framework.TestCase;
+import net.sf.asterisk.AsteriskVersion;
 import net.sf.asterisk.manager.ActionBuilder;
 import net.sf.asterisk.manager.action.AbstractManagerAction;
 import net.sf.asterisk.manager.action.AgentsAction;
@@ -44,8 +48,10 @@ public class ActionBuilderImplTest exten
         actual = actionBuilder.buildAction(myAction);
 
         assertTrue("Action name missing", actual.indexOf("action: My\r\n") >= 0);
-        assertTrue("First property missing", actual.indexOf("firstproperty: first value\r\n") >= 0);
-        assertTrue("Second property missing", actual.indexOf("secondproperty: 2\r\n") >= 0);
+        assertTrue("First property missing", actual
+                .indexOf("firstproperty: first value\r\n") >= 0);
+        assertTrue("Second property missing", actual
+                .indexOf("secondproperty: 2\r\n") >= 0);
         assertTrue("Missing trailing CRNL CRNL", actual.endsWith("\r\n\r\n"));
         assertEquals("Incorrect length", 61, actual.length());
     }
@@ -61,7 +67,8 @@ public class ActionBuilderImplTest exten
         actual = actionBuilder.buildAction(myAction);
 
         assertTrue("Action name missing", actual.indexOf("action: My\r\n") >= 0);
-        assertTrue("First property missing", actual.indexOf("firstproperty: first value\r\n") >= 0);
+        assertTrue("First property missing", actual
+                .indexOf("firstproperty: first value\r\n") >= 0);
         assertTrue("Missing trailing CRNL CRNL", actual.endsWith("\r\n\r\n"));
         assertEquals("Incorrect length", 42, actual.length());
     }
@@ -75,12 +82,13 @@ public class ActionBuilderImplTest exten
 
         actual = actionBuilder.buildAction(action);
 
-        assertTrue("Action name missing", actual.indexOf("action: Agents\r\n") >= 0);
-        assertTrue("Action contains actionCompleteEventClass property", actual.indexOf("actioncompleteeventclass:") == -1);
+        assertTrue("Action name missing",
+                actual.indexOf("action: Agents\r\n") >= 0);
+        assertTrue("Action contains actionCompleteEventClass property", actual
+                .indexOf("actioncompleteeventclass:") == -1);
         assertTrue("Missing trailing CRNL CRNL", actual.endsWith("\r\n\r\n"));
     }
 
-
     public void testBuildActionWithVariablesForAsterisk10()
     {
         OriginateAction originateAction;
@@ -95,6 +103,77 @@ public class ActionBuilderImplTest exten
                 actual.indexOf("variable: var1=value1|var2=value2\r\n") >= 0);
     }
 
+    public void testBuildActionWithVariablesForAsterisk10WithNullValues()
+    {
+        OriginateAction originateAction;
+        String actual;
+
+        originateAction = new OriginateAction();
+        originateAction.setVariable("var1=value1|var2=|var3=value3");
+
+        actual = actionBuilder.buildAction(originateAction);
+
+        assertTrue(
+                "Incorrect mapping of variable property for Asterisk 1.0",
+                actual.indexOf("variable: var1=value1|var2=|var3=value3\r\n") >= 0);
+    }
+
+    public void testBuildActionWithVariablesForAsterisk12()
+    {
+        OriginateAction originateAction;
+        String actual;
+
+        originateAction = new OriginateAction();
+        originateAction.setVariable("var1=value1|var2=value2");
+
+        actionBuilder.setTargetVersion(AsteriskVersion.ASTERISK_1_2);
+        actual = actionBuilder.buildAction(originateAction);
+
+        assertTrue(
+                "Incorrect mapping of variable property for Asterisk 1.2",
+                actual
+                        .indexOf("variable: var1=value1\r\nvariable: var2=value2\r\n") >= 0);
+    }
+
+    public void testBuildActionWithVariablesForAsterisk12WithNullValues()
+    {
+        OriginateAction originateAction;
+        String actual;
+
+        originateAction = new OriginateAction();
+        originateAction.setVariable("var1=value1|var2=|var3=value3");
+
+        actionBuilder.setTargetVersion(AsteriskVersion.ASTERISK_1_2);
+        actual = actionBuilder.buildAction(originateAction);
+
+        assertTrue(
+                "Incorrect mapping of variable property for Asterisk 1.2",
+                actual
+                        .indexOf("variable: var1=value1\r\nvariable: var2=\r\nvariable: var3=value3\r\n") >= 0);
+    }
+
+    public void testBuildActionWithVariableMapForAsterisk12()
+    {
+        OriginateAction originateAction;
+        Map map;
+        String actual;
+
+        originateAction = new OriginateAction();
+
+        map = new LinkedHashMap();
+        map.put("var1", "value1");
+        map.put("VAR2", "value2");
+
+        originateAction.setVariables(map);
+
+        actionBuilder.setTargetVersion(AsteriskVersion.ASTERISK_1_2);
+        actual = actionBuilder.buildAction(originateAction);
+
+        assertTrue(
+                "Incorrect mapping of variable property for Asterisk 1.2",
+                actual.indexOf("variable: var1=value1\r\nvariable: VAR2=value2\r\n") >= 0);
+    }
+
     class MyAction extends AbstractManagerAction
     {
         private static final long serialVersionUID = 3257568425345102641L;

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action OriginateAction.java,1.8,1.9

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

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

Modified Files:
	OriginateAction.java 
Log Message:
Fixed mapping of Variable property in OriginateAction for Asterisk 1.2 (AJ-15)

Index: OriginateAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/OriginateAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- OriginateAction.java	26 Jul 2005 10:04:00 -0000	1.8
+++ OriginateAction.java	29 Oct 2005 12:00:11 -0000	1.9
@@ -16,6 +16,10 @@
  */
 package net.sf.asterisk.manager.action;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
 import net.sf.asterisk.manager.event.OriginateEvent;
 
 /**
@@ -55,7 +59,7 @@ public class OriginateAction extends Abs
     private Long timeout;
     private String callerId;
     private Boolean callingPres;
-    private String variable;
+    private Map variables;
     private String account;
     private String application;
     private String data;
@@ -259,23 +263,63 @@ public class OriginateAction extends Abs
     }
 
     /**
-     * Returns the variables to set on the originated call.
-     */
-    public String getVariable()
-    {
-        return variable;
-    }
-
-    /**
      * Sets the variables to set on the originated call.<br>
      * Variable assignments are of the form "VARNAME=VALUE". You can specify
      * multiple variable assignments separated by the '|' character.<br>
      * Example: "VAR1=abc|VAR2=def" sets the channel variables VAR1 to "abc" and
      * VAR2 to "def".
+     * 
+     * @deprecated use {@link #setVariables(Map)} instead.
      */
     public void setVariable(String variable)
     {
-        this.variable = variable;
+        StringTokenizer st;
+
+        if (variable == null)
+        {
+            this.variables = null;
+        }
+
+        st = new StringTokenizer(variable, "|");
+        variables = new LinkedHashMap();
+        while (st.hasMoreTokens())
+        {
+            String[] keyValue;
+
+            keyValue = st.nextToken().split("=", 2);
+            if (keyValue.length < 2)
+            {
+                variables.put(keyValue[0], null);
+            }
+            else
+            {
+                variables.put(keyValue[0], keyValue[1]);
+            }
+        }
+    }
+
+    /**
+     * Returns the variables to set on the originated call.
+     * 
+     * @param variables a Map containing the variable names as key and their
+     *            values as value.
+     * @since 0.2
+     */
+    public Map getVariables()
+    {
+        return variables;
+    }
+
+    /**
+     * Sets the variables to set on the originated call.
+     * 
+     * @param variables a Map containing the variable names as key and their
+     *            values as value.
+     * @since 0.2
+     */
+    public void setVariables(Map variables)
+    {
+        this.variables = variables;
     }
 
     /**

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager ActionBuilder.java,1.5,1.6 ManagerWriter.java,1.4,1.5 DefaultManagerConnection.java,1.31,1.32

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

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

Modified Files:
	ActionBuilder.java ManagerWriter.java 
	DefaultManagerConnection.java 
Log Message:
Fixed mapping of Variable property in OriginateAction for Asterisk 1.2 (AJ-15)

Index: ActionBuilder.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ActionBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- ActionBuilder.java	5 Mar 2005 13:34:23 -0000	1.5
+++ ActionBuilder.java	29 Oct 2005 12:00:11 -0000	1.6
@@ -16,6 +16,7 @@
  */
 package net.sf.asterisk.manager;
 
+import net.sf.asterisk.AsteriskVersion;
 import net.sf.asterisk.manager.action.ManagerAction;
 
 /**
@@ -28,6 +29,14 @@ import net.sf.asterisk.manager.action.Ma
 public interface ActionBuilder
 {
     /**
+     * Sets the version of the Asterisk server to built the action for.
+     * 
+     * @param asteriskVersion the version of the target Asterisk server.
+     * @since 0.2
+     */
+    public void setTargetVersion(AsteriskVersion targetVersion);
+
+    /**
      * Builds a String suitable to be sent to Asterisk based on the given action object.<br>
      * Asterisk actions consist of an unordered set of key value pairs corresponding to the
      * attributes of the ManagerActions. Key and value are separated by a colon (":"), key value

Index: ManagerWriter.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ManagerWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- ManagerWriter.java	11 Mar 2005 15:27:22 -0000	1.4
+++ ManagerWriter.java	29 Oct 2005 12:00:11 -0000	1.5
@@ -18,23 +18,35 @@ package net.sf.asterisk.manager;
 
 import java.io.IOException;
 
+import net.sf.asterisk.AsteriskVersion;
 import net.sf.asterisk.io.SocketConnectionFacade;
 import net.sf.asterisk.manager.action.ManagerAction;
 
 /**
- * The ManagerWriter transforms actions using an ActionBuilder and sends them to the asterisk
- * server.<br>
+ * The ManagerWriter transforms actions using an ActionBuilder and sends them to
+ * the asterisk server.<br>
  * This class is intended to be used only by the DefaultManagerConnection.
  * 
  * @see net.sf.asterisk.manager.ActionBuilder
  * @see net.sf.asterisk.manager.DefaultManagerConnection
- * 
  * @author srt
  * @version $Id$
  */
 public interface ManagerWriter
 {
+    /**
+     * Sets the version of the target Asterisk server.
+     * 
+     * @param asteriskVersion the version of the target Asterisk server.
+     * @since 0.2
+     */
+    public void setTargetVersion(AsteriskVersion targetVersion);
 
+    /**
+     * Sets the socket to use for writing to Asterisk.
+     * 
+     * @param socket the socket to use for writing to Asterisk.
+     */
     void setSocket(final SocketConnectionFacade socket);
 
     /**

Index: DefaultManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultManagerConnection.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -p -r1.31 -r1.32
--- DefaultManagerConnection.java	25 Oct 2005 23:21:03 -0000	1.31
+++ DefaultManagerConnection.java	29 Oct 2005 12:00:11 -0000	1.32
@@ -26,9 +26,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import net.sf.asterisk.AsteriskVersion;
 import net.sf.asterisk.io.SocketConnectionFacade;
 import net.sf.asterisk.io.impl.SocketConnectionFacadeImpl;
 import net.sf.asterisk.manager.action.ChallengeAction;
+import net.sf.asterisk.manager.action.CommandAction;
 import net.sf.asterisk.manager.action.EventGeneratingAction;
 import net.sf.asterisk.manager.action.LoginAction;
 import net.sf.asterisk.manager.action.LogoffAction;
@@ -42,6 +44,7 @@ import net.sf.asterisk.manager.impl.Mana
 import net.sf.asterisk.manager.impl.ResponseEventsImpl;
 import net.sf.asterisk.manager.impl.Util;
 import net.sf.asterisk.manager.response.ChallengeResponse;
+import net.sf.asterisk.manager.response.CommandResponse;
 import net.sf.asterisk.manager.response.ManagerError;
 import net.sf.asterisk.manager.response.ManagerResponse;
 import net.sf.asterisk.util.Log;
@@ -143,6 +146,11 @@ public class DefaultManagerConnection im
      * The protocol identifer Asterisk sends on connect.
      */
     private String protocolIdentifier;
+    
+    /**
+     * The version of the Asterisk server we are connected to.
+     */
+    private AsteriskVersion version;
 
     /**
      * Contains the registered handlers that process the ManagerResponses.<br>
@@ -470,6 +478,36 @@ public class DefaultManagerConnection im
         this.keepAlive = true;
 
         logger.info("Successfully logged in");
+        
+        this.version = determineVersion();
+        this.writer.setTargetVersion(version);
+        
+        logger.info("Determined Asterisk version: " + version);
+    }
+    
+    protected AsteriskVersion determineVersion() throws IOException, TimeoutException
+    {
+        ManagerResponse showVersionFilesResponse;
+
+        showVersionFilesResponse = sendAction(new CommandAction("show version files"));
+        if (showVersionFilesResponse instanceof CommandResponse)
+        {
+            List showVersionFilesResult;
+            
+            showVersionFilesResult = ((CommandResponse) showVersionFilesResponse).getResult();
+            if (showVersionFilesResult != null && showVersionFilesResult.size() > 0)
+            {
+                String line1;
+                
+                line1 = (String) showVersionFilesResult.get(0); 
+                if (line1 != null && line1.startsWith("File"))
+                {
+                    return AsteriskVersion.ASTERISK_1_2;
+                }
+            }
+        }
+        
+        return AsteriskVersion.ASTERISK_1_0;
     }
 
     protected synchronized void connect() throws IOException