diff options
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/deployment')
| -rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/deployment/.gitignore | 1 | ||||
| -rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml | 9 | ||||
| -rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 | bin | 2661 -> 0 bytes | |||
| -rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks | bin | 1321 -> 0 bytes | |||
| -rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml | 5 |
5 files changed, 7 insertions, 8 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/.gitignore b/nokia/vnfmdriver/vfcadaptorservice/deployment/.gitignore deleted file mode 100644 index 4a811950..00000000 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vfcadaptor-deployment.iml diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml index c1255125..f0c4df7f 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml @@ -69,16 +69,12 @@ "${deployUnzip}/logs") System.out.println("******** start copying from ${basedir}/src/main/release to ${deployUnzip}. ************") - + ant.copy(todir: "${deployUnzip}") { fileset(dir: "${basedir}/src/main/release"){ exclude(name: "**/.gitignore") } - } - ant.copy(todir: "${deployUnzip}/docker") { - fileset(dir: "${basedir}/../docker"){ - exclude(name: "**/.gitignore") - } + } System.out.println("******** start copying from ${project.build.directory}/../../vfcadaptor/target/${package.name}-${project.version} to ${deployUnzip}/webapps/ROOT. ************") @@ -99,6 +95,7 @@ </execution> </executions> </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 Binary files differdeleted file mode 100644 index 5bc1b7a9..00000000 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 +++ /dev/null diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks Binary files differdeleted file mode 100644 index 30b62ce8..00000000 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks +++ /dev/null diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml index 793a8a88..c98ff28c 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="ISO-8859-1"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -238,6 +238,9 @@ <!-- attribute values, should the rules in JSP.1.6 --> <!-- for the escaping of quote characters be --> <!-- strictly applied? [true] --> + <!-- The default can be changed with the --> + <!-- org.apache.jasper.compiler.Parser. --> + <!-- STRICT_QUOTE_ESCAPING system property. --> <!-- --> <!-- quoteAttributeEL When EL is used in an attribute value on a --> <!-- JSP page should the rules for quoting of --> |