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 2013/05/31 05:48:12 UTC

svn commit: r1488083 - in /openmeetings/trunk/singlewebapp: ./ WebContent/ WebContent/WEB-INF/ WebContent/openmeetings/ WebContent/openmeetings/js/ WebContent/openmeetings/public/ WebContent/src/base/ WebContent/src/modules/conference/testsetup/ WebCon...

Author: solomax
Date: Fri May 31 03:48:11 2013
New Revision: 1488083

URL: http://svn.apache.org/r1488083
Log:
Wicket ignore paths are improved;
All non-wicket files are moved to "public" folder;
Admin section in swf version is switched off;

Added:
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/js/openmeetings_functions.js
      - copied unchanged from r1487764, openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings_functions.js
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
      - copied unchanged from r1487764, openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
      - copied unchanged from r1487764, openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/favicon.ico
      - copied unchanged from r1487764, openmeetings/trunk/singlewebapp/WebContent/openmeetings/favicon.ico
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/theme.xml
      - copied, changed from r1487764, openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/theme.xsd
      - copied unchanged from r1487764, openmeetings/trunk/singlewebapp/WebContent/openmeetings/theme.xsd
Removed:
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xsd
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/favicon.ico
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings_functions.js
    openmeetings/trunk/singlewebapp/WebContent/openmeetings/theme.xsd
    openmeetings/trunk/singlewebapp/WebContent/sipindex.html
Modified:
    openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
    openmeetings/trunk/singlewebapp/WebContent/project.xsd
    openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/base/mainDatasets.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainDatasets.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/BaseURLLoadTest.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/NetworkTest.lzx
    openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/UploadSpeedTest.lzx
    openmeetings/trunk/singlewebapp/build.xml
    openmeetings/trunk/singlewebapp/docs/CalendarAndTimezone.html
    openmeetings/trunk/singlewebapp/docs/CustomRoomTypeHowTo.html
    openmeetings/trunk/singlewebapp/docs/PortSettings.html
    openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
    openmeetings/trunk/singlewebapp/docs/WebappNamePath.html
    openmeetings/trunk/singlewebapp/docs/WebcamResolutions.html
    openmeetings/trunk/singlewebapp/docs/red5sip-integration_2.1.html
    openmeetings/trunk/singlewebapp/docs/themes-and-branding.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/swf-functions.js
    openmeetings/trunk/singlewebapp/xdocs/CalendarAndTimezone.xml
    openmeetings/trunk/singlewebapp/xdocs/CustomRoomTypeHowTo.xml
    openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml
    openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
    openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml
    openmeetings/trunk/singlewebapp/xdocs/WebcamResolutions.xml
    openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml
    openmeetings/trunk/singlewebapp/xdocs/themes-and-branding.xml

Modified: openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/WEB-INF/web.xml Fri May 31 03:48:11 2013
@@ -57,7 +57,7 @@
 		</init-param>
 		<init-param>
 			<param-name>ignorePaths</param-name>
-			<param-value>conf,css,default,docs,images,js,persistence,public,screensharing,streams,upload,uploadtemp,services</param-value>
+			<param-value>conf,css,default,docs,images,js,persistence,public,screensharing,streams,upload,uploadtemp,services,networktest.,upload.,remotelog.,screen.,DownloadHandler</param-value>
 		</init-param>
 	</filter>
 	<filter-mapping>

