Author: veithen
Date: Tue Aug 29 12:06:46 2017
New Revision: 1806581
URL: http://svn.apache.org/viewvc?rev=1806581&view=rev
Log:
AXIS2-5873: Don't use property substitution in Groovy scripts (to avoid
problems with characters that would need to be escaped) and instead access the
project properties directly in the script.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1806581&r1=1806580&r2=1806581&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Tue Aug 29 12:06:46
2017
@@ -379,7 +379,7 @@
<script>
import java.util.jar.*
- def jar = new JarInputStream(new
FileInputStream("${webapp}"))
+ def jar = new JarInputStream(new
FileInputStream(project.properties['webapp']))
def expected = new HashSet()
def entry
while(entry = jar.nextJarEntry) {
@@ -387,7 +387,7 @@
}
jar.close()
- jar = new JarInputStream(new
FileInputStream("${project.build.directory}/axis2-${project.version}/dist/axis2.war"))
+ jar = new JarInputStream(new
FileInputStream(new File(project.build.directory, "axis2-" + project.version +
"/dist/axis2.war")))
while(entry = jar.nextJarEntry) {
if (!expected.remove(entry.name)) {
throw new Error("Unexpected entry
in Web app: " + entry.name)
