v5 Plugin Update

MQ plugin zOS v5 wpdate from @mayur-raja
UrbanCode · Jan 22, 2018 · 85b33dd · 85b33dd
1 parent 4e81a5f
commit 85b33dd
Show file tree

Hide file tree

Showing 9 changed files with 320 additions and 106 deletions.
diff --git a/README.md b/README.md
@@ -29,12 +29,24 @@ This plug-in requires version 6.2.2 (or later) of IBM UrbanCode Deploy.
 	your own changes to the plugin.
 
 ### History
-    Version 4
-        Updated build tool from Ant to Gradle.
-    Version 3
-        Updated mqResourceAttribute Mappings.
-        The true and false mapping values for inhibitGet and inhibitPut were previously coded in reverse.
-    Version 2
-      Resolved MQSCUtil missing class exception.
-    Version 1
-        Initial beta release
+Version 5
+- If there is no base file, an error is now raised. An information message is also now issued if there are no resources to deploy in the overrides file.
+- Single keyword (i.e. force/noForce, replace/noReplace, purge/noPurge) overrides are now supported. Other single keywords, like trigger/noTrigger, were previously already supported by the plugin.
+- Default (generic) overrides are now supported.
+- An error is now raised for non-existent attribute groups and attributes.
+- Setting the keepAliveInterval to -1 now correctly builds MQSC with KAINT(AUTO) or AMQPKA(AUTO) depending on the type of channel being defined.
+- The white paper has been updated to document default (generic) overrides.
+- Additional trace has also been added where required, and some comments in the code have been enhanced to aid future maintenance.
+
+Version 4
+- Updated build tool from Ant to Gradle.
+
+Version 3
+- Updated mqResourceAttribute Mappings.
+- The true and false mapping values for inhibitGet and inhibitPut were previously coded in reverse.
+
+Version 2
+- Resolved MQSCUtil missing class exception.
+
+Version 1
+- Initial beta release
diff --git a/doc/white_paper/IBM MQ for zOS Generate MQSC Commands.docx b/doc/white_paper/IBM MQ for zOS Generate MQSC Commands.docx
diff --git a/doc/white_paper/IBM MQ for zOS Generate MQSC Commands.pdf b/doc/white_paper/IBM MQ for zOS Generate MQSC Commands.pdf
diff --git a/src/main/groovy/com/urbancode/air/plugin/mqzos/MQSCUtil.groovy b/src/main/groovy/com/urbancode/air/plugin/mqzos/MQSCUtil.groovy
diff --git a/src/main/zip/generate_commands.groovy b/src/main/zip/generate_commands.groovy
@@ -1,5 +1,5 @@
 /**
- * © Copyright IBM Corporation 2016, 2017.
+ * © Copyright IBM Corporation 2016, 2018.
  * This is licensed under the following license.
  * The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
  * U.S. Government Users Restricted Rights:  Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.

diff --git a/src/main/zip/info.xml b/src/main/zip/info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    © Copyright IBM Corporation 2016, 2017.
+    © Copyright IBM Corporation 2016, 2018.
     This is licensed under the following license.
     The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
     U.S. Government Users Restricted Rights:  Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
@@ -132,5 +132,14 @@
     <release-note plugin-version="4">
         Updated build tool from Ant to Gradle.
     </release-note>
+    <release-note plugin-version="5">
+        If there is no base file, an error is now raised. An information message is also now issued if there are no resources to deploy in the overrides file.
+        Single keyword (i.e. force/noForce, replace/noReplace, purge/noPurge) overrides are now supported. Other single keywords, like trigger/noTrigger, were previously already supported by the plugin.
+        Default (generic) overrides are now supported.
+        An error is now raised for non-existent attribute groups and attributes.
+        Setting the keepAliveInterval to -1 now correctly builds MQSC with KAINT(AUTO) or AMQPKA(AUTO) depending on the type of channel being defined.
+        The white paper has been updated to document default (generic) overrides.
+        Additional trace has also been added where required, and some comments in the code have been enhanced to aid future maintenance.
+    </release-note>
   </release-notes>
 </pluginInfo>
diff --git a/src/main/zip/plugin.xml b/src/main/zip/plugin.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    © Copyright IBM Corporation 2016, 2017.
+    © Copyright IBM Corporation 2016, 2018.
     This is licensed under the following license.
     The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
     U.S. Government Users Restricted Rights:  Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 -->
 <plugin xmlns="http://www.urbancode.com/PluginXMLSchema_v1" xmlns:server="http://www.urbancode.com/PluginServerXMLSchema_v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <header>
-    <identifier id="com.ibm.ucd.plugin.mqzos" name="MQ for zOS" version="4"/>
+    <identifier id="com.ibm.ucd.plugin.mqzos" name="MQ for zOS" version="5"/>
     <description> The MQ for zOS plug-in includes deployment activities for MQ for zOS
     </description>
     <tag>Middleware/Messaging/MQ for zOS</tag>

diff --git a/src/main/zip/resourceMappings/mqResourceAttributes.mappings b/src/main/zip/resourceMappings/mqResourceAttributes.mappings
@@ -11,24 +11,36 @@
                     "attrMapping": "LIKE"
 				},
 				"noReplace": {
-					"attrDataType": "flag",
+					          "attrDataType": "flag",
                     "attrMapping": "NOREPLACE"
 				},
-				"force": {
+        "replace": {
+                    "attrDataType": "flag",
+                    "attrMapping": "REPLACE"
+        },
+        "noForce": {
+                    "attrDataType": "flag",
+                    "attrMapping": "NOFORCE"
+        },				
+        "force": {
                     "attrDataType": "flag",
                     "attrMapping": "FORCE"
 				},
 				"keepAuthorityRecords": {
                     "attrDataType": "keyword",
-					"attrMapping": "AUTHREC",
-					"attrValueMappings": {
-						"keepAuthorityRecords": "NO"
-					}
+					          "attrMapping": "AUTHREC",
+					          "attrValueMappings": {
+						            "keepAuthorityRecords": "NO"
+					          }
 				},
-				"purge": {
+				"noPurge": {
                     "attrDataType": "flag",
-                    "attrMapping": "PURGE"
+                    "attrMapping": "NOPURGE"
 				},
+        "purge": {
+                    "attrDataType": "flag",
+                    "attrMapping": "PURGE"
+        },
 				"queueSharingGroupDisposition": {
                     "attrDataType": "keyword",
                     "attrMapping": "QSGDISP",
@@ -435,6 +447,10 @@
                     "attrDataType": "flag",
                     "attrMapping": "NOREPLACE"
                 },
+                "replace": {
+                    "attrDataType": "flag",
+                    "attrMapping": "REPLACE"
+                },
                 "queueSharingGroupDisposition": {
                     "attrDataType": "keyword",
                     "attrMapping": "QSGDISP",

diff --git a/src/main/zip/upgrade.xml b/src/main/zip/upgrade.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    © Copyright IBM Corporation 2015, 2017.
+    © Copyright IBM Corporation 2015, 2018.
     This is licensed under the following license.
     The Eclipse Public 1.0 License (http://www.eclipse.org/legal/epl-v10.html)
     U.S. Government Users Restricted Rights:  Use, duplication or disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
@@ -11,5 +11,9 @@
   </migrate>
   <migrate to-version="3">
   </migrate>
+  <migrate to-version="4">
+  </migrate>
+  <migrate to-version="5">
+  </migrate>
 
 </plugin-upgrade>