You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2014/08/06 14:22:50 UTC
svn commit: r1616190 - in /incubator/sirona/trunk/server/reporting:
reporting-api/ reporting-api/src/main/resources/
reporting-api/src/main/resources/WEB-INF/
reporting-api/src/main/resources/WEB-INF/lib/
reporting-webapp/src/main/webapp/WEB-INF/
Author: olamy
Date: Wed Aug 6 12:22:49 2014
New Revision: 1616190
URL: http://svn.apache.org/r1616190
Log:
servlet 3.0 and use web fragments
Added:
incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/
incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/
incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/
incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml (with props)
Modified:
incubator/sirona/trunk/server/reporting/reporting-api/pom.xml
incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/webapp/WEB-INF/web.xml
Modified: incubator/sirona/trunk/server/reporting/reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-api/pom.xml?rev=1616190&r1=1616189&r2=1616190&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/pom.xml (original)
+++ incubator/sirona/trunk/server/reporting/reporting-api/pom.xml Wed Aug 6 12:22:49 2014
@@ -37,6 +37,10 @@
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.sirona</groupId>
+ <artifactId>sirona-web</artifactId>
+ </dependency>
</dependencies>
</project>
Added: incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml?rev=1616190&view=auto
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml (added)
+++ incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml Wed Aug 6 12:22:49 2014
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
+
+ <listener>
+ <listener-class>org.apache.sirona.web.discovery.GaugeDiscoveryListener</listener-class>
+ </listener>
+
+
+</web-app>
Propchange: incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/webapp/WEB-INF/web.xml?rev=1616190&r1=1616189&r2=1616190&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/webapp/WEB-INF/web.xml Wed Aug 6 12:22:49 2014
@@ -17,8 +17,8 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
<context-param> <!-- only register this webapp gauges -->
<param-name>monitoring.discovery.packages</param-name>
@@ -33,10 +33,6 @@
</context-param>
<listener>
- <listener-class>org.apache.sirona.web.discovery.GaugeDiscoveryListener</listener-class>
- </listener>
-
- <listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>