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:25:54 UTC
svn commit: r1616195 - in /incubator/sirona/trunk: ./ server/reporting/
server/reporting/reporting-ui/ server/reporting/reporting-ui/src/main/webapp/
server/reporting/reporting-ui/src/main/webapp/WEB-INF/
server/reporting/reporting-ui/src/main/webapp/j...
Author: olamy
Date: Wed Aug 6 12:25:53 2014
New Revision: 1616195
URL: http://svn.apache.org/r1616195
Log:
adding hack to be able to develop the UI without having dependency
this is really a pain this decoupling this.
Added:
incubator/sirona/trunk/reportingUi.sh (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/WEB-INF/
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/WEB-INF/web.xml (contents, props changed)
- copied, changed from r1616194, incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/web.xml
incubator/sirona/trunk/server/reporting/reporting-ui/src/test/
incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/
incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/
incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml (with props)
incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/log4j2-test.xml (with props)
Removed:
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/web.xml
Modified:
incubator/sirona/trunk/server/reporting/pom.xml
incubator/sirona/trunk/server/reporting/reporting-ui/pom.xml
incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js
incubator/sirona/trunk/server/reporting/reporting-webapp/pom.xml
Added: incubator/sirona/trunk/reportingUi.sh
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/reportingUi.sh?rev=1616195&view=auto
==============================================================================
--- incubator/sirona/trunk/reportingUi.sh (added)
+++ incubator/sirona/trunk/reportingUi.sh Wed Aug 6 12:25:53 2014
@@ -0,0 +1 @@
+mvn process-test-resources tomcat7:run -pl :sirona-reporting-ui -am
Propchange: incubator/sirona/trunk/reportingUi.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/reportingUi.sh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/sirona/trunk/server/reporting/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/pom.xml?rev=1616195&r1=1616194&r2=1616195&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/pom.xml (original)
+++ incubator/sirona/trunk/server/reporting/pom.xml Wed Aug 6 12:25:53 2014
@@ -32,6 +32,9 @@
<tomcatRunPort>8080</tomcatRunPort>
<tomcatRunPath>/sirona</tomcatRunPath>
<sirona.properties.path>${basedir}/src/test/sirona.properties</sirona.properties.path>
+ <cxf.version>3.0.1</cxf.version>
+ <jacksonVersion>2.4.1</jacksonVersion>
+ <spring.version>4.0.6.RELEASE</spring.version>
</properties>
<modules>
@@ -55,7 +58,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.0.1</version>
+ <version>${cxf.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
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=1616195&r1=1616194&r2=1616195&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:25:53 2014
@@ -30,6 +30,7 @@
<properties>
<sirona.reporting.ui.tomcat.skip>false</sirona.reporting.ui.tomcat.skip>
+ <log4j2.version>2.0</log4j2.version>
</properties>
<dependencies>
@@ -42,6 +43,43 @@
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-reporting-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jacksonVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-xml-provider</artifactId>
+ <version>${jacksonVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>1.7.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -53,6 +91,7 @@
<port>${tomcatRunPort}</port>
<path>${tomcatRunPath}</path>
<skip>${sirona.reporting.ui.tomcat.skip}</skip>
+ <useTestClasspath>true</useTestClasspath>
<systemProperties>
<org.apache.sirona.configuration.sirona.properties>${sirona.properties.path}</org.apache.sirona.configuration.sirona.properties>
</systemProperties>
@@ -63,6 +102,26 @@
<artifactId>sirona-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>1.7.7</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
Copied: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/WEB-INF/web.xml (from r1616194, incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/web.xml)
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/WEB-INF/web.xml?p2=incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/WEB-INF/web.xml&p1=incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/web.xml&r1=1616194&r2=1616195&rev=1616195&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/web.xml (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/WEB-INF/web.xml Wed Aug 6 12:25:53 2014
@@ -20,4 +20,32 @@
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>
+ <param-value>org.apache.sirona.reporting.web.plugin</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>
+ classpath*:META-INF/spring-context.xml
+ </param-value>
+ </context-param>
+
+
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/restServices/*</url-pattern>
+ </servlet-mapping>
+
</web-app>
Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js?rev=1616195&r1=1616194&r2=1616195&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js (original)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/main/webapp/js/sirona.js Wed Aug 6 12:25:53 2014
@@ -3,8 +3,6 @@
define(['jquery','controllers', 'angular-route', 'bootstrap'],
function (jquery,controllers) {
- console.log("load sirona.js");
-
var sirona = angular.module('sirona', [
'ngRoute',
'homeControllers'
@@ -25,4 +23,5 @@ define(['jquery','controllers', 'angular
}]);
angular.bootstrap(document,['sirona']);
+
});
\ No newline at end of file
Added: incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml?rev=1616195&view=auto
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml (added)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml Wed Aug 6 12:25:53 2014
@@ -0,0 +1,49 @@
+<?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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+
+ <!--
+ <import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+ -->
+
+ <bean id="cxf" class="org.apache.cxf.bus.spring.SpringBus" destroy-method="shutdown"/>
+ <bean id="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor" class="org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/>
+ <bean id="org.apache.cxf.bus.spring.BusExtensionPostProcessor" class="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/>
+
+ <bean id="jsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider">
+ <property name="mapper">
+ <bean class="com.fasterxml.jackson.databind.ObjectMapper"/>
+ </property>
+ </bean>
+
+ <jaxrs:server id="sironaServices" address="/sironaServices" basePackages="org.apache.sirona.reporting.web.**">
+ <jaxrs:providers>
+ <ref bean="jsonProvider"/>
+ </jaxrs:providers>
+ </jaxrs:server>
+
+</beans>
Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/log4j2-test.xml?rev=1616195&view=auto
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/log4j2-test.xml (added)
+++ incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/log4j2-test.xml Wed Aug 6 12:25:53 2014
@@ -0,0 +1,43 @@
+<?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.
+ -->
+
+
+<configuration status="debug">
+
+
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <!--PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/-->
+ <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n}" />
+ </Console>
+ </appenders>
+ <loggers>
+
+ <logger name="org.springframework" level="info"/>
+
+ <logger name="org.apache.cxf" level="info"/>
+
+ <root level="info" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
+
+
Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sirona/trunk/server/reporting/reporting-ui/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/sirona/trunk/server/reporting/reporting-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/server/reporting/reporting-webapp/pom.xml?rev=1616195&r1=1616194&r2=1616195&view=diff
==============================================================================
--- incubator/sirona/trunk/server/reporting/reporting-webapp/pom.xml (original)
+++ incubator/sirona/trunk/server/reporting/reporting-webapp/pom.xml Wed Aug 6 12:25:53 2014
@@ -30,7 +30,6 @@
<properties>
<sirona.reporting.tomcat.skip>false</sirona.reporting.tomcat.skip>
- <jacksonVersion>2.4.1</jacksonVersion>
</properties>
<dependencies>
@@ -71,7 +70,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>4.0.6.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>