Copied: openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/theme.xml (from r1487764, openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/theme.xml?p2=openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/theme.xml&p1=openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml&r1=1487764&r2=1488083&rev=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/theme.xml Fri May 31 03:48:11 2013
@@ -57,302 +57,302 @@
 	<resource name="logo_image" 
 				description="Logo to display on Main BG Navi" 
 				license="APL"
-				src="public/themes/basic-theme/general/logo.png" />
+				src="themes/basic-theme/general/logo.png" />
 	
 	<resource name="icon_facebook_rsc_png" 
 				description="Icon for facebook button in login" 
 				license="Unkown"
-				src="public/themes/basic-theme/auth/icon_facebook.png" />
+				src="themes/basic-theme/auth/icon_facebook.png" />
 				
 	<resource name="warning_popup_icon_rsc" 
 				description="Toolbar Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/error.png" />	
+				src="themes/basic-theme/general/error.png" />	
 				
 	<resource name="info_text_icon_rsc" 
 				description="Info Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/information.png" />
+				src="themes/basic-theme/general/information.png" />
 	
 	<!-- Save Toolbar (for example Admin section) -->
 	
 	<resource name="filesave_rsc" 
 				description="Save Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/disk.png" />
+				src="themes/basic-theme/general/disk.png" />
 
 	<resource name="edit_add_rsc" 
 				description="Save Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/general/plus_icon.png" />
+				src="themes/basic-theme/general/plus_icon.png" />
 
 	<resource name="reload_rsc" 
 				description="Save Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/arrow_refresh_small.png" />
+				src="themes/basic-theme/general/arrow_refresh_small.png" />
 	
 	<resource name="button_cancel_rsc" 
 				description="Save Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/general/cancel_icon.png" />
+				src="themes/basic-theme/general/cancel_icon.png" />
 
 	<resource name="add_rsc" 
 				description="Edit Add Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/general/add.png" />
+				src="themes/basic-theme/general/add.png" />
 				
 	<resource name="date_icon_rsc" 
 				description="Edit Add Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/calendar_view_week.png" />
+				src="themes/basic-theme/general/calendar_view_week.png" />
 				
 	<!-- Sorted list -->
 	
 	<resource name="step_back_two_arrow" 
 				description="Step to first" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/resultset_first.png" />
+				src="themes/basic-theme/general/resultset_first.png" />
 				
 	<resource name="step_fwd_two_arrow" 
 				description="Step to last" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/resultset_last.png" />
+				src="themes/basic-theme/general/resultset_last.png" />
 						
     <resource name="step_back_arrow" 
     			description="Step one back" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/resultset_previous.png" />
+				src="themes/basic-theme/general/resultset_previous.png" />
     
     <resource name="step_fwd_arrow" 
     			description="Step one next" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/resultset_next.png" />
+				src="themes/basic-theme/general/resultset_next.png" />
 				
     <resource name="sort_up_rsc" 
     			description="Sort up" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/resultset_up.png" />
+				src="themes/basic-theme/general/resultset_up.png" />
     
     <resource name="sort_down_rsc" 
     			description="Sort down" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/resultset_down.png" />
+				src="themes/basic-theme/general/resultset_down.png" />
     
     <!-- Chat toolbar -->
     
     <resource name="font_style" 
     			description="Change font style button" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/style.png" />
+				src="themes/basic-theme/general/style.png" />
     
     <resource name="font_bold" 
     			description="Bold font style button" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/text_bold.png" />
+				src="themes/basic-theme/general/text_bold.png" />
     
     <resource name="font_italic" 
     			description="Italic font style button" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/text_italic.png" />
+				src="themes/basic-theme/general/text_italic.png" />
     
     <resource name="font_underline" 
     			description="Underline font style button" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/text_underline.png" />
+				src="themes/basic-theme/general/text_underline.png" />
     
     <resource name="font_color" 
     			description="Change font color button" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/color_swatch.png" />
+				src="themes/basic-theme/general/color_swatch.png" />
     
     <resource name="hyperlink" 
     			description="Insert hyperlink button" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/world_link.png" />
+				src="themes/basic-theme/general/world_link.png" />
 				
 	<!-- Whiteboard Toolbar -->
 	
 	<resource name="plain" 
 				description="Toolbar Icon" 
 				license="APL author sebawagner"
-				src="public/themes/basic-theme/whiteboard/delete_all.png" />
+				src="themes/basic-theme/whiteboard/delete_all.png" />
 	
 	<resource name="plainSlides" 
 				description="Toolbar Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/whiteboard/page_delete.png" />
+				src="themes/basic-theme/whiteboard/page_delete.png" />
 	
 	<resource name="arrow_draw_panel_tool_cursor" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/arrow_cursor_tool.png" />
+				src="themes/basic-theme/whiteboard/arrow_cursor_tool.png" />
 
 	<resource name="saveobj" 
 				description="Toolbar Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/general/disk.png" />
+				src="themes/basic-theme/general/disk.png" />
 
 	<resource name="revert" 
 				description="Toolbar Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/whiteboard/arrow_rotate_anticlockwise.png" />
+				src="themes/basic-theme/whiteboard/arrow_rotate_anticlockwise.png" />
 
 	<resource name="next" 
 				description="Toolbar Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/whiteboard/arrow_rotate_clockwise.png" />
+				src="themes/basic-theme/whiteboard/arrow_rotate_clockwise.png" />
 
 	<resource name="menupointer_rsc" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/menupointer.png" />
+				src="themes/basic-theme/whiteboard/menupointer.png" />
 				
 	<resource name="pointer_whiteboard_menu_rsc" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/pointerWhiteBoard_menu_rsc.png" />
+				src="themes/basic-theme/whiteboard/pointerWhiteBoard_menu_rsc.png" />
 				
 	<resource name="letter" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/letter.png" />
+				src="themes/basic-theme/whiteboard/letter.png" />
 
 	<resource name="paint" 
 				description="Toolbar Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/whiteboard/pencil.png" />
+				src="themes/basic-theme/whiteboard/pencil.png" />
 	
 	<resource name="line_rsc" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/line.png" />	
+				src="themes/basic-theme/whiteboard/line.png" />	
 	
 	<resource name="uline_rsc" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/uline.png" />	
+				src="themes/basic-theme/whiteboard/uline.png" />	
 		
 	<resource name="rectangle" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/rectangle.png" />	
+				src="themes/basic-theme/whiteboard/rectangle.png" />	
 
 	<resource name="ellipse" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/ellipse.png" />	
+				src="themes/basic-theme/whiteboard/ellipse.png" />	
 				
 	<resource name="drawarrowicon_rsc" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/drawarrowicon.png" />			
+				src="themes/basic-theme/whiteboard/drawarrowicon.png" />			
 		
 	<!-- whiteboard general -->		
 				
 	<resource name="bounding_box_delete_item_rsc" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/general/cancel_icon_small.png" />	
+				src="themes/basic-theme/general/cancel_icon_small.png" />	
 	
 	<resource name="bounding_box_textedit_item_rsc" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/text_signature.png" />				
+				src="themes/basic-theme/whiteboard/text_signature.png" />				
 					
 	<!-- document Tools -->	
 	
 	<resource name="doc_next" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/doc_next.png" />		
+				src="themes/basic-theme/whiteboard/doc_next.png" />		
 				
 	<resource name="doc_pre" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/doc_pre.png" />		
+				src="themes/basic-theme/whiteboard/doc_pre.png" />		
 				
 	<resource name="doc_first" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/doc_first.png" />		
+				src="themes/basic-theme/whiteboard/doc_first.png" />		
 				
 	<resource name="doc_last" 
 				description="Toolbar Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/whiteboard/doc_last.png" />		
+				src="themes/basic-theme/whiteboard/doc_last.png" />		
 				
 	<!-- property panel -->	
 	<resource name="colorlinechoose_rsc" 
 				description="Property bar icon line color" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/whiteboard/pencil.png" />
+				src="themes/basic-theme/whiteboard/pencil.png" />
 	
 	<resource name="colorfillchoose_rsc" 
 				description="Property bar icon fill color" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/whiteboard/paintcan.png" />
+				src="themes/basic-theme/whiteboard/paintcan.png" />
 	
 	<resource name="color_lock_rsc" 
 				description="Property bar icon color lock" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/whiteboard/lock.png" />
+				src="themes/basic-theme/whiteboard/lock.png" />
 	
 	<resource name="color_lock_open_rsc" 
 				description="Property bar icon color lock open" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/whiteboard/lock_open.png" />	
+				src="themes/basic-theme/whiteboard/lock_open.png" />	
 				
 	<!-- Dashboard -->
 	
 	<resource name="icon_btn_dashboard_1" 
 				description="Info Guide Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/dashboard/wizzard_button_1.png" />
+				src="themes/basic-theme/dashboard/wizzard_button_1.png" />
 				
     <resource name="icon_btn_dashboard_2" 
     			description="Info Guide Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/dashboard/wizzard_button_2.png" />
+				src="themes/basic-theme/dashboard/wizzard_button_2.png" />
 				
     <resource name="icon_btn_dashboard_3" 
     			description="Info Guide Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/dashboard/wizzard_button_3.png" />
+				src="themes/basic-theme/dashboard/wizzard_button_3.png" />
 				
     <resource name="icon_btn_dashboard_4" 
     			description="Info Guide Icon" 
 				license="APL Author sebawagner"
-				src="public/themes/basic-theme/dashboard/wizzard_button_4.png" />
+				src="themes/basic-theme/dashboard/wizzard_button_4.png" />
 	
 	<resource name="icon_btn_rss_conference" 
     			description="RSS Tab Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/dashboard/feed.png" />
+				src="themes/basic-theme/dashboard/feed.png" />
 	
 	<resource name="icon_btn_chat_dashboard" 
 				description="Chat Tab Icon" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/dashboard/comments.png" />
+				src="themes/basic-theme/dashboard/comments.png" />
 	
     <resource name="icon_btn_rooms_conference" 
 				description="Conference Room Tab Icon" 
 				license="APL author sebawagner"
-				src="public/themes/basic-theme/dashboard/conference_icon_normal.png" />	
+				src="themes/basic-theme/dashboard/conference_icon_normal.png" />	
 				
 	<!-- Conference room -->	
 	<resource name="users_tab_btn" 
 				description="Conference Room Tab User" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/conference/group.png" />
+				src="themes/basic-theme/conference/group.png" />
 		
 	<resource name="files_tab_btn" 
 				description="Conference Room Tab Files" 
 				license="FamFam Icon Set"
-				src="public/themes/basic-theme/conference/folder_explore.png" />
+				src="themes/basic-theme/conference/folder_explore.png" />
 	
 	<resource name="exit_btn_rsc" 
 				description="Conference Room Tab Icon" 
 				license="APL author sebawagner"
-				src="public/themes/basic-theme/conference/exit_button.png" />			
+				src="themes/basic-theme/conference/exit_button.png" />			
 	
 </theme>
\ No newline at end of file

Modified: openmeetings/trunk/singlewebapp/WebContent/project.xsd
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/project.xsd?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/project.xsd (original)
+++ openmeetings/trunk/singlewebapp/WebContent/project.xsd Fri May 31 03:48:11 2013
@@ -908,7 +908,7 @@ This is used in the conference.
 <xs:documentation xml:lang="en">
  
 		indicates if the message should be send, you can change the notification 
-		level by changing the loudnessAcitviation in the config.xml
+		level by changing the loudnessAcitviation in the public/config.xml
 	 </xs:documentation>
 </xs:annotation>
 </xs:attribute>

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Fri May 31 03:48:11 2013
@@ -24,7 +24,7 @@
 <library>
 <!-- 
 ##########################################################
-these properties will be overwritten by config.xml -->  
+these properties will be overwritten by public/config.xml -->  
 
 <attribute name="vid_lc_name" value="" type="string"/>
 
@@ -110,15 +110,15 @@ Attributes needed for clustering -->
 
 <attribute name="isSlaveHosted" value="false" type="boolean" />
 
-<!-- server object's address (not loaded from config.xml cause this variable is empty by default) -->
+<!-- server object's address (not loaded from public/config.xml cause this variable is empty by default) -->
 <attribute name="slaveRtmphostlocal" value="" type="string" />
-<!-- rtmpport from slave's config.xml  --> 
+<!-- rtmpport from slave's public/config.xml  --> 
 <attribute name="slaveRtmpport" value="5080" type="string" />
-<!-- rtmpTunnelport from slave's config.xml -->
+<!-- rtmpTunnelport from slave's public/config.xml -->
 <attribute name="slaveRtmpTunnelport" value="8088" type="string" />
-<!-- rtmpsslport from slave's config.xml -->
+<!-- rtmpsslport from slave's public/config.xml -->
 <attribute name="slaveRtmpsslport" value="443" type="string" />
-<!-- from slave's config.xml -->
+<!-- from slave's public/config.xml -->
 <attribute name="slaveWebAppRootKey" value="" type="string" /> 
 
 <!--
@@ -146,7 +146,7 @@ Attributes needed for clustering -->
 <attribute name="defaultWhiteboardWidth" value="2400" type="number" />
 <attribute name="defaultWhiteboardHeight" value="1200" type="number" />
 
-<!-- END OF config.xml attributes
+<!-- END OF public/config.xml attributes
 ##########################################################
  -->
 
@@ -264,7 +264,7 @@ the LAST RoomClient Object that has been
 <attribute name="roomTypesInitValues" value="null" />
 
 <!--- Audio-Video Quality Settings
-    overwritten by values from the config.xml 
+    overwritten by values from the public/config.xml 
  -->
 <attribute name="codecType" value="h264" type="string" />
 <attribute name="framesPerSecond" value="30" type="number" />

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainDatasets.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainDatasets.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainDatasets.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainDatasets.lzx Fri May 31 03:48:11 2013
@@ -23,7 +23,7 @@
 
 <library>
 
-<!-- get values from config.xml -->
+<!-- get values from public/config.xml -->
 <dataset type="http" name="myConfigSet" request="false" ondata="parent.mainTheme.loadTheme()">
     <handler name="oninit">
         var d = new Date();
@@ -41,11 +41,11 @@
     </handler>
 </dataset>
 
-<!-- get values from config.xml -->
+<!-- get values from public/config.xml -->
 <dataset type="http" name="mainTheme" request="false" ondata="canvas.myinit()">
     <method name="loadTheme">
         var d = new Date();
-        this.setAttribute("src","default-theme.xml?random="+d.getTime());
+        this.setAttribute("src","theme.xml?random="+d.getTime());
         this.doRequest();
     </method>
     <handler name="ondata">

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Fri May 31 03:48:11 2013
@@ -118,7 +118,7 @@
     	if ($debug) Debug.write(message);
     	var remoteLog = new lz.dataset();
     	remoteLog.setQueryType("POST");
-    	remoteLog.setAttribute("src", canvas.getUrl() + "/remotelog.upload");
+    	remoteLog.setAttribute("src", canvas.getUrl() + "remotelog.upload");
     	remoteLog.setQueryParam("message", message);
     	remoteLog.doRequest();
     </method>
@@ -152,7 +152,7 @@
 	</method>
 
 	<method name="getAppBaseUrlWithoutSwfSuffix">
-		<![CDATA[
+	<![CDATA[
 		var urlObject = lz.Browser.getBaseURL();
 		//If Port is Null or undefinied use port 80
 		var port = (urlObject.port != null && urlObject.port != undefined) ? urlObject.port : 80;
@@ -179,7 +179,7 @@
 		
 		var appBase = canvas.getAppBaseUrlWithoutSwfSuffix();
 		Debug.write("appBase=" + appBase);
-		var downloadurl = appBase + 'screen.upload?'
+		var downloadurl = appBase + '../screen.upload?'
 			+'rtmphostlocal=' + canvas.getHttpHost()
 			+'&baseurl=' + escape(appBase)
 			+'&domain=' + hib.conferencedomain
@@ -208,7 +208,7 @@
         
         if($debug) Debug.write("main.lzx/config.xml ondata",this);
         
-        //Set Config-values by config.xml, see comments on config.xml
+        //Set Config-values by public/config.xml, see comments on public/config.xml
         this.setAttribute('rtmphostlocal',canvas.myConfigSet.getPointer().xpathQuery('config/rtmphostlocal/text()'));   
         this.setAttribute('rtmpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpport/text()')));  
         this.setAttribute('rtmpTunnelport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpTunnelport/text()'))); 

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx Fri May 31 03:48:11 2013
@@ -22,7 +22,7 @@
 <library>
 <!-- 
 ##########################################################
-these properties can be overwritten by config.xml -->  
+these properties can be overwritten by public/config.xml -->  
    
    
 <!-- #############################################

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx Fri May 31 03:48:11 2013
@@ -62,13 +62,13 @@ RTMP-host, RTMP/RTMPT-port for the sessi
 			if ($debug) Debug.write("getServerForSession ",value);
 			//if return value is null, everything stays the same, session is on the current host
 			if (value != null){
-				//is not loaded from config.xml from slave as this is variable is empty by default!
+				//is not loaded from public/config.xml from slave as this is variable is empty by default!
 				canvas.slaveRtmphostlocal = value.address;
 				
 				var slaveUrl = value.protocol + "://" + value.address + ":" + value.port + "/" + value.webapp + "/";
 				
 				var d = new Date();
-		        parent.myConfigSet.setAttribute("src", slaveUrl + "config.xml?random="+d.getTime());
+		        parent.myConfigSet.setAttribute("src", slaveUrl + "public/config.xml?random="+d.getTime());
 		        parent.myConfigSet.doRequest();
 				
 			} else {
@@ -79,7 +79,7 @@ RTMP-host, RTMP/RTMPT-port for the sessi
 		</handler>
 	</netRemoteCallHib>	
 	
-	<!-- get values from config.xml from slave -->
+	<!-- get values from public/config.xml from slave -->
 	<dataset type="http" name="myConfigSet" request="false" ondata="parent.parseResultsToSlaveClusterConfig()">
 	    <handler name="ondata">
 	        if ($debug) Debug.write("ondata");

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx Fri May 31 03:48:11 2013
@@ -25,7 +25,7 @@
 	
 	<!--- 
 	   Audio-Video Quality Settings
-		overwritten by values from the config.xml 
+		overwritten by values from the public/config.xml 
 	 -->
 	<attribute name="codecType" value="h264" type="string" />
 	<attribute name="framesPerSecond" value="30" type="number" />

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainDatasets.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainDatasets.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainDatasets.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainDatasets.lzx Fri May 31 03:48:11 2013
@@ -23,7 +23,7 @@
 
 <library>
 
-<!-- get values from config.xml -->
+<!-- get values from public/config.xml -->
 <dataset type="http" name="myConfigSet" request="false" ondata="parent.mainTheme.loadTheme()" proxied="false">
     <handler name="oninit">
         var d = new Date();
@@ -45,11 +45,11 @@
 	
 </method>
 
-<!-- get values from config.xml -->
+<!-- get values from public/config.xml -->
 <dataset type="http" name="mainTheme" request="false" ondata="canvas.myinit()" proxied="false">
     <method name="loadTheme">
         var d = new Date();
-        this.setAttribute("src","default-theme.xml?random="+d.getTime());
+        this.setAttribute("src","theme.xml?random="+d.getTime());
         this.doRequest();
     </method>
     <handler name="ondata">

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/base/remote/baseVideoStreamDevice.lzx Fri May 31 03:48:11 2013
@@ -44,7 +44,7 @@
 		<!--- Message to send to Clients -->
 		<attribute name="objMessage" value="null" />
 		<!--- indicates if the message should be send, you can change the notification 
-			level by changing the loudnessAcitviation in the config.xml -->
+			level by changing the loudnessAcitviation in the public/config.xml -->
 		<attribute name="isgreater" value="false" type="boolean" />
 
 		<attribute name="doSendNotification" value="true" type="boolean" />

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/main.as3.lzx Fri May 31 03:48:11 2013
@@ -92,6 +92,20 @@
         return "" + Math.floor(999999*Math.random());
     </method>
 
+	<method name="getAppBaseUrlWithoutSwfSuffix">
+	<![CDATA[
+		var urlObject = lz.Browser.getBaseURL();
+		//If Port is Null or undefinied use port 80
+		var port = (urlObject.port != null && urlObject.port != undefined) ? urlObject.port : 80;
+		//if($debug) Debug.write("getBaseUrl:: [urlObject, port]", urlObject, port);
+		var url = "" + urlObject.protocol + "://" + urlObject.host + (port != 80 ? ":" + port : "") + urlObject.path;
+		//if($debug) Debug.write("!!!!!!! getBaseUrl:: [urlObject, port, url]", urlObject, port, url);
+		url = url + (url.slice(-1) == '/' ? '' : '/');
+		//if($debug) Debug.write("!!!!!!! getBaseUrl:: [last, url]", url.slice(-1), url);
+		return url;
+	]]>
+	</method>
+
     <handler name="oninit"><![CDATA[
 		doDebugInit();
     
@@ -121,7 +135,7 @@
             }
         }
         
-        var tSWFURL = "main" + ($debug ? "debug" : "") + ".swf8.swf?lzproxied=solo&lc_SID="+lc_SID+tqueryString;
+        var tSWFURL = getAppBaseUrlWithoutSwfSuffix() + "main" + ($debug ? "debug" : "") + ".swf8.swf?lzproxied=solo&lc_SID="+lc_SID+tqueryString;
         
         if ($debug) Debug.write("tSWFURL :: ",tSWFURL);
         
@@ -133,6 +147,7 @@
         new lz.commonVideoViewContentSWF10(this, {name:'_videoComponent'});
         new lz.hibAdapter(this);
 
+        if ($debug) Debug.write("main::init DONE");
     ]]></handler>
 
     <view name="inner"></view>

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/networktesting.lzx Fri May 31 03:48:11 2013
@@ -47,7 +47,7 @@
 	]]></handler>
 	
     <!--
