Removed reference to specifically version 9 of IIB

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>iib9-maven-plugin</name>
+	<name>iib-maven-plugin</name>
 	<comment></comment>
 	<projects>
 	</projects>

README.md

@@ -1,2 +1,2 @@
-iib9-maven-plugin
+iib-maven-plugin
 =================

ToDo.txt

@@ -1,11 +1,9 @@
 - .project & pom.xml in UEBERGABE nicht mit liefern
 
-- Fail wmb-bar build if no dependencies are defined
+- Fail iib-bar build if no dependencies are defined
 
-- Add Message Sets to wmb-bar build automatically (also when no flows use them)
+- Add Message Sets to iib-bar build automatically (also when no flows use them)
 
-- Fail wmb-src & wmb-bar build if no Maven dependency defined for Project References and vice-versa
+- Fail iib-src & iib-bar build if no Maven dependency defined for Project References and vice-versa
 
 - Fail all builds if artifactId != EclipseProjectName
-
-- Exclude flows without an input node (they can never be deployed in V7)

pom.xml

@@ -2,10 +2,10 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.sbb.maven.plugins</groupId>
-	<artifactId>iib9-maven-plugin</artifactId>
+	<artifactId>iib-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
 	<version>1.0-SNAPSHOT</version>
-	<name>iib9-maven-plugin Maven Mojo</name>
+	<name>iib-maven-plugin Maven Mojo</name>
 	<url>http://maven.apache.org</url>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -108,7 +108,7 @@
 		<url>http://ci.sbb.ch</url>
 	</ciManagement>
 	<scm>
-		<connection>scm:git:https://code.sbb.ch/scm/kd_int/iib9-maven-plugin.git</connection>
-		<developerConnection>scm:git:https://code.sbb.ch/scm/kd_int/iib9-maven-plugin.git</developerConnection>
+		<connection>scm:git:https://code.sbb.ch/scm/kd_int/iib-maven-plugin.git</connection>
+		<developerConnection>scm:git:https://code.sbb.ch/scm/kd_int/iib-maven-plugin.git</developerConnection>
 	</scm>
 </project>

src/it/CleanBarBuildWorkspaceMojo1/pom.xml

@@ -22,7 +22,7 @@
             </goals>
             <phase>compile</phase>
             <configuration>
-              <toolkitInstallDir>@wmb.toolkitInstallDir@</toolkitInstallDir>
+              <toolkitInstallDir>@iib.toolkitInstallDir@</toolkitInstallDir>
             </configuration>
           </execution>
         </executions>

src/it/CleanBarBuildWorkspaceMojo1/verify.bsh

@@ -1,6 +1,6 @@
 import java.io.*;
 
-static String WORKSPACE_DIR = "target/it/CleanUpMojo1/target/wmb/workspace";
+static String WORKSPACE_DIR = "target/it/CleanUpMojo1/target/iib/workspace";
 
 
 File workspace = new File(WORKSPACE_DIR);

src/it/CreateBarMojo1/invoker.properties

@@ -1,6 +1,6 @@
 # Switch on debugging, so the verifier can find the parameters debug statments in the build.log
 invoker.debug = true
 #invoker.offline = true
-invoker.goals = iib9:create-bar
+invoker.goals = iib:create-bar
 # when this test fails is the test case successful 
 invoker.buildResult=failure

src/it/CreateBarMojo1/pom.xml

@@ -22,7 +22,7 @@
             </goals>
             <configuration>
               <projectName>project1</projectName>
-              <toolkitInstallDir>@wmb.toolkitInstallDir@</toolkitInstallDir>
+              <toolkitInstallDir>@iib.toolkitInstallDir@</toolkitInstallDir>
             </configuration>
           </execution>
         </executions>

src/it/CreateBarMojo1/verify.bsh

@@ -44,5 +44,5 @@ validateParam("esql21", "false");
 validateParam("includeArtifactsPattern", "\\*\\*/\\*\\.msgflow,\\*\\*/\\*\\.mset");
 validateParam("versionString", ".*");
 validateParam("toolkitInstallDir", ".*");
-validateParam("toolkitVersion", "7");
+validateParam("toolkitVersion", "9");
 validateParam("workspace", ".*");

src/it/PrepareBarBuildWorkspaceMojo1/pom.xml

@@ -22,7 +22,7 @@
             </goals>
             <phase>compile</phase>
             <configuration>
-              <toolkitInstallDir>@wmb.toolkitInstallDir@</toolkitInstallDir>
+              <toolkitInstallDir>@iib.toolkitInstallDir@</toolkitInstallDir>
             </configuration>
           </execution>
         </executions>

src/it/PrepareBarBuildWorkspaceMojo1/verify.bsh

@@ -1,6 +1,6 @@
 import java.io.*;
 
-static String WORKSPACE_DIR = "target/it/PrepareBarBuildWorkspaceMojo1/target/wmb/workspace";
+static String WORKSPACE_DIR = "target/it/PrepareBarBuildWorkspaceMojo1/target/iib/workspace";
 
 
 File workspace = new File(WORKSPACE_DIR);

