From 24a92381e7e0b5e69f735109836547e69f0e16ef Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Tue, 2 Jun 2009 22:35:52 +0000
Subject: [PATCH] remove carriage returns for development on unix
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1535 af16638f-c34d-0410-8cfa-b39d5352b314
---
.../bigbluebutton/pbx/IConferenceService.java | 10 +-
.../java/org/bigbluebutton/pbx/PbxAgi.java | 198 +++++++++---------
.../java/org/bigbluebutton/pbx/PbxLive.java | 160 +++++++-------
3 files changed, 184 insertions(+), 184 deletions(-)
diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/pbx/IConferenceService.java b/bigbluebutton-web/src/java/org/bigbluebutton/pbx/IConferenceService.java
index 9936bc1a5a..503bf458bf 100644
--- a/bigbluebutton-web/src/java/org/bigbluebutton/pbx/IConferenceService.java
+++ b/bigbluebutton-web/src/java/org/bigbluebutton/pbx/IConferenceService.java
@@ -1,5 +1,5 @@
-package org.bigbluebutton.pbx;
-
-public interface IConferenceService {
-
-}
+package org.bigbluebutton.pbx;
+
+public interface IConferenceService {
+
+}
diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/pbx/PbxAgi.java b/bigbluebutton-web/src/java/org/bigbluebutton/pbx/PbxAgi.java
index 5b22b27c1a..f00eedabb4 100644
--- a/bigbluebutton-web/src/java/org/bigbluebutton/pbx/PbxAgi.java
+++ b/bigbluebutton-web/src/java/org/bigbluebutton/pbx/PbxAgi.java
@@ -1,99 +1,99 @@
-package org.bigbluebutton.pbx;
-
-import groovy.lang.Binding;
-import groovy.sql.Sql;
-import groovy.util.GroovyScriptEngine;
-import groovy.util.ResourceException;
-import groovy.util.ScriptException;
-
-import java.io.IOException;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-
-import org.asteriskjava.fastagi.AgiChannel;
-import org.asteriskjava.fastagi.AgiException;
-import org.asteriskjava.fastagi.AgiRequest;
-import org.asteriskjava.fastagi.AgiScript;
-
-public class PbxAgi implements AgiScript {
- private GroovyScriptEngine gse;
- private Sql db;
- private DataSource dataSource;
-
- private String scriptsLocation = null;
-
- public PbxAgi() throws IOException
- {
-
- }
-
- public PbxAgi(String url, String username, String password,
- String driver, String scriptsLocation) throws IOException
- {
- System.out.println("INITIALIZING PBX-AGI");
- try {
- db = Sql.newInstance(url, username, password, driver);
-
-
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- System.out.println("blank");
- String[] roots = new String[] { scriptsLocation };
- this.gse = new GroovyScriptEngine(roots);
- }
-
- public void setDataSource(DataSource source)
- {
- dataSource = source;
- db = new Sql(dataSource);
- }
-
- public void setScriptsLocation(String location)
- {
- scriptsLocation = location;
- try {
- this.gse = new GroovyScriptEngine(scriptsLocation);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- public void service(AgiRequest request, AgiChannel channel)
- throws AgiException
- {
- String script;
- Binding binding;
-
- script = request.getScript();
- binding = new Binding();
- binding.setVariable("request", request);
- binding.setVariable("channel", channel);
- binding.setVariable("db", db);
- try
- {
- System.out.println(script.toString());
- gse.run(script, binding);
- }
- catch (ResourceException e)
- {
- throw new AgiException("Unable to load groovy script '" + script + "'", e);
- }
- catch (ScriptException e)
- {
- throw new AgiException("Exception while running groovy script '" +
- script + "'", e);
- }
- }
-
-// public void setScriptsLocation(String location) {
-// scriptsLocation = location;
-// }
-}
+package org.bigbluebutton.pbx;
+
+import groovy.lang.Binding;
+import groovy.sql.Sql;
+import groovy.util.GroovyScriptEngine;
+import groovy.util.ResourceException;
+import groovy.util.ScriptException;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
+import org.asteriskjava.fastagi.AgiChannel;
+import org.asteriskjava.fastagi.AgiException;
+import org.asteriskjava.fastagi.AgiRequest;
+import org.asteriskjava.fastagi.AgiScript;
+
+public class PbxAgi implements AgiScript {
+ private GroovyScriptEngine gse;
+ private Sql db;
+ private DataSource dataSource;
+
+ private String scriptsLocation = null;
+
+ public PbxAgi() throws IOException
+ {
+
+ }
+
+ public PbxAgi(String url, String username, String password,
+ String driver, String scriptsLocation) throws IOException
+ {
+ System.out.println("INITIALIZING PBX-AGI");
+ try {
+ db = Sql.newInstance(url, username, password, driver);
+
+
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ System.out.println("blank");
+ String[] roots = new String[] { scriptsLocation };
+ this.gse = new GroovyScriptEngine(roots);
+ }
+
+ public void setDataSource(DataSource source)
+ {
+ dataSource = source;
+ db = new Sql(dataSource);
+ }
+
+ public void setScriptsLocation(String location)
+ {
+ scriptsLocation = location;
+ try {
+ this.gse = new GroovyScriptEngine(scriptsLocation);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ public void service(AgiRequest request, AgiChannel channel)
+ throws AgiException
+ {
+ String script;
+ Binding binding;
+
+ script = request.getScript();
+ binding = new Binding();
+ binding.setVariable("request", request);
+ binding.setVariable("channel", channel);
+ binding.setVariable("db", db);
+ try
+ {
+ System.out.println(script.toString());
+ gse.run(script, binding);
+ }
+ catch (ResourceException e)
+ {
+ throw new AgiException("Unable to load groovy script '" + script + "'", e);
+ }
+ catch (ScriptException e)
+ {
+ throw new AgiException("Exception while running groovy script '" +
+ script + "'", e);
+ }
+ }
+
+// public void setScriptsLocation(String location) {
+// scriptsLocation = location;
+// }
+}
diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/pbx/PbxLive.java b/bigbluebutton-web/src/java/org/bigbluebutton/pbx/PbxLive.java
index 19a1a90a26..f40b547c14 100644
--- a/bigbluebutton-web/src/java/org/bigbluebutton/pbx/PbxLive.java
+++ b/bigbluebutton-web/src/java/org/bigbluebutton/pbx/PbxLive.java
@@ -1,80 +1,80 @@
-package org.bigbluebutton.pbx;
-import org.asteriskjava.live.AsteriskChannel;
-import org.asteriskjava.live.AsteriskQueue;
-import org.asteriskjava.live.AsteriskServer;
-import org.asteriskjava.live.AsteriskServerListener;
-import org.asteriskjava.live.DefaultAsteriskServer;
-import org.asteriskjava.live.ManagerCommunicationException;
-import org.asteriskjava.live.MeetMeRoom;
-import org.asteriskjava.live.MeetMeUser;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
-
-public class PbxLive implements AsteriskServerListener, PropertyChangeListener
-{
- private AsteriskServer asteriskServer;
-
- public PbxLive() {}
-
- public void setAsteriskServer(AsteriskServer server) {
- asteriskServer = server;
- }
-
- public void startup() throws ManagerCommunicationException
- {
- // listen for new events
- asteriskServer.addAsteriskServerListener(this);
-
- // add property change listeners to existing objects
- for (AsteriskChannel asteriskChannel : asteriskServer.getChannels())
- {
- // System.out.println(asteriskChannel);
- // asteriskChannel.addPropertyChangeListener(this);
- }
-
- for (AsteriskQueue asteriskQueue : asteriskServer.getQueues())
- {
- // System.out.println(asteriskQueue);
- for (AsteriskChannel asteriskChannel : asteriskQueue.getEntries())
- {
- // asteriskChannel.addPropertyChangeListener(this);
- }
- }
-
- for (MeetMeRoom meetMeRoom : asteriskServer.getMeetMeRooms())
- {
- System.out.println(meetMeRoom);
- for (MeetMeUser user : meetMeRoom.getUsers())
- {
- user.addPropertyChangeListener(this);
- }
- }
- }
-
- public void onNewAsteriskChannel(AsteriskChannel channel)
- {
- // System.out.println(channel);
- // channel.addPropertyChangeListener(this);
- }
-
- public void onNewMeetMeUser(MeetMeUser user)
- {
- System.out.println(user);
- user.addPropertyChangeListener(this);
- }
-
- public void propertyChange(PropertyChangeEvent propertyChangeEvent)
- {
- if (propertyChangeEvent.getSource() instanceof MeetMeUser) {
-// System.out.println(propertyChangeEvent);
- MeetMeUser user = (MeetMeUser) propertyChangeEvent.getSource();
- System.out.println(user.getChannel().getCallerId().getName() + " " + user.getChannel().getCallerId().getNumber());
- }
-
- }
-
- public void shutdown() {
- asteriskServer.shutdown();
- }
-
-}
+package org.bigbluebutton.pbx;
+import org.asteriskjava.live.AsteriskChannel;
+import org.asteriskjava.live.AsteriskQueue;
+import org.asteriskjava.live.AsteriskServer;
+import org.asteriskjava.live.AsteriskServerListener;
+import org.asteriskjava.live.DefaultAsteriskServer;
+import org.asteriskjava.live.ManagerCommunicationException;
+import org.asteriskjava.live.MeetMeRoom;
+import org.asteriskjava.live.MeetMeUser;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeEvent;
+
+public class PbxLive implements AsteriskServerListener, PropertyChangeListener
+{
+ private AsteriskServer asteriskServer;
+
+ public PbxLive() {}
+
+ public void setAsteriskServer(AsteriskServer server) {
+ asteriskServer = server;
+ }
+
+ public void startup() throws ManagerCommunicationException
+ {
+ // listen for new events
+ asteriskServer.addAsteriskServerListener(this);
+
+ // add property change listeners to existing objects
+ for (AsteriskChannel asteriskChannel : asteriskServer.getChannels())
+ {
+ // System.out.println(asteriskChannel);
+ // asteriskChannel.addPropertyChangeListener(this);
+ }
+
+ for (AsteriskQueue asteriskQueue : asteriskServer.getQueues())
+ {
+ // System.out.println(asteriskQueue);
+ for (AsteriskChannel asteriskChannel : asteriskQueue.getEntries())
+ {
+ // asteriskChannel.addPropertyChangeListener(this);
+ }
+ }
+
+ for (MeetMeRoom meetMeRoom : asteriskServer.getMeetMeRooms())
+ {
+ System.out.println(meetMeRoom);
+ for (MeetMeUser user : meetMeRoom.getUsers())
+ {
+ user.addPropertyChangeListener(this);
+ }
+ }
+ }
+
+ public void onNewAsteriskChannel(AsteriskChannel channel)
+ {
+ // System.out.println(channel);
+ // channel.addPropertyChangeListener(this);
+ }
+
+ public void onNewMeetMeUser(MeetMeUser user)
+ {
+ System.out.println(user);
+ user.addPropertyChangeListener(this);
+ }
+
+ public void propertyChange(PropertyChangeEvent propertyChangeEvent)
+ {
+ if (propertyChangeEvent.getSource() instanceof MeetMeUser) {
+// System.out.println(propertyChangeEvent);
+ MeetMeUser user = (MeetMeUser) propertyChangeEvent.getSource();
+ System.out.println(user.getChannel().getCallerId().getName() + " " + user.getChannel().getCallerId().getNumber());
+ }
+
+ }
+
+ public void shutdown() {
+ asteriskServer.shutdown();
+ }
+
+}
--
GitLab