I1

galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsBundle.java

@@ -3,6 +3,8 @@
  */
 package dev.galasa.cicsts.cicsresource;
 
+
+
 /**
  * Represents a CICS Bundle resource. It provides methods to set CICS Bundle specific attributes on the resource
  * (via CEDA) and to manage and set attributes in CEMT
@@ -47,14 +49,15 @@ public interface ICicsBundle {
 
 	/**
 	 * Return the CICS BUNDLE resource BUNDLEDIR attribute value
-	 * @return the resource JVMPROFILE attribute value
+	 * @return the resource BundleDirectory
 	 */	
 	public String getResourceDefinitionBundledirAttribute();
 
 	/**
-	 * Build the complete JVM server including the profile zOS UNIX file and the CICS resource definition. This method will install the CICS 
+	 * Build the complete CICS Bundle CICS resource definition. This method will install the CICS 
 	 * resource and wait for it to become enabled
 	 * @throws CicsBundleResourceException
+	 * @throws TestBundleResourceException 
 	 */
 	public void build() throws CicsBundleResourceException;
 
@@ -186,5 +189,8 @@ public interface ICicsBundle {
 	 * Returns the CICS BUNDLE name as defined in the CICS Resource Definition
 	 * @return the CICS BUNDLE name
 	 */
-	public String getName();
+	public String getDefinitionName();
+
+
+
 }

galasa-managers-parent/galasa-managers-cicsts-parent/dev.galasa.cicsts.manager/src/main/java/dev/galasa/cicsts/cicsresource/ICicsResource.java

@@ -15,6 +15,7 @@
  */
 public interface ICicsResource {
 
+
 	/**
 	 * Create a CICS BUNDLE resource object supplying the CICS bundle content. 
 	 * 
@@ -26,11 +27,13 @@ public interface ICicsResource {
 	 * @param name the CICS BUNDLE RDO name
 	 * @param group the CICS BUNDLE RDO group name
 	 * @param bundlePath the path to the directory in the test class bundle containing the CICS bundle
-	 * @param parameters substitution parameters to replace variables in the <code>META-INF/cics.xml</code>. Can be <code>null</code>  
+	 * @param bundleDir the path to an existing bundle already on zfs
+	 * @param parameters substitution parameters to replace variables in the bundle parts  
+	 * @param skeletonType Velocity = 1, PlusPlus = 0
 	 * @return the CICS Bundle object
 	 * @throws CicsBundleResourceException
 	 */
-	public ICicsBundle newCicsBundle(ICicsTerminal cicsTerminal, Class<?> testClass, String name, String group, String bundlePath, Map<String, String> parameters) throws CicsBundleResourceException;
+	public ICicsBundle newCicsBundle(ICicsTerminal cicsTerminal, Class<?> testClass, String name, String group, String bundlePath,String bundleDir, Map<String, Object> parameters,int skeletonType) throws CicsBundleResourceException;
 
 	/**
 	 * Create a CICS BUNDLE resource object without supplying the CICS bundle content, i.e. the bundle already exists on the zOS UNIX file system
@@ -102,4 +105,6 @@ public interface ICicsResource {
 	 * @return the JVM profile
 	 */
 	public IJvmprofile newJvmprofile(String jvmprofileName, String content);
+
+
 }