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 2014/09/19 11:38:06 UTC
svn commit: r1626161 - in /openmeetings/trunk/singlewebapp:
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/
openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
openmeetings-core/src/main/java/org/apache/op...
Author: solomax
Date: Fri Sep 19 09:38:06 2014
New Revision: 1626161
URL: http://svn.apache.org/r1626161
Log:
Redundant files are removed; images relocated
Added:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/logo.png
- copied unchanged from r1626137, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/themes/basic-theme/general/logo.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/wizzard_button_1.png
- copied unchanged from r1626159, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/themes/basic-theme/dashboard/wizzard_button_1.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/wizzard_button_2.png
- copied unchanged from r1626137, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/themes/basic-theme/dashboard/wizzard_button_2.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/wizzard_button_3.png
- copied unchanged from r1626137, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/themes/basic-theme/dashboard/wizzard_button_3.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/wizzard_button_4.png
- copied unchanged from r1626137, openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/themes/basic-theme/dashboard/wizzard_button_4.png
Removed:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/config.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/config.xsd
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/emoticons/
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/theme.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/theme.xsd
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/themes/basic-theme/dashboard/wizzard_button_1.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/themes/basic-theme/dashboard/wizzard_button_2.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/themes/basic-theme/dashboard/wizzard_button_3.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/themes/basic-theme/dashboard/wizzard_button_4.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/public/themes/basic-theme/general/logo.png
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1626161&r1=1626160&r2=1626161&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Fri Sep 19 09:38:06 2014
@@ -33,7 +33,6 @@ import java.util.Set;
import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.core.data.conference.RoomManager;
-import org.apache.openmeetings.core.data.whiteboard.EmoticonsManager;
import org.apache.openmeetings.core.data.whiteboard.WhiteboardManager;
import org.apache.openmeetings.core.remote.FLVRecorderService;
import org.apache.openmeetings.core.remote.WhiteBoardService;
@@ -83,8 +82,6 @@ public class ScopeApplicationAdapter ext
@Autowired
private ISessionManager sessionManager;
@Autowired
- private EmoticonsManager emoticonsManager;
- @Autowired
private WhiteBoardService whiteBoardService;
@Autowired
private WhiteboardManager whiteboardManagement;
@@ -130,10 +127,6 @@ public class ScopeApplicationAdapter ext
getCryptKey();
// init your handler here
- // The scheduled Jobs did go into the Spring-Managed Beans, see schedulerJobs.service.xml
- // Spring Definition does not work here, its too early, Instance is not set yet
- emoticonsManager.loadEmot();
-
for (String scopeName : scope.getScopeNames()) {
log.debug("scopeName :: " + scopeName);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1626161&r1=1626160&r2=1626161&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Fri Sep 19 09:38:06 2014
@@ -63,7 +63,6 @@
-->
</property>
</bean>
- <bean id="openmeetings.EmoticonsManager" class="org.apache.openmeetings.core.data.whiteboard.EmoticonsManager" />
<!-- Singletons for memory based cache -->
<bean id="openmeetings.HashMapStore" scope="singleton" class="org.apache.openmeetings.core.session.store.HashMapStore" />
@@ -90,7 +89,6 @@
<bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.core.data.file.FileProcessor" />
<bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.core.converter.FlvExplorerConverter" />
<bean id="conferenceservice.service" class="org.apache.openmeetings.core.remote.ConferenceService" />
- <bean id="chatservice.service" class="org.apache.openmeetings.core.remote.ChatService" />
<bean id="flvrecorderservice.service" class="org.apache.openmeetings.core.remote.FLVRecorderService" />
<bean id="openmeetings.FlvRecorderConverterTask" class="org.apache.openmeetings.core.data.flvrecord.converter.FlvRecorderConverterTask" />
<bean id="openmeetings.FlvInterviewConverterTask" class="org.apache.openmeetings.core.data.flvrecord.converter.FlvInterviewConverterTask" />
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css?rev=1626161&r1=1626160&r2=1626161&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css Fri Sep 19 09:38:06 2014
@@ -25,7 +25,7 @@ html, body {
font-size: 28px;
line-height: 40px;
font-weight: bold;
- background-image: url(../public/themes/basic-theme/general/logo.png);
+ background-image: url(images/logo.png);
background-repeat: no-repeat;
padding-left: 150px;
margin-bottom: 10px;
@@ -253,18 +253,18 @@ html, body {
display: inline-block;
}
.start_step1 {
- background-image: url(../public/themes/basic-theme/dashboard/wizzard_button_1.png);
+ background-image: url(images/wizzard_button_1.png);
}
.start_step2 {
- background-image: url(../public/themes/basic-theme/dashboard/wizzard_button_2.png);
+ background-image: url(images/wizzard_button_2.png);
margin-left: 20px;
}
.start_step3 {
- background-image: url(../public/themes/basic-theme/dashboard/wizzard_button_3.png);
+ background-image: url(images/wizzard_button_3.png);
margin-left: 40px;
}
.start_step4 {
- background-image: url(../public/themes/basic-theme/dashboard/wizzard_button_4.png);
+ background-image: url(images/wizzard_button_4.png);
margin-left: 60px;
}
.widget {