From 2b50b7cd587f45dd1989ae59d1ff37263d03e105 Mon Sep 17 00:00:00 2001
From: Jyoti-Prakash01 <45236642+Jyoti-Prakash01@users.noreply.github.com>
Date: Fri, 10 Jul 2020 10:16:53 +0530
Subject: [PATCH 1/5] RFE 142314  - Need ability to export more than a single
 class or object.

---
 src/main/zip/info.xml    |  3 ++
 src/main/zip/plugin.xml  | 76 +++++++++++++++++++++++++++++++++++++++-
 src/main/zip/upgrade.xml | 22 +++++++++++-
 3 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/src/main/zip/info.xml b/src/main/zip/info.xml
index a895bb7..7b75cb7 100644
--- a/src/main/zip/info.xml
+++ b/src/main/zip/info.xml
@@ -184,5 +184,8 @@
     <release-note plugin-version="22">
         RFE 142129 - Added Deployment-Policy-variables field to the Import (Deployment Policy Object) step.
     </release-note>
+    <release-note plugin-version="23">
+        RFE 142314  - Need ability to export more than a single class or object.
+    </release-note>    
   </release-notes>
 </pluginInfo>
diff --git a/src/main/zip/plugin.xml b/src/main/zip/plugin.xml
index 203c782..2ac9df0 100644
--- a/src/main/zip/plugin.xml
+++ b/src/main/zip/plugin.xml
@@ -19,7 +19,7 @@
 <plugin xmlns="http://www.urbancode.com/PluginXMLSchema_v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
   <header>
-    <identifier version="22" id="com.ibm.datapower" name="DataPower"/>
+    <identifier version="23" id="com.ibm.datapower" name="DataPower"/>
     <description>The IBM WebSphere DataPower plugin deploys DataPower services.</description>
     <tag>Infrastructure/WebSphere DataPower</tag>
   </header>
@@ -717,6 +717,80 @@
       <arg value="export-object"/>
     </command>
   </step-type>
