From 3323223d19bc1f0e02a63125463e025e94f13a1c Mon Sep 17 00:00:00 2001
From: tmortagne <thomas.mortagne@gmail.com>
Date: Fri, 22 May 2015 15:39:04 +0200
Subject: [PATCH] [misc] Cleanup a bit dependencies mess in oldcore (there is
still other things to remove)
---
.../doc/XWikiApplicationClass.java | 17 +++---
.../xwiki-platform-oldcore/pom.xml | 56 +++++++++----------
.../main/java/com/xpn/xwiki/XWikiContext.java | 3 +-
.../com/xpn/xwiki/doc/XWikiAttachment.java | 3 +-
4 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/xwiki-platform-core/xwiki-platform-application-manager/xwiki-platform-application-manager-api/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java b/xwiki-platform-core/xwiki-platform-application-manager/xwiki-platform-application-manager-api/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
index a3e81293da8..f08abc44294 100644
--- a/xwiki-platform-core/xwiki-platform-application-manager/xwiki-platform-application-manager-api/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
+++ b/xwiki-platform-core/xwiki-platform-application-manager/xwiki-platform-application-manager-api/src/main/java/com/xpn/xwiki/plugin/applicationmanager/doc/XWikiApplicationClass.java
@@ -20,6 +20,13 @@
package com.xpn.xwiki.plugin.applicationmanager.doc;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xwiki.localization.ContextualLocalizationManager;
+
import com.xpn.xwiki.XWiki;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
@@ -32,12 +39,6 @@
import com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.AbstractXClassManager;
import com.xpn.xwiki.web.Utils;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jfree.util.Log;
-import org.xwiki.localization.ContextualLocalizationManager;
-
/**
* {@link com.xpn.xwiki.plugin.applicationmanager.core.doc.objects.classes.XClassManager} implementation for
* XAppClasses.XWikiApplicationClass class.
@@ -191,6 +192,8 @@ public class XWikiApplicationClass extends AbstractXClassManager<XWikiApplicatio
// ///
+ private static final Logger LOGGER = LoggerFactory.getLogger(XWikiApplicationClass.class);
+
/**
* Space of class document.
*/
@@ -283,7 +286,7 @@ public static boolean isApplication(XWikiDocument doc)
XWikiApplicationClass xclass = getInstance(null, false);
isApplication = xclass.isInstance(doc);
} catch (XWikiException e) {
- Log.error("Fail to get unique instance of " + XWikiApplicationClass.class.getName(), e);
+ LOGGER.error("Fail to get unique instance of " + XWikiApplicationClass.class.getName(), e);
}
return isApplication;
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-oldcore/pom.xml
index dca61f6070c..f5097148960 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-oldcore/pom.xml
@@ -331,6 +331,11 @@
</dependency>
<!-- Other XWiki modules -->
+ <dependency>
+ <groupId>org.xwiki.commons</groupId>
+ <artifactId>xwiki-commons-component-api</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
<dependency>
<groupId>org.xwiki.commons</groupId>
<artifactId>xwiki-commons-environment-api</artifactId>
@@ -346,6 +351,27 @@
<artifactId>xwiki-commons-script</artifactId>
<version>${commons.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.xwiki.commons</groupId>
+ <artifactId>xwiki-commons-classloader-api</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xwiki.commons</groupId>
+ <artifactId>xwiki-commons-job</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xwiki.commons</groupId>
+ <artifactId>xwiki-commons-properties</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xwiki.commons</groupId>
+ <artifactId>xwiki-commons-configuration-api</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.xwiki.commons</groupId>
<artifactId>xwiki-commons-observation-local</artifactId>
@@ -391,11 +417,6 @@
<artifactId>xwiki-platform-rendering-xwiki</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-platform-chart-renderer</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-url-api</artifactId>
@@ -427,30 +448,7 @@
<artifactId>xwiki-platform-captcha</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-platform-rendering-macro-script</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-platform-rendering-macro-context</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.xwiki.rendering</groupId>
- <artifactId>xwiki-rendering-transformation-icon</artifactId>
- <version>${rendering.version}</version>
- <!-- Only needed at runtime since it's a component implementation -->
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.xwiki.rendering</groupId>
- <artifactId>xwiki-rendering-transformation-wikiword</artifactId>
- <version>${rendering.version}</version>
- <!-- Only needed at runtime since it's a component implementation -->
- <scope>runtime</scope>
- </dependency>
+
<dependency>
<groupId>org.xwiki.platform</groupId>
<artifactId>xwiki-platform-formula-renderer</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/XWikiContext.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/XWikiContext.java
index 435d41c7361..69025815742 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/XWikiContext.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/XWikiContext.java
@@ -33,7 +33,6 @@
import org.apache.commons.collections4.map.LRUMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.xmlrpc.server.XmlRpcServer;
-import org.jfree.util.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xwiki.component.util.DefaultParameterizedType;
@@ -468,7 +467,7 @@ public void setUserReference(DocumentReference userReference)
// Log this since it's probably a mistake so that we find who is doing bad things
if (this.userReference.getName().equals(XWikiRightService.GUEST_USER)) {
- Log.warn("A reference to XWikiGuest user as been set instead of null. This is probably a mistake.",
+ LOGGER.warn("A reference to XWikiGuest user as been set instead of null. This is probably a mistake.",
new Exception("See stack trace"));
}
}
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java
index 11d81853bed..51c7b3a5294 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java
@@ -46,7 +46,6 @@
import org.dom4j.dom.DOMElement;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.SAXReader;
-import org.jfree.util.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.suigeneris.jrcs.rcs.Archive;
@@ -1026,7 +1025,7 @@ public boolean apply(XWikiAttachment attachment)
modified = true;
}
} catch (Exception e) {
- Log.error("Failed to compare content of attachments", e);
+ LOGGER.error("Failed to compare content of attachments", e);
}
return modified;
--
GitLab