Author: solomax
Date: Mon Aug 12 09:41:27 2013
New Revision: 1513087
URL: http://svn.apache.org/r1513087
Log:
[OPENMEETINGS-760] navi module is removed
Removed:
openmeetings/trunk/singlewebapp/WebContent/src/base/navi/helpAndBugs.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/rssPanel.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/rss/
Modified:
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/WebContent/project.xsd
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/navi/library.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Mon Aug 12 09:41:27 2013
@@ -294,7 +294,6 @@
<bean id="languageImport"
class="org.apache.openmeetings.xmlimport.LanguageImport" />
<bean id="userImport"
class="org.apache.openmeetings.xmlimport.UserImport" />
<bean id="libraryWmlLoader"
class="org.apache.openmeetings.documents.LibraryWmlLoader" />
- <bean id="loadAtomRssFeed"
class="org.apache.openmeetings.rss.LoadAtomRssFeed" />
<bean id="authLevelManagement"
class="org.apache.openmeetings.data.basic.AuthLevelUtil" />
<bean id="generateSWF"
class="org.apache.openmeetings.documents.GenerateSWF" />
<bean id="fileUtils"
class="org.apache.openmeetings.data.file.FileUtils" />
Modified: openmeetings/trunk/singlewebapp/WebContent/project.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/project.xsd?rev=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/project.xsd (original)
+++ openmeetings/trunk/singlewebapp/WebContent/project.xsd Mon Aug 12 09:41:27
2013
@@ -842,28 +842,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="confAdminListItem" type="project:confAdminListItem" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Configuration list. It shows ID-KEY pairs. </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="confAdminListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentListItem">
- <xs:attribute name="configuration_id" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Configuration list. It shows ID-KEY pairs. </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- <xs:attribute name="conf_value" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="conf_key" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="baseVideoStreamDevice" type="project:baseVideoStreamDevice" >
<xs:annotation>
<xs:documentation xml:lang="en">
@@ -1389,18 +1367,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="backupContent" type="project:backupContent" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Backup module for admin. It can export or import user account data as
xml-file. </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="backupContent" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="iframeView" type="project:iframeView" >
</xs:element>
<xs:complexType name="iframeView" mixed="true">
@@ -1425,18 +1391,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="confAdmin" type="project:confAdmin" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Configuration module for ADMIN </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="confAdmin" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="labelerrorPopup" type="project:labelerrorPopup" >
</xs:element>
<xs:complexType name="labelerrorPopup" mixed="true">
@@ -1642,18 +1596,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="roomClient" type="project:roomClient" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Admin module to configure the Conference or Audience room.</xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="roomClient" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="questionCheckbox" type="project:questionCheckbox" >
</xs:element>
<xs:complexType name="questionCheckbox" mixed="true">
@@ -1800,28 +1742,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="roomValueForm" type="project:roomValueForm" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- configure value for roomadmin module </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="roomValueForm" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentSaveView">
- <xs:attribute name="sendObject" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="rooms_id" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- configure value for roomadmin module </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- <xs:attribute name="roomsObj" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="dateSelectorMonth" type="project:dateSelectorMonth" >
</xs:element>
<xs:complexType name="dateSelectorMonth" mixed="true">
@@ -1850,30 +1770,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="userAdminListItem" type="project:userAdminListItem" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Existing user list. used by userAdmin only </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="userAdminListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentListItem">
- <xs:attribute name="user_id" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Existing user list. used by userAdmin only </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- <xs:attribute name="login" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="lastname" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="firstname" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="participentListItem" type="project:participentListItem" >
</xs:element>
<xs:complexType name="participentListItem" mixed="true">
@@ -2577,24 +2473,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="orgAdminChooseUserWindow"
type="project:orgAdminChooseUserWindow" >
-</xs:element>
- <xs:complexType name="orgAdminChooseUserWindow" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:labelExplorerBox">
- <xs:attribute name="usersId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="refObjectDialog" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="refObj" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="organisation_id" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="isOrgUserAddForm" type="lzx:boolean" default="false"
>
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="conferenceRoomSidebarTabButton"
type="project:conferenceRoomSidebarTabButton" >
</xs:element>
<xs:complexType name="conferenceRoomSidebarTabButton" mixed="true">
@@ -3077,22 +2955,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="rssFeedListItem" type="project:rssFeedListItem" >
-</xs:element>
- <xs:complexType name="rssFeedListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="updated" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="titel" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="summary" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="link" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="listPresentationThumb" type="project:listPresentationThumb" >
</xs:element>
<xs:complexType name="listPresentationThumb" mixed="true">
@@ -3357,18 +3219,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="iconStepButtonWizzard" type="project:iconStepButtonWizzard" >
-</xs:element>
- <xs:complexType name="iconStepButtonWizzard" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="resourceViewName" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="labelid" type="lzx:number" default="0" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="baseRoomInnerList" type="project:baseRoomInnerList" >
</xs:element>
<xs:complexType name="baseRoomInnerList" mixed="true">
@@ -3731,26 +3581,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="infosPanel" type="project:infosPanel" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- "System" panel on the dashboard </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="infosPanel" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:guiPresenter">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-<xs:element name="helpAndBugs2" type="project:helpAndBugs2" >
-</xs:element>
- <xs:complexType name="helpAndBugs2" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="vsliderThumb" type="project:vsliderThumb" >
</xs:element>
<xs:complexType name="vsliderThumb" mixed="true">
@@ -3929,28 +3759,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="ldapAdminListItem" type="project:ldapAdminListItem" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Existing organization list. used by orgAdmin only </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="ldapAdminListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentListItem">
- <xs:attribute name="tName" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="ldapConfigId" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Existing organization list. used by orgAdmin only </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- <xs:attribute name="configFileName" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="turnoverlistheaderitemIcon"
type="project:turnoverlistheaderitemIcon" >
</xs:element>
<xs:complexType name="turnoverlistheaderitemIcon" mixed="true">
@@ -4298,18 +4106,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="roomAdmin" type="project:roomAdmin" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Admin module to configure the Conference or Audience room.</xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="roomAdmin" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="baseFileExplorerItem" type="project:baseFileExplorerItem" >
</xs:element>
<xs:complexType name="baseFileExplorerItem" mixed="true">
@@ -4822,24 +4618,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="orgUsersRecordValueList"
type="project:orgUsersRecordValueList" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Existing organization list. used by orgAdmin only </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="orgUsersRecordValueList" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:recordValueList">
- <xs:attribute name="usersId" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Existing organization list. used by orgAdmin only </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="labelCheckbox" type="project:labelCheckbox" >
</xs:element>
<xs:complexType name="labelCheckbox" mixed="true">
@@ -5561,18 +5339,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="userAdmin" type="project:userAdmin" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- User administration module for ADMIN.</xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="userAdmin" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="drawClipArtWhiteBoard" type="project:drawClipArtWhiteBoard" >
</xs:element>
<xs:complexType name="drawClipArtWhiteBoard" mixed="true">
@@ -6039,18 +5805,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="orgAdmin" type="project:orgAdmin" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Organization administration module for ADMIN.</xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="orgAdmin" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="interviewUserList" type="project:interviewUserList" >
</xs:element>
<xs:complexType name="interviewUserList" mixed="true">
@@ -6453,40 +6207,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="confAdminValueForm" type="project:confAdminValueForm" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- configuration edit panel. </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="confAdminValueForm" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentSaveView">
- <xs:attribute name="sendObject" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="confobj" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="configuration_id" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- configuration edit panel. </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-<xs:element name="ldapAdmin" type="project:ldapAdmin" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Organization administration module for ADMIN.</xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="ldapAdmin" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="dateSelectorWeekNumberHeader"
type="project:dateSelectorWeekNumberHeader" >
</xs:element>
<xs:complexType name="dateSelectorWeekNumberHeader" mixed="true">
@@ -6691,22 +6411,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="ldapAdminValueForm" type="project:ldapAdminValueForm" >
-</xs:element>
- <xs:complexType name="ldapAdminValueForm" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentSaveView">
- <xs:attribute name="sendObject" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="ldapConfigId" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- recordContent id </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="dtmfButton" type="project:dtmfButton" >
</xs:element>
<xs:complexType name="dtmfButton" mixed="true">
@@ -6717,26 +6421,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="roomAdminOrgListItem" type="project:roomAdminOrgListItem" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- list of conference/audience rooms </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="roomAdminOrgListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentListItem">
- <xs:attribute name="orgName" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="orgId" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- list of conference/audience rooms </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="lzCalendarContent" type="project:lzCalendarContent" >
</xs:element>
<xs:complexType name="lzCalendarContent" mixed="true">
@@ -6783,22 +6467,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="orgAdminValueForm" type="project:orgAdminValueForm" >
-</xs:element>
- <xs:complexType name="orgAdminValueForm" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentSaveView">
- <xs:attribute name="sendObject" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="organisation_id" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- recordContent id </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="emotIconsSelector" type="project:emotIconsSelector" >
<xs:annotation>
<xs:documentation xml:lang="en">
@@ -7637,14 +7305,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="xmlCrmUserAdmin" type="project:xmlCrmUserAdmin" >
-</xs:element>
- <xs:complexType name="xmlCrmUserAdmin" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:labelExplorerBox">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="moderationMiniIconRestricted"
type="project:moderationMiniIconRestricted" >
</xs:element>
<xs:complexType name="moderationMiniIconRestricted" mixed="true">
@@ -8117,28 +7777,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="mainMenuMeetingsItem" type="project:mainMenuMeetingsItem" >
-</xs:element>
- <xs:complexType name="mainMenuMeetingsItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="textvalue" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="textToolTip" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="selected" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="list" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="isopen" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isleaf" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="action" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="innerlistViewEventUserListTable"
type="project:innerlistViewEventUserListTable" >
</xs:element>
<xs:complexType name="innerlistViewEventUserListTable" mixed="true">
@@ -8219,24 +7857,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="mainNavi" type="project:mainNavi" >
-</xs:element>
- <xs:complexType name="mainNavi" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="pending" type="lzx:boolean" default="true" >
-</xs:attribute>
- <xs:attribute name="naviObject" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="currentmenu" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="currentSubmenu" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="currentMainmenu" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="searchUserProfileListItem"
type="project:searchUserProfileListItem" >
</xs:element>
<xs:complexType name="searchUserProfileListItem" mixed="true">
@@ -8764,26 +8384,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="orgAdminListItem" type="project:orgAdminListItem" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Existing organization list. used by orgAdmin only </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="orgAdminListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentListItem">
- <xs:attribute name="orgname" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="organisation_id" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- Existing organization list. used by orgAdmin only </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="baseVideoObject" type="project:baseVideoObject" >
<xs:annotation>
<xs:documentation xml:lang="en">
@@ -9203,14 +8803,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="rssPanel" type="project:rssPanel" >
-</xs:element>
- <xs:complexType name="rssPanel" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:guiPresenter">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="drawDocumentPanelItem" type="project:drawDocumentPanelItem" >
</xs:element>
<xs:complexType name="drawDocumentPanelItem" mixed="true">
@@ -9355,14 +8947,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="userListAdmin" type="project:userListAdmin" >
-</xs:element>
- <xs:complexType name="userListAdmin" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="baseDrawULine" type="project:baseDrawULine" >
</xs:element>
<xs:complexType name="baseDrawULine" mixed="true">
@@ -9404,28 +8988,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="roomAdminRoomClientListItem"
type="project:roomAdminRoomClientListItem" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- list of conference/audience rooms </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="roomAdminRoomClientListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentListItem">
- <xs:attribute name="red5_id" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- list of conference/audience rooms </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- <xs:attribute name="login" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="ispublic" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="editUserContactsContent"
type="project:editUserContactsContent" >
</xs:element>
<xs:complexType name="editUserContactsContent" mixed="true">
@@ -9508,26 +9070,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="userAdminValueForm" type="project:userAdminValueForm" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- User Profile edit panel in the useradmin leftblock. Private class only for
useradmin </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="userAdminValueForm" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentSaveView">
- <xs:attribute name="user_id" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- recordContent-id </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- <xs:attribute name="sendObject" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="activityListRestrictedRoomWhiteboard"
type="project:activityListRestrictedRoomWhiteboard" >
</xs:element>
<xs:complexType name="activityListRestrictedRoomWhiteboard" mixed="true">
@@ -9602,36 +9144,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="helpAndBugs" type="project:helpAndBugs" >
-</xs:element>
- <xs:complexType name="helpAndBugs" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-<xs:element name="roomAdminListItem" type="project:roomAdminListItem" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- list of conference/audience rooms </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="roomAdminListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentListItem">
- <xs:attribute name="rooms_id" type="lzx:number" default="0" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- list of conference/audience rooms </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- <xs:attribute name="roomname" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="ispublic" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="chatTabBottom" type="project:chatTabBottom" >
<xs:annotation>
<xs:documentation xml:lang="en">
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Mon Aug 12 09:41:27 2013
@@ -93,9 +93,6 @@
<!--- the current Invitation-Object -->
<attribute name="currentInvitation" value="null" />
- <!--- the current Dashboard config -->
- <attribute name="dashboardConfig" value="null" />
-
<!-- shows what kind of conferenceView it is at the moment
wether its conferenceView or audienceView -->
<attribute name="modus" value="" type="string" />
@@ -811,48 +808,6 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="getNavi" funcname="xmlcrm.getNavi"
dataobject="myresultnavi">
- <netparam><method name="getValue"> return canvas.sessionId;
</method></netparam>
- <netparam><method name="getValue"> return parent.parent.userlang;
</method></netparam>
- <netparam><method name="getValue"> return
hib.currentdomainObj.organisation_id;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("getNavi: ",value);
- canvas.thishib.loaderVar.close();
- //The Main-Navi will automatically init the Dashboard
- new
lz.mainNavi(canvas._mainbgcontentNavi,{name:'navi',naviObject:value});
- new lz.helpAndBugs(canvas._mainbgcontentNavi,{name:'help'});
-
- if (canvas.landingZone == "dashboard") {
-
- canvas.destroyExitButton = false;
-
- var g = canvas.getUserData();
-
- if ($debug)
Debug.write("doShowUpdateProfileMessage",g["doShowUpdateProfileMessage"]);
-
- if (g["doShowUpdateProfileMessage"]) {
- //Do not show message
- } else {
- new
lz.rememberMessage(canvas.main_content._content.inner,{labelid:1298,labeliderror:1297,refObj:this});
- }
-
- }
- ]]>
- </handler>
-
- <method name="sendConfirmation" args="askagain" >
-
- //Debug.write("clear yesno,askagain: ",yesno,askagain);
- //can only be true in this case
-
- var g = canvas.getUserData();
- g["doShowUpdateProfileMessage"]=askagain;
- canvas.setUserData(g);
- </method>
- </netRemoteCallHib>
-
<netRemoteCallHib name="setId" funcname="setId">
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
@@ -871,26 +826,11 @@
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("setUsernameAndSession:
",canvas.user_id,value);
if (canvas.thishib.loaderVar != null) {
- canvas.thishib.loaderVar.setProgress();
+ canvas.thishib.loaderVar.close();
}
- parent.getDashboardConfiguration.doCall();
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="getDashboardConfiguration"
funcname="xmlcrm.getDashboardConfiguration" remotecontext="$once{
canvas.thishib }" >
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- if ($debug)
Debug.write("getDashboardConfiguration: ", value);
- if (canvas.thishib.loaderVar != null) {
- canvas.thishib.loaderVar.setProgress();
- }
- parent.dashboardConfig = value;
- parent.getNavi.doCall();
- ]]>
- </handler>
- </netRemoteCallHib>
-
<netRemoteCallHib name="testMethod" funcname="testMethod">
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/navi/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/library.lzx?rev=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/navi/library.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/navi/library.lzx Mon
Aug 12 09:41:27 2013
@@ -28,7 +28,6 @@
<frame src="resources/bullet_arrow_down_dark.png" />
</resource>
- <include href="helpAndBugs.lzx" />
<include href="mainNavi.lzx" />
</library>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx?rev=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx Mon
Aug 12 09:41:27 2013
@@ -228,135 +228,4 @@
</class>
-<class name="mainMenuMeetingsItem" extends="baseMenuMeetingsItem" >
-
- <handler name="onclick">
- new lz.dropDownMenuList(canvas,{
- x:this.getAttributeRelative("x",canvas),
-
y:this.getAttributeRelative("y",canvas)+this.height,
- btnRef:this,
- list:this.list
- });
- this.parent.parent.sendOpenMenu(this);
- </handler>
-
-</class>
-
-<class name="mainNavi" extends="view" bgcolor="$once{
canvas.getThemeColor('styleMenuBarBaseColor') }"
- width="${ canvas.width }" y="50" >
-
- <attribute name="naviObject" value="null" />
-
- <attribute name="selected" value="null" />
-
- <method name="sendOpenMenu" args="menuref">
- if (this.selected != null) {
- this.selected.setAttribute("selected",false);
- }
- this.selected = menuref;
- this.selected.setAttribute("selected",true);
- </method>
-
- <!---
- Initialize Menu
- -->
- <handler name="oninit">
- <![CDATA[
- var value = this.naviObject;
- for (var i = 0; i < value.length; ++i) {
- var t1 = new lz.mainMenuMeetingsItem(this.itemlist,{
- textvalue:value[i].name,
- list:value[i].mainnavi,
- isleaf:value[i].isleaf,
- text:value[i].label.value,
- textToolTip:value[i].tooltip.value,
- action:value[i].action
- });
- }
-
- if (canvas.cuser == "") {
- var opened = false;
- for (var i = 0; i <
canvas.thishib.dashboardConfig.length; ++i) {
- var cfg =
canvas.thishib.dashboardConfig[i];
- if (cfg.conf_key ==
"default.landing.zone") {
- switch (cfg.conf_value) {
- case "dashboard.rooms":
-
loadContent({action: "dashboardModuleStartScreen", params: "myRoomsTabButton"});
- opened = true;
- break;
- case "dashboard.chat":
-
loadContent({action: "dashboardModuleStartScreen", params: "chatTabButton"});
- opened = true;
- break;
- case "calendar":
-
quicklinkAct("dashboardModuleCalendar");
- opened = true;
- break;
- case "rooms.public":
-
loadContent({action: "conferenceModuleRoomList", params: "publicTabButton"});
- opened = true;
- break;
- case "rooms.private":
-
loadContent({action: "conferenceModuleRoomList", params: "privateTabButton"});
- opened = true;
- break;
- case "rooms.user":
-
loadContent({action: "conferenceModuleRoomList", params: "myTabButton"});
- opened = true;
- break;
- }
- break;
- }
- }
- if (!opened && value.length) {
- var navi = value[0].mainnavi[0];
- loadContent({action: navi.action,
params: navi.params});
- }
- } else {
- if (canvas.cuserStatus == "yes") {
- this.changeUserContactByHash.pending = true;
- this.changeUserContactByHash.doCall();
- } else if (canvas.cuserStatus == "no") {
- this.changeUserContactByHash.pending = false;
- this.changeUserContactByHash.doCall();
- } else {
- canvas.userSettingsModuleOpt =
"contactMessages";
- quicklinkAct("userSettingsModule");
- }
- }
-
- ]]>
- </handler>
-
- <!--
- public Object changeUserContactByHash(String SID, String hash, Boolean
status)
- -->
- <netRemoteCallHib name="changeUserContactByHash"
funcname="userservice.changeUserContactByHash"
- remotecontext="$once{ canvas.thishib }"
activeErrorHandler="true" >
- <attribute name="pending" value="true" type="boolean" />
- <netparam><method name="getValue"> return canvas.sessionId;
</method></netparam>
- <netparam><method name="getValue"> return canvas.cuser;
</method></netparam>
- <netparam><method name="getValue"> return parent.pending;
</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- if ($debug)
Debug.write("changePendingStatusUserContacts 1: ",value);
- if ($debug)
Debug.write("changePendingStatusUserContacts 2: ",canvas.cuser);
-
- if (value > 0) {
- if (this.pending) {
- new
lz.labelerrorPopup(canvas,{labelid:217,errorlabelid:1229});
- } else {
- new
lz.labelerrorPopup(canvas,{labelid:217,errorlabelid:1230});
- }
- }
-
- quicklinkAct("userSettingsModule");
- ]]>
- </handler>
- </netRemoteCallHib>
-
- <view name="itemlist" layout="axis:x;spacing:0" />
-
-</class>
-
</library>
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx?rev=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
Mon Aug 12 09:41:27 2013
@@ -21,9 +21,7 @@
<library>
<include href="tabButtonMain.lzx" />
- <include href="infosPanel.lzx" />
<include href="profilesPanel.lzx" />
- <include href="rssPanel.lzx" />
<include href="mainDashboard.lzx" />
</library>
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx?rev=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
Mon Aug 12 09:41:27 2013
@@ -132,8 +132,6 @@
<view height="240" x="516" width="1" bgcolor="$once{
canvas.getThemeColor('secondBorderColor') }" />
- <infosPanel x="520" />
-
<view name="_bottomArea" y="240" x="0"
width="${ canvas.width }" height="${ canvas.height-240-84 }"
visibility="hidden">
@@ -275,9 +273,6 @@
<overAllChat name="_overallchat" visibility="hidden" />
- <rssBox name="feed1" visibility="hidden" width="${ parent.width-4
}"
- height="${ parent.height }" y="0" x="2" />
-
</view>
</view>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDao.java?rev=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UserContactsDao.java
Mon Aug 12 09:41:27 2013
@@ -126,20 +126,6 @@ public class UserContactsDao {
return null;
}
- public UserContact getContactsByHash(String hash) {
- try {
- TypedQuery<UserContact> query =
em.createNamedQuery("getContactsByHash", UserContact.class);
- query.setParameter("hash", hash);
- List<UserContact> ll = query.getResultList();
- if (ll.size() > 0) {
- return ll.get(0);
- }
- } catch (Exception e) {
- log.error("[getContactsByHash]",e);
- }
- return null;
- }
-
public List<UserContact> get(long ownerId, int first, int count) {
TypedQuery<UserContact> q =
em.createNamedQuery("getContactsByUser", UserContact.class);
q.setParameter("user_id", ownerId);
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=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
Mon Aug 12 09:41:27 2013
@@ -18,8 +18,6 @@
*/
package org.apache.openmeetings.remote;
-import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DASHBOARD_SHOW_MYROOMS_KEY;
-import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DASHBOARD_SHOW_RSS_KEY;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.FRONTEND_REGISTER_KEY;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.MAX_UPLOAD_SIZE_KEY;
@@ -31,7 +29,6 @@ import java.util.Map;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.NaviBuilder;
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
@@ -46,7 +43,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.ldap.LdapLoginManagement;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
-import org.apache.openmeetings.persistence.beans.basic.Naviglobal;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.basic.RemoteSessionObject;
import org.apache.openmeetings.persistence.beans.basic.SOAPLogin;
@@ -57,7 +53,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.user.Userdata;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
-import org.apache.openmeetings.rss.LoadAtomRssFeed;
import org.apache.openmeetings.session.ISessionManager;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
@@ -94,8 +89,6 @@ public class MainService implements IPen
@Autowired
private OmTimeZoneDao omTimeZoneDaoImpl;
@Autowired
- private NaviBuilder navimanagement;
- @Autowired
private RoomManager roomManager;
@Autowired
private ConferenceLogDao conferenceLogDao;
@@ -112,32 +105,11 @@ public class MainService implements IPen
@Autowired
private AuthLevelUtil authLevelUtil;
@Autowired
- private LoadAtomRssFeed loadAtomRssFeed;
- @Autowired
private LdapLoginManagement ldapLoginManagement;
// External User Types
public static final String EXTERNAL_USER_TYPE_LDAP = "LDAP";
- /**
- * get Navigation
- *
- * @param SID
- * @param language_id
- * @return - list of global navigation menus
- */
- public List<Naviglobal> getNavi(String SID, long language_id, Long
organisation_id) {
- try {
- Long user_id = sessiondataDao.checkSession(SID);
- log.debug("getNavi 1: " + user_id);
- Long user_level =
userManager.getUserLevelByIdAndOrg(user_id, organisation_id);
- log.debug("getNavi 2: " + user_level);
- 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);
- }
- return null;
- }
/**
* gets a user by its SID
@@ -619,36 +591,6 @@ public class MainService implements IPen
}
/**
- * @deprecated
- * @param SID
- * @return - map of rss messages
- */
- @Deprecated
- public LinkedHashMap<String, LinkedHashMap<String,
LinkedHashMap<String, LinkedHashMap<String, Object>>>> getRssFeeds(
- String SID) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- return loadAtomRssFeed.getRssFeeds(user_level);
- }
-
- /**
- *
- * @param SID
- * @param urlEndPoint
- * @return - map of rss messages
- */
- public LinkedHashMap<String, LinkedHashMap<String,
LinkedHashMap<String, Object>>> getRssFeedByURL(
- String SID, String urlEndPoint) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
- return loadAtomRssFeed.parseRssFeed(urlEndPoint);
- } else {
- return null;
- }
- }
-
- /**
* TODO: Is this function in usage?
*
* @deprecated
@@ -707,22 +649,4 @@ public class MainService implements IPen
public void resultReceived(IPendingServiceCall arg0) {
log.debug("[resultReceived]" + arg0);
}
-
- public List<Configuration> getDashboardConfiguration(String SID) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
- return configurationDao.get(
- "dashboard.show.chat", //
- DASHBOARD_SHOW_MYROOMS_KEY, //
- DASHBOARD_SHOW_RSS_KEY, //
- "default.dashboard.tab", //
- "default.landing.zone");
- }
- } catch (Exception err) {
- log.error("[getDashboardConfiguration]", err);
- }
- return null;
- }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
Mon Aug 12 09:41:27 2013
@@ -501,41 +501,6 @@ public class UserService {
return null;
}
- public Object changeUserContactByHash(String SID, String hash,
- Boolean status) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- UserContact userContact = userContactsDao
- .getContactsByHash(hash);
-
- if (userContact == null) {
-
- log.error("changeUserContactByHash " +
hash);
-
- return -48L;
- }
-
- if
(userContact.getContact().getUser_id().equals(users_id)) {
-
- return
this.changePendingStatusUserContacts(SID,
-
userContact.getUserContactId(), status);
-
- } else {
- return -48L;
- }
-
- }
-
- } catch (Exception err) {
- log.error("[changeUserContactByHash]", err);
- }
- return null;
- }
-
public List<UserContact> getUserContacts(String SID) {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -603,91 +568,6 @@ public class UserService {
return null;
}
- public Long changePendingStatusUserContacts(String SID, Long
userContactId,
- Boolean pending) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- UserContact userContacts =
userContactsDao.get(userContactId);
-
- if (userContacts == null) {
- return -46L;
- }
-
- if (!userContacts.getPending()) {
- return -47L;
- }
-
- if (pending) {
-
-
userContactsDao.updateContactStatus(userContactId, false);
-
- userContacts = userContactsDao
- .get(userContactId);
-
-
userContactsDao.addUserContact(userContacts.getOwner()
- .getUser_id(),
users_id, false, "");
-
- User user = userContacts.getOwner();
-
- if (user.getAdresses() != null) {
-
- Long language_id =
user.getLanguage_id();
- if (language_id == null) {
- language_id =
configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1");
- }
-
- String message = "";
-
- Fieldlanguagesvalues fValue1192
= fieldManager
-
.getFieldByIdAndLanguage(1192L, language_id);
- Fieldlanguagesvalues fValue1198
= fieldManager
-
.getFieldByIdAndLanguage(1198L, language_id);
-
- message +=
fValue1192.getValue() + " "
- +
user.getFirstname() + " "
- +
user.getLastname() + "<br/><br/>";
- message +=
userContacts.getContact().getFirstname()
- + " " +
userContacts.getContact().getLastname()
- + " " +
fValue1198.getValue();
-
- String template =
requestContactConfirmTemplate
-
.getRequestContactTemplate(message);
-
-
privateMessagesDao.addPrivateMessage(
-
user.getFirstname() + " " + user.getLastname()
-
+ " " + fValue1198.getValue(), message,
- 0L,
userContacts.getContact(), user, user,
- false, null,
false, 0L, user.getAdresses()
-
.getEmail());
-
-
mailHandler.send(user.getAdresses().getEmail(),
-
userContacts.getContact().getFirstname()
-
+ " "
-
+ userContacts.getContact()
-
.getLastname() + " "
-
+ fValue1198.getValue(), template);
-
- }
-
- } else {
-
-
userContactsDao.deleteUserContact(userContactId);
-
- }
-
- return userContactId;
- }
-
- } catch (Exception err) {
- log.error("[getPendingUserContact]", err);
- }
- return null;
- }
-
private Date createCalendarDate(TimeZone timezone, String dateOnly,
String time) {
Integer hour = Integer.valueOf(time.substring(0, 2)).intValue();
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java?rev=1513087&r1=1513086&r2=1513087&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java
Mon Aug 12 09:41:27 2013
@@ -18,59 +18,21 @@
*/
package org.apache.openmeetings.rss;
-import static
org.apache.openmeetings.persistence.beans.basic.Configuration.RSS_FEED1_KEY;
-import static
org.apache.openmeetings.persistence.beans.basic.Configuration.RSS_FEED2_KEY;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.AuthLevelUtil;
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.dom4j.Attribute;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
public class LoadAtomRssFeed {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- LoadAtomRssFeed.class,
OpenmeetingsVariables.webAppRootKey);
- @Autowired
- private ConfigurationDao configurationDao;
- @Autowired
- private AuthLevelUtil authLevelmanagement;
-
- public LinkedHashMap<String, LinkedHashMap<String,
LinkedHashMap<String, LinkedHashMap<String, Object>>>> getRssFeeds(
- Long user_level) {
- try {
- if (authLevelmanagement.checkUserLevel(user_level)) {
- LinkedHashMap<String, LinkedHashMap<String,
LinkedHashMap<String, LinkedHashMap<String, Object>>>> returnMap = new
LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String,
LinkedHashMap<String, Object>>>>();
-
- String url1 =
configurationDao.getConfValue(RSS_FEED1_KEY, String.class, "");
- returnMap.put("feed1", this.parseRssFeed(url1));
-
- String url2 =
configurationDao.getConfValue(RSS_FEED2_KEY, String.class, "");
- returnMap.put("feed2", this.parseRssFeed(url2));
-
- return returnMap;
- } else {
- log.error("[getRssFeeds] authorization
required");
- }
-
- } catch (Exception ex) {
- log.error("[getRssFeeds]", ex);
- }
- return null;
- }
+ private static final Logger log =
Red5LoggerFactory.getLogger(LoadAtomRssFeed.class, webAppRootKey);
public static HttpURLConnection getFeedConnection(String _url) throws
IOException {
+ log.debug("getFeedConnection:: " + _url);
+
URL url = new URL(_url);
HttpURLConnection conn = (HttpURLConnection)
url.openConnection();
@@ -81,74 +43,4 @@ public class LoadAtomRssFeed {
conn.setRequestProperty("Referer",
"http://openmeetings.apache.org/";);
return conn;
}
-
- public LinkedHashMap<String, LinkedHashMap<String,
LinkedHashMap<String, Object>>> parseRssFeed(
- String urlEndPoint) {
- try {
- LinkedHashMap<String, LinkedHashMap<String,
LinkedHashMap<String, Object>>> lMap = new LinkedHashMap<String,
LinkedHashMap<String, LinkedHashMap<String, Object>>>();
-
- URL url = new URL(urlEndPoint);
-
- HttpURLConnection conn = (HttpURLConnection)
url.openConnection();
-
- conn.setDoOutput(true);
- conn.setDoInput(true);
- conn.setRequestProperty("user-agent",
- "Mozilla/4.0 (compatible; MSIE 6.0;
Windows NT 5.1; .NET CLR 1.1.4322)");
- conn.setRequestProperty("Referer",
- "http://openmeetings.apache.org/";);
- conn.connect();
-
- SAXReader reader = new SAXReader();
- Document document = reader.read(conn.getInputStream());
-
- Element root = document.getRootElement();
- int l = 0;
-
- for (@SuppressWarnings("unchecked")
- Iterator<Element> i = root.elementIterator();
i.hasNext();) {
- Element item = i.next();
- LinkedHashMap<String, LinkedHashMap<String,
Object>> items = new LinkedHashMap<String, LinkedHashMap<String, Object>>();
- boolean isSubElement = false;
-
- for (@SuppressWarnings("unchecked")
- Iterator<Element> it2 = item.elementIterator();
it2.hasNext();) {
- Element subItem = it2.next();
-
- LinkedHashMap<String, Object> itemObj =
new LinkedHashMap<String, Object>();
-
- itemObj.put("name", subItem.getName());
- itemObj.put("text", subItem.getText());
-
- LinkedHashMap<String, String>
attributes = new LinkedHashMap<String, String>();
-
- for (@SuppressWarnings("unchecked")
- Iterator<Attribute> attr =
subItem.attributeIterator(); attr
- .hasNext();) {
- Attribute at = attr.next();
- attributes.put(at.getName(),
at.getText());
- }
- itemObj.put("attributes", attributes);
-
- // log.error(subItem.getName()+ ": "
+subItem.getText());
- items.put(subItem.getName(), itemObj);
- isSubElement = true;
- }
-
- if (isSubElement) {
- l++;
- lMap.put("item" + l, items);
- }
-
- }
-
- return lMap;
-
- } catch (Exception err) {
- log.error("[parseRssFeed]", err);
- }
- return null;
-
- }
-
}
