[Lada-commits] [PATCH 05 of 14] Removed config files
Wald Commits
scm-commit at wald.intevation.org
Wed Feb 4 16:16:27 CET 2015
# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1423061574 -3600
# Node ID c7e86351d6baefbe7c2556c6da72b807de18c8c3
# Parent 82b616dcbd5371624ce8918ae57b5ec07fcd61ff
Removed config files.
diff -r 82b616dcbd53 -r c7e86351d6ba pom.xml
--- a/pom.xml Wed Feb 04 15:52:20 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>de.intevation</groupId>
- <artifactId>lada</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
-
- <properties>
- <!-- Explicitly declaring the source encoding eliminates the following
- message: -->
- <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
- resources, i.e. build is platform dependent! -->
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <!-- Define the version of JBoss' Java EE 6 APIs and Tools we want
- to import. -->
- <jboss.bom.version>1.0.0.Final</jboss.bom.version>
- <!-- Alternatively, comment out the above line, and un-comment the
- line below to use version 1.0.0.M12-redhat-1 which is a release certified
- to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6
- maven repository. -->
- <!-- <jboss.bom.version>1.0.0.M12-redhat-1</jboss.bom.version>> -->
- </properties>
-
-
- <dependencyManagement>
- <dependencies>
- <!-- JBoss distributes a complete set of Java EE 6 APIs including
- a Bill of Materials (BOM). A BOM specifies the versions of a "stack" (or
- a collection) of artifacts. We use this here so that we always get the correct
- versions of artifacts. Here we use the jboss-javaee-6.0-with-tools stack
- (you can read this as the JBoss stack of the Java EE 6 APIs, with some extras
- tools for your project, such as Arquillian for testing) and the jboss-javaee-6.0-with-hibernate
- stack you can read this as the JBoss stack of the Java EE 6 APIs, with extras
- from the Hibernate family of projects) -->
- <dependency>
- <groupId>org.jboss.bom</groupId>
- <artifactId>jboss-javaee-6.0-with-tools</artifactId>
- <version>${jboss.bom.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.bom</groupId>
- <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
- <version>${jboss.bom.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
- <!-- First declare the APIs we depend on and need for compilation.
- All of them are provided by JBoss AS 7 -->
-
- <!-- Import the CDI API, we use provided scope as the API is included
- in JBoss AS 7 -->
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the Common Annotations API (JSR-250), we use provided
- scope as the API is included in JBoss AS 7 -->
- <dependency>
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the JAX-RS API, we use provided scope as the API is included
- in JBoss AS 7 -->
- <dependency>
- <groupId>org.jboss.spec.javax.ws.rs</groupId>
- <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the JPA API, we use provided scope as the API is included
- in JBoss AS 7 -->
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Import the EJB API, we use provided scope as the API is included
- in JBoss AS 7 -->
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- JSR-303 (Bean Validation) Implementation -->
- <!-- Provides portable constraints such as @Email -->
- <!-- Hibernate Validator is shipped in JBoss AS 7 -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Import the JSF API, we use provided scope as the API is included
- in JBoss AS 7 -->
- <dependency>
- <groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Now we declare any tools needed -->
-
- <!-- Annotation processor to generate the JPA 2.0 metamodel classes
- for typesafe criteria queries -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-jpamodelgen</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Annotation processor that raising compilation errors whenever
- constraint annotations are incorrectly used. -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator-annotation-processor</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Needed for running tests (you may also use TestNG) -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>2.2.2.GA</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxb-provider</artifactId>
- <version>2.3.1.GA</version>
- <scope>provided</scope>
- </dependency>
- <!-- Multipart support -->
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-multipart-provider</artifactId>
- <version>2.3.1.GA</version>
- </dependency>
- <!-- For better I/O control -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.1.4</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Optional, but highly recommended -->
- <!-- Arquillian allows you to test enterprise code such as EJBs and
- Transactional(JTA) JPA from JUnit/TestNG -->
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20090211</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-spatial</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>org.postgis</groupId>
- <artifactId>postgis-jdbc</artifactId>
- <version>1.5.2</version>
- </dependency>
- </dependencies>
-
- <build>
- <!-- Maven will append the version to the finalName (which is the
- name given to the generated war, and hence the context root) -->
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <!-- Compiler plugin enforces Java 1.6 compatibility and activates
- annotation processors -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
- <configuration>
- <!-- Java EE 6 doesn't require web.xml, Maven needs to
- catch up! -->
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </configuration>
- </plugin>
- <!-- The JBoss AS plugin deploys your war to a local JBoss AS
- container -->
- <!-- To use, run: mvn package jboss-as:deploy -->
- <plugin>
- <groupId>org.jboss.as.plugins</groupId>
- <artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.1.1.Final</version>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <!-- The default profile skips all tests, though you can tune
- it to run just unit tests based on a custom pattern -->
- <!-- Seperate profiles are provided for running all tests, including
- Arquillian tests that execute in the specified container -->
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <systemProperties>
- <property>
- <name>de.intevation.lada.test.singleprobe</name>
- <value>${basedir}/test/single.laf</value>
- </property>
- <property>
- <name>de.intevation.lada.test.incompleteprobe</name>
- <value>${basedir}/test/incomplete.laf</value>
- </property>
- <property>
- <name>de.intevation.lada.import</name>
- <value>${basedir}/config/import.json</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>remote</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jboss.as.plugins</groupId>
- <artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.1.1.Final</version>
- <configuration>
- <hostname>ike.polyhedra.intevation.de</hostname>
- <port>9999</port>
- <username>admin</username>
- <password>secret</password>
- </configuration>
- <executions>
- <execution>
- <id>deploy-jar</id>
- <phase>install</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!-- An optional Arquillian testing profile that executes tests
- in your JBoss AS instance -->
- <!-- This profile will start a new JBoss AS instance, and execute
- the test, shutting it down when done -->
- <!-- Run with: mvn clean test -Parq-jbossas-managed -->
- <id>arq-jbossas-managed</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-arquillian-container-managed</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <!-- An optional Arquillian testing profile that executes tests
- in a remote JBoss AS instance -->
- <!-- Run with: mvn clean test -Parq-jbossas-remote -->
- <id>arq-jbossas-remote</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-arquillian-container-remote</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <!-- When built in OpenShift the 'openshift' profile will be
- used when invoking mvn. -->
- <!-- Use this profile for any OpenShift specific customization
- your app will need. -->
- <!-- By default that is to put the resulting archive into the
- 'deployments' folder. -->
- <!-- http://maven.apache.org/guides/mini/guide-building-for-different-environments.html -->
- <id>openshift</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
- <configuration>
- <outputDirectory>deployments</outputDirectory>
- <warName>ROOT</warName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>unit-tests</id>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>2.2.2.GA</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.1.4</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
- <repositories>
- <repository>
- <id>OSGEO GeoTools repo</id>
- <url>http://download.osgeo.org/webdav/geotools</url>
- </repository>
- <repository>
- <id>Hibernate Spatial repo</id>
- <url>http://www.hibernatespatial.org/repository</url>
- </repository>
- </repositories>
- <name>Lada Server</name>
- <description>Lada server application.
-
-The Lada server provides RESTful services to grant access to laboratory data using authentication and validation.</description>
-</project>
diff -r 82b616dcbd53 -r c7e86351d6ba queryconf.json
--- a/queryconf.json Wed Feb 04 15:52:20 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-[
-{ "id": 1,
- "name": "Kein Filter",
- "description": "Abfrage der Proben ohne Filter",
- "sql": "select probe_id, mst_id, umw_id from l_probe",
- "result": [
- {"dataIndex": "probeId", "header": "ProbeId", "width": 100},
- {"dataIndex": "mstId", "header": "MST", "width": 100},
- {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}
- ],
- "filters": [
- ]
-},
-{ "id": 2,
- "name": "MST und UMW",
- "description": "Abfrage der Proben gefiltert nach Messtellen ID und ID des Umweltbereichs",
- "sql": "select probe_id, mst_id, umw_id from l_probe where (mst_id = :mst_id OR '' = :mst_id) and (umw_id = :umw_id OR '' = :umw_id)",
- "result": [
- {"dataIndex": "probeId", "header": "ProbeId", "width": 100},
- {"dataIndex": "mstId", "header": "MST", "width": 100},
- {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100}
- ],
- "filters": [
- {"dataIndex": "mst_id", "type": "listmst", "label": "Messstelle"},
- {"dataIndex": "umw_id", "type": "listumw", "label": "Umweltbereich"}
- ]
-},
-{ "id": 3,
- "name": "Proben pro Land",
- "description": "Detailiertere Beschreibung der Abfrage",
- "sql": "select probe_id, netzbetreiber_id, mst_id, umw_id, hauptproben_nr from l_probe where (netzbetreiber_id = :netz OR '' = :netz)",
- "result": [
- {"dataIndex": "probeId", "header": "ProbeId", "width": 100},
- {"dataIndex": "netzbetreiberId", "header": "Land", "width": 100},
- {"dataIndex": "mstId", "header": "MST", "width": 100},
- {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100},
- {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100}
- ],
- "filters": [
- {"dataIndex": "netz", "type": "listnetz", "label": "Land"}
- ]
-},
-{ "id": 4,
- "name": "alle Proben mit Ort",
- "description": "alle Proben mit Entnahmeort",
- "sql": "select lp.probe_id, lp.netzbetreiber_id, lp.mst_id, lp.umw_id, lp.hauptproben_nr, ort.gem_id, s_verwaltungseinheit.bezeichnung from l_probe left outer join l_ort on (lp.probe_id = l_ort.probe_id) left outer join ort on (l_ort.ort_id = ort.ort_id) left outer join s_verwaltungseinheit on (ort.gem_id = s_verwaltungseinheit.gem_id) where l_ort.orts_typ = 'E' or l_ort.orts_typ is null",
- "result": [
- {"dataIndex": "probeId", "header": "ProbeId", "width": 100},
- {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50},
- {"dataIndex": "mstId", "header": "MST", "width": 60},
- {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100},
- {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100},
- {"dataIndex": "gemId", "header": "Gem-ID", "width": 100},
- {"dataIndex": "bezeichnung", "header": "Gemeinde", "flex": 1}
- ],
- "filters": [
- ]
-},
-{ "id": 5,
- "name": "Proben pro Land und UMW (Multyselect)",
- "description": "Abfrage aller Proben gefiltert pro Land und Umweltbereich (mit Mehrfachauswahl)",
- "sql": "select lp.probe_id, lp.netzbetreiber_id, lp.mst_id, to_char(lp.probeentnahme_beginn,'YYYY-mm-dd HH24:MI') entnahme_von, to_char(lp.probeentnahme_ende,'YYYY-mm-dd HH24:MI') entnahme_bis, lp.umw_id, lp.hauptproben_nr, l_ort.orts_typ, ort.gem_id, s_verwaltungseinheit.bezeichnung from l_probe left outer join l_ort on (lp.probe_id = l_ort.probe_id) left outer join ort on (l_ort.ort_id = ort.ort_id) left outer join s_verwaltungseinheit on (ort.gem_id = s_verwaltungseinheit.gem_id) where (l_ort.orts_typ = 'E' or l_ort.orts_typ is null) and lp.netzbetreiber_id = :netz and (umw_id similar to (:umw_id) OR '' = :umw_id)",
- "result": [
- {"dataIndex": "probeId", "header": "ProbeId", "width": 100},
- {"dataIndex": "netzbetreiberId", "header": "Land", "width": 50},
- {"dataIndex": "mstId", "header": "MST", "width": 50},
- {"dataIndex": "entnahmeVon", "header": "Entnahme von", "width": 120},
- {"dataIndex": "entnahmeBis", "header": "Entnahme bis", "width": 120},
- {"dataIndex": "umwId", "header": "Umweltbereich", "width": 100},
- {"dataIndex": "hauptprobenNr", "header": "Proben-Nr", "width": 100},
- {"dataIndex": "ortsTyp", "header": "Ortstyp", "width": 50},
- {"dataIndex": "genId", "header": "Gemeinde-ID", "width": 100},
- {"dataIndex": "bezeichnung", "header": "Gemeinde", "flex": 1}
- ],
- "filters": [
- {"dataIndex": "netz", "type": "listnetz", "label": "Land"},
- {"dataIndex": "umw_id", "type": "listumw", "label": "Umweltbereich", "multiselect":true}
- ]
-}
-]
More information about the Lada-commits
mailing list