src/it/ValidateClassloaderApproach1/invoker.properties

@@ -1,3 +1,3 @@
 #invoker.debug = true
 #invoker.offline = true
-invoker.goals = iib9:validate-classloader-approach 
+invoker.goals = iib:validate-classloader-approach 

src/it/ValidateClassloaderApproach1/pom.xml

@@ -22,7 +22,7 @@
             </goals>
             <configuration>
               <projectName>project1</projectName>
-              <toolkitInstallDir>@wmb.toolkitInstallDir@</toolkitInstallDir>
+              <toolkitInstallDir>@iib.toolkitInstallDir@</toolkitInstallDir>
             </configuration>
           </execution>
         </executions>

src/it/ValidateClassloaderApproach2/invoker.properties

@@ -1,6 +1,6 @@
 #invoker.debug = true
 #invoker.offline = true
-invoker.goals = iib9:validate-classloader-approach
+invoker.goals = iib:validate-classloader-approach
 
 # The expected result of the build, possible values are "success" (default) and "failure"
 invoker.buildResult = failure

src/it/ValidateClassloaderApproach2/pom.xml

@@ -22,7 +22,7 @@
             </goals>
             <configuration>
               <projectName>project1</projectName>
-              <toolkitInstallDir>@wmb.toolkitInstallDir@</toolkitInstallDir>
+              <toolkitInstallDir>@iib.toolkitInstallDir@</toolkitInstallDir>
             </configuration>
           </execution>
         </executions>

src/it/ValidateClassloaderApproach3/invoker.properties

@@ -1,5 +1,5 @@
 #invoker.debug = true
 #invoker.offline = true
-invoker.goals = iib9:validate-classloader-approach
+invoker.goals = iib:validate-classloader-approach
 # when this test fails is the test case successful 
 invoker.buildResult=failure

src/it/ValidateClassloaderApproach3/pom.xml

@@ -22,7 +22,7 @@
             </goals>
             <configuration>
               <projectName>project1</projectName>
-              <toolkitInstallDir>@wmb.toolkitInstallDir@</toolkitInstallDir>
+              <toolkitInstallDir>@iib.toolkitInstallDir@</toolkitInstallDir>
             </configuration>
           </execution>
         </executions>

src/it/ValidateClassloaderApproach4/invoker.properties

@@ -1,3 +1,3 @@
 invoker.debug = true
 #invoker.offline = true
-invoker.goals = iib9:validate-classloader-approach 
+invoker.goals = iib:validate-classloader-approach 

src/it/ValidateClassloaderApproach4/pom.xml

@@ -8,7 +8,7 @@
   <description>Test the validate-classloader-approach Mojo breaks with classloaders defined sometimes </description>
 
   <properties>
-    <wmb.failOnInvalidClassloader>false</wmb.failOnInvalidClassloader>
+    <iib.failOnInvalidClassloader>false</iib.failOnInvalidClassloader>
   </properties>
 
   <build>

src/main/java/ch/sbb/iib9/plugin/mojos/CleanBarBuildWorkspaceMojo.java → src/main/java/ch/sbb/iib/plugin/mojos/CleanBarBuildWorkspaceMojo.java

@@ -1,4 +1,4 @@
-package ch.sbb.iib9.plugin.mojos;
+package ch.sbb.iib.plugin.mojos;
 
 import java.io.File;
 import java.io.IOException;
@@ -8,7 +8,7 @@
 import org.codehaus.plexus.util.FileUtils;
 
 /**
- * Cleans up the ${wmb.workspace} directory. Build errors will appear in the WMB Toolkit if .msgflow files are left under the ${wmb.workspace} - the path determines the Namespace of the flow and that
+ * Cleans up the ${iib.workspace} directory. Build errors will appear in the IIB Toolkit if .msgflow files are left under the ${iib.workspace} - the path determines the Namespace of the flow and that
  * certainly won't match the original directory structure.
  * 
  * @goal clean-bar-build-workspace
@@ -20,7 +20,7 @@ public class CleanBarBuildWorkspaceMojo extends AbstractMojo {
     /**
      * The path of the workspace in which the projects were created.
      * 
-     * @parameter expression="${wmb.workspace}" default-value="${project.build.directory}/wmb/workspace"
+     * @parameter expression="${iib.workspace}" default-value="${project.build.directory}/iib/workspace"
      * @required
      */
     protected File workspace;
