Skip to content

Commit bc7753c

Browse files
gdesiatogdesiato
committed
Updates on webapp, util, cmis and core
1 parent 4decde7 commit bc7753c

File tree

8 files changed

+110
-57
lines changed

8 files changed

+110
-57
lines changed

‎logicaldoc-cmis/pom.xml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,16 +138,16 @@
138138
<dependency>
139139
<groupId>org.hsqldb</groupId>
140140
<artifactId>hsqldb</artifactId>
141-
<scope>provided</scope>
141+
<scope>provided</scope>
142142
</dependency>
143143
<dependency>
144144
<groupId>org.hsqldb</groupId>
145145
<artifactId>sqltool</artifactId>
146-
<scope>provided</scope>
146+
<scope>provided</scope>
147147
</dependency>
148148

149149

150-
<!-- For testing purpose -->
150+
<!-- For testing purpose -->
151151
<dependency>
152152
<groupId>org.springframework</groupId>
153153
<artifactId>spring-tx</artifactId>
@@ -159,12 +159,16 @@
159159
<scope>provided</scope>
160160
</dependency>
161161
<dependency>
162-
<groupId>commons-beanutils</groupId>
163-
<artifactId>commons-beanutils</artifactId>
164-
<version>1.9.4</version>
162+
<groupId>commons-beanutils</groupId>
163+
<artifactId>commons-beanutils</artifactId>
164+
<version>1.9.4</version>
165+
<scope>provided</scope>
166+
</dependency>
167+
<dependency>
168+
<groupId>org.jdom</groupId>
169+
<artifactId>jdom2</artifactId>
165170
<scope>provided</scope>
166171
</dependency>
167-
168172
</dependencies>
169173

170174
<build>

‎logicaldoc-cmis/src/test/java/com/logicaldoc/cmis/LDRepositoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ public void testGetContentChanges() throws PersistenceException, ParseException
449449
PropertyData<?> oid = objectData.getProperties().getProperties().get("cmis:objectId");
450450

451451
String cmisDocID = (String) oid.getFirstValue();
452-
assertTrue(cmisDocID.equals("doc.1") || cmisDocID.equals("fld.5"));
452+
assertTrue(cmisDocID.equals("doc.1") || cmisDocID.equals("fld.5") || cmisDocID.equals("fld.4"));
453453
}
454454

455455
}

‎logicaldoc-core/src/main/java/com/logicaldoc/core/history/History.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.logicaldoc.core.history;
22

3-
import java.io.IOException;
43
import java.util.ArrayList;
54
import java.util.Collection;
65
import java.util.Date;
@@ -13,10 +12,7 @@
1312
import org.slf4j.LoggerFactory;
1413
import org.springframework.beans.factory.config.BeanDefinition;
1514
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
16-
import org.springframework.core.type.classreading.MetadataReader;
17-
import org.springframework.core.type.classreading.MetadataReaderFactory;
1815
import org.springframework.core.type.filter.AnnotationTypeFilter;
19-
import org.springframework.core.type.filter.AssignableTypeFilter;
2016

