Make tests run under Eclipse

Author: car031

logicaldoc-core/src/main/java/com/logicaldoc/core/HibernatePersistentObjectDAO.java

@@ -49,7 +49,7 @@ public abstract class HibernatePersistentObjectDAO<T extends PersistentObject> i
 
 	private static final String AND = " and (";
 
-	private static final String ORDER_BY = "order by";
+	protected static final String ORDER_BY = " order by ";
 
 	protected Logger log = LoggerFactory.getLogger(HibernatePersistentObjectDAO.class);
 
@@ -60,7 +60,7 @@ public abstract class HibernatePersistentObjectDAO<T extends PersistentObject> i
 
 	protected static final String ASPECT_STORING = "storing";
 
-	private static final String DEFAULT_WHERE_PREAMBLE = " " + ENTITY + " where " + ENTITY + ".deleted=0 ";
+	protected static final String DEFAULT_WHERE_PREAMBLE = " " + ENTITY + " where " + ENTITY + ".deleted=0 ";
 
 	public void setSessionFactory(SessionFactory sessionFactory) {
 		this.sessionFactory = sessionFactory;

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

@@ -92,7 +92,7 @@ public XMLBean(InputStream is) {
 	 * Initializes the SAX builder
 	 */
 	private void initDocument() {
-		SAXBuilder builder = new SAXBuilder(XMLReaders.DTDVALIDATING);
+		SAXBuilder builder = new SAXBuilder(XMLReaders.NONVALIDATING);
 
 		builder.setFeature("http://xml.org/sax/features/validation", false);
 		builder.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);

logicaldoc-webapp/pom.xml

@@ -448,6 +448,13 @@
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
+		
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.12.2</version>
+			<scope>test</scope>
+		</dependency>		
 	</dependencies>
 	<build>
 		<plugins>

logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/SystemServiceImpl.java

@@ -876,6 +876,7 @@ public void installPlugin() throws ServerException {
 
 		try (ZipUtil zipUtil = new ZipUtil();) {
 			File pluginPackage = uploadedFilesMap.values().iterator().next();
+			
 			ContextProperties config = Context.get().getProperties();
 			File rootFolder;
 			if (getThreadLocalRequest() != null)

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

@@ -54,6 +54,9 @@ public void setUp() throws IOException, SQLException, PluginException {
 		File testWebappFolder = new File("target/webapp");
 		testWebappFolder.mkdir();
 		SystemServiceImpl.defaultWebappRootFolder = testWebappFolder;
+		
+		// This is to make JAXP happy even when running inside Eclipse
+		System.setProperty("javax.xml.parsers.SAXParserFactory", "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl");
 	}
 
 	@Override