Skip to content

Commit fe95086

Browse files
author
Kelven Yang
committed
Make the final switch on console proxy refactoring work. new VNC engine will be in use after this commit
Reviewed-By: Kelven
1 parent 27c7713 commit fe95086

59 files changed

Lines changed: 29 additions & 10854 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/build-cloud.xml‎

Lines changed: 3 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,10 @@
9191
<property name="scripts.dir" location="${base.dir}/scripts" />
9292
<property name="scripts.target.dir" location="${target.dir}/scripts"/>
9393

94-
<!-- directories for console proxy & applet code compilation-->
95-
<property name="console-common.dir" location="${base.dir}/console" />
96-
<property name="console-common.dist.dir" location="${dist.dir}/console-common" />
97-
94+
<!-- directories for console proxy compilation-->
9895
<property name="console-proxy.dir" location="${base.dir}/console-proxy" />
9996
<property name="console-proxy.dist.dir" location="${dist.dir}/console-proxy" />
10097

101-
<property name="console-viewer.dir" location="${base.dir}/console-viewer" />
102-
<property name="console-viewer.dist.dir" location="${dist.dir}/console-viewer" />
103-
10498
<property name="tools.dir" location="${base.dir}/tools" />
10599
<!-- <property name="antcontrib.dir" location="${tools.dir}/tools/ant/apache-ant-1.8.0/lib" />-->
106100
<property name="deploy.dir" location="${build.dir}/deploy" />
@@ -118,7 +112,6 @@
118112
<property name="utils.jar" value="cloud-utils.jar" />
119113
<property name="server.jar" value="cloud-server.jar" />
120114
<property name="agent.jar" value="cloud-agent.jar" />
121-
<property name="console-common.jar" value="cloud-console-common.jar" />
122115
<property name="console-proxy.jar" value="cloud-console-proxy.jar" />
123116
<property name="api.jar" value="cloud-api.jar"/>
124117
<property name="vmware-base.jar" value="cloud-vmware-base.jar" />
@@ -317,19 +310,11 @@
317310
</copy>
318311
</target>
319312

320-
<path id="console-common.classpath">
321-
<path refid="deps.classpath" />
322-
<path refid="dist.classpath" />
323-
</path>
324-
<target name="compile-console-common" depends="-init" description="Compile the console-common jar that is shared.">
325-
<compile-java jar.name="${console-common.jar}" top.dir="${console-common.dir}" classpath="console-common.classpath" />
326-
</target>
327-
328313
<path id="console-proxy.classpath">
329314
<path refid="deps.classpath" />
330315
<path refid="dist.classpath" />
331316
</path>
332-
<target name="compile-console-proxy" depends="-init, compile-console-common" description="Compile the console proxy.">
317+
<target name="compile-console-proxy" depends="-init" description="Compile the console proxy.">
333318
<compile-java jar.name="${console-proxy.jar}" top.dir="${console-proxy.dir}" classpath="console-proxy.classpath" >
334319
<include-files>
335320
<fileset dir="${console-proxy.dir}/certs">
@@ -364,7 +349,6 @@
364349
<copy todir="${copyto.dir}">
365350
<fileset dir="${jar.dir}">
366351
<include name="cloud-console-proxy.jar" />
367-
<include name="cloud-console-common.jar" />
368352
</fileset>
369353
</copy>
370354
<copy todir="${copyto.dir}/conf">
@@ -381,11 +365,6 @@
381365
<include name="*.cur" />
382366
</fileset>
383367
</copy>
384-
<copy todir="${copyto.dir}/applet">
385-
<fileset dir="${jar.dir}">
386-
<include name="VMOpsConsoleApplet.jar" />
387-
</fileset>
388-
</copy>
389368
<copy todir="${copyto.dir}/js">
390369
<fileset dir="${console-proxy.dir}/js">
391370
<include name="*.js" />
@@ -410,7 +389,7 @@
410389
</copy>
411390
</target>
412391

413-
<target name="build-console-proxy" depends="-init, build-console-viewer, compile-console-proxy, copy-console-proxy">
392+
<target name="build-console-proxy" depends="-init, compile-console-proxy, copy-console-proxy">
414393
<copy todir="${console-proxy.dist.dir}">
415394
<fileset dir="${console-proxy.dir}/scripts">
416395
</fileset>
@@ -421,36 +400,6 @@
421400
</copy>
422401
</target>
423402