-        These attributes are rewritten by values from "config.xml"
+        These attributes are rewritten by values from "public/config.xml"
     -->
     <attribute name="rtmpProtocol" type="string" value="rtmp" />
     <attribute name="rtmpHost" type="string" value="" />

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/BaseURLLoadTest.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/BaseURLLoadTest.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/BaseURLLoadTest.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/BaseURLLoadTest.lzx Fri May 31 03:48:11 2013
@@ -49,7 +49,7 @@
     <attribute name="loader" value="null" />
 
     <method name="initLoader">
-        hostUrl = protocol + "://" + host + ":" + port + canvas.uriContext + "/networktest.upload?testType=" + testTypeParameter;
+        hostUrl = getBaseUrl() + "networktest.upload?testType=" + testTypeParameter;
         request = new URLRequest(hostUrl);
 
         loader = new URLLoader();

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/NetworkTest.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/NetworkTest.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/NetworkTest.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/NetworkTest.lzx Fri May 31 03:48:11 2013
@@ -121,6 +121,11 @@
         if ($debug) Debug.write(str);
     </method>
 
+    <method name="getBaseUrl">
+    	var hostUrl = protocol + "://" + host + ":" + port + canvas.uriContext;
+    	return hostUrl + (hostUrl.slice(-1) == '/' ? '' : '/');
+    </method>
+
 </class>
 
 </library>

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/UploadSpeedTest.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/UploadSpeedTest.lzx?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/UploadSpeedTest.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/networkTesting/tests/UploadSpeedTest.lzx Fri May 31 03:48:11 2013
@@ -45,7 +45,7 @@
     </handler>
 
     <method name="initLoader">
