You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/11/03 23:25:39 UTC
svn commit: r1712427 [1/9] - in /openmeetings/branches/3.1.x: ./ .settings/
WebContent/ openmeetings-core/ openmeetings-core/src/
openmeetings-core/src/main/ openmeetings-core/src/main/java/
openmeetings-core/src/main/java/org/ openmeetings-core/src/ma...
Author: solomax
Date: Tue Nov 3 22:25:34 2015
New Revision: 1712427
URL: http://svn.apache.org/viewvc?rev=1712427&view=rev
Log:
[OPENMEETINGS-1276] initial merge, build system is changed to maven (everything broken)
Added:
openmeetings/branches/3.1.x/openmeetings-core/ (with props)
openmeetings/branches/3.1.x/openmeetings-core/pom.xml
openmeetings/branches/3.1.x/openmeetings-core/src/
openmeetings/branches/3.1.x/openmeetings-core/src/main/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/batik/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/converter/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/documents/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/ldap/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/mail/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/remote/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ISlaveHTTPConnectionManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/rss/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/servlet/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/session/
openmeetings/branches/3.1.x/openmeetings-core/src/site/
openmeetings/branches/3.1.x/openmeetings-core/src/site/site.xml
openmeetings/branches/3.1.x/openmeetings-core/src/test/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/TestConnection.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/TestConnection.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/asf/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/chat/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/derby/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/emotes/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/gui/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/gui/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/jai/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/rdc/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/rtmp/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/user/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/userdata/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/xsd/
openmeetings/branches/3.1.x/openmeetings-db/ (with props)
openmeetings/branches/3.1.x/openmeetings-db/pom.xml
openmeetings/branches/3.1.x/openmeetings-db/src/
openmeetings/branches/3.1.x/openmeetings-db/src/main/
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IWebSession.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/
- copied from r1711723, openmeetings/branches/3.1.x/src/db/java/org/apache/openmeetings/db/
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/AuthLevelUtil.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/web/java/org/apache/openmeetings/web/util/FormatHelper.java
openmeetings/branches/3.1.x/openmeetings-db/src/site/
openmeetings/branches/3.1.x/openmeetings-db/src/site/site.xml
openmeetings/branches/3.1.x/openmeetings-flash/ (with props)
openmeetings/branches/3.1.x/openmeetings-flash/openlaszlo.xml
openmeetings/branches/3.1.x/openmeetings-flash/pom.xml
openmeetings/branches/3.1.x/openmeetings-flash/src/
openmeetings/branches/3.1.x/openmeetings-flash/src/main/
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/
- copied from r1711723, openmeetings/branches/3.1.x/WebContent/src/
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/
- copied from r1711723, openmeetings/branches/3.1.x/WebContent/swf10/
openmeetings/branches/3.1.x/openmeetings-flash/src/site/
openmeetings/branches/3.1.x/openmeetings-flash/src/site/site.xml
openmeetings/branches/3.1.x/openmeetings-install/ (with props)
openmeetings/branches/3.1.x/openmeetings-install/pom.xml
openmeetings/branches/3.1.x/openmeetings-install/src/
openmeetings/branches/3.1.x/openmeetings-install/src/main/
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/
- copied from r1711723, openmeetings/branches/3.1.x/src/install/java/org/apache/openmeetings/backup/
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/
- copied from r1711723, openmeetings/branches/3.1.x/src/install/java/org/apache/openmeetings/cli/
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/
- copied from r1711723, openmeetings/branches/3.1.x/src/install/java/org/apache/openmeetings/installation/
openmeetings/branches/3.1.x/openmeetings-screenshare/ (with props)
openmeetings/branches/3.1.x/openmeetings-screenshare/pom.xml
openmeetings/branches/3.1.x/openmeetings-screenshare/src/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/
- copied from r1711723, openmeetings/branches/3.1.x/src/screenshare/java/org/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/resources/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/resources/icon.jpg
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/main/webapp/screensharing/icon.jpg
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/resources/splashicon.jpg
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/main/webapp/screensharing/splashicon.jpg
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/screenshare.vm
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/
- copied from r1711723, openmeetings/branches/3.1.x/src/screenshare/resources/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/org/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/org/apache/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/org/apache/openmeetings/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/org/apache/openmeetings/screen/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/org/apache/openmeetings/screen/down.png
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/screenshare/java/org/apache/openmeetings/screen/down.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/org/apache/openmeetings/screen/next.png
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/screenshare/java/org/apache/openmeetings/screen/next.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/org/apache/openmeetings/screen/play.png
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/screenshare/java/org/apache/openmeetings/screen/play.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/org/apache/openmeetings/screen/previous.png
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/screenshare/java/org/apache/openmeetings/screen/previous.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/org/apache/openmeetings/screen/stop.png
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/screenshare/java/org/apache/openmeetings/screen/stop.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/resources/org/apache/openmeetings/screen/up.png
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/screenshare/java/org/apache/openmeetings/screen/up.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/site/
openmeetings/branches/3.1.x/openmeetings-screenshare/src/site/site.xml
openmeetings/branches/3.1.x/openmeetings-server/ (with props)
openmeetings/branches/3.1.x/openmeetings-server/pom.xml
openmeetings/branches/3.1.x/openmeetings-server/src/
openmeetings/branches/3.1.x/openmeetings-server/src/main/
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/components/
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/components/all.xml
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/components/templates.xml
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/jrebel/
- copied from r1711723, openmeetings/branches/3.1.x/WebContent/jrebel/
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/quick.xml
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/root/
- copied from r1711723, openmeetings/branches/3.1.x/WebContent/red5/
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/scripts/
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/scripts/admin.bat
- copied unchanged from r1711723, openmeetings/branches/3.1.x/WebContent/red5/admin.bat
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/scripts/admin.sh
- copied unchanged from r1711723, openmeetings/branches/3.1.x/WebContent/red5/admin.sh
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/scripts/network_test.sh
- copied unchanged from r1711723, openmeetings/branches/3.1.x/WebContent/red5/network_test.sh
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/server.xml
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/unpacked.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/css/
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/css/jquery-ui.css
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/css/netcalc.css
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/css/site.css
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/
- copied from r1711723, openmeetings/branches/3.1.x/xdocs/images/
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/drupal_module_configuration.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/drupal_module_installation.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/drupal_room_configuration.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/eclipse-import-maven-project.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/logo_om1.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/logo_om_big2.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/logo_om_big3.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/logo_om_big4.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/logo_om_big5.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/logo_om_big6.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/logo_om_small2.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/logo_om_small3.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/logo_om_small4.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/logo_om_small5.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/logos/pb.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/moodle_add_activity_plugin.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/moodle_configure_plugin.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/images/moodle_install_plugin.png (with props)
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/js/
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/js/jquery-ui.min.js
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/js/netcalc.js
openmeetings/branches/3.1.x/openmeetings-server/src/site/resources/js/site.js
openmeetings/branches/3.1.x/openmeetings-server/src/site/site.xml
- copied, changed from r1711723, openmeetings/branches/3.1.x/xdocs/stylesheets/project.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/stylesheets/
- copied from r1711723, openmeetings/branches/3.1.x/xdocs/stylesheets/
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/
- copied from r1711723, openmeetings/branches/3.1.x/xdocs/
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/BuildInstructions_3.0.x.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/CallForLogo.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/NetworkCalculator.xml
openmeetings/branches/3.1.x/openmeetings-service/ (with props)
openmeetings/branches/3.1.x/openmeetings-service/pom.xml
openmeetings/branches/3.1.x/openmeetings-service/src/
openmeetings/branches/3.1.x/openmeetings-service/src/main/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/
- copied from r1711723, openmeetings/branches/3.1.x/src/web/java/org/apache/openmeetings/web/mail/template/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/quartz/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
openmeetings/branches/3.1.x/openmeetings-service/src/site/
openmeetings/branches/3.1.x/openmeetings-service/src/site/site.xml
openmeetings/branches/3.1.x/openmeetings-util/ (with props)
openmeetings/branches/3.1.x/openmeetings-util/pom.xml
openmeetings/branches/3.1.x/openmeetings-util/src/
openmeetings/branches/3.1.x/openmeetings-util/src/main/
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/CalendarHelper.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/CalendarPatterns.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/install/java/org/apache/openmeetings/cli/ConnectionProperties.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/DaoHelper.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/ImportHelper.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/InitializationContainer.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/InitializationContainer.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/Logger.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/Logger.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/OMContextListener.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/OmException.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/StoredFile.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/Version.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/XmlExport.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/XmlExport.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/
- copied from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/crypt/
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/
- copied from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/geom/
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/
- copied from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/mail/
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/
- copied from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/process/
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/
- copied from r1711723, openmeetings/branches/3.1.x/src/util/java/org/apache/openmeetings/util/stringhandlers/
openmeetings/branches/3.1.x/openmeetings-util/src/site/
openmeetings/branches/3.1.x/openmeetings-util/src/site/site.xml
openmeetings/branches/3.1.x/openmeetings-web/ (with props)
openmeetings/branches/3.1.x/openmeetings-web/pom.xml
openmeetings/branches/3.1.x/openmeetings-web/src/
openmeetings/branches/3.1.x/openmeetings-web/src/main/
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/
- copied from r1711723, openmeetings/branches/3.1.x/src/web/java/org/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/WEB-INF/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/conf/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/conf/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/css/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/css/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/default/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/default/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/images/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/images/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/js/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/js/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/languages/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/public/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/public/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/screensharing/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/screensharing/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/streams/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/streams/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/upload/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/upload/
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/uploadtemp/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/webapp/uploadtemp/
openmeetings/branches/3.1.x/openmeetings-web/src/site/
openmeetings/branches/3.1.x/openmeetings-web/src/site/site.xml
openmeetings/branches/3.1.x/openmeetings-web/src/test/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/
- copied from r1711723, openmeetings/branches/3.1.x/src/test/java/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/HeavyTests.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumTests.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java
- copied unchanged from r1711723, openmeetings/branches/3.1.x/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java
openmeetings/branches/3.1.x/openmeetings-webservice/ (with props)
openmeetings/branches/3.1.x/openmeetings-webservice/pom.xml
openmeetings/branches/3.1.x/openmeetings-webservice/src/
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/
- copied from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/CalendarWebService.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/FileWebService.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/JabberWebService.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomCountBean.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomReturn.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomUser.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/ServerWebService.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/
- copied from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/cluster/
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java
- copied, changed from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/cluster/sync/RestClient.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/site/
openmeetings/branches/3.1.x/openmeetings-webservice/src/site/site.xml
openmeetings/branches/3.1.x/pom.xml
Removed:
openmeetings/branches/3.1.x/.classpath
openmeetings/branches/3.1.x/.project
openmeetings/branches/3.1.x/.settings/
openmeetings/branches/3.1.x/.springBeans
openmeetings/branches/3.1.x/WebContent/
openmeetings/branches/3.1.x/build-jaudiotagger.xsl
openmeetings/branches/3.1.x/build.properties
openmeetings/branches/3.1.x/build.xml
openmeetings/branches/3.1.x/ivy.xml
openmeetings/branches/3.1.x/ivysettings.xml
openmeetings/branches/3.1.x/ivysettings.xsd
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/InvitationManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/user/
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestStateToLower.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestUserContact.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestUserCount.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestUserOrganisation.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestAuth.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/userdata/TestLogin.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionProperties.java
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/down.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/next.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/play.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/previous.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/stop.png
openmeetings/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/up.png
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/root/admin.bat
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/root/admin.sh
openmeetings/branches/3.1.x/openmeetings-server/src/main/assembly/root/network_test.sh
openmeetings/branches/3.1.x/openmeetings-server/src/site/stylesheets/project.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/stylesheets/project.xsd
openmeetings/branches/3.1.x/openmeetings-server/src/site/stylesheets/site.vsl
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ApiClassesTemplate.vm
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/ApiMethodsTemplate.vm
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/SoapRestAPI.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/css/
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/dependencies.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/images/
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/js/
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/license.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/mail-lists.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/stylesheets/
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/svn.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/team-list-ru.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/team-list.xml
openmeetings/branches/3.1.x/openmeetings-server/src/site/xdoc/website.xsd
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/mail/template/
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FormatHelper.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/screensharing/icon.jpg
openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/screensharing/splashicon.jpg
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/TestConnection.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/asf/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/chat/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/emotes/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/gui/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/jai/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/rdc/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/rtmp/
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/xsd/
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/axis/
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/sync/
openmeetings/branches/3.1.x/src/
openmeetings/branches/3.1.x/xdocs/
Modified:
openmeetings/branches/3.1.x/ (props changed)
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/beans/PrintBean.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/IRecordingConverter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/BaseStreamWriter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/CachedEvent.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamAudioWriter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamVideoWriter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/WhiteboardMapToSVG.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectListManagerById.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/CreateLibraryPresentation.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocuments.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryWmlLoader.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentation.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LoadLibraryPresentationToObject.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/SMSHandler.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ContactService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/DocumentService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/GroupService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/LanguageService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/PrintService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/UserService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/util/SessionVariablesUtil.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BaseHttpServlet.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/BeanUtil.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/ServerNotInitializedException.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/AbstractUploadController.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ExportToImage.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/NetworkTestingController.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/ScreenController.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/UploadController.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/ServerUtil.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/DatabaseStore.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/HashMapStore.java
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/store/IClientPersistenceStore.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/chat/TestChatLinking.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/emotes/TestChatParsing.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestSVGTextExporterArrow.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/KeyCodesTest.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/ReadKeyCodesTest.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java
openmeetings/branches/3.1.x/openmeetings-core/src/test/java/org/apache/openmeetings/test/xsd/GenerateWebsiteXsd.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
openmeetings/branches/3.1.x/openmeetings-server/src/site/stylesheets/errortable.xsl
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AppointmentReminderTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/MeetingReminderJob.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java
openmeetings/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5CryptImplementation.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/geom/GeomPoint.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java
openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/StringComparer.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/library/TestFileParser.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
openmeetings/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/session/TestHashMapSession.java
openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java
Propchange: openmeetings/branches/3.1.x/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 3 22:25:34 2015
@@ -1,4 +1,5 @@
-build
-dist
-.ant-targets-build.xml
+target
+.project
+.classpath
+.settings
Propchange: openmeetings/branches/3.1.x/openmeetings-core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 3 22:25:34 2015
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+
Added: openmeetings/branches/3.1.x/openmeetings-core/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/pom.xml?rev=1712427&view=auto
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/pom.xml (added)
+++ openmeetings/branches/3.1.x/openmeetings-core/pom.xml Tue Nov 3 22:25:34 2015
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file 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.
+-->
+<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>
+ <parent>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-parent</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openmeetings-core</artifactId>
+ <packaging>jar</packaging>
+ <name>Openmeetings Core</name>
+ <description>TODO</description>
+ <properties>
+ <velocity.version>1.7</velocity.version>
+ <smslib.version>3.5.4</smslib.version>
+ <derby.version>10.10.1.1</derby.version>
+ <site.basedir>${project.parent.basedir}</site.basedir>
+ <skip.site.copy>false</skip.site.copy>
+ </properties>
+ <repositories>
+ <repository>
+ <id>smslib</id>
+ <url>http://smslib.org/maven2/v3</url>
+ </repository>
+ </repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-db</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>${velocity.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-svg-dom</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-svggen</artifactId>
+ <version>${batik.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-transcoder</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.smslib</groupId>
+ <artifactId>smslib</artifactId>
+ <version>${smslib.version}</version>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-install</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.red5</groupId>
+ <artifactId>red5-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.thaiopensource</groupId>
+ <artifactId>trang</artifactId>
+ <version>20091111</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-all</artifactId>
+ <version>1.0.0-M32</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/beans/PrintBean.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/beans/PrintBean.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/beans/PrintBean.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/batik/beans/PrintBean.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.batik.beans;
+package org.apache.openmeetings.core.batik.beans;
import java.util.List;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java Tue Nov 3 22:25:34 2015
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
-import static org.apache.openmeetings.data.flvrecord.listener.async.BaseStreamWriter.TIME_TO_WAIT_FOR_FRAME;
+import static org.apache.openmeetings.core.data.flvrecord.listener.async.BaseStreamWriter.TIME_TO_WAIT_FOR_FRAME;
import static org.apache.openmeetings.util.OmFileHelper.MP4_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.OGG_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.getRecording;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java Tue Nov 3 22:25:34 2015
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
import java.util.ArrayList;
@@ -29,7 +30,6 @@ import java.util.regex.Pattern;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingLogDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -38,8 +38,7 @@ import org.springframework.beans.factory
public class FlvExplorerConverter extends BaseConverter {
- private static final Logger log = Red5LoggerFactory.getLogger(
- FlvExplorerConverter.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(FlvExplorerConverter.class, webAppRootKey);
// Spring loaded Beans
@Autowired
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvInterviewConverter.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvRecorderConverter.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.bigImagePrefix;
import static org.apache.openmeetings.util.OmFileHelper.chatImagePrefix;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateThumbs.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/IRecordingConverter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/IRecordingConverter.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/IRecordingConverter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/IRecordingConverter.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.converter;
+package org.apache.openmeetings.core.converter;
public interface IRecordingConverter {
void startConversion(Long recordingId);
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/beans/rooms/RoomsList.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.beans.rooms;
+package org.apache.openmeetings.core.data.beans.rooms;
import org.apache.openmeetings.db.entity.room.Room;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.conference;
+package org.apache.openmeetings.core.data.conference;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.file;
+package org.apache.openmeetings.core.data.file;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
@@ -26,12 +26,12 @@ import java.util.Date;
import java.util.List;
import org.apache.commons.transaction.util.FileHelper;
-import org.apache.openmeetings.converter.FlvExplorerConverter;
-import org.apache.openmeetings.converter.GenerateImage;
-import org.apache.openmeetings.converter.GenerateThumbs;
+import org.apache.openmeetings.core.converter.FlvExplorerConverter;
+import org.apache.openmeetings.core.converter.GenerateImage;
+import org.apache.openmeetings.core.converter.GenerateThumbs;
import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
-import org.apache.openmeetings.documents.GeneratePDF;
+import org.apache.openmeetings.core.documents.GeneratePDF;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.StoredFile;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileUtils.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.file;
+package org.apache.openmeetings.core.data.file;
import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvInterviewConverterTask.java Tue Nov 3 22:25:34 2015
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.converter;
+package org.apache.openmeetings.core.data.flvrecord.converter;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import org.apache.openmeetings.converter.FlvInterviewConverter;
+import org.apache.openmeetings.core.converter.FlvInterviewConverter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/converter/FlvRecorderConverterTask.java Tue Nov 3 22:25:34 2015
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.converter;
+package org.apache.openmeetings.core.data.flvrecord.converter;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import org.apache.openmeetings.converter.FlvRecorderConverter;
+import org.apache.openmeetings.core.converter.FlvRecorderConverter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/StreamListener.java Tue Nov 3 22:25:34 2015
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.listener;
+package org.apache.openmeetings.core.data.flvrecord.listener;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.util.Date;
-import org.apache.openmeetings.data.flvrecord.listener.async.BaseStreamWriter;
-import org.apache.openmeetings.data.flvrecord.listener.async.CachedEvent;
-import org.apache.openmeetings.data.flvrecord.listener.async.StreamAudioWriter;
-import org.apache.openmeetings.data.flvrecord.listener.async.StreamVideoWriter;
+import org.apache.openmeetings.core.data.flvrecord.listener.async.BaseStreamWriter;
+import org.apache.openmeetings.core.data.flvrecord.listener.async.CachedEvent;
+import org.apache.openmeetings.core.data.flvrecord.listener.async.StreamAudioWriter;
+import org.apache.openmeetings.core.data.flvrecord.listener.async.StreamVideoWriter;
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDataDao;
import org.apache.openmeetings.db.dao.record.FlvRecordingMetaDeltaDao;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/BaseStreamWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/BaseStreamWriter.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/BaseStreamWriter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/BaseStreamWriter.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.listener.async;
+package org.apache.openmeetings.core.data.flvrecord.listener.async;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/CachedEvent.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/CachedEvent.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/CachedEvent.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/CachedEvent.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.listener.async;
+package org.apache.openmeetings.core.data.flvrecord.listener.async;
import java.util.Date;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamAudioWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamAudioWriter.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamAudioWriter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamAudioWriter.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.listener.async;
+package org.apache.openmeetings.core.data.flvrecord.listener.async;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.red5.io.IoConstants.TYPE_AUDIO;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamVideoWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamVideoWriter.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamVideoWriter.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/flvrecord/listener/async/StreamVideoWriter.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.flvrecord.listener.async;
+package org.apache.openmeetings.core.data.flvrecord.listener.async;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.red5.server.net.rtmp.event.VideoData.FrameType.KEYFRAME;
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java?rev=1712427&r1=1711723&r2=1712427&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/BatikMethods.java Tue Nov 3 22:25:34 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.data.record;
+package org.apache.openmeetings.core.data.record;
import java.awt.AlphaComposite;
import java.awt.BasicStroke;