You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/06/02 10:44:05 UTC
[maven-war-plugin] branch MWAR-303 created (now 589cac9)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MWAR-303
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git.
at 589cac9 [MWAR-303] - filtering of ${project.developers[0].id} does not work
This branch includes the following new commits:
new 589cac9 [MWAR-303] - filtering of ${project.developers[0].id} does not work
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-war-plugin] 01/01: [MWAR-303] - filtering of
${project.developers[0].id} does not work
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MWAR-303
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
commit 589cac9dfd963b0510eddd91e865aed31a8050e9
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Jun 2 12:43:37 2018 +0200
[MWAR-303] - filtering of ${project.developers[0].id} does not work
---
src/it/web-resources-filtering/verify.bsh | 7 +++++++
.../web/src/main/webresources/WEB-INF/jetty-env.xml | 6 +++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/it/web-resources-filtering/verify.bsh b/src/it/web-resources-filtering/verify.bsh
index bdea7a7..6ea7d17 100644
--- a/src/it/web-resources-filtering/verify.bsh
+++ b/src/it/web-resources-filtering/verify.bsh
@@ -56,6 +56,13 @@ try
return false;
}
+ indexOf = paramContent.indexOf( "Author id: 1" );
+ if ( indexOf < 0 )
+ {
+ System.err.println( "project.developers[0].id not filtered correctly" );
+ return false;
+ }
+
indexOf = paramContent.indexOf( "<Set name=\"URL\">jdbc:oracle:thin:@localhost:1521:orcl</Set>" );
if ( indexOf < 0 )
{
diff --git a/src/it/web-resources-filtering/web/src/main/webresources/WEB-INF/jetty-env.xml b/src/it/web-resources-filtering/web/src/main/webresources/WEB-INF/jetty-env.xml
index 2675249..20d9ebd 100644
--- a/src/it/web-resources-filtering/web/src/main/webresources/WEB-INF/jetty-env.xml
+++ b/src/it/web-resources-filtering/web/src/main/webresources/WEB-INF/jetty-env.xml
@@ -27,6 +27,10 @@ under the License.
set to ISO-8859-1:
Characters that should be encoded in UTF-8: åäö
-->
+ <!--
+ Filter a complex expression:
+ Author id: ${project.developers[0].id}
+ -->
<New id="MyDS" class="org.mortbay.jetty.plus.naming.Resource">
<Arg>jdbc/EventdialogDS</Arg>
<Arg>
@@ -37,4 +41,4 @@ under the License.
</New>
</Arg>
</New>
-</Configure>
\ No newline at end of file
+</Configure>
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.