-        hostUrl = protocol + "://" + host + ":" + port + canvas.uriContext + "/networktest.upload";
+        hostUrl = getBaseUrl() + "networktest.upload";
         request = new URLRequest(hostUrl);
         request.method = URLRequestMethod.POST;
         request.data = getDataString();

Modified: openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Fri May 31 03:48:11 2013
@@ -63,7 +63,7 @@
 	<property name="main.out.dir" value="${build.base.dir}/classes/openmeetings" />
 
 	<!-- LPS Properties -->
-	<property name="out.dir.swf" value="${basedir}/${dist.webapps.dir}/" />
+	<property name="out.dir.swf" value="${basedir}/${dist.webapps.dir}/public" />
 	<property name="laszlo.as3.src.dir" value="${webcontent.src.dir}/swf10" />
 	<property name="laszlo.src.dir" value="${webcontent.src.dir}/src" />
 
@@ -969,6 +969,11 @@
 				<include name="**/*"/>
 			</fileset>
 		</move>
+		<!-- FIXME !!!!!! UNCOMMENT
+		<delete>
+			<fileset dir="${red5.lib}/lib" includes="red5-client*.jar" />
+		</delete>
+		-->
 		
 		<!-- START of Tomcat 7 patch -->
 		<delete>

Modified: openmeetings/trunk/singlewebapp/docs/CalendarAndTimezone.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/CalendarAndTimezone.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/CalendarAndTimezone.html (original)
+++ openmeetings/trunk/singlewebapp/docs/CalendarAndTimezone.html Fri May 31 03:48:11 2013
@@ -688,7 +688,7 @@ limitations under the License.
       </td></tr>
       <tr><td>
         <blockquote>