424-
<path id="console-viewer.classpath">
425-
<path refid="deps.classpath" />
426-
<path refid="dist.classpath" />
427-
</path>
428-
<target name="build-console-viewer" depends="-init" description="Compile console viewer applet">
429-
430-
<mkdir dir="${classes.dir}/console-viewer" />
431-
<depend srcdir="${console-viewer.dir}/src" destdir="${classes.dir}/console-viewer" cache="${dep.cache.dir}" />
432-
433-
<javac srcdir="${console-common.dir}/src" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" destdir="${classes.dir}/console-viewer" source="${source.compat.version}" target="${target.compat.version}" includeantruntime="false">
434-
<classpath refid="console-viewer.classpath" />
435-
<exclude name="${compile.java.exclude.files}" />
436-
<compilerarg value="-Xlint:all" />
437-
</javac>
438-
439-
<javac srcdir="${console-viewer.dir}/src" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" destdir="${classes.dir}/console-viewer" source="${source.compat.version}" target="${target.compat.version}" includeantruntime="false">
440-
<classpath refid="console-viewer.classpath" />
441-
<exclude name="${compile.java.exclude.files}" />
442-
<compilerarg value="-Xlint:all" />
443-
</javac>
444-
<jar jarfile="${jar.dir}/VMOpsConsoleApplet.jar" basedir="${classes.dir}/console-viewer">
445-
<manifest>
446-
<attribute name="Class-Path" value="" />
447-
<attribute name="Built-By" value="${built.by}" />
448-
<attribute name="Manifest-Version" value="1.0" />
449-
<attribute name="Main-Class" value="ConsoleViewer" />
450-
</manifest>
451-
</jar>
452-
</target>
453-
454403
<path id="agent.classpath">
455404
<path refid="deps.classpath" />
456405
<fileset dir="${target.dir}">

‎build/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
</target>
284284

285285
<!-- The following target is OBSOLETE. If you need to add a jar file / target, go to the function def runant(target): in wscrpit_build, and list the jar file and the target in the appropriate places -->
286-
<target name="sendjarfiles" depends="compile-utils, compile-core, compile-server, compile-agent, compile-console-common, compile-console-proxy, build-console-viewer">
286+
<target name="sendjarfiles" depends="compile-utils, compile-core, compile-server, compile-agent, compile-console-proxy">
287287
<copy todir="${waf.artifacts}">
288288
<fileset dir="${target.dir}/jar"/>
289289
</copy>

‎console-proxy/.classpath‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
55
<classpathentry combineaccessrules="false" kind="src" path="/deps"/>
6-
<classpathentry combineaccessrules="false" kind="src" path="/console"/>
76
<classpathentry kind="output" path="bin"/>
87
</classpath>

‎console-proxy/src/com/cloud/consoleproxy/AjaxFIFOImageCache.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import java.util.HashMap;
2323
import java.util.List;
2424
import java.util.Map;
25-
26-
import com.cloud.console.Logger;
25+
26+
import com.cloud.consoleproxy.util.Logger;
2727

2828
public class AjaxFIFOImageCache {
2929
private static final Logger s_logger = Logger.getLogger(AjaxFIFOImageCache.class);

console/src/com/cloud/console/AuthenticationException.java renamed to console-proxy/src/com/cloud/consoleproxy/AuthenticationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
// repackage it to VMOps common packaging structure
20-
package com.cloud.console;
20+
package com.cloud.consoleproxy;
2121

2222
public class AuthenticationException extends Exception {
2323
private static final long serialVersionUID = -393139302884898842L;

‎console-proxy/src/com/cloud/consoleproxy/ConsoleProxy.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
import org.apache.log4j.xml.DOMConfigurator;
1616

17-
import com.cloud.console.AuthenticationException;
18-
import com.cloud.console.Logger;
17+
import com.cloud.consoleproxy.util.Logger;
1918
import com.sun.net.httpserver.HttpServer;
2019

2120
/**

‎console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.List;
2929
import java.util.Map;
3030

31-
import com.cloud.console.Logger;
31+
import com.cloud.consoleproxy.util.Logger;
3232
import com.sun.net.httpserver.Headers;
3333
import com.sun.net.httpserver.HttpExchange;
3434
import com.sun.net.httpserver.HttpHandler;

‎console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxImageHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.HashMap;
2424
import java.util.Map;
2525

26-
import com.cloud.console.Logger;
26+
import com.cloud.consoleproxy.util.Logger;
2727
import com.sun.net.httpserver.Headers;
2828
import com.sun.net.httpserver.HttpExchange;
2929
import com.sun.net.httpserver.HttpHandler;

‎console-proxy/src/com/cloud/consoleproxy/ConsoleProxyBaseServerFactoryImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import javax.net.ssl.SSLServerSocket;
2525

26-
import com.cloud.console.Logger;
26+
import com.cloud.consoleproxy.util.Logger;
2727
import com.sun.net.httpserver.HttpServer;
2828

2929
public class ConsoleProxyBaseServerFactoryImpl implements ConsoleProxyServerFactory {

‎console-proxy/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
import org.apache.log4j.Logger;
88

9-
import com.cloud.console.TileInfo;
10-
import com.cloud.console.TileTracker;
9+
import com.cloud.consoleproxy.util.TileInfo;
10+
import com.cloud.consoleproxy.util.TileTracker;
1111
import com.cloud.consoleproxy.vnc.FrameBufferCanvas;
1212

1313
/**

0 commit comments

Comments
 (0)