Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
642088e2
by Tony Chemit at 2020-05-23T13:51:15+02:00
2 changed files:
Changes:
| ... | ... | @@ -65,6 +65,25 @@ |
| 65 | 65 |
<pluginManagement>
|
| 66 | 66 |
<plugins>
|
| 67 | 67 |
|
| 68 |
+ <plugin>
|
|
| 69 |
+ <groupId>org.apache.maven.plugins</groupId>
|
|
| 70 |
+ <artifactId>maven-war-plugin</artifactId>
|
|
| 71 |
+ <configuration>
|
|
| 72 |
+ <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
|
|
| 73 |
+<!-- <webResources>-->
|
|
| 74 |
+<!-- <resource>-->
|
|
| 75 |
+<!-- <filtering>true</filtering>-->
|
|
| 76 |
+<!-- <directory>src/main/webapp</directory>-->
|
|
| 77 |
+<!-- <includes>-->
|
|
| 78 |
+<!-- <include>**/web.xml</include>-->
|
|
| 79 |
+<!-- </includes>-->
|
|
| 80 |
+<!-- </resource>-->
|
|
| 81 |
+<!-- </webResources>-->
|
|
| 82 |
+<!-- <warSourceDirectory>src/main/webapp</warSourceDirectory>-->
|
|
| 83 |
+<!-- <webXml>src/main/webapp/WEB-INF/web.xml</webXml>-->
|
|
| 84 |
+ </configuration>
|
|
| 85 |
+ </plugin>
|
|
| 86 |
+ |
|
| 68 | 87 |
<plugin>
|
| 69 | 88 |
<groupId>org.mortbay.jetty</groupId>
|
| 70 | 89 |
<artifactId>jetty-maven-plugin</artifactId>
|
| ... | ... | @@ -25,25 +25,13 @@ |
| 25 | 25 |
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
|
| 26 | 26 |
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" >
|
| 27 | 27 |
|
| 28 |
- <display-name>Observe Web Application by WebMotion</display-name>
|
|
| 28 |
+ <display-name>Observe Web v ${project.version} Application by WebMotion</display-name>
|
|
| 29 | 29 |
|
| 30 | 30 |
<context-param>
|
| 31 | 31 |
<param-name>wm.skip.conventionScan</param-name>
|
| 32 | 32 |
<param-value>true</param-value>
|
| 33 | 33 |
</context-param>
|
| 34 | 34 |
|
| 35 |
- <!--filter>
|
|
| 36 |
- <filter-name>topiaTransaction</filter-name>
|
|
| 37 |
- <filter-class>
|
|
| 38 |
- fr.ird.observe.services.rest.ObserveRestTransactionFilter
|
|
| 39 |
- </filter-class>
|
|
| 40 |
- </filter-->
|
|
| 41 |
- |
|
| 42 |
- <!--filter-mapping>
|
|
| 43 |
- <filter-name>topiaTransaction</filter-name>
|
|
| 44 |
- <url-pattern>/*</url-pattern>
|
|
| 45 |
- </filter-mapping-->
|
|
| 46 |
- |
|
| 47 | 35 |
<listener>
|
| 48 | 36 |
<listener-class>fr.ird.observe.server.ObserveWebApplicationListener</listener-class>
|
| 49 | 37 |
</listener>
|