-                                    <p>in the config.xml change the key: </p>
+                                    <p>in the public/config.xml change the key: </p>
                                                 <div class="xmlcode">
 				&lt;!--
 				<br />

Modified: openmeetings/trunk/singlewebapp/docs/CustomRoomTypeHowTo.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/CustomRoomTypeHowTo.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/CustomRoomTypeHowTo.html (original)
+++ openmeetings/trunk/singlewebapp/docs/CustomRoomTypeHowTo.html Fri May 31 03:48:11 2013
@@ -701,9 +701,9 @@ limitations under the License.
 					<tt>src/base/moduleConfiguration.lzx</tt>, 
 				here you need to add a default class name for your room type </li>
 				
-				<li>Add your room type in the real configuration: config.xml, add a new entry.
+				<li>Add your room type in the real configuration: public/config.xml, add a new entry.
 					<br />
-					You should fix also the file <tt>openmeetings-config.xsd</tt> that is the Schema file for the config.xml.
+					You should fix also the file <tt>public/config.xsd</tt> that is the Schema file for the public/config.xml.
 				</li>
         		
 				<li>Add a parser entry to modify the room type mapping: 

Modified: openmeetings/trunk/singlewebapp/docs/PortSettings.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/PortSettings.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/PortSettings.html (original)
+++ openmeetings/trunk/singlewebapp/docs/PortSettings.html Fri May 31 03:48:11 2013
@@ -675,7 +675,7 @@ limitations under the License.
 					need to restart the red5-service so that changes are online.
 				</li>
 				<li>Client-Side configuration:
-					$RED5_HOME/webapps/openmeetings/config.xml, you need to clear your
+					$RED5_HOME/webapps/openmeetings/public/config.xml, you need to clear your
 					browser cache after changing the file.
 				</li>
 				<li>
@@ -697,7 +697,7 @@ limitations under the License.
          Name in red5.properties 
     </th>
                                 <th bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
-         Name in config.xml 
+         Name in public/config.xml 
     </th>
             </tr>
                                 <tr>

