business service tree elements can be added to network maps
authorVictor Kirhenshtein <victor@netxms.org>
Sun, 10 Nov 2013 16:49:42 +0000 (18:49 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Sun, 10 Nov 2013 16:49:42 +0000 (18:49 +0200)
src/java/netxms-client/src/main/java/org/netxms/client/objects/ServiceContainer.java
src/java/netxms-eclipse/ObjectManager/plugin.xml
webui/webapp/ObjectManager/META-INF/MANIFEST.MF
webui/webapp/ObjectManager/plugin.xml

index 958aee9..39c7fac 100644 (file)
@@ -62,4 +62,13 @@ public abstract class ServiceContainer extends GenericObject
        {
                return uptimeForMonth;
        }
+
+   /* (non-Javadoc)
+    * @see org.netxms.client.objects.AbstractObject#isAllowedOnMap()
+    */
+   @Override
+   public boolean isAllowedOnMap()
+   {
+      return true;
+   }
 }
index 16da706..d5c05e6 100644 (file)
                  <instanceof
                        value="org.netxms.client.objects.NetworkMap">
                  </instanceof>
+                 <instanceof
+                       value="org.netxms.client.objects.ServiceContainer">
+                 </instanceof>
               </or>
            </enabledWhen>
         </page>
index b855720..6dc1027 100644 (file)
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NXMC Basic Object Management Plug-in
 Bundle-SymbolicName: org.netxms.ui.eclipse.objectmanager;singleton:=true
-Bundle-Version: 1.2.8
+Bundle-Version: 1.2.10
 Bundle-Activator: org.netxms.ui.eclipse.objectmanager.Activator
 Bundle-Vendor: netxms.org
-Require-Bundle: org.netxms.ui.eclipse.objectbrowser;bundle-version="1.2.6",
- org.netxms.ui.eclipse.usermanager;bundle-version="1.2.1",
- org.netxms.ui.eclipse.nxsl;bundle-version="1.2.4",
- org.netxms.ui.eclipse.imagelibrary;bundle-version="1.2.6",
- org.netxms.ui.eclipse.datacollection;bundle-version="1.2.6",
- org.netxms.ui.eclipse.eventmanager;bundle-version="1.2.6",
- org.eclipse.rap.ui;bundle-version="2.0.0",
- org.netxms.webui.core;bundle-version="1.2.6"
+Require-Bundle: org.netxms.ui.eclipse.objectbrowser;bundle-version="1.2.10",
+ org.netxms.ui.eclipse.usermanager;bundle-version="1.2.8",
+ org.netxms.ui.eclipse.nxsl;bundle-version="1.2.6",
+ org.netxms.ui.eclipse.imagelibrary;bundle-version="1.2.7",
+ org.netxms.ui.eclipse.datacollection;bundle-version="1.2.9",
+ org.netxms.ui.eclipse.eventmanager;bundle-version="1.2.10",
+ org.eclipse.rap.ui;bundle-version="2.1.1",
+ org.netxms.webui.core;bundle-version="1.2.10"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.objectmanager.actions,
index af90838..1fe15ed 100644 (file)
                  <instanceof
                        value="org.netxms.client.objects.NetworkMap">
                  </instanceof>
+                 <instanceof
+                       value="org.netxms.client.objects.ServiceContainer">
+                 </instanceof>
               </or>
            </enabledWhen>
         </page>