nxmc.properties now loaded from common classpath (e.g. for Tomcat: $TOMCAT_HOME/lib/)
authorAlex Kirhenshtein <alk@netxms.org>
Thu, 11 Jul 2013 23:10:30 +0000 (23:10 +0000)
committerAlex Kirhenshtein <alk@netxms.org>
Thu, 11 Jul 2013 23:10:30 +0000 (23:10 +0000)
.gitattributes
webui/webapp/Core/WEB-INF/launch.ini
webui/webapp/Core/src/org/netxms/webui/core/ApplicationWorkbenchWindowAdvisor.java
webui/webapp/Core/src/org/netxms/webui/core/nxmc.properties [deleted file]

index 2585b11..933b0b7 100644 (file)
@@ -2737,7 +2737,6 @@ webui/webapp/Core/src/org/netxms/webui/core/dialogs/PasswordExpiredDialog.java -
 webui/webapp/Core/src/org/netxms/webui/core/messages.properties -text
 webui/webapp/Core/src/org/netxms/webui/core/messages_es.properties -text
 webui/webapp/Core/src/org/netxms/webui/core/messages_ru.properties -text
-webui/webapp/Core/src/org/netxms/webui/core/nxmc.properties -text
 webui/webapp/Core/theme/resources/arrows/down.gif -text
 webui/webapp/Core/theme/resources/button/arrow-down.png -text
 webui/webapp/Core/theme/resources/button/arrow-left.png -text
index 388ebcd..20bbebf 100644 (file)
@@ -7,7 +7,7 @@ osgi.*=@null
 org.osgi.*=@null
 eclipse.*=@null
 
-osgi.parentClassloader=app
-osgi.contextClassLoaderParent=app
+osgi.parentClassloader=fwk
+#osgi.contextClassLoaderParent=app
 
 eclipse.product=org.netxms.webui.core.product
index 814aeec..af6c6b7 100644 (file)
@@ -267,7 +267,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor
                InputStream in = null;
                try
                {
-                       in = getClass().getResourceAsStream("nxmc.properties"); //$NON-NLS-1$
+                       in = getClass().getResourceAsStream("/nxmc.properties"); //$NON-NLS-1$
                        if (in != null)
                                properties.load(in);
                }
diff --git a/webui/webapp/Core/src/org/netxms/webui/core/nxmc.properties b/webui/webapp/Core/src/org/netxms/webui/core/nxmc.properties
deleted file mode 100644 (file)
index 707d0ff..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-server=127.0.0.1\r
-enableAdvancedSettings=true\r