Skip to content
This repository was archived by the owner on Apr 22, 2022. It is now read-only.

Commit de84636

Browse files
alegrmalegrm
committed
Merge branch 'dashboard'
2 parents ed7c2f3 + 433de73 commit de84636

File tree

898 files changed

+18690
-166425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

898 files changed

+18690
-166425
lines changed

‎.gitignore‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,5 @@
1515
/target
1616
/logs
1717

18-
# Vaadin cache dir
19-
/src/main/webapp/VAADIN/gwt-unitCache
20-
/src/main/webapp/VAADIN/widgetsets
21-
/target
22-
/bin
18+
# Working dirs
19+
/batch-jobs

‎deb-package/debian/changelog‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
geoknow-generator-ui (1.0.2) ldstack-nightly; urgency=low
22

3-
* Initial Release.
3+
* Intermediate release of GeoKnow Generatro Workbench
4+
* Includes user authentication and users and role management
5+
* Implements graph level access control
6+
* Requires spring batch admin generator for running batch processes
47

5-
-- Vadim Zaslawski <vadim.zaslawski@ontos.com> Wed, 21 Aug 2013 15:01:15 +0200
8+
-- Alejandra Garcia Rojas <alejandra.garciarojas@ontos.com> Tue, 25 Nov 2014 17:11:12 +0200

‎pom.xml‎

Lines changed: 95 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>eu.geoknow</groupId>
5-
<artifactId>generator</artifactId>
6-
<packaging>war</packaging>
7-
<version>1.0.1</version>
8-
<name>GeoKnow Generator</name>
4+
<groupId>eu.geoknow</groupId>
5+
<artifactId>generator</artifactId>
6+
<packaging>war</packaging>
7+
<version>1.0.1</version>
8+
<name>GeoKnow Generator</name>
99

1010
<properties>
1111
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13+
<jersey.version>2.12</jersey.version>
1314
</properties>
1415

1516
<repositories>
@@ -19,13 +20,20 @@
1920
</repository>
2021
</repositories>
2122

23+
<dependencyManagement>
24+
<dependencies>
25+
<dependency>
26+
<groupId>org.glassfish.jersey</groupId>
27+
<artifactId>jersey-bom</artifactId>
28+
<version>${jersey.version}</version>
29+
<type>pom</type>
30+
<scope>import</scope>
31+
</dependency>
32+
</dependencies>
33+
</dependencyManagement>
34+
2235
<dependencies>
23-
<dependency>
24-
<groupId>junit</groupId>
25-
<artifactId>junit</artifactId>
26-
<version>4.10</version>
27-
<scope>test</scope>
28-
</dependency>
36+
2937
<dependency>
3038
<groupId>javax.servlet</groupId>
3139
<artifactId>servlet-api</artifactId>
@@ -63,12 +71,37 @@
6371
<artifactId>gson</artifactId>
6472
<version>2.2.4</version>
6573
</dependency>
66-
6774
<dependency>
68-
<groupId>commons-httpclient</groupId>
69-
<artifactId>commons-httpclient</artifactId>
70-
<version>3.1</version>
71-
</dependency>
75+
<groupId>javax.xml.bind</groupId>
76+
<artifactId>jaxb-api</artifactId>
77+
<version>2.2.11</version>
78+
</dependency>
79+
80+
<!-- <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId>
81+
<version>3.1</version> </dependency> -->
82+
<dependency>
83+
<groupId>org.apache.httpcomponents</groupId>
84+
<artifactId>httpclient</artifactId>
85+
<version>4.3.5</version>
86+
</dependency>
87+
88+
<dependency>
89+
<groupId>org.apache.httpcomponents</groupId>
90+
<artifactId>httpmime</artifactId>
91+
<version>4.3.5</version>
92+
</dependency>
93+
94+
<dependency>
95+
<groupId>org.apache.httpcomponents</groupId>
96+
<artifactId>httpcore</artifactId>
97+
<version>4.3.2</version>
98+
</dependency>
99+
100+
<dependency>
101+
<groupId>org.apache.commons</groupId>
102+
<artifactId>commons-lang3</artifactId>
103+
<version>3.3.2</version>
104+
</dependency>
72105

73106
<!-- for digest authentication -->
74107
<dependency>
@@ -83,14 +116,39 @@
83116
<artifactId>log4j</artifactId>
84117
<version>1.2.16</version>
85118
</dependency>
86-
119+
87120
<!-- Javax web services with jersey -->
88121
<dependency>
89-
<groupId>org.glassfish.jersey.containers</groupId>
90-
<artifactId>jersey-container-servlet</artifactId>
91-
<version>2.12</version>
122+
<groupId>org.glassfish.jersey.containers</groupId>
123+
<artifactId>jersey-container-servlet</artifactId>
124+
</dependency>
125+
<dependency>
126+
<groupId>org.glassfish.jersey.media</groupId>
127+
<artifactId>jersey-media-json-jackson</artifactId>
92128
</dependency>
93-
129+
130+
<!-- for testing -->
131+
<dependency>
132+
<groupId>com.jayway.restassured</groupId>
133+
<artifactId>rest-assured</artifactId>
134+
<version>2.3.4</version>
135+
<scope>test</scope>
136+
</dependency>
137+
138+
<dependency>
139+
<groupId>org.hamcrest</groupId>
140+
<artifactId>hamcrest-all</artifactId>
141+
<version>1.3</version>
142+
<scope>test</scope>
143+
</dependency>
144+
145+
<dependency>
146+
<groupId>junit</groupId>
147+
<artifactId>junit</artifactId>
148+
<version>4.10</version>
149+
<scope>test</scope>
150+
</dependency>
151+
94152
</dependencies>
95153

96154
<build>
@@ -116,6 +174,22 @@
116174
<failOnMissingWebXml>false</failOnMissingWebXml>
117175
</configuration>
118176
</plugin>
177+
<!-- integration test run: mvn verify after deploying the war in tomcat -->
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-failsafe-plugin</artifactId>
181+
<version>2.12</version>
182+
<executions>
183+
<execution>
184+
<id>integration-test</id>
185+
<phase>integration-test</phase>
186+
<goals>
187+
<goal>integration-test</goal>
188+
</goals>
189+
</execution>
190+
</executions>
191+
</plugin>
192+
119193
<!-- Maven Tomcat Plugin -->
120194
<plugin>
121195
<version>1.1</version>

0 commit comments

Comments
 (0)