Modified: openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html Fri May 31 03:48:11 2013
@@ -782,7 +782,7 @@ limitations under the License.
 				</li>
 			
 				<li>
-					Edit red5/webapps/openmeetings/config.xml and set
+					Edit red5/webapps/openmeetings/public/config.xml and set
 					<tt>&lt;rtmpsslport&gt;5443&lt;/rtmpsslport&gt;</tt>
 					,
 					<tt>&lt;useSSL&gt;yes&lt;/useSSL&gt;</tt>
@@ -820,11 +820,11 @@ limitations under the License.
 					file to <tt>red5/conf/jee-container.xml</tt>
 				</li>
 				<li>
-					Edit red5/webapps/openmeetings/config.xml and set
+					Edit red5/webapps/openmeetings/public/config.xml and set
 					<tt>&lt;protocol&gt;https&lt;/protocol&gt;</tt>
 				</li>
 				<li>
-					Edit red5/webapps/openmeetings/config.xml and set
+					Edit red5/webapps/openmeetings/public/config.xml and set
 					<tt>red5httpport</tt> to <tt>https</tt> port
 				</li>
 				<li>In webapps/openmeetings/WEB-INF/conf/axis2.xml add (below the existing http transportReceiver (around line 225))

Modified: openmeetings/trunk/singlewebapp/docs/WebappNamePath.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/WebappNamePath.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/WebappNamePath.html (original)
+++ openmeetings/trunk/singlewebapp/docs/WebappNamePath.html Fri May 31 03:48:11 2013
@@ -652,8 +652,8 @@ limitations under the License.
                                                 <ol>
 				<li>create your logo image as PNG 40px height</li>
 				<li>replace <tt>/opt/red5/webapps/openmeetings/public/themes/basic-theme/general/logo.png</tt> with your logo file</li>
-				<li>(Advanced optional) you can modify <tt>/opt/red5/webapps/openmeetings/config.xml</tt> and modify <tt>appdisplay</tt> section: set position and display for the logo and/or name</li>
-				<li>(Advanced optional) you can modify <tt>/opt/red5/webapps/openmeetings/default-theme.xml</tt> (around line 57) and change image name/path</li>
+				<li>(Advanced optional) you can modify <tt>/opt/red5/webapps/openmeetings/public/config.xml</tt> and modify <tt>appdisplay</tt> section: set position and display for the logo and/or name</li>
+				<li>(Advanced optional) you can modify <tt>/opt/red5/webapps/openmeetings/public/theme.xml</tt> (around line 57) and change image name/path</li>
 			</ol>
                             </blockquote>
       </td></tr>
@@ -695,9 +695,9 @@ limitations under the License.
 				</li>
 				<li>
 					open
-					<tt>/opt/red5/webapps/yourmeetings/config.xml</tt>
+					<tt>/opt/red5/webapps/yourmeetings/public/config.xml</tt>
 					using your favorite text editor (for ex.
-					<tt>vim /opt/red5/webapps/yourmeetings/config.xml</tt>
+					<tt>vim /opt/red5/webapps/yourmeetings/public/config.xml</tt>
 					)
 				</li>
 				<li>
@@ -785,7 +785,7 @@ limitations under the License.
                                                 <p>
 				Please
 				<i>NOTE</i>
-				there are 3 additional properties in the config.xml file which
+				there are 3 additional properties in the public/config.xml file which
 				should be modified for
 				<strong>TOTAL</strong>
 				Openmeetings clean up:

Modified: openmeetings/trunk/singlewebapp/docs/WebcamResolutions.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/WebcamResolutions.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/WebcamResolutions.html (original)
+++ openmeetings/trunk/singlewebapp/docs/WebcamResolutions.html Fri May 31 03:48:11 2013
@@ -651,7 +651,7 @@ limitations under the License.
                                     <p>When you choose the webcam you have different resolutions
 				available the user can choose from. </p>
                                                 <p>You can add/remove resolutions and also change the default
-				selection. In the config.xml there is a section: </p>
+				selection. In the public/config.xml there is a section: </p>
                                                 <div class="xmlcode">
 				&lt;availableCameraResolutions&gt;<br />
 				<div style="margin-left:20px">
@@ -673,9 +673,9 @@ limitations under the License.
 				    </div>
 				&lt;/availableCameraResolutions&gt;			 
 			</div>
-                                                <p>Tip: You might edit the config.xml with an XML aware editor that correctly 
+                                                <p>Tip: You might edit the public/config.xml with an XML aware editor that correctly 
 		    handles the XSD defintion to avoid misconfiguration. The openmeetings-config.xsd 
-		    is in the same folder like the config.xml. </p>
+		    is in the same folder like the public/config.xml. </p>
                             </blockquote>
       </td></tr>
       <tr><td><br/></td></tr>

Modified: openmeetings/trunk/singlewebapp/docs/red5sip-integration_2.1.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/red5sip-integration_2.1.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/red5sip-integration_2.1.html (original)
+++ openmeetings/trunk/singlewebapp/docs/red5sip-integration_2.1.html Fri May 31 03:48:11 2013
@@ -955,7 +955,7 @@ limitations under the License.
 						red5.host=127.0.0.1 # red5 server address<br />
 						om.context=openmeetings # Openmeetings context<br /> 
 						red5.codec=asao<br />
-						red5.codec.rate=22 # should correlate with mic settings in config.xml<br />
+						red5.codec.rate=22 # should correlate with mic settings in public/config.xml<br />
 						sip.obproxy=127.0.0.1 # asterisk adderss<br />
 						sip.phone=red5sip_user # sip phone number<br />
 						sip.authid=red5sip_user # sip auth id<br />

Modified: openmeetings/trunk/singlewebapp/docs/themes-and-branding.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/themes-and-branding.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/themes-and-branding.html (original)
+++ openmeetings/trunk/singlewebapp/docs/themes-and-branding.html Fri May 31 03:48:11 2013
@@ -652,7 +652,7 @@ limitations under the License.
 				Themes are only available starting with Openmeetings 2.x.
 				<br />
 				There are also more general client side configuration like port
-				configuration. Those configs are stored in the config.xml
+				configuration. Those configs are stored in the public/config.xml
 			</p>
                             </blockquote>
       </td></tr>
