Config in XML, forgot to add connect servlet to web.xml

This commit is contained in:
Michael Jumper
2010-11-26 19:15:47 -08:00
parent e353bb14c9
commit 9066923298
4 changed files with 32 additions and 16 deletions

View File

@@ -24,23 +24,23 @@ import net.sourceforge.guacamole.GuacamoleException;
public class GuacamoleConfiguration extends Configuration {
private String hostname;
private int port;
private String guacd_hostname;
private int guacd_port;
public GuacamoleConfiguration(ServletContext context) throws GuacamoleException {
super(context);
hostname = context.getInitParameter("hostname");
port = readIntParameter("port", null);
guacd_hostname = context.getInitParameter("guacd-hostname");
guacd_port = readIntParameter("guacd-port", null);
}
public int getPort() {
return port;
public int getProxyPort() {
return guacd_port;
}
public String getHostname() {
return hostname;
public String getProxyHostname() {
return guacd_hostname;
}
}

View File

@@ -96,8 +96,8 @@ public class GuacamoleSession {
client = new SessionClient(
new GuacamoleClient (
config.getHostname(),
config.getPort()
config.getProxyHostname(),
config.getProxyPort()
)
);

View File

@@ -1,2 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context antiJARLocking="true" path=""/>
<Context antiJARLocking="true" path="">
<!-- Hostname and port of guacamole proxy -->
<Parameter name="guacd-hostname" value="localhost"/>
<Parameter name="guacd-port" value="4822"/>
</Context>

View File

@@ -17,9 +17,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<!-- Basic config -->
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
@@ -29,9 +29,19 @@
30
</session-timeout>
</session-config>
<!-- Servlets -->
<servlet>
<description>Connect servlet.</description>
<servlet-name>Connect</servlet-name>
<servlet-class>net.sourceforge.guacamole.net.tunnel.Connect</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>Connect</servlet-name>
<url-pattern>/connect</url-pattern>
</servlet-mapping>
<servlet>
<description>Outbound servlet.</description>
<servlet-name>Outbound</servlet-name>
@@ -41,7 +51,7 @@
<servlet-name>Outbound</servlet-name>
<url-pattern>/outbound</url-pattern>
</servlet-mapping>
<servlet>
<description>Input servlet.</description>
<servlet-name>Inbound</servlet-name>
@@ -51,5 +61,5 @@
<servlet-name>Inbound</servlet-name>
<url-pattern>/inbound</url-pattern>
</servlet-mapping>
</web-app>