2117
import com.logicaldoc.core.PersistenceException;
2218
import com.logicaldoc.core.PersistentObject;
@@ -551,22 +547,15 @@ public static Collection<String> eventTables() {
551547

552548
ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(false);
553549
scanner.addIncludeFilter(new AnnotationTypeFilter(Table.class));
554-
scanner.addExcludeFilter(new AssignableTypeFilter(History.class) {
555-
556-
@Override
557-
public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
558-
throws IOException {
559-
return !super.match(metadataReader, metadataReaderFactory);
560-
}
561-
});
562550

563551
for (BeanDefinition bd : scanner.findCandidateComponents("com.logicaldoc")) {
564552
String beanClassName = bd.getBeanClassName();
565553

566554
try {
567555
Class<?> beanClass = Class.forName(beanClassName);
568556
Table annotation = beanClass.getAnnotation(Table.class);
569-
if (annotation != null && StringUtils.isNotEmpty(annotation.name()))
557+
if (annotation != null && StringUtils.isNotEmpty(annotation.name())
558+
&& History.class.isAssignableFrom(beanClass))
570559
tables.add(annotation.name());
571560
} catch (Exception e) {
572561
log.error(e.getMessage(), e);

‎logicaldoc-util/src/main/java/com/logicaldoc/util/config/WebConfigurator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ public void addServlet(String name, String clazz, int loadOnStartup) {
393393
* @param name The filter name
394394
* @param clazz The filter class fully qualified name
395395
*/
396-
@SuppressWarnings("unchecked")
397396
public void addFilter(String name, String clazz) {
398397
Element filter = null;
399398
Element filterClass = null;

‎logicaldoc-util/src/main/java/com/logicaldoc/util/config/XMLBean.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public XMLBean(URL docname) {
7171
docPath = URLDecoder.decode(docname.getPath(), "UTF-8");
7272
docInputStream = null;
7373
} catch (Exception ex) {
74-
log.error(ex.getMessage());
74+
log.error(ex.getMessage(), ex);
7575
}
7676

7777
initDocument();
@@ -92,7 +92,7 @@ public XMLBean(InputStream is) {
9292
* Initializes the SAX builder
9393
*/
9494
private void initDocument() {
95-
SAXBuilder builder = new SAXBuilder(XMLReaders.NONVALIDATING);
95+
SAXBuilder builder = new SAXBuilder(XMLReaders.DTDVALIDATING);
9696

9797
builder.setFeature("http://xml.org/sax/features/validation", false);
9898
builder.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
@@ -102,23 +102,25 @@ private void initDocument() {
102102

103103
builder.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
104104
builder.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
105-
105+
106106
if (docPath != null) {
107107
try {
108108
doc = builder.build(docPath);
109109
} catch (Exception t) {
110+
t.printStackTrace();
111+
110112
// In some environments, during maven test phase a well formed
111113
// URL must be used
112114
// instead of ordinary path
113-
log.error(t.getMessage());
115+
log.error(t.getMessage(), t);
114116

115117
buildFromFileUrl(builder);
116118
}
117119
} else {
118120
try {
119121
doc = builder.build(docInputStream);
120122
} catch (Exception t) {
121-
log.error(t.getMessage());
123+
log.error(t.getMessage(), t);
122124
}
123125
}
124126

‎logicaldoc-webapp/pom.xml‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,18 @@
1212
<name>logicaldoc-webapp</name>
1313
<packaging>war</packaging>
1414
<dependencies>
15+
<dependency>
16+
<groupId>org.jdom</groupId>
17+
<artifactId>jdom2</artifactId>
18+
</dependency>
19+
<dependency>
20+
<groupId>xml-apis</groupId>
21+
<artifactId>xml-apis</artifactId>
22+
</dependency>
23+
<dependency>
24+
<groupId>xml-apis</groupId>
25+
<artifactId>xml-apis-ext</artifactId>
26+
</dependency>
1527
<dependency>
1628
<groupId>com.google.guava</groupId>
1729
<artifactId>guava</artifactId>
@@ -130,20 +142,7 @@
130142
<groupId>org.hsqldb</groupId>
131143
<artifactId>sqltool</artifactId>
132144
</dependency>
133-
<dependency>
134-
<groupId>xml-apis</groupId>
135-
<artifactId>xml-apis</artifactId>
136-
<scope>runtime</scope>
137-
</dependency>
138-
<dependency>
139-
<groupId>xml-apis</groupId>
140-
<artifactId>xml-apis-ext</artifactId>
141-
<scope>runtime</scope>
142-
</dependency>
143-
<dependency>
144-
<groupId>org.jdom</groupId>
145-
<artifactId>jdom2</artifactId>
146-
</dependency>
145+
147146
<dependency>
148147
<groupId>torque</groupId>
149148
<artifactId>torque</artifactId>
@@ -435,10 +434,6 @@
435434
<artifactId>cron-utils</artifactId>
436435
<version>9.1.6</version>
437436
</dependency>
438-
<dependency>
439-
<groupId>org.dom4j</groupId>
440-
<artifactId>dom4j</artifactId>
441-
</dependency>
442437
<dependency>
443438
<groupId>org.apache.calcite</groupId>
444439
<artifactId>calcite-core</artifactId>
@@ -454,15 +449,6 @@
454449
<artifactId>batik-util</artifactId>
455450
<scope>provided</scope>
456451
</dependency>
457-
<!-- dependency> <groupId>com.microsoft.graph</groupId>
458-
<artifactId>microsoft-graph</artifactId>
459-
<version>5.32.0</version> </dependency> <dependency>
460-
<groupId>com.azure</groupId>
461-
<artifactId>azure-identity</artifactId> <version>1.3.7</version> </dependency>
462-
<dependency> <groupId>com.microsoft.azure</groupId>
463-
<artifactId>msal4j</artifactId>
464-
<version>1.13.0</version> </dependency -->
465-
466452
<dependency>
467453
<groupId>org.mockito</groupId>
468454
<artifactId>mockito-core</artifactId>

‎logicaldoc-webapp/src/test/java/com/logicaldoc/web/service/SystemServiceImplTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,9 @@ public void testGetPlugins() throws ServerException {
169169
@Test
170170
public void testSearch() throws ServerException {
171171
List<GUIHistory> hits = testSubject.search(null, null, null, 100, null, new ArrayList<>(), null);
172-
assertEquals(7, hits.size());
173-
172+
assertEquals(9, hits.size());
174173
hits = testSubject.search(null, null, null, 100, null, new ArrayList<>(), 5L);
175-
assertEquals(3, hits.size());
174+
assertEquals(5, hits.size());
176175

177176
hits = testSubject.search(1L, new Date(), new Date(), 100, "unxisting",
178177
List.of(DocumentEvent.STORED.toString()), 5L);

‎logicaldoc-webapp/src/test/resources/log.xml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration packages="com.logicaldoc.util.log4j">
3+
<Properties>
4+
<Property name="root">target</Property>
5+
<Property name="pattern">%d{dd.MM.yyyy HH:mm:ss,SSS} %-5p (%c:%4L) -- %m%n</Property>
6+
<Property name="dateformat">ISO8601</Property>
7+
</Properties>
8+
9+
<Appenders>
10+
<RollingFile name="file" fileName="${root}/file.log" filePattern="${root}/file.log.%i">
11+
<PatternLayout>
12+
<Pattern>${pattern}</Pattern>
13+
</PatternLayout>
14+
<Policies>
15+
<SizeBasedTriggeringPolicy size="1 MB" />
16+
</Policies>
17+
<DefaultRolloverStrategy max="1" />
18+
</RollingFile>
19+
<RollingFile name="hikari" fileName="${root}/hikari.log" filePattern="${root}/hikari.log.%i">
20+
<PatternLayout>
21+
<Pattern>${pattern}</Pattern>
22+
</PatternLayout>
23+
<Policies>
24+
<SizeBasedTriggeringPolicy size="1 MB" />
25+
</Policies>
26+
<DefaultRolloverStrategy max="1" />
27+
</RollingFile>
28+
29+
<Console name="console" target="SYSTEM_OUT">
30+
<PatternLayout pattern="%m%n" />
31+
</Console>
32+
</Appenders>
33+
34+
<Loggers>
35+
<Logger name="org.apache.cxf" level="fatal" additivity="false">
36+
<Appender-Ref ref="file" />
37+
</Logger>
38+
<Logger name="com.logicaldoc.core.searchengine" level="error"
39+
additivity="false">
40+
<Appender-Ref ref="file" />
41+
</Logger>
42+
<Logger name="com.logicaldoc" level="warn" additivity="false">
43+
<Appender-Ref ref="file" />
44+
</Logger>
45+
<Logger name="com.logicaldoc.util.spring.DatabasePropertySource"
46+
level="fatal" additivity="false">
47+
<Appender-Ref ref="file" />
48+
</Logger>
49+
<Logger name="com.zaxxer.hikari" level="debug" additivity="false">
50+
<AppenderRef ref="hikari" />
51+
</Logger>
52+
<Logger name="java.sql" level="error" additivity="false">
53+
<AppenderRef ref="file" />
54+
</Logger>
55+
<Logger name="org.hsqldb" level="error" additivity="false">
56+
<AppenderRef ref="file" />
57+
</Logger>
58+
<Logger name="com.logicaldoc.core.document.DocumentManagerImpl" level="info" additivity="false">
59+
<AppenderRef ref="file" />
60+
</Logger>
61+
<Logger name="com.logicaldoc.util.io.FileUtil" level="debug" additivity="false">
62+
<AppenderRef ref="file" />
63+
</Logger>
64+
<Logger name="org.hsqldb" level="debug" additivity="false">
65+
<AppenderRef ref="file" />
66+
</Logger>
67+
68+
<Root level="fatal">
69+
<AppenderRef ref="console" />
70+
</Root>
71+
</Loggers>
72+
73+
74+
</Configuration>

0 commit comments

Comments
 (0)