+  
+  
+  
+  <step-type name="Export Objects">
+    <description>Export objects from a domain on a device</description>
+    <properties>
+      <property name="domainName" required="true">
+        <property-ui type="textBox" default-value="${p:dpDomainName}" label="Domain name" description="Name of the first domain to backup"/>
+      </property>
+      <property name="definitionFile" required="true">
+        <property-ui type="textBox" default-value="" label="Definition file" description="Definition file for class objects to export"/>
+      </property>
+      <property name="refObjects">
+        <property-ui type="checkBox" default-value="true" label="Include reference objects?" description="Include referenced objects when exporting?"/>
+      </property>
+      <property name="refFiles">
+        <property-ui type="checkBox" default-value="true" label="Include reference files?" description="Include referenced files when exporting?"/>
+      </property>
+      <property name="allFiles">
+        <property-ui type="checkBox" default-value="false" label="Include all files?" description="Include other files when exporting?"/>
+      </property>
+      <property name="exportFile" required="true">
+        <property-ui type="textBox" default-value="" label="Export file" description="DataPower export zip file to create/overwrite"/>
+      </property>
+      <property name="hostname">
+        <property-ui type="textBox" default-value="${p:dpHostname}" label="DataPower hostname/IP" description="Hostname or IP address of DataPower appliance" hidden="true"/>
+      </property>
+      <property name="uid">
+        <property-ui type="textBox" default-value="${p:dpUserid}" label="DataPower userid" description="Userid on DataPower appliance" hidden="true"/>
+      </property>
+      <property name="pwd">
+        <property-ui type="secureBox" default-value="${p:dpPassword}" label="DataPower password" description="Password for userid on DataPower appliance" hidden="true"/>
+      </property>
+      <property name="portXMI">
+        <property-ui type="textBox" default-value="${p:dpXMIPort}" label="DataPower XMI port" description="XML Management Interface port on DataPower appliance (usually 5550)" hidden="true"/>
+      </property>
+      <property name="addlProperties">
+        <property-ui type="textBox" default-value="" label="Additional Properties" description="Additional property mappings - antpropname=...[ '~' more definitions ]" hidden="true"/>
+      </property>
+      <property name="memorySize">
+        <property-ui type="selectBox" default-value="default" label="Java Max Memory Size" description="Set the max Java Heap Memory size for the DCM's Ant call. " hidden="true"/>
+          <value label="Default">default</value>
+          <value label="-Xmx256m">-Xmx256m</value>
+          <value label="-Xmx512m">-Xmx512m</value>
+          <value label="-Xmx1024m">-Xmx1024m</value>
+          <value label="-Xmx2048m">-Xmx2048m</value>
+          <value label="-Xmx4096m">-Xmx4096m</value>
+          <value label="${p?:environment/memorySize}">${p?:environment/memorySize}</value>
+          <value label="${p?:resource/memorySize}">${p?:resource/memorySize}</value>
+      </property>
+    </properties>
+    <post-processing><![CDATA[
+    if (properties.get("exitCode") != 0) {
+            properties.put(new java.lang.String("Status"), new java.lang.String("Failure"));
+        }
+        else {
+            properties.put("Status", "Success");
+        }
+     ]]></post-processing>
+    <command program="${GROOVY_HOME}/bin/groovy">
+      <arg value="-cp"/>
+      <arg file="classes"/>
+      <arg file="RunDeployDotAnt.groovy"/>
+      <arg file="${PLUGIN_INPUT_PROPS}"/>
+      <arg file="${PLUGIN_OUTPUT_PROPS}"/>
+      <arg value="-Ddomain=@domainName@"/>
+      <arg value="-Dexport-manifest.file=@definitionFile@"/>
+      <arg value="-Dref.objects=@refObjects@"/>
+      <arg value="-Dref.files=@refFiles@"/>
+      <arg value="-Dall.files=@allFiles@"/>
+      <arg value="-Dexport.file=@exportFile@"/>
+      <arg value="export-objects"/>
+    </command>
+  </step-type>
 
 
 
diff --git a/src/main/zip/upgrade.xml b/src/main/zip/upgrade.xml
index b4d8a01..fae9d20 100644
--- a/src/main/zip/upgrade.xml
+++ b/src/main/zip/upgrade.xml
@@ -579,6 +579,26 @@
         <migrate-property name="deploymentPolicyObjectVariables" />
       </migrate-properties>
     </migrate-command>
-  </migrate>    
+  </migrate>
+  
+  <migrate to-version="23">
+    <migrate-command  name="Export Objects">
+      <migrate-properties>
+        <migrate-property name="domainName" default="${p:dpDomainName}"/>
+        <migrate-property name="definitionFile" default=""/>
+        <migrate-property name="refObjects" default=""/>
+        <migrate-property name="refFiles" default=""/>
+        <migrate-property name="allFiles" default=""/>
+        <migrate-property name="exportFile" default=""/>
+        <migrate-property name="hostname" default="${p:dpHostname}"/>
+        <migrate-property name="uid" default="${p:dpUserid}"/>
+        <migrate-property name="pwd" default="${p:dpPassword}"/>
+        <migrate-property name="portXMI" default="${p:dpXMIPort}"/>
+        <migrate-property name="addlProperties" default=""/>
+        <migrate-property name="memorySize" default="default"/>
+      </migrate-properties>
+    </migrate-command>
+  </migrate>
+  
 
 </plugin-upgrade>

From 3b7c3d98f59ea556e79986a67adf82fe442e5f5b Mon Sep 17 00:00:00 2001
From: Jyoti-Prakash01 <45236642+Jyoti-Prakash01@users.noreply.github.com>
Date: Fri, 10 Jul 2020 10:52:31 +0530
Subject: [PATCH 2/5] Update upgrade.xml

---
 src/main/zip/upgrade.xml | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/main/zip/upgrade.xml b/src/main/zip/upgrade.xml
