Skip to content

Commit 0db023b

Browse files
author
Wolfgang Walter SAUER
authored
Merge pull request #94 from clarin-eric/dev
Dev
2 parents 7162be8 + 55378a0 commit 0db023b

File tree

4 files changed

+25
-34
lines changed

4 files changed

+25
-34
lines changed

‎curation-module-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<properties>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<slf4j.version>1.7.25</slf4j.version>
15-
<rasa.version>4.0.0</rasa.version>
15+
<rasa.version>4.0.1</rasa.version>
1616
</properties>
1717
<dependencies>
1818

‎curation-module-core/src/test/java/eu/clarin/cmdi/curation/cr/profile_parser/TestBase.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,28 @@ public static void initClass() {
5959
Configuration.linkToBeCheckedResource.save(new LinkToBeChecked("https://maps.google.com", "GoogleRecord", "Google", null, today));
6060
Configuration.linkToBeCheckedResource.save(new LinkToBeChecked("https://drive.google.com", "GoogleRecord", "Google", null, today));
6161

62-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/waiting.html", "HEAD", 200, "text/html; charset=UTF-8", 100, 132, today, "Ok", 0, Category.Ok));
63-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/audio_files/EMP1M1B1.mp3", "GET", 400, "text/html; charset=UTF-8", 0, 46, today, "Broken", 0, Category.Broken));
64-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/audio_files/WBA1M3A2.mp3", "GET", 400, "text/html; charset=UTF-8", 0, 46, today, "Broken", 0, Category.Broken));
65-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/text_files/WBA1M1A2a.mp3", "GET", 400, "text/html; charset=UTF-8", 0, 46, today, "Broken", 0, Category.Broken));
66-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/audio_files/KUA2M1A1.mp3", "GET", 400, "text/html; charset=UTF-8", 0, 56, today, "Broken", 0, Category.Broken));
67-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/text_files/KUA2M1.pdf", "HEAD", 200, "text/html; charset=UTF-8", 0, 51, today, "Ok", 0, Category.Ok));
68-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/audio_files/sarixojani.mp3", "GET", 400, "text/html; charset=UTF-8", 0, 48, today, "Broken", 0, Category.Broken));
69-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/audio_files/TEH11M7A1sa.mp3", "GET", 400, "text/html; charset=UTF-8", 0, 48, today, "Broken", 0, Category.Broken));
70-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/text_files/TEH11M7.pdf", "HEAD", 200, "text/html; charset=UTF-8", 0, 57, today, "Ok", 0, Category.Ok));
71-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://dspin.dwds.de:8088/ddc-sru/dta/", "HEAD", 200, "application/xml;charset=utf-8", 2094, 67, today, "Ok", 0, Category.Ok));
72-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://dspin.dwds.de:8088/ddc-sru/grenzboten/", "HEAD", 200, "application/xml;charset=utf-8", 2273, 57, today, "Ok", 0, Category.Ok));
73-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://dspin.dwds.de:8088/ddc-sru/rem/", "HEAD", 200, "application/xml;charset=utf-8", 2497, 58, today, "Ok", 0, Category.Ok));
74-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M084E-N1.xml", "HEAD", 200, "text/html; charset=utf-8", 0, 591, today, "Ok", 0, Category.Ok));
75-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M220P-N1.xml", "HEAD", 200, "text/html; charset=utf-8", 0, 592, today, "Ok", 0, Category.Ok));
76-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M119-N1.xml", "HEAD", 200, "text/html; charset=utf-8", 0, 602, today, "Ok", 0, Category.Ok));
77-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M171-G1.xml", "HEAD", 200, "text/html; charset=utf-8", 0, 613, today, "Ok", 0, Category.Ok));
78-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M185-N1.xml", "HEAD", 200, "text/html; charset=utf-8", 0, 605, today, "Ok", 0, Category.Ok));
79-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M048P-N1.xml", "HEAD", 200, "text/html; charset=utf-8", 0, 599, today, "Ok", 0, Category.Ok));
80-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M112-G1.xml", "HEAD", 200, "text/html; charset=utf-8", 0, 591, today, "Ok", 0, Category.Ok));
81-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "https://www.google.com", "HEAD", 200, "text/html; charset=ISO-8859-1", 0, 222, today, "Ok", 0, Category.Ok));
82-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "https://maps.google.com", "HEAD", 200, "text/html; charset=UTF-8", 0, 440, today, "Ok", 2, Category.Ok));
83-
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "https://drive.google.com", "HEAD", 200, "text/html; charset=UTF-8", 73232, 413, today, "Ok", 1, Category.Ok));
62+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/waiting.html", "HEAD", 200, "text/html; charset=UTF-8", 100l, 132, today, "Ok", 0, Category.Ok));
63+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/audio_files/EMP1M1B1.mp3", "GET", 400, "text/html; charset=UTF-8", 0l, 46, today, "Broken", 0, Category.Broken));
64+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/audio_files/WBA1M3A2.mp3", "GET", 400, "text/html; charset=UTF-8", 0l, 46, today, "Broken", 0, Category.Broken));
65+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/text_files/WBA1M1A2a.mp3", "GET", 400, "text/html; charset=UTF-8", 0l, 46, today, "Broken", 0, Category.Broken));
66+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/audio_files/KUA2M1A1.mp3", "GET", 400, "text/html; charset=UTF-8", 0l, 56, today, "Broken", 0, Category.Broken));
67+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/text_files/KUA2M1.pdf", "HEAD", 200, "text/html; charset=UTF-8", 0l, 51, today, "Ok", 0, Category.Ok));
68+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/audio_files/sarixojani.mp3", "GET", 400, "text/html; charset=UTF-8", 0l, 48, today, "Broken", 0, Category.Broken));
69+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/audio_files/TEH11M7A1sa.mp3", "GET", 400, "text/html; charset=UTF-8", 0l, 48, today, "Broken", 0, Category.Broken));
70+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.ailla.org/text_files/TEH11M7.pdf", "HEAD", 200, "text/html; charset=UTF-8", 0l, 57, today, "Ok", 0, Category.Ok));
71+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://dspin.dwds.de:8088/ddc-sru/dta/", "HEAD", 200, "application/xml;charset=utf-8", 2094l, 67, today, "Ok", 0, Category.Ok));
72+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://dspin.dwds.de:8088/ddc-sru/grenzboten/", "HEAD", 200, "application/xml;charset=utf-8", 2273l, 57, today, "Ok", 0, Category.Ok));
73+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://dspin.dwds.de:8088/ddc-sru/rem/", "HEAD", 200, "application/xml;charset=utf-8", 2497l, 58, today, "Ok", 0, Category.Ok));
74+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M084E-N1.xml", "HEAD", 200, "text/html; charset=utf-8", 0l, 591, today, "Ok", 0, Category.Ok));
75+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M220P-N1.xml", "HEAD", 200, "text/html; charset=utf-8", 0l, 592, today, "Ok", 0, Category.Ok));
76+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M119-N1.xml", "HEAD", 200, "text/html; charset=utf-8", 0l, 602, today, "Ok", 0, Category.Ok));
77+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M171-G1.xml", "HEAD", 200, "text/html; charset=utf-8", 0l, 613, today, "Ok", 0, Category.Ok));
78+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M185-N1.xml", "HEAD", 200, "text/html; charset=utf-8", 0l, 605, today, "Ok", 0, Category.Ok));
79+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M048P-N1.xml", "HEAD", 200, "text/html; charset=utf-8", 0l, 599, today, "Ok", 0, Category.Ok));
80+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "http://www.deutschestextarchiv.de/rem/?d=M112-G1.xml", "HEAD", 200, "text/html; charset=utf-8", 0l, 591, today, "Ok", 0, Category.Ok));
81+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "https://www.google.com", "HEAD", 200, "text/html; charset=ISO-8859-1", 0l, 222, today, "Ok", 0, Category.Ok));
82+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "https://maps.google.com", "HEAD", 200, "text/html; charset=UTF-8", 0l, 440, today, "Ok", 2, Category.Ok));
83+
Configuration.checkedLinkResource.save(new CheckedLink(null, null, "https://drive.google.com", "HEAD", 200, "text/html; charset=UTF-8", 73232l, 413, today, "Ok", 1, Category.Ok));
8484

