[openwonderland] r4893 committed - added Fix of issue with the new java7 update

[openwon...@googlecode.com]

Revision: 4893
Author: abhishek...@wishtreetech.com
Date: Thu Oct 24 05:47:03 2013 UTC
Log: added Fix of issue with the new java7 update
http://code.google.com/p/openwonderland/source/detail?r=4893

Modified:
/trunk/core/src/classes/org/jdesktop/wonderland/client/ClientContext.java

/trunk/core/src/classes/org/jdesktop/wonderland/client/jme/JmeClientMain.java

/trunk/web/front/src/java/org/jdesktop/wonderland/front/servlet/WonderlandSubstitutionHandler.java
/trunk/web/webstart/web/Wonderland.jnlp

=======================================
---
/trunk/core/src/classes/org/jdesktop/wonderland/client/ClientContext.java
Tue Jan 24 18:51:54 2012 UTC
+++
/trunk/core/src/classes/org/jdesktop/wonderland/client/ClientContext.java
Thu Oct 24 05:47:03 2013 UTC
@@ -180,7 +180,7 @@
// if neither the preference or the system property are set, use
// a default value based on the Wonderland version
if (userDirName == null) {
- String version = System.getProperty("wonderland.version");
+ String version = System.getProperty("jnlp.wonderland.version");

// on Windows, we probably want to use the profile directory
// rather than the home directory, as described in Java bug
=======================================
---
/trunk/core/src/classes/org/jdesktop/wonderland/client/jme/JmeClientMain.java
Thu Jul 18 13:37:08 2013 UTC
+++
/trunk/core/src/classes/org/jdesktop/wonderland/client/jme/JmeClientMain.java
Thu Oct 24 05:47:03 2013 UTC
@@ -103,7 +103,7 @@
// standard properties
private static final String PROPS_URL_PROP = "run.properties.file";
private static final String CONFIG_DIR_PROP =
- "wonderland.client.config.dir";
+ "jnlp.wonderland.client.config.dir";
private static final String DESIRED_FPS_PROP = "wonderland.client.fps";
private static final String WINDOW_SIZE_PROP =
"wonderland.client.windowSize";
=======================================
---
/trunk/web/front/src/java/org/jdesktop/wonderland/front/servlet/WonderlandSubstitutionHandler.java
Tue Oct 26 00:37:40 2010 UTC
+++
/trunk/web/front/src/java/org/jdesktop/wonderland/front/servlet/WonderlandSubstitutionHandler.java
Thu Oct 24 05:47:03 2013 UTC
@@ -67,7 +67,7 @@
ServletContext context = request.getSession().getServletContext();

// substitute $$sgs.server with the sgs server URL
- String serverURL =
ServletPropertyUtil.getProperty("wonderland.server.url", context);
+ String serverURL =
ServletPropertyUtil.getProperty("jnlp.wonderland.server.url", context);
if (serverURL == null) {
UriBuilder builder =
UriBuilder.fromUri(request.getRequestURL().toString());
serverURL = builder.replacePath("/").build().toString();
@@ -82,7 +82,7 @@
jnlpTemplate = substitute(jnlpTemplate, "$$wonderland.server.url",
serverURL);

// substitute in the config directory
- String configDirURL =
ServletPropertyUtil.getProperty("wonderland.client.config.dir", context);
+ String configDirURL =
ServletPropertyUtil.getProperty("jnlp.wonderland.client.config.dir",
context);
if (configDirURL == null) {
UriBuilder builder =
UriBuilder.fromUri(request.getRequestURL().toString());
configDirURL =
builder.replacePath("/wonderland-web-front/config/").build().toString();
=======================================
--- /trunk/web/webstart/web/Wonderland.jnlp Wed Oct 26 17:45:54 2011 UTC
+++ /trunk/web/webstart/web/Wonderland.jnlp Thu Oct 24 05:47:03 2013 UTC
@@ -23,10 +23,10 @@
<!-- jar files auto-populated by build script -->
%LOCAL_JAR_FILES%

- <property name="wonderland.server.url"
value="$$wonderland.server.url"/>
- <property name="wonderland.client.config.dir"
value="$$wonderland.client.config.dir"/>
- <property name="wonderland.protocol.handler.pkgs"
value="org.jdesktop.wonderland.client.protocols"/>
- <property name="wonderland.version" value="%VERSION%"/>
+ <property name="jnlp.wonderland.server.url"
value="$$wonderland.server.url"/>
+ <property name="jnlp.wonderland.client.config.dir"
value="$$wonderland.client.config.dir"/>
+ <property name="jnlp.wonderland.protocol.handler.pkgs"
value="org.jdesktop.wonderland.client.protocols"/>
+ <property name="jnlp.wonderland.version" value="%VERSION%"/>

<!-- properties passed in via the URL -->
$$url.props