index fae9d20..3693ee5 100644
--- a/src/main/zip/upgrade.xml
+++ b/src/main/zip/upgrade.xml
@@ -582,22 +582,7 @@
   </migrate>
   
   <migrate to-version="23">
-    <migrate-command  name="Export Objects">
-      <migrate-properties>
-        <migrate-property name="domainName" default="${p:dpDomainName}"/>
-        <migrate-property name="definitionFile" default=""/>
-        <migrate-property name="refObjects" default=""/>
-        <migrate-property name="refFiles" default=""/>
-        <migrate-property name="allFiles" default=""/>
-        <migrate-property name="exportFile" default=""/>
-        <migrate-property name="hostname" default="${p:dpHostname}"/>
-        <migrate-property name="uid" default="${p:dpUserid}"/>
-        <migrate-property name="pwd" default="${p:dpPassword}"/>
-        <migrate-property name="portXMI" default="${p:dpXMIPort}"/>
-        <migrate-property name="addlProperties" default=""/>
-        <migrate-property name="memorySize" default="default"/>
-      </migrate-properties>
-    </migrate-command>
+    <migrate-command  name="Export Objects"/>
   </migrate>
   
 

From 0075c4f8a94691a4885d208b4e4b3ed213acb201 Mon Sep 17 00:00:00 2001
From: Jyoti-Prakash01 <45236642+Jyoti-Prakash01@users.noreply.github.com>
Date: Fri, 10 Jul 2020 13:52:00 +0530
Subject: [PATCH 3/5] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 35acd44..71f06c6 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ Complete list of current DCM target commands. (* = matching plug-in step)
 - __download-files__* - Download target files or all files from a filestore
 
 - __export-object__* - export an object i.e. service
-- __export-objects__ - export objects based on a dcm:definition file
+- __export-objects__* - export objects based on a dcm:definition file
 
 - __firmware-rollback__ - Rollback to the previous firmware (and filesystem contents!)
 - __firmware-update__   - Update to a new level of firmware

From fcd952347ab36500383c60f8b46c40a12c43e2c8 Mon Sep 17 00:00:00 2001
From: Jyoti-Prakash01 <45236642+Jyoti-Prakash01@users.noreply.github.com>
Date: Fri, 10 Jul 2020 13:52:31 +0530
Subject: [PATCH 4/5] Update deploy.ant.xml

---
 deploy.ant.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy.ant.xml b/deploy.ant.xml
index a40d75a..b08901d 100644
--- a/deploy.ant.xml
+++ b/deploy.ant.xml
@@ -46,7 +46,7 @@
   download-files* - Download target files or all files from a filestore
 
   export-object* - export an object i.e. service
-  export-objects - export objects based on a dcm:definition file
+  export-objects* - export objects based on a dcm:definition file
 
   firmware-rollback - Rollback to the previous firmware (and filesystem contents!)
   firmware-update   - Update to a new level of firmware

From 7a6d2430f014ddd01ce9ea0b7db54545260169c4 Mon Sep 17 00:00:00 2001
From: Jyoti-Prakash01 <45236642+Jyoti-Prakash01@users.noreply.github.com>
Date: Mon, 24 Aug 2020 19:45:18 +0530
Subject: [PATCH 5/5] Update info.xml

---
 src/main/zip/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/zip/info.xml b/src/main/zip/info.xml
index 7b75cb7..42e0adb 100644
--- a/src/main/zip/info.xml
+++ b/src/main/zip/info.xml
@@ -185,7 +185,7 @@
         RFE 142129 - Added Deployment-Policy-variables field to the Import (Deployment Policy Object) step.
     </release-note>
     <release-note plugin-version="23">
-        RFE 142314  - Need ability to export more than a single class or object.
+        RFE 142314  - Added new Export Objects steps that enables the export of one or more objects.
     </release-note>    
   </release-notes>
 </pluginInfo>