8585

8686

‎curation-module-core/src/test/resources/createDB.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ CREATE TABLE `status` (
4949
`id` int NOT NULL AUTO_INCREMENT,
5050
`url_id` int DEFAULT NULL,
5151
`statusCode` int DEFAULT NULL,
52-
`message` varchar(256),
52+
`message` varchar(1024),
5353
`category` varchar(25) NOT NULL,
5454
`method` varchar(10) NOT NULL,
5555
`contentType` varchar(256) DEFAULT NULL,
56-
`byteSize` int DEFAULT NULL,
56+
`byteSize` bigint DEFAULT NULL,
5757
`duration` int DEFAULT NULL,
5858
`checkingDate` datetime NOT NULL,
5959
`redirectCount` int DEFAULT NULL,

‎pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,21 @@
66
<artifactId>curation-module</artifactId>
77
<name>Curation Module</name>
88
<packaging>pom</packaging>
9-
109
<version>5.1.1</version>
11-
1210
<organization>
1311
<name>CLARIN</name>
1412
<url>http://www.clarin.eu</url>
1513
</organization>
16-
1714
<modules>
1815
<module>curation-module-core</module>
1916
<module>curation-module-web</module>
2017
</modules>
21-
22-
2318
<properties>
2419
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2520

2621
<junit.version>4.13.1</junit.version>
2722
<slf4j.version>1.7.30</slf4j.version>
2823
</properties>
29-
3024
<build>
3125
<plugins>
3226
<plugin>
@@ -45,8 +39,6 @@
4539
</plugin>
4640
</plugins>
4741
</build>
48-
49-
5042
<dependencies>
5143
<dependency>
5244
<groupId>org.slf4j</groupId>
@@ -90,5 +82,4 @@
9082
</snapshots>
9183
</repository>
9284
</repositories>
93-
9485
</project>

0 commit comments

Comments
 (0)