Author: solomax
Date: Mon Dec 21 14:03:03 2015
New Revision: 1721159
URL: http://svn.apache.org/viewvc?rev=1721159&view=rev
Log:
[OPENMEETINGS-1303] Redundant properties is removed, documentation is updated
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/WebappNamePath.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xsd
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/WebappNamePath.xml
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx?rev=1721159&r1=1721158&r2=1721159&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainAttributes.lzx
Mon Dec 21 14:03:03 2015
@@ -95,11 +95,6 @@ Attributes needed for clustering -->
-->
<attribute name="roomRecordingId" value="0" type="number" />
-<!--- Name of the Application -->
-<attribute name="currentappname" value="OpenMeetings" type="string" />
-<attribute name="currentappnameurl" value="OpenMeetings" type="string" />
-<attribute name="currentappnamebugurl" value="OpenMeetings" type="string" />
-
<!--- Video Settings -->
<attribute name="loudnessAcitviation" value="10" type="number" />
<attribute name="showWindowEffect" value="y" type="string" />
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1721159&r1=1721158&r2=1721159&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
Mon Dec 21 14:03:03 2015
@@ -210,9 +210,6 @@
this.setAttribute('red5httpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/red5httpport/text()')));
-
this.setAttribute('currentappname',canvas.myConfigSet.getPointer().xpathQuery('config/currentappname/text()'));
-
this.setAttribute('currentappnameurl',canvas.myConfigSet.getPointer().xpathQuery('config/currentappnameurl/text()'));
-
this.setAttribute('currentappnamebugurl',canvas.myConfigSet.getPointer().xpathQuery('config/currentappnamebugurl/text()'));
this.setAttribute('loudnessAcitviation',canvas.myConfigSet.getPointer().xpathQuery('config/loudnessAcitviation/text()'));
this.setAttribute('webAppRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/webAppRootKey/text()'));
this.setAttribute('showWindowEffect',canvas.myConfigSet.getPointer().xpathQuery('config/showWindowEffect/text()'));
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/WebappNamePath.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/WebappNamePath.xml?rev=1721159&r1=1721158&r2=1721159&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/WebappNamePath.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/WebappNamePath.xml
Mon Dec 21 14:03:03 2015
@@ -129,22 +129,6 @@
<tt>Openmeetings</tt>
</i>
</p>
- <p>
- Please
- <i>NOTE</i>
- there are 3 additional properties in the
public/config.xml file which
- should be modified for
- <strong>TOTAL</strong>
- Openmeetings clean up:
- </p>
- <source>
-<![CDATA[
-<currentappname>OpenMeetings</currentappname>
-<currentappnameurl>http://openmeetings.apache.org</currentappnameurl>
-<currentappnamebugurl>https://issues.apache.org/jira/browse/OPENMEETINGS</currentappnamebugurl>
-]]>
- </source>
-
</section>
<section name="Running multiple Openmeetings instances on the
same server">
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xml?rev=1721159&r1=1721158&r2=1721159&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xml
Mon Dec 21 14:03:03 2015
@@ -81,24 +81,6 @@ of the red5-servlet
<proxyType>none</proxyType>
<!--
- Name of the Application
- this is the Top-Icon Name of the Application
- -->
-<currentappname>Apache OpenMeetings</currentappname>
-
-<!--
- URL to the Home of the Application
- this is the URL which is used if you click on the Top-icon
--->
-<currentappnameurl>http://openmeetings.apache.org</currentappnameurl>
-
-<!--
- URL to Bugs/Support
- this is the URL which is used if you click on *report a bug*
- -->
-<currentappnamebugurl>https://issues.apache.org/jira/browse/OPENMEETINGS</currentappnamebugurl>
-
-<!--
Video-Settings
Number that specifies the amount of sound required to activate the
microphone
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xsd?rev=1721159&r1=1721158&r2=1721159&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xsd
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/public/config.xsd
Mon Dec 21 14:03:03 2015
@@ -30,9 +30,6 @@
<xs:element ref="red5httpport"/>
<xs:element ref="protocol"/>
<xs:element ref="proxyType"/>
- <xs:element ref="currentappname"/>
- <xs:element ref="currentappnameurl"/>
- <xs:element ref="currentappnamebugurl"/>
<xs:element ref="loudnessAcitviation"/>
<xs:element ref="webAppRootKey"/>
<xs:element ref="httpRootKey"/>
@@ -88,9 +85,6 @@
<xs:element name="red5httpport" type="xs:integer"/>
<xs:element name="protocol" type="xs:NCName"/>
<xs:element name="proxyType" type="xs:NCName"/>
- <xs:element name="currentappname" type="xs:string"/>
- <xs:element name="currentappnameurl" type="xs:anyURI"/>
- <xs:element name="currentappnamebugurl" type="xs:anyURI"/>
<xs:element name="loudnessAcitviation" type="xs:integer"/>
<xs:element name="webAppRootKey" type="xs:NCName"/>
<xs:element name="httpRootKey" type="xs:string"/>
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/WebappNamePath.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/WebappNamePath.xml?rev=1721159&r1=1721158&r2=1721159&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/WebappNamePath.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/WebappNamePath.xml
Mon Dec 21 14:03:03 2015
@@ -129,22 +129,6 @@
<tt>Openmeetings</tt>
</i>
</p>
- <p>
- Please
- <i>NOTE</i>
- there are 3 additional properties in the
public/config.xml file which
- should be modified for
- <strong>TOTAL</strong>
- Openmeetings clean up:
- </p>
- <source>
-<![CDATA[
-<currentappname>OpenMeetings</currentappname>
-<currentappnameurl>http://openmeetings.apache.org</currentappnameurl>
-<currentappnamebugurl>https://issues.apache.org/jira/browse/OPENMEETINGS</currentappnamebugurl>
-]]>
- </source>
-
</section>
<section name="Running multiple Openmeetings instances on the
same server">
