Author: solomax
Date: Mon Dec 7 19:06:49 2015
New Revision: 1718445
URL: http://svn.apache.org/viewvc?rev=1718445&view=rev
Log:
Build is fixed; code clean-up
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/pom.xml
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/navi/mainNavi.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Modified: openmeetings/branches/3.1.x/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/pom.xml?rev=1718445&r1=1718444&r2=1718445&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/pom.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/pom.xml Mon Dec 7 19:06:49
2015
@@ -36,6 +36,41 @@
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
</properties>
+ <profiles>
+ <profile>
+ <id>default-target</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <ant.target>client.only</ant.target>
+ </properties>
+ </profile>
+ <profile>
+ <id>debug-target</id>
+ <activation>
+ <property>
+ <name>debug</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <ant.target>client.debug.only</ant.target>
+ </properties>
+ </profile>
+ <profile>
+ <id>client-debug-target</id>
+ <activation>
+ <property>
+ <name>client-debug</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+
<ant.target>compile.laszlo.main.debug</ant.target>
+ </properties>
+ </profile>
+ </profiles>
<build>
<!-- sourceDirectory>src/main/flex</sourceDirectory-->
@@ -79,9 +114,7 @@
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
- <!--ant
antfile="${basedir}/openlaszlo.xml" target="compile.laszlo.main.debug"/-->
- <ant
antfile="${basedir}/openlaszlo.xml" target="client.only"/>
- <!--ant
antfile="${basedir}/openlaszlo.xml" target="client.debug.only"/-->
+ <ant
antfile="${basedir}/openlaszlo.xml" target="${ant.target}"/>
</target>
<skip>${om.quick.build}</skip>
</configuration>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1718445&r1=1718444&r2=1718445&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
Mon Dec 7 19:06:49 2015
@@ -59,7 +59,6 @@
<!-- UserId-->
<attribute name="UserID" value="1" type="number" />
<!-- reconnect after each conferenceView -->
- <attribute name="reconnectAfterRoomleft" type="boolean" value="false" />
<attribute name="reconnectedRoomInstance" value="null" />
<attribute name="reconnectionAction" value="false" type="boolean" />
@@ -152,11 +151,6 @@
canvas.sessionId = canvas.wicketsid;
this.getPublicSID.doCall();
}
- } else if (this.reconnectAfterRoomleft) {
- //Return to content after reconnect
- canvas.thishib.reconnectedRoomInstance.destroy();
- this.overwritePublicSID.doCall();
- this.setUsernameReconnect.doCall();
} else if (canvas.wicketsid != null) {
canvas.sessionId = canvas.wicketsid;
if (canvas.thishib.loaderVar != null) {
@@ -209,8 +203,6 @@
if (this.reconnectionAction){
this.reconnectionAction = false;
this.reconnectObjRef.reconnectSuccess();
- } else if (this.reconnectAfterRoomleft) {
- loadContentByTempActionForNavi();
}
canvas.currentContentView.sendInit.sendEvent(this);
</method>
@@ -219,7 +211,7 @@
<![CDATA[
canvas.remoteLogWrite("error status='" + this.status + "';
src='" + this.src + "'; lastCalled='" + this.lastCalled
+ "'; showKickMessage='" + this.showKickMessage + "';
showFullMessage='" + this.showFullMessage
- + "'; reconnectionAction='" + this.reconnectionAction +
"'; reconnectAfterRoomleft='" + this.reconnectAfterRoomleft + "'");
+ + "'; reconnectionAction='" + this.reconnectionAction +
"'");
if (this.showFullMessage) {
new lz.labelerrorPopup(canvas,
{
@@ -246,10 +238,6 @@
} else if (this.reconnectionAction){
if ($debug) Debug.write("this.reconnectionAction: ",
this.lastCalled);
this.connect();
- } else if (this.reconnectAfterRoomleft) {
- if ($debug) Debug.write("this.reconnectAfterRoomleft:
",this.reconnectAfterRoomleft);
- this.counterror=0;
- this.connect();
} else {
if (canvas.isRemoteUser() && (this.status ==
'NetConnection.Connect.Closed'
|| this.status ==
'NetConnection.Connect.NetworkChange'))
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1718445&r1=1718444&r2=1718445&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
Mon Dec 7 19:06:49 2015
@@ -407,7 +407,6 @@
<method name="quit">
canvas.thishib.src = null;
canvas.thishib.reconnectionAction = false;
- canvas.thishib.reconnectAfterRoomleft = false;
canvas.thishib.counterror = 100;
canvas.thishib.disconnect();
if (canvas.thishib._nc) {
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/navi/mainNavi.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/navi/mainNavi.lzx?rev=1718445&r1=1718444&r2=1718445&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/navi/mainNavi.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/navi/mainNavi.lzx
Mon Dec 7 19:06:49 2015
@@ -20,11 +20,6 @@
-->
<library>
-<class name="textBoxSubBlank" extends="text" text="$once{ parent.text }"
- fgcolor="0x000000" fontstyle="bold"
- fontsize="14" y="6" x="10" />
-
-
<class name="baseDropDownMenuListItem" extends="view" height="36">
<attribute name="action" value="" type="string" />
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx?rev=1718445&r1=1718444&r2=1718445&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
Mon Dec 7 19:06:49 2015
@@ -64,9 +64,6 @@
client.setId = this.setId;
this._nc.client = client;
-
- //Register Methods
- //this.registerMethods();
</method>
<method name="setId" args="tId">
@@ -126,65 +123,6 @@
this._nc.close();
}
</method>
- <!---
- With this function all methods are registered to the NetConnection
- A server can invoke this Method with a call for it from the Client
- Only subnodes of rtmpconnections which are a instance of
netRemoteCallHib
- are registered, to add dynamically methods to the remotefunction you
will
- have to invoke this method once again
- -swagner
- -->
- <method name="registerMethods">
- <![CDATA[
- if (this.subnodes != null) {
- //Register all methods which are instanceof
netRemoteCallHib
- for (var i = 0; i < this.subnodes.length; ++i) {
- //If it is of Type netRemoteCallHib then
register it to the NetConnection
- if (this.subnodes[i] instanceof
lz.netRemoteCallHib) {
- this._nc[this.subnodes[i].funcname] =
function(args) {
- return
hib.remoteCallMethod(arguments.callee, arguments);
- }
- }
- }
- }
- ]]>
- </method>
-
- <!--
- Process the RemoteCall to the Right Funtion
- -swagner
- -->
- <method name="remoteCallMethod" args="callee,args">
- <![CDATA[
- for (var eg in this._nc){
- if (this._nc[eg]==callee){
- if (this.debug) {
- //_root.Debug.write.write("DEBUG invoked a function
remotely: ",eg,args);
- }
- if (args.length == 1) {
- return this.callFuntion(eg,args[0]);
- } else {
- return this.callFuntion(eg,args);
- }
- //return this.callFuntion(eg,args);
- }
- }
- ]]>
- </method>
-
- <!--
- Map the Function to a netRemoteCallHib
- -swagner
- -->
- <method name="callFuntion" args="funcname,args">
- <![CDATA[
- for (var i=0;i<this.subnodes.length;i++){
- if (this.subnodes[i].funcname==funcname){
- return this.subnodes[i].onResult(args);
- }
- }
- ]]>
- </method>
<method name="callRPC" args="func, obj, params">
//if ($debug) Debug.write("*** call: func, obj, params",func,obj,
typeof (params) ,params.length);
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1718445&r1=1718444&r2=1718445&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Mon Dec 7 19:06:49 2015
@@ -202,7 +202,6 @@
<handler name="ondata" args="value">
if ($debug) Debug.write("#############
logicalRoomLeave: ",value);
//this.parent.destroy();
- canvas.thishib.reconnectAfterRoomleft = true;
canvas.thishib.reconnectedRoomInstance = this.parent;
// Reconnect User to default Scope
