Author: solomax
Date: Thu Aug 11 01:04:18 2016
New Revision: 1755894
URL: http://svn.apache.org/viewvc?rev=1755894&view=rev
Log:
[OPENMEETINGS-1030] typos and compilation errors are fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector
openmeetings/application/trunk/openmeetings-util/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector?rev=1755894&r1=1755893&r2=1755894&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector
Thu Aug 11 01:04:18 2016
@@ -9,4 +9,4 @@
# 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.
-org.apache.openmeetings.util.OmFileDetector
\ No newline at end of file
+org.apache.openmeetings.util.OmFileDetector
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector?rev=1755894&r1=1755893&r2=1755894&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector
Thu Aug 11 01:04:18 2016
@@ -9,4 +9,4 @@
# 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.
-org.apache.openmeetings.util.OmFileDetector
\ No newline at end of file
+org.apache.openmeetings.util.OmFileDetector
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1755894&r1=1755893&r2=1755894&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Thu Aug 11 01:04:18 2016
@@ -29,6 +29,8 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Calendar;
+import org.apache.openmeetings.core.remote.ConferenceLibrary;
+import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -73,6 +75,7 @@ import org.apache.wicket.protocol.ws.api
import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;
import org.apache.wicket.protocol.ws.api.registry.PageIdKey;
import org.apache.wicket.protocol.ws.concurrent.Executor;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.red5.logging.Red5LoggerFactory;