method DefaultFilesetArchetypeGenerator.replaceFilenameTokens(final String filePath, final Context context) doesn't work when two tokens are close to each other

Hello,

In a maven archetype we can use properties in filepaths which are replaced when the archetype is generated.

e.g.:
Properties :

• int1FirstMaj = Inscription
• nameMaj = TEST

filepath = __int1FirstMaj____nameMaj__RemoteService.java

The method DefaultFilesetArchetypeGenerator.replaceFilenameTokens(final String filePath, final Context context) use the delimiter '__' to replace the properties.

So, after the build, my filepath should be : InscriptionTESTRemoteService.java

The problem is the following:

• The method looks for the start delimiter index which is 0 in my exemple and the end delimiter index which is 14.
• It replaces __int1FirstMaj__ with 'Inscription'. My filepath is now 'Inscription_nameMaj_RemoteService.java'.
• The method changes the start index value to : start = end + DELIMITER.length() + 1; So the start index is now : 14+2+1=17
• For the second property __nameMaj__ the method looks for the start delimiter index from the new start index (17). But the delimiter for the property __nameMaj__ is at the index 11 so the property __nameMaj__ is never found nor replaced.

To fix this issue, we have to replace the line 403 in the file org.apache.maven.archetype.generator.DefaultFilesetArchetypeGenerator from :

  start = end + DELIMITER.length() + 1;

to :

  start = start +contextPropertyValue.length();

contextPropertyValue being the value of the propety 'int1FirstMaj' which is 'Inscription'. The new start index becomes 0+11=11 and the next property __nameMaj__ will be found and replaced.