Merge pull request #152 from sophiegreen/master

Rename resources folder to bundleParts

README.md

@@ -111,7 +111,7 @@ To create a CICS bundle in this way:
 
     The generated CICS bundle takes its bundle ID from the Maven module's `artifactId` and its version from the Maven module's `version`.
 
-1. To include CICS bundleparts like FILE or URIMAP, put the bundlepart files in your Maven project's resources directory, for instance `src/main/resources`. Files in your Maven project's resources directory will be included within the output CICS bundle, and supported types will have a `<define>` element added to the CICS bundle's `cics.xml`.
+1. To include CICS bundleparts like FILE or URIMAP, put the bundlepart files in your bundle Maven module's bundleParts directory, for instance `src/main/bundleParts`. Files in your Maven module's bundleParts directory will be included within the output CICS bundle, and supported types will have a `<define>` element added to the CICS bundle's `cics.xml`.
 
 ## Create a CICS bundle (from an existing Java module) using `cics-bundle-maven-plugin`
 

cics-bundle-maven-plugin/src/main/java/com/ibm/cics/cbmp/AbstractAutoConfigureBundlePublisherMojo.java

@@ -65,7 +65,7 @@ protected void initBundlePublisher(BundlePublisher bundlePublisher) throws MojoE
 	private void addStaticBundleResources(BundlePublisher bundlePublisher) throws MojoExecutionException {
 		//Add bundle parts for any resources
 		Path basePath = baseDir.toPath();
-		Path bundlePartSource = basePath.resolve("src/main/resources");
+		Path bundlePartSource = basePath.resolve("src/main/bundleParts");
 		getLog().info("Gathering bundle parts from " + basePath.relativize(bundlePartSource));
 
 		if (Files.exists(bundlePartSource)) {
@@ -83,14 +83,14 @@ private void addStaticBundleResources(BundlePublisher bundlePublisher) throws Mo
 								() -> Files.newInputStream(toAdd)
 							);
 						} catch (PublishException e) {
-							throw new MojoExecutionException("Failure adding static resource " + toAdd + ": " + e.getMessage(), e);
+							throw new MojoExecutionException("Failure adding static bundle parts " + toAdd + ": " + e.getMessage(), e);
 						}
 					}
 				} catch (IOException e) {
-					throw new MojoExecutionException("Failure adding static resources", e);
+					throw new MojoExecutionException("Failure adding static bundle parts", e);
 				}
 			} else {
-				throw new MojoExecutionException("Static bundle resources directory " + bundlePartSource + "wasn't a directory");
+				throw new MojoExecutionException("Static bundle parts directory " + bundlePartSource + "wasn't a directory");
 			}
 		} else {
 			//Ignore if it doesn't exist