http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java index de31d41..51e7ec8 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/InlineConverter.java @@ -21,7 +21,7 @@ package org.apache.openmeetings.backup; import org.simpleframework.xml.stream.InputNode; public abstract class InlineConverter<T> extends OmConverter<T> { - + String getNextValue(InputNode parent, String name) throws Exception { InputNode node = parent.getNext(name); return node != null ? node.getValue() : null;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java index f4c9349..6c74d75 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java @@ -28,7 +28,7 @@ import org.simpleframework.xml.stream.OutputNode; public class OmCalendarConverter extends OmConverter<OmCalendar> { private OmCalendarDao calendarDao; private Map<Long, Long> idMap; - + public OmCalendarConverter() { //default constructor is for export } @@ -42,7 +42,7 @@ public class OmCalendarConverter extends OmConverter<OmCalendar> { public OmCalendar read(InputNode node) throws Exception { long oldId = getLong(node); Long newId = idMap.containsKey(oldId) ? idMap.get(oldId) : oldId; - + OmCalendar c = calendarDao.get(newId); return c == null ? new OmCalendar() : c; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java index 34539e1..6fd9912 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java @@ -29,7 +29,7 @@ public abstract class OmConverter<T> implements Converter<T> { static long getLong(String value) { return getLong(value, 0); } - + static long getLong(String value, long def) { long result = def; try { @@ -43,7 +43,7 @@ public abstract class OmConverter<T> implements Converter<T> { static int getInt(InputNode node) throws Exception { return getInt(node.getValue(), 0); } - + static int getInt(String value, int def) { int result = def; try { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ProgressHolder.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ProgressHolder.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ProgressHolder.java index 3f53b78..7518278 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ProgressHolder.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ProgressHolder.java @@ -22,7 +22,7 @@ import java.io.Serializable; public class ProgressHolder implements Serializable { private static final long serialVersionUID = 1L; - + private int progress; public int getProgress() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Db2Patcher.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Db2Patcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Db2Patcher.java index 2103db1..5453988 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Db2Patcher.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Db2Patcher.java @@ -23,6 +23,6 @@ public class Db2Patcher extends ConnectionPropertiesPatcher { protected String getUrl(String _url, String host, String _port, String _db) { String port = (_port == null) ? "50000" : _port; String db = (_db == null) ? "openmeet" : _db; - return "jdbc:db2://" + host + ":" + port + "/" + db; + return "jdbc:db2://" + host + ":" + port + "/" + db; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java index ea55963..1bc86e4 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java @@ -23,11 +23,11 @@ public class DerbyPatcher extends ConnectionPropertiesPatcher { protected String getUrl(String _url, String host, String _port, String _db) { String db = (_db == null) ? "openmeetings" : _db; String suffix = _url.substring(_url.indexOf(';')); - + if (host != null && _port != null) { //return "jdbc:derby" + "://" + host + ":" + _port + "/" + db + suffix; } - - return "jdbc:derby" + ":" + db + suffix; + + return "jdbc:derby" + ":" + db + suffix; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java index bb2db07..0284efd 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java @@ -27,6 +27,6 @@ public class OraclePatcher extends ConnectionPropertiesPatcher { if (db.startsWith("/")) { delim = ""; } - return String.format("jdbc:oracle:thin:@%s:%s%s%s", host, port, delim, db); + return String.format("jdbc:oracle:thin:@%s:%s%s%s", host, port, delim, db); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-install/src/main/java/org/apache/openmeetings/cli/PostgresPatcher.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/PostgresPatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/PostgresPatcher.java index 975f6dc..53f1140 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/PostgresPatcher.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/PostgresPatcher.java @@ -23,6 +23,6 @@ public class PostgresPatcher extends ConnectionPropertiesPatcher { protected String getUrl(String _url, String host, String _port, String _db) { String port = (_port == null) ? "5432" : _port; String db = (_db == null) ? "openmeetings" : _db; - return "jdbc:postgresql://" + host + ":" + port + "/" + db; + return "jdbc:postgresql://" + host + ":" + port + "/" + db; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml index 03c21a9..70e9714 100644 --- a/openmeetings-screenshare/pom.xml +++ b/openmeetings-screenshare/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java index 591ceb4..8cfe2e2 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/AudioTone.java @@ -28,7 +28,7 @@ public class AudioTone { public static void play() { byte[] buf = new byte[1]; - + AudioFormat af = new AudioFormat(SAMPLE_RATE, 8, 1, true, false); try (SourceDataLine sdl = AudioSystem.getSourceDataLine(af)) { sdl.open(af); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/BaseScreenEncoder.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/BaseScreenEncoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/BaseScreenEncoder.java index b00ea24..e1723aa 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/BaseScreenEncoder.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/BaseScreenEncoder.java @@ -29,7 +29,7 @@ public abstract class BaseScreenEncoder implements IScreenEncoder { BufferedImage img = _img; if (img.getWidth() != size.width || img.getHeight() != size.height) { img = new BufferedImage(size.width, size.height, BufferedImage.TYPE_INT_RGB); - + Graphics2D graphics2D = img.createGraphics(); graphics2D.setRenderingHint( RenderingHints.KEY_INTERPOLATION, @@ -39,5 +39,4 @@ public abstract class BaseScreenEncoder implements IScreenEncoder { } return img; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/IScreenEncoder.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/IScreenEncoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/IScreenEncoder.java index 26dcb4b..8ce61cf 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/IScreenEncoder.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/IScreenEncoder.java @@ -24,10 +24,10 @@ import org.red5.server.net.rtmp.event.VideoData; public interface IScreenEncoder { void createUnalteredFrame() throws IOException; - + VideoData getUnalteredFrame(); VideoData encode(int[][] img) throws IOException; - + void reset(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java index 7e44ba3..dbec35f 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java @@ -35,11 +35,11 @@ class RTMPClientPublish extends RTMPClient implements IPendingServiceCallback, I private final CaptureScreen publishScreen; private String id; private Core core; - + public void setCore(Core core) { this.core = core; } - + RTMPClientPublish(Core core, String host, String app, String id) { this.id = id; this.core = core; @@ -49,7 +49,7 @@ class RTMPClientPublish extends RTMPClient implements IPendingServiceCallback, I public void connect() { super.connect(publishScreen.getHost(), 1935, publishScreen.getApp(), this); } - + @Override public void handleException(Throwable throwable) { logger.error("ERROR", throwable); @@ -60,24 +60,24 @@ class RTMPClientPublish extends RTMPClient implements IPendingServiceCallback, I super.connectionOpened(conn); createStream(this); } - + @Override public void connectionClosed(RTMPConnection conn) { super.connectionClosed(conn); connectionClosed(); } - + private void connectionClosed() { publishScreen.setStartPublish(false); publishScreen.release(); core.publishingStop(); } - + @Override protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) { super.onCommand(conn, channel, source, command); } - + @Override public void resultReceived(IPendingServiceCall call) { String method = call == null ? null : call.getServiceMethodName(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java index 0b62a7e..899e628 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java @@ -49,15 +49,15 @@ public class ScreenV1Encoder extends BaseScreenEncoder { private Deflater d = new Deflater(Deflater.DEFAULT_COMPRESSION); private byte[] zipBuf = null; private VideoData unalteredFrame = null; - + public ScreenV1Encoder() { this(KEY_FRAME_INDEX, DEFAULT_BLOCK_SIZE); } - + public ScreenV1Encoder(int keyFrameIndex) { this(keyFrameIndex, DEFAULT_BLOCK_SIZE); } - + //will create square blocks public ScreenV1Encoder(int keyFrameIndex, int blockSize) { this.keyFrameIndex = keyFrameIndex; @@ -77,7 +77,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder { buf.flip(); return new VideoData(buf); } - + @Override public void createUnalteredFrame() throws IOException { if (last == null) { @@ -85,7 +85,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder { } if (unalteredFrame == null) { ByteArrayOutputStream ba = new ByteArrayOutputStream(200); - + Rectangle _area = new Rectangle(resizeX, resizeY); //header ba.write(getTag(FLAG_FRAMETYPE_INTERFRAME, FLAG_CODEC_SCREEN)); @@ -99,7 +99,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder { unalteredFrame = getData(ba.toByteArray()); } } - + @Override public VideoData getUnalteredFrame() { if (unalteredFrame != null && (frameCount % keyFrameIndex) != 0) { @@ -107,19 +107,19 @@ public class ScreenV1Encoder extends BaseScreenEncoder { } return unalteredFrame; } - + @Override public synchronized VideoData encode(int[][] img) throws IOException { ba.reset(); Rectangle imgArea = new Rectangle(img.length, img[0].length); Rectangle area = getNextBlock(imgArea, null); boolean isKeyFrame = (frameCount++ % keyFrameIndex) == 0 || last == null; - + //header ba.write(getTag(isKeyFrame ? FLAG_FRAMETYPE_KEYFRAME : FLAG_FRAMETYPE_INTERFRAME, FLAG_CODEC_SCREEN)); writeShort(ba, imgArea.width + ((blockSize / 16 - 1) << 12)); writeShort(ba, imgArea.height + ((blockSize / 16 - 1) << 12)); - + while (area.width > 0 && area.height > 0) { writeBytesIfChanged(ba, isKeyFrame, img, area); area = getNextBlock(imgArea, area); @@ -127,13 +127,13 @@ public class ScreenV1Encoder extends BaseScreenEncoder { last = img; return getData(ba.toByteArray()); } - + @Override public void reset() { last = null; unalteredFrame = null; } - + private Rectangle getNextBlock(Rectangle img, Rectangle _prev) { Rectangle prev; if (_prev == null) { @@ -151,7 +151,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder { prev.x += blockSize; } } - return img.intersection(prev); + return img.intersection(prev); } private void writeBytesIfChanged(ByteArrayOutputStream ba, boolean isKeyFrame, int[][] img, Rectangle area) throws IOException { @@ -183,12 +183,12 @@ public class ScreenV1Encoder extends BaseScreenEncoder { public int getTag(final int frame, final int codec) { return ((frame & 0x0F) << 4) + ((codec & 0x0F) << 0); } - + private static void writeShort(OutputStream os, final int n) throws IOException { os.write((n >> 8) & 0xFF); os.write((n >> 0) & 0xFF); } - + public static int[][] getImage(Rectangle screen, Robot robot) { int[][] buffer = new int[resizeX][resizeY]; BufferedImage image = resize(robot.createScreenCapture(screen), new Rectangle(resizeX, resizeY)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/NumberSpinner.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/NumberSpinner.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/NumberSpinner.java index d349e16..e261d38 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/NumberSpinner.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/NumberSpinner.java @@ -27,7 +27,7 @@ public class NumberSpinner extends JSpinner { public NumberSpinner(int value, int min, int max, int step) { super(new SpinnerNumberModel(value, min, max, step)); } - + @Override public Integer getValue() { return (Integer)super.getValue(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java index 7ea1111..c23e5ef 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenDimensions.java @@ -45,13 +45,13 @@ public class ScreenDimensions { public static int spinnerHeight = 0; public static int spinnerX = 0; public static int spinnerY = 0; - + public static ScreenQuality quality = ScreenQuality.Medium; public static int FPS = 10; - + public static int resizeX = 640; public static int resizeY = 480; - + static { Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); ratio = screenSize.getHeight() / screenSize.getWidth(); @@ -65,7 +65,7 @@ public class ScreenDimensions { resizeX = 640; resizeY = 400; } - + public enum ScreenQuality { VeryHigh , High http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenHeightMouseListener.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenHeightMouseListener.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenHeightMouseListener.java index 18e21b3..ca7a61b 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenHeightMouseListener.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenHeightMouseListener.java @@ -31,7 +31,7 @@ public class ScreenHeightMouseListener extends MouseInputAdapter { public ScreenHeightMouseListener(ScreenSharerFrame frame) { this.frame = frame; } - + @Override public void mouseEntered(MouseEvent e) { frame.setCursor(Cursor.getPredefinedCursor(Cursor.N_RESIZE_CURSOR)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/CursorJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/CursorJob.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/CursorJob.java index 781dca2..213e4e4 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/CursorJob.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/CursorJob.java @@ -28,9 +28,9 @@ import org.quartz.JobExecutionException; @DisallowConcurrentExecution public class CursorJob implements Job { public static final String CAPTURE_KEY = "capture"; - + public CursorJob() {} - + @Override public void execute(JobExecutionContext context) throws JobExecutionException { JobDataMap data = context.getJobDetail().getJobDataMap(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/EncodeJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/EncodeJob.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/EncodeJob.java index 552c715..f211457 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/EncodeJob.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/EncodeJob.java @@ -45,7 +45,7 @@ public class EncodeJob implements Job { Robot robot; Rectangle screen = new Rectangle(spinnerX, spinnerY, spinnerWidth, spinnerHeight); int[][] image = null; - + public EncodeJob() { try { robot = new Robot(); @@ -53,12 +53,12 @@ public class EncodeJob implements Job { log.error("encode: Unexpected Error while creating robot", e); } } - + @Override public void execute(JobExecutionContext context) throws JobExecutionException { JobDataMap data = context.getJobDetail().getJobDataMap(); CaptureScreen capture = (CaptureScreen)data.get(CAPTURE_KEY); - + long start = 0; if (log.isTraceEnabled()) { start = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-screenshare/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/resources/logback.xml b/openmeetings-screenshare/src/main/resources/logback.xml index ead06e1..8b6c297 100644 --- a/openmeetings-screenshare/src/main/resources/logback.xml +++ b/openmeetings-screenshare/src/main/resources/logback.xml @@ -7,16 +7,16 @@ to you 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. - + --> <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index 55d4e45..eb2d5ee 100644 --- a/openmeetings-server/pom.xml +++ b/openmeetings-server/pom.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/resources/js/site.js ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/resources/js/site.js b/openmeetings-server/src/site/resources/js/site.js index 2a4be8c..88fcece 100644 --- a/openmeetings-server/src/site/resources/js/site.js +++ b/openmeetings-server/src/site/resources/js/site.js @@ -6,16 +6,16 @@ to you 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. - + */ $(document).ready(function() { // "New" markers http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/stylesheets/errorvalues.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/stylesheets/errorvalues.xml b/openmeetings-server/src/site/stylesheets/errorvalues.xml index 237a9a0..e8c18f9 100644 --- a/openmeetings-server/src/site/stylesheets/errorvalues.xml +++ b/openmeetings-server/src/site/stylesheets/errorvalues.xml @@ -18,7 +18,7 @@ under the License. --> -<ROOT xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<ROOT xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="errorvalues.xsd"> <row> <field name="starttime">2007-12-06 19:01:07</field> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/BitrixPlugin.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/BitrixPlugin.xml b/openmeetings-server/src/site/xdoc/BitrixPlugin.xml index f7b7f90..6307428 100644 --- a/openmeetings-server/src/site/xdoc/BitrixPlugin.xml +++ b/openmeetings-server/src/site/xdoc/BitrixPlugin.xml @@ -11,10 +11,10 @@ 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. - --> +--> <document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Bitrix Plugin</title> <author email="[email protected]">Apache OpenMeetings Team</author> @@ -22,9 +22,9 @@ <body> <section name="OpenMeetings Plugin for Bitrix"> <p> - Plugin for Bitrix currently is not open source. - Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. - </p> + Plugin for Bitrix currently is not open source. + Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. + </p> </section> <section name="Features"> <p>The plugin contains the following features: </p> @@ -32,7 +32,7 @@ <li>Enter videoconference rooms from Bitrix (http://www.1c-bitrix.ru/): </li> </ul> </section> - <section name="Configuration"> + <section name="Configuration"> <div> <b>OpenMeetings Bitrix Plugin Installation</b><br/> <ol> @@ -40,9 +40,8 @@ <li>Unpack it into bitrix/modules</li> <li>Install via Admin</li> <li>Add OPenmeetings component to any page.</li> - </ol> + </ol> </div> </section> </body> - </document> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml b/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml index ac74b31..aff2312 100644 --- a/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml +++ b/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml @@ -32,7 +32,7 @@ </section> <section name="These instructions are for 3.0.x version only"/> - + <section name="How to Build a Distribution"> <div> <p>To build a binary release of OpenMeetings you need: </p> @@ -302,4 +302,4 @@ ant -Ddb=<name of DB> # will copy <name of DB>_persistense.xml to pers </body> -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml b/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml index c0fa323..b11fe15 100644 --- a/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml +++ b/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml @@ -40,7 +40,7 @@ --email-auth-user [email protected] --password 123qweasd --system-email-address [email protected] --email-auth-pass 123qweasd </source> </section> - <section name="Command reference"> + <section name="Command reference"> <source><![CDATA[ -v,--verbose verbose error messages -------------------------------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml b/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml index 3697315..3eb204c 100644 --- a/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml +++ b/openmeetings-server/src/site/xdoc/CustomRoomTypeHowTo.xml @@ -65,7 +65,7 @@ <li>continue styling :)))</li> </ul> </p> - <p>Thats it. You can add/edit/delete your room with the new room type in the Administration > Rooms interface of + <p>Thats it. You can add/edit/delete your room with the new room type in the Administration > Rooms interface of OpenMeetings like any other room.</p> </section> </body> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/DrupalPlugin.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/DrupalPlugin.xml b/openmeetings-server/src/site/xdoc/DrupalPlugin.xml index 6b6e0ac..40fde09 100644 --- a/openmeetings-server/src/site/xdoc/DrupalPlugin.xml +++ b/openmeetings-server/src/site/xdoc/DrupalPlugin.xml @@ -13,28 +13,24 @@ limitations under the License. --> <document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Drupal Plugin</title> <author email="[email protected]">Apache OpenMeetings Team</author> </properties> - <body> - <section name="Drupal Plugin for OpenMeetings"> <p> - Plugin for Drupal currently is not open source. - Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. + Plugin for Drupal currently is not open source. + Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. </p> </section> - <section name="Installation of the Drupal Plugin for Apache OpenMeetings"> <p> You simply download the ZIP or TAR package and unzip it to Drupal "mod" directory. <br/> - For a detailed description on how to install plugins in Drupal please review their + For a detailed description on how to install plugins in Drupal please review their <a href="http://drupal.org/documentation/install/modules-themes"; target="_blank" rel="nofollow">handbook</a>. <br /> Then you visit the module interface of Drupal, where you will find the new module. @@ -52,12 +48,10 @@ height="340" /> </a> </section> - <section name="Adding a new conference room to Drupal"> - <p> - After installation of the plugin you can go to the front page in Drupal and add a new content item - "OpenMeetings Rooms" => "Add New Room". You may find following configuration values for each + After installation of the plugin you can go to the front page in Drupal and add a new content item + "OpenMeetings Rooms" => "Add New Room". You may find following configuration values for each conference room: </p> <a class="fancybox-buttons" href="images/drupal_room_configuration.png"> @@ -65,12 +59,10 @@ height="400" /> </a> </section> - <section name="Demo video"> <p>The demo video of Drupal plugin show you the plugin in action </p> <iframe width="640" height="390" src="http://www.youtube.com/embed/LmMIKFCLRV4"; frameborder="0" allowfullscreen=""></iframe> <iframe width="640" height="390" src="http://www.youtube.com/embed/k5PF3vdVUn0"; frameborder="0" allowfullscreen=""></iframe> </section> </body> - -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/EditTemplates.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/EditTemplates.xml b/openmeetings-server/src/site/xdoc/EditTemplates.xml index 0846c24..b86c2fc 100644 --- a/openmeetings-server/src/site/xdoc/EditTemplates.xml +++ b/openmeetings-server/src/site/xdoc/EditTemplates.xml @@ -13,14 +13,12 @@ limitations under the License. --> <document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Edit Templates</title> <author email="[email protected]">Apache OpenMeetings Team</author> </properties> - <body> <section name="Changing Labels and text strings"> <p> @@ -34,7 +32,7 @@ To lookup the labelids in the GUI you can simply run OpenMeetings client with the debug enabled. That way every text-string has the labelid in brackets additionally in the textfield. To start the - client in debug mode please check "Tips and Tricks" section of + client in debug mode please check "Tips and Tricks" section of <a href="installation.html" rel="nofollow">Installation guide</a> </p> </section> @@ -47,12 +45,12 @@ <ul> <li>Stop the Red5/OpenMeetings service</li> <li>Goto: <tt>$RED5_HOME/webapps/openmeetings/WEB-INF/classes/org/apache/openmeetings/service/mail/template/</tt></li> - <li>Change HTML file(s) according to your needs, BUT do not remove - elements with <tt>wicket:id</tt> attributes! You can hide those + <li>Change HTML file(s) according to your needs, BUT do not remove + elements with <tt>wicket:id</tt> attributes! You can hide those elements by adding <tt>wicket:visible="false"</tt> attribute </li> <li>Starting OM 3.1.4 you can change Appointment reminder subject by - modifying "subject" fragment in file + modifying "subject" fragment in file <tt>$RED5_HOME/webapps/openmeetings/WEB-INF/classes/org/apache/openmeetings/service/mail/template/subject/AbstractSubjectEmailTemplate.html</tt> as described in previous bullet. </li> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml b/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml index 1baf855..6397510 100644 --- a/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml +++ b/openmeetings-server/src/site/xdoc/JoomlaPlugin.xml @@ -11,10 +11,10 @@ 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. - --> +--> <document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Joomla Plugin</title> <author email="[email protected]">Apache OpenMeetings Team</author> @@ -22,9 +22,9 @@ <body> <section name="OpenMeetings Plugin for Joomla"> <p> - Plugin for Joomla currently is not open source. - Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. - </p> + Plugin for Joomla currently is not open source. + Please contact <a href="commercial-support.html" target="_blank" rel="nofollow">Commercial Support</a> to get it. + </p> </section> <section name="Features"> <p>The plugin contains the following features: </p> @@ -32,29 +32,28 @@ <li>Create videoconference rooms from Joomla: </li> <li> <ol> - <li>Create rooms</li> + <li>Create rooms</li> <li>Enter the room</li> </ol> </li> <li>Access recordings from Joomla: </li> <li> <ol> - <li>Download recordings</li> + <li>Download recordings</li> </ol> </li> </ul> </section> - <section name="Demo video"> + <section name="Demo video"> <div> - <b>OpenMeetings Joomla Plugin Installation</b><br/> + <b>OpenMeetings Joomla Plugin Installation</b><br/> <iframe width="640" height="360" src="https://www.youtube.com/embed/jt8ejgtHavc?feature=player_embedded"; frameborder="0" allowfullscreen=""></iframe> </div> <br/> <div> - <b>OpenMeetings Integration with Joomla</b><br/> + <b>OpenMeetings Integration with Joomla</b><br/> <iframe width="640" height="360" src="https://www.youtube.com/embed/H61N0pfLusA?feature=player_embedded"; frameborder="0" allowfullscreen=""></iframe> </div> </section> </body> - -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/LdapAndADS.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/LdapAndADS.xml b/openmeetings-server/src/site/xdoc/LdapAndADS.xml index c43e3ee..87c17dd 100644 --- a/openmeetings-server/src/site/xdoc/LdapAndADS.xml +++ b/openmeetings-server/src/site/xdoc/LdapAndADS.xml @@ -85,7 +85,7 @@ TLS_CACERT /etc/ssl/certs/ca-certificates.crt Successful integration is also reported with Novell eDirectory </p> <p> - You can configure multiple domains or different user-paths in the Administration of OpenMeetings. + You can configure multiple domains or different user-paths in the Administration of OpenMeetings. </p> <p> <b>NOTE: </b>You should specify file name <i>RELATIVE</i> to <tt>$RED5_HOME/webapps/openmeetings/conf</tt> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/MSSQLConfig.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/MSSQLConfig.xml b/openmeetings-server/src/site/xdoc/MSSQLConfig.xml index 26e2a78..0f454bb 100644 --- a/openmeetings-server/src/site/xdoc/MSSQLConfig.xml +++ b/openmeetings-server/src/site/xdoc/MSSQLConfig.xml @@ -30,7 +30,7 @@ before you start the installation process of OpenMeetings! </li> <li> - make sure MSSQL is listening on TCP/IP connections! and username/password + make sure MSSQL is listening on TCP/IP connections! and username/password authentication is enabled for it <br /> To verify if MSSQL connection is working: OpenMeetings will http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/ManualTesting.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/ManualTesting.xml b/openmeetings-server/src/site/xdoc/ManualTesting.xml index d3e5876..f11db0a 100644 --- a/openmeetings-server/src/site/xdoc/ManualTesting.xml +++ b/openmeetings-server/src/site/xdoc/ManualTesting.xml @@ -36,7 +36,7 @@ <b>User GUI tests</b> <ol> <li> - Login/logout + Login/logout <ol> <li>Password recovering </li> <li>Self-registering </li> @@ -53,10 +53,10 @@ <li>Links in the "Help and support" section </li> <li>It should be possible to enter user’s room from the dashboard </li> <li>Room details should be shown correctly in the "Rooms in this section…" part of the screen </li> - </ol> + </ol> </li> <li> - Global chat + Global chat <ol> <li>Send/receive message where at least 3 users in the system </li> <li>Adding a contact to the contact list </li> @@ -68,7 +68,7 @@ <li>Changing font style in the massage </li> <li>Adding emotions to the message </li> </ol> - Attention! Correct RTL support does not work in the current implementation + Attention! Correct RTL support does not work in the current implementation </li> <li> Calendar view @@ -94,12 +94,12 @@ </ol> </li> <li> - My Profile: User profile should contain correct user info and allow to edit this + My Profile: User profile should contain correct user info and allow to edit this </li> <li> Contacts and Messages <ol> - <li>Add/remove a message </li> + <li>Add/remove a message </li> <li>Creating a new folder </li> <li>Moving between the folders </li> <li>Marking messages as read/unread </li> @@ -113,7 +113,7 @@ <li>Possibility to change the user info </li> <li>Changing time zone and language (should start to work after user re-login </li> <li>Community settings or different users </li> - <li>Display settings</li> + <li>Display settings</li> </ol> </li> <li> @@ -125,7 +125,7 @@ </ol> </li> <li> - Room lists + Room lists <ol> <li>Public rooms, private rooms and my rooms should contain correct room lists </li> <li>User list for the selected room </li> @@ -134,7 +134,7 @@ </li> <li> Recordings - <ol> + <ol> <li>The list should contain available recordings in public and private folders </li> <li>Info panel should contain actual info about the recording </li> <li>Downloading a recording is different formats (AVI/FLV) </li> @@ -285,7 +285,7 @@ </ol> </li> <li> - Groups + Groups <ol> <li>Add/remove/edit/search an group </li> <li>Add/remove a user from the user list of selected group </li> @@ -325,7 +325,7 @@ </ol> </li> <li> - Language editor + Language editor <ol> <li>Add/remove/edit/search a key </li> <li>Import/export of localization files </li> @@ -340,7 +340,7 @@ <li>System import </li> <li>System backup </li> <li>TBD – need to add tests for command line admin here </li> - </ol> + </ol> </li> <li> Servers: Add/remove/edit/search a server @@ -426,7 +426,7 @@ </li> <li> <b>Conference room testing</b> - <ol> + <ol> <li> Screen sharing <ol> @@ -442,7 +442,7 @@ <li>Repeat steps 2.1.1-2.1.7 one more time, but choose "Medium quality" on the step 2.1.5</li> <li>Repeat steps 2.1.1-2.1.7 one more time, but choose "Low quality" on the step 2.1.5</li> <li>Repeat steps 2.1.1-2.1.7 one more time, but choose some random height and width on the step 2.1.5</li> - <li>Repeat steps 2.1.1-2.1.7 one more time, but turn the "Notify on disconnect" switch on the step 2.1.5</li> + <li>Repeat steps 2.1.1-2.1.7 one more time, but turn the "Notify on disconnect" switch on the step 2.1.5</li> </ol> </li> <li> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/MoodlePlugin.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/MoodlePlugin.xml b/openmeetings-server/src/site/xdoc/MoodlePlugin.xml index 8bb9935..7eea909 100644 --- a/openmeetings-server/src/site/xdoc/MoodlePlugin.xml +++ b/openmeetings-server/src/site/xdoc/MoodlePlugin.xml @@ -13,15 +13,13 @@ limitations under the License. --> <document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Moodle Plugin</title> <author email="[email protected]">Apache OpenMeetings Team</author> </properties> - <body> - <section name="Moodle Plugin for OpenMeetings"> <p> You can get the latest Version of the Plugin for Moodle from the @@ -30,7 +28,6 @@ . </p> </section> - <section name="Installation of the Moodle Plugin for Apache OpenMeetings"> <p> You simply download the ZIP or TAR package and unzip it to Moodle's "mod" directory.<br/> @@ -53,12 +50,10 @@ height="300" /> </a> </section> - <section name="Adding a new conference room to a Moodle course"> - <p> After installation of the plugin you can go to the course pages in Moodle and turn editing on. - Then you choose the activity "OpenMeetings", Moodle will then show you the conference room + Then you choose the activity "OpenMeetings", Moodle will then show you the conference room configuration with all the options: </p> <a class="fancybox-buttons" href="images/moodle_add_activity_plugin.png"> @@ -66,11 +61,9 @@ height="360" /> </a> </section> - <section name="Demo video"> <p>The demo video of SugarCRM plugin show you the plugin in action </p> <iframe width="640" height="390" src="http://www.youtube.com/embed/pPgv7zkPXAk"; frameborder="0" allowfullscreen=""></iframe> </section> </body> - </document> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/NewsArchive.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/NewsArchive.xml b/openmeetings-server/src/site/xdoc/NewsArchive.xml index dde8c67..e41ca4c 100644 --- a/openmeetings-server/src/site/xdoc/NewsArchive.xml +++ b/openmeetings-server/src/site/xdoc/NewsArchive.xml @@ -293,7 +293,7 @@ Other fixes in admin, localization, installer, invitations, room etc.<br/> </div> <span> - 77 issues are fixed please check + 77 issues are fixed please check <a href="http://archive.apache.org/dist/openmeetings/3.1.0/CHANGELOG";>CHANGELOG</a> and <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312720&version=12333397";>Detailed list</a> </span> @@ -318,7 +318,7 @@ Other fixes<br/> </div> <span> - 20 issues are fixed please check + 20 issues are fixed please check <a href="http://archive.apache.org/dist/openmeetings/3.0.7/CHANGELOG";>CHANGELOG</a> and <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312720&version=12332443";>Detailed list</a> </span> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/PostgresConfig.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/PostgresConfig.xml b/openmeetings-server/src/site/xdoc/PostgresConfig.xml index 9f6b33d..6021c24 100644 --- a/openmeetings-server/src/site/xdoc/PostgresConfig.xml +++ b/openmeetings-server/src/site/xdoc/PostgresConfig.xml @@ -25,7 +25,7 @@ <subsection name="Before you start"> <ul> - <li>Make sure that you have set utf8 as default/server-character-set + <li>Make sure that you have set utf8 as default/server-character-set </li> <li> make sure PostgreSQL is listening on TCP/IP connections! http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml b/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml index d31aaad..66ce74e 100644 --- a/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml +++ b/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml @@ -76,7 +76,7 @@ Enter key password for <red5> </li> <li>Import your chosen CA's root certificate into the keystore (may need to download it from their site - make sure to get the root CA and - not the intermediate one): + not the intermediate one): <source><![CDATA[keytool -import -alias root -keystore red5/conf/keystore.jks -trustcacerts -file root.crt]]></source> (note: you may receive a warning that the certificate already exists in the system wide keystore - import anyway) @@ -121,7 +121,7 @@ keytool -importkeystore -srcstorepass password -srckeystore red5.p12 -srcstorety </li> <li>Import your chosen CA's root certificate into the keystore (may need to download it from their site - make sure to get the root CA and - not the intermediate one): + not the intermediate one): <source><![CDATA[keytool -import -alias root -keystore red5/conf/keystore.jks -trustcacerts -file root.crt]]></source> (note: you may receive a warning that the certificate already exists in the system wide keystore - import anyway) @@ -143,7 +143,7 @@ keytool -importkeystore -srcstorepass password -srckeystore red5.p12 -srcstorety <h3>Prerequisites</h3> <ul> <li>Create CA's root certificate: ca.crt</li> - <li>Create self-signed server certificate: red5.crt <tt>Common Name (CN) while creating certificate + <li>Create self-signed server certificate: red5.crt <tt>Common Name (CN) while creating certificate should be assign to FQDN of your site, for example - vkc.company.com</tt></li> <li>Rename the existing keystore file <tt>red5/conf/keystore.jmx</tt> to <tt>red5/conf/keystore.bak</tt></li> <li>Rename the existing truststore file <tt>red5/conf/truststore.jmx</tt> to <tt>red5/conf/truststore.bak</tt></li> @@ -231,7 +231,7 @@ jmx.keystorepass=changeit ]]></source> </li> <li>Restart red5 and try to connect - your connection should now be made via RTMPS (close port 1935 to be sure) - </li> + </li> </ol> <h3>Native RTMPS</h3> <ol> @@ -252,7 +252,7 @@ jmx.keystorepass=changeit ]]></source> </li> <li>Restart red5 and try to connect - your connection should now be made via RTMPS (close port 1935 to be sure) - </li> + </li> </ol> </section> <section name="Credits"> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/RedminePlugin.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/RedminePlugin.xml b/openmeetings-server/src/site/xdoc/RedminePlugin.xml index c302720..3d71131 100644 --- a/openmeetings-server/src/site/xdoc/RedminePlugin.xml +++ b/openmeetings-server/src/site/xdoc/RedminePlugin.xml @@ -25,7 +25,7 @@ Current Development Snapshots for testing can be created from the sources: <a href="https://github.com/openmeetings/openmeetings-redmine-plugin";>here</a>.<br/> The page at redmine site is <a href="http://www.redmine.org/plugins/redmine-openmeetings";>here</a> - </p> + </p> </section> <section name="Features"> <p>TBD</p> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/ReleaseGuide.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml index 11364fe..56680b3 100644 --- a/openmeetings-server/src/site/xdoc/ReleaseGuide.xml +++ b/openmeetings-server/src/site/xdoc/ReleaseGuide.xml @@ -88,7 +88,6 @@ Set up development environment as described here: <a href="http://www.apache.org/dev/publishing-maven-artifacts.html#dev-env";>Setup development environment</a><br/> Don't forget to secure passwords as described here: <a href="http://maven.apache.org/guides/mini/guide-encryption.html#How_to_create_a_master_password";>Password Encryption</a> </li> - </ul> </li> </ul> @@ -194,11 +193,11 @@ mvn deploy -Pdeploy,rc <a href="http://mail-archives.apache.org/mod_mbox/openmeetings-dev/201701.mbox/%3CCAJmbs8gyvHuarzdVma%2BF6ap7RHBhhVciZp5Oi5JogQdLR6o0NA%40mail.gmail.com%3E";>example Result email</a> <br /> - Votes on whether a package is ready to be released use majority approval -- i.e., at - least three PMC members must vote affirmatively for release, and there must be more + Votes on whether a package is ready to be released use majority approval -- i.e., at + least three PMC members must vote affirmatively for release, and there must be more positive than negative votes. Releases may not be vetoed. Before voting +1 PMC members - are required to download the signed source code package, compile it as provided, and - test the resulting executable on their own platform, along with also verifying that + are required to download the signed source code package, compile it as provided, and + test the resulting executable on their own platform, along with also verifying that the package meets the requirements of the ASF policy on releases. </p> </subsection> @@ -261,13 +260,11 @@ for f in `ls -1 *.tar.gz *.zip`; do gpg --verify $f.asc; done </li> </ul> <p>NOTE: "Type of signing" can be selected as "Test" to check everything works as expected</p> - </subsection> - <subsection name="Step4 - Distribute and announce"> <p>If VOTEs positive: Upload the release </p> <ul> - <li>Upload Artifacts with signatures created on the previous steps to + <li>Upload Artifacts with signatures created on the previous steps to https://dist.apache.org/repos/dist/release/openmeetings/CURRENT_VERSION </li> <li>Close staging repo: @@ -297,7 +294,7 @@ for f in `ls -1 *.tar.gz *.zip`; do gpg --verify $f.asc; done Add a section to <a href="downloads.html">downloads</a> website.<br /> Make sure that the binary packages are linked using the mirror URL as base path ( <b>not</b> http://www.apache.org/dist):<br /> - Mirror URL: + Mirror URL: <a href="http://www.apache.org/dyn/closer.lua/openmeetings/";>http://www.apache.org/dyn/closer.lua/openmeetings/</a> </li> <li> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/RestAPISample.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/RestAPISample.xml b/openmeetings-server/src/site/xdoc/RestAPISample.xml index 30de9db..998741a 100644 --- a/openmeetings-server/src/site/xdoc/RestAPISample.xml +++ b/openmeetings-server/src/site/xdoc/RestAPISample.xml @@ -13,8 +13,8 @@ limitations under the License. --> <document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>REST API sample</title> <author email="[email protected]">Apache OpenMeetings Team</author> @@ -22,11 +22,10 @@ <body> <section name="Introduction"> <p> For a detailed instruction which services, methods and params are available see the list in the <a href="/openmeetings-webservice/apidocs/index.html" target="_blank">SOAP/REST API</a> . - ALL methods that are implemented for the SOAP API are also available via REST. + ALL methods that are implemented for the SOAP API are also available via REST. </p> <div> you can query methods of each service using following suffixes - <ul> <li>SOAP: <tt>?wsdl</tt> suffix, for example <tt>http://localhost:5080/openmeetings/services/UserService?wsdl</tt></li> <li>REST: as xml <tt>?_wadl</tt> for example <tt>http://localhost:5080/openmeetings/services/user?_wadl</tt></li> @@ -35,7 +34,7 @@ <div class="bs-callout bs-callout-info"> The full list of services with All WSDLs/WADLs is available at following URL: <tt>http://localhost:5080/openmeetings/services/services</tt> </div> - </div> + </div> </section> <section name="How to get room hash via REST"> <ul> @@ -83,7 +82,7 @@ $.ajax({ </table> </li> <li> - In case of error you can get detailed error message in your language as result of following query + In case of error you can get detailed error message in your language as result of following query <tt>http://localhost:5080/openmeetings/services/error/<b>ERROR_ID</b>/<b>LANGUAGE_ID</b></tt> (for ex. http://localhost:5080/openmeetings/services/error/<b>-11</b>/<b>9</b>) </li> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/RestrictedAccess.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/RestrictedAccess.xml b/openmeetings-server/src/site/xdoc/RestrictedAccess.xml index 82e53bc..9cb47dc 100644 --- a/openmeetings-server/src/site/xdoc/RestrictedAccess.xml +++ b/openmeetings-server/src/site/xdoc/RestrictedAccess.xml @@ -21,9 +21,7 @@ </properties> <body> - <section name="Server Side"> - <p>You can protect your OpenMeetings instance from beeing accessed from 3th party by using the file: </p> @@ -36,9 +34,7 @@ rel="nofollow">https://git-wip-us.apache.org/repos/asf/openmeetings.git/KEYS?p=openmeetings.git;a=blob;f=openmeetings-web/src/main/webapp/WEB-INF/red5-web.properties;hb=HEAD </a> </section> - <section name="Client Side"> - <p>And you can restrict the access also for the client side: Every Flash Plugin will check a file called "crossdomain.xml" before it tries to access the server using rtmp/RPC. This file is located: </p> @@ -54,7 +50,6 @@ </cross-domain-policy> ]]> </source> - <p> If you accessing your application behind an Apache Webservre (using mod_proxy or mod_jk2) be careful to make the crossdomain.xml @@ -64,9 +59,6 @@ </a> for example to lookup requests. </p> - </section> - </body> - </document> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/SakaiPlugin.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/SakaiPlugin.xml b/openmeetings-server/src/site/xdoc/SakaiPlugin.xml index 64b9d0a..68d29cd 100644 --- a/openmeetings-server/src/site/xdoc/SakaiPlugin.xml +++ b/openmeetings-server/src/site/xdoc/SakaiPlugin.xml @@ -33,7 +33,7 @@ <p> The plugin was developed for some Spanish Universities that use Sakai and belongs to - <a rel="nofollow" target="_blank" + <a rel="nofollow" target="_blank" href="https://confluence.sakaiproject.org/display/SPANISH/S2G+-+Spanish+Sakai+Group";>"Spanish Sakai Universities"</a> group: </p> @@ -86,7 +86,7 @@ <section name="Source"> <p> You can download and build the source code - <a rel="nofollow" target="_blank" + <a rel="nofollow" target="_blank" href="https://source.sakaiproject.org/contrib/samoo/adobeconnectpro-openmeetings-integration/trunk/";>here</a> </p> </section> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/Upgrade.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/Upgrade.xml b/openmeetings-server/src/site/xdoc/Upgrade.xml index b224c75..67dc208 100644 --- a/openmeetings-server/src/site/xdoc/Upgrade.xml +++ b/openmeetings-server/src/site/xdoc/Upgrade.xml @@ -13,8 +13,8 @@ limitations under the License. --> <document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Upgrade</title> <author email="[email protected]">Apache OpenMeetings Team</author> @@ -32,7 +32,7 @@ appointments (Invitations and Reminders are NOT included in the Backup and Reminders will not be send again!). The Backup contains also all uploaded Files and Documents and will re-import them again. - + Max Upload Size is 1000 MB. </p> </li> @@ -55,7 +55,7 @@ <section name="Upgrading OpenMeetings from command line"> <p> - <i>You need OpenMeetings 2.x or later to have the command line interface (CLI) + <i>You need OpenMeetings 2.x or later to have the command line interface (CLI) feature available </i> </p> @@ -70,7 +70,7 @@ A typical import would be:<br /> <tt>./admin.sh -r -file backup_yesterday.zip</tt><br /> <br /> - You can also combine the installation with a backup, that way you will create exactly the user table + You can also combine the installation with a backup, that way you will create exactly the user table that existed in the backup.<br /> A typical install from backup would be:<br /> <tt>./admin.sh -i -file backup_yesterday.zip</tt><br/> @@ -91,7 +91,5 @@ </ol> <p>(*) Optional step</p> </section> - </body> - -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/WebappNamePath.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/WebappNamePath.xml b/openmeetings-server/src/site/xdoc/WebappNamePath.xml index 0014828..bf6776e 100644 --- a/openmeetings-server/src/site/xdoc/WebappNamePath.xml +++ b/openmeetings-server/src/site/xdoc/WebappNamePath.xml @@ -113,13 +113,13 @@ </section> <section name="Running multiple Openmeetings instances on the same server"> <p> - If you want to run multiple Openmeetings instances on the same server i.e. to have<br/> - <tt>http://yourcorp.com:5080/openmeetings1</tt><br/> + If you want to run multiple Openmeetings instances on the same server i.e. to have<br/> + <tt>http://yourcorp.com:5080/openmeetings1</tt><br/> <tt>http://yourcorp.com:5080/openmeetings2</tt><br/> etc.<br/> you need to do the following: </p> <ol> - <li>edit <tt>webapps/openmeetings1/WEB-INF/red5-web.properties</tt> for <strong>every</strong> Openmeetings - instance and add the following line <tt>webapp.contextPath=/openmeetings1</tt> to it (context of + <li>edit <tt>webapps/openmeetings1/WEB-INF/red5-web.properties</tt> for <strong>every</strong> Openmeetings + instance and add the following line <tt>webapp.contextPath=/openmeetings1</tt> to it (context of <strong>every</strong> instance <strong>should</strong> match the folder name in webapps dir) </li> <li>in case of java memory problems modify <tt>red5.sh</tt> add following line:<br/> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/WebsiteGuide.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml index 6d50a36..fb6605f 100644 --- a/openmeetings-server/src/site/xdoc/WebsiteGuide.xml +++ b/openmeetings-server/src/site/xdoc/WebsiteGuide.xml @@ -32,8 +32,8 @@ <subsection name="Introduction"> <div> <p> - The Apache OpenMeetings HTML websites are generated from XML files. - You edit the XML files, run the MAVEN command <source><![CDATA[mvn install -P allModules,unpacked -DskipTests=true]]></source> that generates the HTML files + The Apache OpenMeetings HTML websites are generated from XML files. + You edit the XML files, run the MAVEN command <source><![CDATA[mvn install -P allModules,unpacked -DskipTests=true]]></source> that generates the HTML files and then you copy generated HTML files into appropriate place and commit to Git both: XML and HTML files. </p> <p> @@ -70,7 +70,7 @@ git checkout asf-site </subsection> <subsection name="Adding a new menu entry"> <div> - To add a new menu entry in the left side panel you need to modify the file: + To add a new menu entry in the left side panel you need to modify the file: <br/> <tt>openmeetings-server/src/site/site.xml</tt> </div> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/commercial-support.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/commercial-support.xml b/openmeetings-server/src/site/xdoc/commercial-support.xml index fe8a191..3752ff0 100644 --- a/openmeetings-server/src/site/xdoc/commercial-support.xml +++ b/openmeetings-server/src/site/xdoc/commercial-support.xml @@ -13,9 +13,8 @@ limitations under the License. --> <document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Commercial Support</title> <author email="[email protected]">Apache OpenMeetings Team</author> @@ -34,23 +33,20 @@ run by Maxim Solodovnik, Timur Tleukenov, Irina Arkhipets, Denis Kandrov, Vasily Degtyarev </li> <li> - <a href="http://www.samoo.es"; target="_blank" rel="nofollow">samoo.es</a> - provides support for the Sakai Plugin - </li> + <a href="http://www.samoo.es"; target="_blank" rel="nofollow">samoo.es</a> + provides support for the Sakai Plugin + </li> </ul> <p> Please write to <a href="mailto:[email protected]";>[email protected]</a> to get UniPro support </p> <p> - There are more companies offering installation, customization, hosting, conferencing and support services. You can add + There are more companies offering installation, customization, hosting, conferencing and support services. You can add yourself to the <a href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Commercial+Support";>wiki page</a>. </p> - <p> Want to get listed here? Become a <a href="http://www.apache.org/dev/committers.html";>committer</a>. </p> </section> - </body> - </document> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/downloads.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/downloads.xml b/openmeetings-server/src/site/xdoc/downloads.xml index 4939715..46c02fb 100644 --- a/openmeetings-server/src/site/xdoc/downloads.xml +++ b/openmeetings-server/src/site/xdoc/downloads.xml @@ -107,8 +107,8 @@ http://localhost:15080/openmeetings </subsection> <subsection name="Plugins / Non ASF downloads"> <p> - If you are looking for more plugins for 3th party applications (Moodle, Drupal, Joomla, ...) check out - <a href="https://github.com/openmeetings/"; target="_blank" rel="nofollow">github.com</a> or + If you are looking for more plugins for 3th party applications (Moodle, Drupal, Joomla, ...) check out + <a href="https://github.com/openmeetings/"; target="_blank" rel="nofollow">github.com</a> or ask <a href="commercial-support.html">commercial support</a>. </p> <p> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/installation.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/installation.xml b/openmeetings-server/src/site/xdoc/installation.xml index 173df11..7261acd 100644 --- a/openmeetings-server/src/site/xdoc/installation.xml +++ b/openmeetings-server/src/site/xdoc/installation.xml @@ -13,17 +13,14 @@ limitations under the License. --> <document xmlns="http://maven.apache.org/XDOC/2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> <properties> <title>Installation</title> <author email="[email protected]">Apache OpenMeetings Team</author> </properties> - <body> - <section name="OpenMeetings Installation"> - <p> To update from past versions or migrate see <a href="Upgrade.html">Upgrade</a>.<br/> If you are looking for commercial help have a look at @@ -36,7 +33,7 @@ <p> <i>Note: Openmeetings requires JRE 7/8, JRE 6 is NOT compatible!</i><br /> <i> - Since Version 2.0 you can also install OpenMeetings from command line. Just cd to the unpacked + Since Version 2.0 you can also install OpenMeetings from command line. Just cd to the unpacked archive and type ./admin.sh or admin.bat, please see <a href="CommandLineAdmin.html" target="_blank" rel="nofollow">Command Line Admin</a> for more options @@ -208,7 +205,7 @@ </li> <li> <a href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools";> - OpenMeetings Installation tutorials by Alvaro Bustos for: Ubuntu, Debian, Mint, MacOS X, CentOS, Fedora, + OpenMeetings Installation tutorials by Alvaro Bustos for: Ubuntu, Debian, Mint, MacOS X, CentOS, Fedora, PCLinuxOS, openSUSE and Arch Linux.</a> </li> <li> @@ -243,7 +240,7 @@ <param-name>configuration</param-name> <param-value>DEVELOPMENT</param-value> </init-param> - ]]></source> + ]]></source> then access your OM installation </li> <li>If you have Problems with conversion-jobs check your openmeetings log http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml b/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml index e3b0660..a874f77 100644 --- a/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml +++ b/openmeetings-server/src/site/xdoc/red5sip-integration_2.0.xml @@ -31,18 +31,18 @@ </p> </section> - <section name="Setup Asterisk"> + <section name="Setup Asterisk"> <div> - Run the commands + Run the commands <source> <![CDATA[ sudo apt-get update sudo apt-get install asterisk asterisk-mysql ]]> </source> - </div> - <div> - Ubuntu 10.04 has broken asterisk-mysql version. For other distribution next commands not needed: + </div> + <div> + Ubuntu 10.04 has broken asterisk-mysql version. For other distribution next commands not needed: <source> <![CDATA[ aptitude purge asterisk-mysql @@ -52,21 +52,21 @@ apt-get -b source asterisk-mysql dpkg -i asterisk-mysql_1.6.2.0-1_i386.deb ]]> </source> - </div> - <div> - Enable asterisk mysql realtime module:<br/><br/> - Add string + </div> + <div> + Enable asterisk mysql realtime module:<br/><br/> + Add string <source> <![CDATA[ load => res_config_mysql.so ]]> </source> - to the /etc/asterisk/modules.conf into the "modules" section. - </div> - <div> - Configure mysql realtime module:<br/><br/> + to the /etc/asterisk/modules.conf into the "modules" section. + </div> + <div> + Configure mysql realtime module:<br/><br/> - Create file /etc/asterisk/res_mysql.conf and add lines: + Create file /etc/asterisk/res_mysql.conf and add lines: <source> <![CDATA[ [general] @@ -77,9 +77,9 @@ dbpass= dbport=3306 ]]> </source> - </div> - <div> - Add next lines into the /etc/asterisk/extconfig.conf: + </div> + <div> + Add next lines into the /etc/asterisk/extconfig.conf: <source> <![CDATA[ [settings] @@ -89,50 +89,50 @@ extensions => mysql,general,extensions meetme => mysql,general,meetme ]]> </source> - </div> - <div> - Add next lines into the /etc/asterisk/extensions.conf: + </div> + <div> + Add next lines into the /etc/asterisk/extensions.conf: <source> <![CDATA[ [rooms] switch => Realtime/@ ]]> </source> - </div> + </div> - <div> - Restart asterisk: + <div> + Restart asterisk: <source> <![CDATA[ service asterisk restart ]]> </source> - Insert, for example, SIP user with name 'test': + Insert, for example, SIP user with name 'test': <source> <![CDATA[ INSERT INTO sipusers (allow, context, disallow, host, name, secret) VALUES ('ulaw' , 'rooms', NULL, 'dynamic' , 'test', '12345'); ]]> </source> - </div> + </div> </section> - <section name="Setup red5sip transport"> - <div> - Download red5sip from<tt>http://red5phone.googlecode.com/svn/branches/red5sip</tt> - </div> - <p> - Build with Apache Ant - </p> - <div> - Install jsvc: + <section name="Setup red5sip transport"> + <div> + Download red5sip from<tt>http://red5phone.googlecode.com/svn/branches/red5sip</tt> + </div> + <p> + Build with Apache Ant + </p> + <div> + Install jsvc: <source> <![CDATA[ apt-get install jsvc ]]> </source> - </div> - <div> - Insert proper values to the /opt/red5sip/settings.properties + </div> + <div> + Insert proper values to the /opt/red5sip/settings.properties <source> <![CDATA[ @@ -146,9 +146,9 @@ sip.proxy - rooms - ids of openmeetings rooms, can be, for example, 2,3,5,6 ]]> </source> - </div> - <div> - Add red5sip to autostart: + </div> + <div> + Add red5sip to autostart: <source> <![CDATA[ ln -s /opt/red5sip/red5sip.sh /etc/init.d/red5sip @@ -156,24 +156,23 @@ chmod a+x /etc/init.d/red5sip update-rc.d /etc/init.d/red5sip defaults ]]> </source> - </div> - <div> - Start openmeetings + </div> + <div> + Start openmeetings <source> <![CDATA[ service red5 start ]]> </source> - </div> - <div> - Start red5sip + </div> + <div> + Start red5sip <source> <![CDATA[ service red5sip start ]]> </source> - </div> - </section> + </div> + </section> </body> - -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml b/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml index c76add3..2693adf 100644 --- a/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml +++ b/openmeetings-server/src/site/xdoc/red5sip-integration_2.1.xml @@ -218,7 +218,7 @@ denoise=true [default_bridge] type=bridge -video_mode=follow_talker +video_mode=follow_talker ]]> </source> </div><br /> @@ -243,14 +243,14 @@ write = all </source> </div><br /> <div> - Update Openmeetings with creadentials for Asterisk manager. + Update Openmeetings with creadentials for Asterisk manager. Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/openmeetings-applicationContext.xml</tt><br /> find <strong><bean id="sipDao" class="org.apache.openmeetings.data.conference.dao.SipDao"></strong> uncomment its parameters and set it to your custom values. <p style="font-size: larger; color: blue;"> IMPORTANT: this step should be done <strong>BEFORE</strong> system install/restore otherwise all SIP related room information will be lost - </p> + </p> </div><br /> <div> Restart asterisk: @@ -280,7 +280,7 @@ ant <source> <![CDATA[ red5.host=127.0.0.1 # red5 server address -om.context=openmeetings # Openmeetings context +om.context=openmeetings # Openmeetings context red5.codec=asao red5.codec.rate=22 # should correlate with mic settings in public/config.xml sip.obproxy=127.0.0.1 # asterisk adderss http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml b/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml index e54fb2f..9581c2d 100644 --- a/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml +++ b/openmeetings-server/src/site/xdoc/red5sip-integration_3.0.xml @@ -195,7 +195,7 @@ denoise=true [default_bridge] type=bridge -video_mode=follow_talker +video_mode=follow_talker ]]> </source> </div><br /> @@ -220,14 +220,14 @@ write = all </source> </div><br /> <div> - Update Openmeetings with creadentials for Asterisk manager. + Update Openmeetings with creadentials for Asterisk manager. Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt><br /> find <strong><bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"></strong> uncomment its parameters and set it to your custom values. <p style="font-size: larger; color: blue;"> IMPORTANT: this step should be done <strong>BEFORE</strong> system install/restore otherwise all SIP related room information will be lost - </p> + </p> </div><br /> <div> Restart asterisk: @@ -266,7 +266,7 @@ ant <source> <![CDATA[ red5.host=127.0.0.1 # red5 server address -om.context=openmeetings # Openmeetings context +om.context=openmeetings # Openmeetings context red5.codec=asao red5.codec.rate=22 # should correlate with mic settings in public/config.xml sip.obproxy=127.0.0.1 # asterisk adderss http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml b/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml index ed92b3b..33c6d80 100644 --- a/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml +++ b/openmeetings-server/src/site/xdoc/red5sip-integration_3.1.xml @@ -195,7 +195,7 @@ denoise=true [default_bridge] type=bridge -video_mode=follow_talker +video_mode=follow_talker ]]> </source> </div><br /> @@ -220,14 +220,14 @@ write = all </source> </div><br /> <div> - Update OpenMeetings with credentials for Asterisk manager. + Update OpenMeetings with credentials for Asterisk manager. Modify <tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt><br /> find <strong><bean id="sipDao" class="org.apache.openmeetings.db.dao.room.SipDao"></strong> uncomment its parameters and set it to your custom values. <p style="font-size: larger; color: blue;"> IMPORTANT: this step should be done <strong>BEFORE</strong> system install/restore otherwise all SIP related room information will be lost - </p> + </p> </div><br /> <div> Restart asterisk: @@ -262,7 +262,7 @@ mvn clean package <source> <