@@ -669,13 +669,13 @@ limitations under the License.
         <blockquote>
                                     <p>You can find the default theme in the SVN: </p>
                                                 <p>
-				<a href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml" target="_BLANK" rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
+				<a href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/theme.xml" target="_BLANK" rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/theme.xml
 				</a>
 			</p>
                                                 <p>
 				Or if you already installed OpenMeetings on your machine at:
 				<br />
-				<tt>/webapps/openmeetings/default-theme.xml</tt>
+				<tt>/webapps/openmeetings/public/theme.xml</tt>
 				<br />
 				The file contains border, background and font color definitions as
 				well as paths to icons that are loaded at runtime.

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java Fri May 31 03:48:11 2013
@@ -137,7 +137,7 @@ public class MainService implements IPen
 			Long user_level = userManager.getUserLevelByIdAndOrg(user_id,
 					organisation_id);
 			// log.error("getNavi 2: "+user_level);
-			return navimanagement.getMainMenu(user_level, user_id, language_id);
+			return navimanagement.getMainMenu(1, user_id, language_id); //Hardcoded to user level to disable admin menu in flash version
 		} catch (Exception err) {
 			log.error("[getNavi] ", err);
 		}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/xsd/GenerateConfigXsd.java Fri May 31 03:48:11 2013
