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:23:07 UTC
svn commit: r1616191 - in /incubator/sirona/trunk/server/reporting: reporting-api/src/main/resources/META-INF/ reporting-api/src/main/resources/WEB-INF/lib/ reporting-ui/ reporting-ui/src/ reporting-ui/src/main/ reporting-ui/src/main/webapp/ reporting-...

Author: olamy
Date: Wed Aug  6 12:23:06 2014
New Revision: 1616191

URL: http://svn.apache.org/r1616191
Log:
fixing web-fragment.xml configuration

Added:
    incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/META-INF/
    incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/META-INF/web-fragment.xml
      - copied, changed from r1616190, incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml
    incubator/sirona/trunk/server/reporting/reporting-ui/src/
    incubator/sirona/trunk/server/reporting/reporting-ui/src/main/
    incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/
    incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html   (with props)
    incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/web.xml   (contents, props changed)
      - copied, changed from r1616190, incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml
Removed:
    incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml
Modified:
    incubator/sirona/trunk/server/reporting/reporting-ui/pom.xml
    incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/java/org/apache/sirona/reporting/web/SironaController.java

Copied: incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/META-INF/web-fragment.xml (from r1616190, 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/META-INF/web-fragment.xml?p2=incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/META-INF/web-fragment.xml&p1=incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml&r1=1616190&r2=1616191&rev=1616191&view=diff
==============================================================================
    (empty)

Modified: incubator/sirona/trunk/server/reporting/reporting-ui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/pom.xml?rev=1616191&r1=1616190&r2=1616191&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/pom.xml (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/pom.xml Wed Aug  6 12:23:06 2014
@@ -41,17 +41,6 @@
   </dependencies>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <configuration>
-            <failOnMissingWebXml>false</failOnMissingWebXml>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.tomcat.maven</groupId>

Added: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html?rev=1616191&view=auto
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html (added)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html Wed Aug  6 12:23:06 2014
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+  </head>
+
+  <body>
+  here you go
+  </body>
+</html>
\ No newline at end of file

Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/web.xml (from r1616190, 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-ui/src/main/webapp/web.xml?p2=incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/web.xml&p1=incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml&r1=1616190&r2=1616191&rev=1616191&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-api/src/main/resources/WEB-INF/lib/web.xml (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/web.xml Wed Aug  6 12:23:06 2014
@@ -20,9 +20,4 @@
          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-ui/src/main/webapp/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/web.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/java/org/apache/sirona/reporting/web/SironaController.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/java/org/apache/sirona/reporting/web/SironaController.java?rev=1616191&r1=1616190&r2=1616191&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/java/org/apache/sirona/reporting/web/SironaController.java (original)
+++ incubator/sirona/trunk/server/reporting/reporting-webapp/src/main/java/org/apache/sirona/reporting/web/SironaController.java Wed Aug  6 12:23:06 2014
@@ -125,8 +125,6 @@ public class SironaController implements
         request.setAttribute("baseUri", baseUri);
 
 
-
-
         final String requestURI = httpRequest.getRequestURI();
         final String path = buildMatchablePath(httpRequest, baseUri, requestURI, true);
         final String pathWithoutParams = buildMatchablePath(httpRequest, baseUri, requestURI, false);