XWIKI-11034: Use LESS4J for the implementation of LESSCompiler.

XWIKI-11394: Being able to overwrite a LESS file within a skin object.

* Fix.

xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/compiler/less4j/AbstractLESSSource.java

@@ -36,8 +36,6 @@ public abstract class AbstractLESSSource extends LessSource
     protected TemplateManager templateManager;
 
     protected Skin skin;
-
-    protected boolean useVelocity;
     
     private String folder;
 

xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/resources/LESSSkinFileReader.java

@@ -60,7 +60,7 @@ public String getContent(LESSResourceReference lessResourceReference, String ski
         LESSSkinFileResourceReference lessSkinFileResourceReference =
                 (LESSSkinFileResourceReference) lessResourceReference;
 
-        Template template = templateManager.getTemplate(lessSkinFileResourceReference.getFileName(),
+        Template template = templateManager.getTemplate("less/" + lessSkinFileResourceReference.getFileName(),
                 skinManager.getSkin(skin));
         if (template == null) {
             throw new LESSCompilerException(String.format("The template [%s] does not exists.",

xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/resources/META-INF/components.txt

@@ -18,7 +18,6 @@ org.xwiki.lesscss.internal.compiler.CachedIntegratedLESSCompiler
 org.xwiki.lesscss.internal.compiler.DefaultIntegratedLESSCompiler
 org.xwiki.lesscss.internal.compiler.DefaultLESSCompiler
 org.xwiki.lesscss.internal.compiler.DefaultLESSSkinFileCompiler
-org.xwiki.lesscss.internal.compiler.SkinDirectoryGetter
 org.xwiki.lesscss.internal.resources.DefaultLESSResourceReader
 org.xwiki.lesscss.internal.resources.DefaultLESSResourceReferenceSerializer
 org.xwiki.lesscss.internal.resources.LESSObjectPropertyReader

xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/test/java/org/xwiki/lesscss/internal/resources/LESSSkinFileContentReaderTest.java

@@ -67,7 +67,7 @@ public void getContent() throws Exception
     {
         // Mocks
         Template template = mock(Template.class);
-        when(templateManager.getTemplate("style.less", skin)).thenReturn(template);
+        when(templateManager.getTemplate("less/style.less", skin)).thenReturn(template);
         TemplateContent templateContent = mock(TemplateContent.class);
         when(template.getContent()).thenReturn(templateContent);
         when(templateContent.getContent()).thenReturn("// My LESS file");
@@ -115,7 +115,7 @@ public void getContentWhenException() throws Exception
     {
         // Mocks
         Template template = mock(Template.class);
-        when(templateManager.getTemplate("file.less", skin)).thenReturn(template);
+        when(templateManager.getTemplate("less/file.less", skin)).thenReturn(template);
         Exception exception = new Exception("exception");
         when(template.getContent()).thenThrow(exception);