@@ -32,8 +32,8 @@ public class GenerateConfigXsd {
 		try {
 			
 			String[] args = { 
-						"WebContent"+File.separatorChar+"openmeetings"+File.separatorChar+"config.xml",
-						"WebContent"+File.separatorChar+"openmeetings"+File.separatorChar+"openmeetings-config.xsd"
+				"WebContent"+File.separatorChar+"openmeetings"+File.separatorChar+"public"+File.separatorChar+"config.xml",
+				"WebContent"+File.separatorChar+"openmeetings"+File.separatorChar+"public"+File.separatorChar+"config.xsd"
 			};
 			
 			Driver.main(args);

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html Fri May 31 03:48:11 2013
@@ -21,7 +21,7 @@
 <html xmlns:wicket="http://wicket.apache.org" wicket:id="html">
 	<head>
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-		<link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
+		<link rel="shortcut icon" href="public/favicon.ico" type="image/x-icon"/>
 		<title wicket:id="pageTitle">[title]</title>
 		<link media="screen" type="text/css" rel="stylesheet" href="css/jquery-ui-1.10.2.custom.min.css"/>
 		<link rel="stylesheet" type="text/css" href="css/openmeetings-forms.css"/>

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/CongratulationsPanel.html Fri May 31 03:48:11 2013
@@ -26,7 +26,7 @@
 	<br />
 	<br />
 	If your Red5-Server runs on a different Port or on a different domain<br />
-	<a href="config.xml">alter the config values of the client</a>
+	<a href="public/config.xml">alter the config values of the client</a>
 	<br />
 	<br />
 	<br />

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.html?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.html Fri May 31 03:48:11 2013
@@ -20,7 +20,7 @@
 -->
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:head>
-	<script type="text/javascript" src="openmeetings_functions.js"></script>
+	<script type="text/javascript" src="js/openmeetings_functions.js"></script>
 </wicket:head>
 <wicket:panel>
 	<div id="swfloading"

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/swf-functions.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/swf-functions.js?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/swf-functions.js (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/swf-functions.js Fri May 31 03:48:11 2013
@@ -33,7 +33,7 @@ function initSwf(swfurl) {
 	$('#header, #topLinks, #menu').hide();
 	$('div[id="contents"], div[id="contents"] > div').css('height', '100%');
 	var embed = $('<embed>').attr('quality', 'high').attr('bgcolor', options.bgcolor)
-		.attr('src', options.url)
+		.attr('src', "public/" + options.url)
 		.attr('wmode', 'window').attr('allowfullscreen', true)
 		.attr('width', options.width).attr('height', options.height)
 		.attr('id', 'lzapp').attr('name', 'lzapp')

Modified: openmeetings/trunk/singlewebapp/xdocs/CalendarAndTimezone.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/CalendarAndTimezone.xml?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/CalendarAndTimezone.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/CalendarAndTimezone.xml Fri May 31 03:48:11 2013
@@ -48,7 +48,7 @@
 		<section
 			name="Changing first day in week for calendar from Sunday to Monday">
 
-			<p>in the config.xml change the key: </p>
+			<p>in the public/config.xml change the key: </p>
 			<div class="xmlcode">
 				&lt;!--
 				<br />

Modified: openmeetings/trunk/singlewebapp/xdocs/CustomRoomTypeHowTo.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/CustomRoomTypeHowTo.xml?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/CustomRoomTypeHowTo.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/CustomRoomTypeHowTo.xml Fri May 31 03:48:11 2013
@@ -61,9 +61,9 @@
 					<tt>src/base/moduleConfiguration.lzx</tt>, 
 				here you need to add a default class name for your room type </li>
 				
-				<li>Add your room type in the real configuration: config.xml, add a new entry.
+				<li>Add your room type in the real configuration: public/config.xml, add a new entry.
 					<br/>
-					You should fix also the file <tt>openmeetings-config.xsd</tt> that is the Schema file for the config.xml.
+					You should fix also the file <tt>public/config.xsd</tt> that is the Schema file for the public/config.xml.
 				</li>
         		
 				<li>Add a parser entry to modify the room type mapping: 

Modified: openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml Fri May 31 03:48:11 2013
@@ -44,7 +44,7 @@
 					need to restart the red5-service so that changes are online.
 				</li>
 				<li>Client-Side configuration:
-					$RED5_HOME/webapps/openmeetings/config.xml, you need to clear your
+					$RED5_HOME/webapps/openmeetings/public/config.xml, you need to clear your
 					browser cache after changing the file.
 				</li>
 				<li>
@@ -59,7 +59,7 @@
 					<th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Config-Name </th>
 					<th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Default-value </th>
 					<th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Name in red5.properties </th>
-					<th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Name in config.xml </th>
+					<th style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> Name in public/config.xml </th>
 				</tr>
 				<tr>
 					<td style="border: 1px solid rgb(204, 204, 204); padding: 5px;"> HTTP </td>

Modified: openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml Fri May 31 03:48:11 2013
@@ -137,7 +137,7 @@
 				</li>
 			
 				<li>
-					Edit red5/webapps/openmeetings/config.xml and set
+					Edit red5/webapps/openmeetings/public/config.xml and set
 					<tt>&lt;rtmpsslport&gt;5443&lt;/rtmpsslport&gt;</tt>
 					,
 					<tt>&lt;useSSL&gt;yes&lt;/useSSL&gt;</tt>
@@ -167,11 +167,11 @@
 					file to <tt>red5/conf/jee-container.xml</tt>
 				</li>
 				<li>
-					Edit red5/webapps/openmeetings/config.xml and set
+					Edit red5/webapps/openmeetings/public/config.xml and set
 					<tt>&lt;protocol&gt;https&lt;/protocol&gt;</tt>
 				</li>
 				<li>
-					Edit red5/webapps/openmeetings/config.xml and set
+					Edit red5/webapps/openmeetings/public/config.xml and set
 					<tt>red5httpport</tt> to <tt>https</tt> port
 				</li>
 				<li>In webapps/openmeetings/WEB-INF/conf/axis2.xml add (below the existing http transportReceiver (around line 225))

Modified: openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml Fri May 31 03:48:11 2013
@@ -28,8 +28,8 @@
 			<ol>
 				<li>create your logo image as PNG 40px height</li>
 				<li>replace <tt>/opt/red5/webapps/openmeetings/public/themes/basic-theme/general/logo.png</tt> with your logo file</li>
-				<li>(Advanced optional) you can modify <tt>/opt/red5/webapps/openmeetings/config.xml</tt> and modify <tt>appdisplay</tt> section: set position and display for the logo and/or name</li>
-				<li>(Advanced optional) you can modify <tt>/opt/red5/webapps/openmeetings/default-theme.xml</tt> (around line 57) and change image name/path</li>
+				<li>(Advanced optional) you can modify <tt>/opt/red5/webapps/openmeetings/public/config.xml</tt> and modify <tt>appdisplay</tt> section: set position and display for the logo and/or name</li>
+				<li>(Advanced optional) you can modify <tt>/opt/red5/webapps/openmeetings/public/theme.xml</tt> (around line 57) and change image name/path</li>
 			</ol>
 		</section>
 		<section name="Renaming /openmeetings context">
@@ -60,9 +60,9 @@
 				</li>
 				<li>
 					open
-					<tt>/opt/red5/webapps/yourmeetings/config.xml</tt>
+					<tt>/opt/red5/webapps/yourmeetings/public/config.xml</tt>
 					using your favorite text editor (for ex.
-					<tt>vim /opt/red5/webapps/yourmeetings/config.xml</tt>
+					<tt>vim /opt/red5/webapps/yourmeetings/public/config.xml</tt>
 					)
 				</li>
 				<li>
@@ -141,7 +141,7 @@
 			<p>
 				Please
 				<i>NOTE</i>
-				there are 3 additional properties in the config.xml file which
+				there are 3 additional properties in the public/config.xml file which
 				should be modified for
 				<strong>TOTAL</strong>
 				Openmeetings clean up:

Modified: openmeetings/trunk/singlewebapp/xdocs/WebcamResolutions.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/WebcamResolutions.xml?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/WebcamResolutions.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/WebcamResolutions.xml Fri May 31 03:48:11 2013
@@ -28,7 +28,7 @@
 			<p>When you choose the webcam you have different resolutions
 				available the user can choose from. </p>
 			<p>You can add/remove resolutions and also change the default
-				selection. In the config.xml there is a section: </p>
+				selection. In the public/config.xml there is a section: </p>
 			<div class="xmlcode">
 				&lt;availableCameraResolutions&gt;<br/>
 				<div style="margin-left:20px">
@@ -51,9 +51,9 @@
 				&lt;/availableCameraResolutions&gt;			 
 			</div>	
 		      
-		    <p>Tip: You might edit the config.xml with an XML aware editor that correctly 
+		    <p>Tip: You might edit the public/config.xml with an XML aware editor that correctly 
 		    handles the XSD defintion to avoid misconfiguration. The openmeetings-config.xsd 
-		    is in the same folder like the config.xml. </p>
+		    is in the same folder like the public/config.xml. </p>
 		</section>
 
 	</body>

Modified: openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/red5sip-integration_2.1.xml Fri May 31 03:48:11 2013
@@ -265,7 +265,7 @@
 						red5.host=127.0.0.1 # red5 server address<br />
 						om.context=openmeetings # Openmeetings context<br /> 
 						red5.codec=asao<br />
-						red5.codec.rate=22 # should correlate with mic settings in config.xml<br />
+						red5.codec.rate=22 # should correlate with mic settings in public/config.xml<br />
 						sip.obproxy=127.0.0.1 # asterisk adderss<br />
 						sip.phone=red5sip_user # sip phone number<br />
 						sip.authid=red5sip_user # sip auth id<br />

Modified: openmeetings/trunk/singlewebapp/xdocs/themes-and-branding.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/themes-and-branding.xml?rev=1488083&r1=1488082&r2=1488083&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/themes-and-branding.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/themes-and-branding.xml Fri May 31 03:48:11 2013
@@ -29,7 +29,7 @@
 				Themes are only available starting with Openmeetings 2.x.
 				<br />
 				There are also more general client side configuration like port
-				configuration. Those configs are stored in the config.xml
+				configuration. Those configs are stored in the public/config.xml
 			</p>
 
 		</section>
@@ -39,14 +39,14 @@
 			<p>You can find the default theme in the SVN: </p>
 			<p>
 				<a
-					href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml"
-					target="_BLANK" rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/WebContent/openmeetings/default-theme.xml
+					href="https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/theme.xml"
+					target="_BLANK" rel="nofollow">https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/theme.xml
 				</a>
 			</p>
 			<p>
 				Or if you already installed OpenMeetings on your machine at:
 				<br />
-				<tt>/webapps/openmeetings/default-theme.xml</tt>
+				<tt>/webapps/openmeetings/public/theme.xml</tt>
 				<br />
 				The file contains border, background and font color definitions as
 				well as paths to icons that are loaded at runtime.