@@ -32,6 +32,7 @@ public class CleanBarBuildWorkspaceMojo extends AbstractMojo {
      */
     protected boolean debugWorkspace;
 
+    @Override
     public void execute() throws MojoFailureException {
         if (debugWorkspace) {
             getLog().info("debugWorkspace enabled - workspace will not be cleaned");

src/main/java/ch/sbb/iib9/plugin/mojos/CreateBarMojo.java → src/main/java/ch/sbb/iib/plugin/mojos/CreateBarMojo.java

@@ -1,4 +1,4 @@
-package ch.sbb.iib9.plugin.mojos;
+package ch.sbb.iib.plugin.mojos;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,11 +15,11 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
 
-import ch.sbb.iib9.plugin.utils.ProcessOutputLogger;
-import ch.sbb.iib9.plugin.utils.ZipUtils;
+import ch.sbb.iib.plugin.utils.ProcessOutputLogger;
+import ch.sbb.iib.plugin.utils.ZipUtils;
 
 /**
- * Creates a .bar file from a wmb-bar Project.
+ * Creates a .bar file from a iib-bar Project.
  * 
  * Implemented with help from: https://github.com/TimMoore/mojo-executor/blob/master/README.md
  * 
@@ -32,90 +32,90 @@ public class CreateBarMojo extends AbstractMojo {
     /**
      * The name of the BAR (compressed file format) archive file where the result is stored.
      * 
-     * @parameter expression="${wmb.barName}" default-value= "${project.build.directory}/wmb/${project.artifactId}-${project.version}.bar"
+     * @parameter expression="${iib.barName}" default-value= "${project.build.directory}/iib/${project.artifactId}-${project.version}.bar"
      * @required
      */
     protected File barName;
 
     /**
      * Refreshes the projects in the workspace and then invokes a clean build before new items are added to the BAR file.
      * 
-     * @parameter expression="${wmb.cleanBuild}" default-value="true"
+     * @parameter expression="${iib.cleanBuild}" default-value="true"
      * @required
      */
     protected boolean cleanBuild;
 
     /**
      * Compile ESQL for brokers at Version 2.1 of the product.
      * 
-     * @parameter expression="${wmb.esql21}" default-value="false"
+     * @parameter expression="${iib.esql21}" default-value="false"
      * @required
      */
     protected boolean esql21;
 
     /**
      * Exclude artifacts pattern (or patterns, comma separated)
      * 
-     * @parameter expression="${wmb.excludeArtifactsPattern}" default-value=""
+     * @parameter expression="${iib.excludeArtifactsPattern}" default-value=""
      */
     protected String excludeArtifactsPattern;
 
     /**
      * Include artifacts pattern (or patterns, comma separated)
      * 
-     * @parameter expression="${wmb.includeArtifactsPattern}" default-value="**\/*\.msgflow,**\/*\.mset"
+     * @parameter expression="${iib.includeArtifactsPattern}" default-value="**\/*\.msgflow,**\/*\.mset"
      * @required
      */
     protected String includeArtifactsPattern;
 
     /**
      * Projects containing files to include in the BAR file in the workspace. Required for a new workspace. A new workspace is a system folder which don't contain a .metadata folder.
      * 
-     * @parameter expression="${wmb.projectName}" default-value=""
+     * @parameter expression="${iib.projectName}" default-value=""
      */
     protected String projectName;
 
     /**
-     * Installation directory of the WMB Toolkit
+     * Installation directory of the IIB Toolkit
      * 
-     * @parameter expression="${wmb.toolkitInstallDir}"
+     * @parameter expression="${iib.toolkitInstallDir}"
      * @required
      */
     protected File toolkitInstallDir;
 
     /**
-     * Major Version number of the WMB Toolkit. (Current not used, but will be needed when support for difference Versions with different options is supported)
+     * Major Version number of the IIB Toolkit. (Current not used, but will be needed when support for difference Versions with different options is supported)
      * 
-     * @parameter expression="${wmb.toolkitVersion}" default-value="7"
+     * @parameter expression="${iib.toolkitVersion}" default-value="9"
      */
     protected String toolkitVersion;
 
     /**
      * Appends the _ (underscore) character and the value of VersionString to the names of the compiled versions of the message flows (.cmf) files added to the BAR file, before the file extension.
      * 
-     * @parameter expression="${wmb.versionString}" default-value="${project.version}"
+     * @parameter expression="${iib.versionString}" default-value="${project.version}"
      */
     protected String versionString;
 
     /**
      * The path of the workspace in which the projects are extracted to be built.
      * 
-     * @parameter expression="${wmb.workspace}" default-value="${project.build.directory}/wmb/workspace"
+     * @parameter expression="${iib.workspace}" default-value="${project.build.directory}/iib/workspace"
      * @required
      */
     protected File workspace;
 
     /**
      * Pattern (or patterns, comma separated) of jars to be excluded from the generated bar file
      * 
-     * @parameter expression="${wmb.discardJarsPattern}" default-value="**\/javacompute_**.jar,**\/jplugin2_**.jar"
+     * @parameter expression="${iib.discardJarsPattern}" default-value="**\/javacompute_**.jar,**\/jplugin2_**.jar"
      */
     protected String discardJarsPattern;
 
     /**
      * Whether classloaders are in use with this bar
      * 
-     * @parameter expression="${wmb.useClassloaders}" default-value="false"
+     * @parameter expression="${iib.useClassloaders}" default-value="false"
      * @since 1.5
      */
     protected Boolean useClassloaders;