new codes for market support; cosmetic changes
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 22 Apr 2016 11:33:39 +0000 (14:33 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 22 Apr 2016 11:33:39 +0000 (14:33 +0300)
include/nms_cscp.h
src/java/client/META-INF/MANIFEST.MF
src/java/client/netxms-base/src/main/java/org/netxms/base/NXCPCodes.java
src/java/client/netxms-client/src/main/java/org/netxms/client/NXCSession.java
src/java/netxms-eclipse/FileManager/src/org/netxms/ui/eclipse/filemanager/views/helpers/AgentFileFilter.java

index 562d7ba..c3508b2 100644 (file)
@@ -559,13 +559,16 @@ typedef struct
 #define CMD_LEAVE_MAINT_MODE           0x0146
 #define CMD_JOIN_CLUSTER               0x0147
 #define CMD_CLUSTER_NOTIFY             0x0148
-
 #define CMD_ZMQ_SUBSCRIBE_EVENT        0x0149
 #define CMD_ZMQ_UNSUBSCRIBE_EVENT      0x014A
 #define CMD_ZMQ_SUBSCRIBE_DATA         0x014B
 #define CMD_ZMQ_UNSUBSCRIBE_DATA       0x014C
-#define CMD_ZMQ_LIST_EVENT_SUBSCRIPTIONS 0x014D
-#define CMD_ZMQ_LIST_DATA_SUBSCRIPTIONS 0x014E
+#define CMD_ZMQ_GET_EVT_SUBSCRIPTIONS  0x014D
+#define CMD_ZMQ_GET_DATA_SUBSCRIPTIONS 0x014E
+#define CMD_GET_REPOSITORIES           0x014F
+#define CMD_ADD_REPOSITORY             0x0150
+#define CMD_MODIFY_REPOSITORY          0x0151
+#define CMD_DELETE_REPOSITORY          0x0152
 
 #define CMD_RS_LIST_REPORTS            0x1100
 #define CMD_RS_GET_REPORT              0x1101
@@ -1120,6 +1123,8 @@ typedef struct
 #define VID_STATUS                  ((UINT32)537)
 #define VID_FLAGS_MASK              ((UINT32)538)
 #define VID_TOP_BOTTOM              ((UINT32)539)
+#define VID_AUTH_TOKEN              ((UINT32)540)
+#define VID_REPOSITORY_ID           ((UINT32)541)
 
 // Base variabe for single threshold in message
 #define VID_THRESHOLD_BASE          ((UINT32)0x00800000)
index 1c755ce..ef6194e 100644 (file)
@@ -24,6 +24,7 @@ Export-Package: org.netxms.base,
  org.netxms.client.maps,
  org.netxms.client.maps.configs,
  org.netxms.client.maps.elements,
+ org.netxms.client.market,
  org.netxms.client.mt,
  org.netxms.client.objects,
  org.netxms.client.objecttools,
index 9f6a14b..7524879 100644 (file)
@@ -346,13 +346,18 @@ public class NXCPCodes
    public static final int CMD_REMOVE_SCHEDULE = 0x0144;
    public static final int CMD_ENTER_MAINT_MODE = 0x0145;
    public static final int CMD_LEAVE_MAINT_MODE = 0x0146;   
-
+   public static final int CMD_JOIN_CLUSTER = 0x0147;   
+   public static final int CMD_CLUSTER_NOTIFY = 0x0148;   
    public static final int CMD_ZMQ_SUBSCRIBE_EVENT = 0x0149;
-   public static final int CMD_ZMQ_UNSUBSCRIBE_EVENT = 0x014a;
-   public static final int CMD_ZMQ_SUBSCRIBE_DATA = 0x014b;
-   public static final int CMD_ZMQ_UNSUBSCRIBE_DATA = 0x014c;
-   public static final int CMD_ZMQ_LIST_EVENT_SUBSCRIPTIONS = 0x014d;
-   public static final int CMD_ZMQ_LIST_DATA_SUBSCRIPTIONS = 0x014e;
+   public static final int CMD_ZMQ_UNSUBSCRIBE_EVENT = 0x014A;
+   public static final int CMD_ZMQ_SUBSCRIBE_DATA = 0x014B;
+   public static final int CMD_ZMQ_UNSUBSCRIBE_DATA = 0x014C;
+   public static final int CMD_ZMQ_GET_EVT_SUBSCRIPTIONS = 0x014D;
+   public static final int CMD_ZMQ_GET_DATA_SUBSCRIPTIONS = 0x014E;
+   public static final int CMD_GET_REPOSITORIES = 0x014F;
+   public static final int CMD_ADD_REPOSITORY = 0x0150;
+   public static final int CMD_MODIFY_REPOSITORY = 0x0151;
+   public static final int CMD_DELETE_REPOSITORY = 0x0152;
 
        // CMD_RS_ - Reporting Server related codes
        public static final int CMD_RS_LIST_REPORTS = 0x1100;
@@ -906,6 +911,8 @@ public class NXCPCodes
    public static final long VID_STATUS = 537;
    public static final long VID_FLAGS_MASK = 538;
    public static final long VID_TOP_BOTTOM = 539;
+   public static final long VID_AUTH_TOKEN = 540;
+   public static final long VID_REPOSITORY_ID = 541;
 
        public static final long VID_ACL_USER_BASE = 0x00001000L;
        public static final long VID_ACL_USER_LAST = 0x00001FFFL;
index 7e28ab8..6e63c88 100644 (file)
@@ -8755,7 +8755,7 @@ public class NXCSession
    
    public List<ZmqSubscription> getZmqSubscriptions(ZmqSubscriptionType type) throws IOException, NXCException
    {
-       final NXCPMessage msg = newMessage(type == ZmqSubscriptionType.EVENT ? NXCPCodes.CMD_ZMQ_LIST_EVENT_SUBSCRIPTIONS : NXCPCodes.CMD_ZMQ_LIST_DATA_SUBSCRIPTIONS);
+       final NXCPMessage msg = newMessage(type == ZmqSubscriptionType.EVENT ? NXCPCodes.CMD_ZMQ_GET_EVT_SUBSCRIPTIONS : NXCPCodes.CMD_ZMQ_GET_DATA_SUBSCRIPTIONS);
        sendMessage(msg);
        final NXCPMessage response = waitForRCC(msg.getMessageId());
 
index 9a26262..3b46080 100644 (file)
@@ -49,6 +49,10 @@ public class AgentFileFilter extends ViewerFilter
       return pass;
        }
        
+       /**
+        * @param children
+        * @return
+        */
        private boolean containString(AgentFile[] children)
        {
           if (children != null)