BZ 961683 - BPMS dashbuilder uses non-standard log file location.

(Log4J replaced by SLF4J)

builder/src/main/assembly/assembly-demo.xml

@@ -40,7 +40,6 @@
                     <exclude>WEB-INF/web.xml</exclude>
                     <exclude>WEB-INF/jetty-*.xml</exclude>
                     <exclude>WEB-INF/lib/jetty-*.jar</exclude>
-                    <exclude>WEB-INF/classes/log4j.xml</exclude>
                 </excludes>
             </unpackOptions>
             <useStrictFiltering>true</useStrictFiltering>

builder/src/main/assembly/assembly-jboss-as-7_0.xml

@@ -41,7 +41,6 @@
                     <exclude>WEB-INF/jboss-web.xml</exclude>
                     <exclude>WEB-INF/jboss-deployment-structure.xml</exclude>
                     <exclude>WEB-INF/web.xml</exclude>
-                    <exclude>WEB-INF/classes/log4j.xml</exclude>
                     <exclude>WEB-INF/lib/jboss-*.jar</exclude>
                     <exclude>WEB-INF/lib/servlet-*.jar</exclude>
                     <exclude>WEB-INF/lib/jsp-*.jar</exclude>
@@ -57,7 +56,8 @@
                     <exclude>WEB-INF/lib/itext-*.jar</exclude>
                     <exclude>WEB-INF/lib/pdfbox-*.jar</exclude>
                     <exclude>WEB-INF/lib/xml-apis-*.jar</exclude>
-                    <exclude>WEB-INF/lib/slf4j-api-*.jar</exclude>
+                    <exclude>WEB-INF/lib/slf4j-*.jar</exclude>
+                    <exclude>WEB-INF/lib/jcl-over-slf4j-*.jar</exclude>
                     <exclude>WEB-INF/lib/commons-lang-*.jar</exclude>
                     <exclude>WEB-INF/lib/commons-collections-*.jar</exclude>
                     <exclude>WEB-INF/lib/commons-io-*.jar</exclude>

builder/src/main/assembly/assembly-tomcat-7_0.xml

@@ -41,7 +41,6 @@
                     <exclude>WEB-INF/jboss-web.xml</exclude>
                     <exclude>WEB-INF/jboss-deployment-structure.xml</exclude>
                     <exclude>WEB-INF/web.xml</exclude>
-                    <exclude>WEB-INF/classes/log4j.xml</exclude>
                     <exclude>WEB-INF/lib/jboss-servlet-*.jar</exclude>
                     <exclude>WEB-INF/lib/servlet-*.jar</exclude>
                     <exclude>WEB-INF/lib/jsp-*.jar</exclude>

builder/src/main/jbossas7/WEB-INF/jboss-deployment-structure.xml

@@ -23,17 +23,15 @@
             <module name="org.hibernate" />
             <module name="org.dom4j" />
             <module name="org.jdom" />
+            <module name="org.slf4j" />
             <module name="org.apache.commons.lang" />
             <module name="org.apache.commons.io" />
             <module name="org.apache.commons.collections" />
             <module name="org.apache.commons.codec" />
+            <module name="org.apache.commons.logging" />
             <module name="org.apache.xerces" />
             <module name="org.jboss.ironjacamar.jdbcadapters" />
         </dependencies>
 
-        <exclusions>
-            <module name="org.apache.log4j" />
-            <module name="org.apache.commons.logging" />
-        </exclusions>
     </deployment>
 </jboss-deployment-structure>

builder/src/main/standalone-demo/README.md

@@ -57,7 +57,6 @@ Installation steps
                               start-demo.bat
                               realm.properties
                               /db
-                              /log
 
 * Open a command window and execute the start-demo.sh script for linux environments or start-demo.bat for windows
    environments.

modules/README.md

@@ -51,15 +51,6 @@ The parameters that you can configure are: db.url, db.user and db.password
         <db.password>dashbuilder</db.password>
 
 
-Log4j configuration
--------------------
-
-The log4j.xml file is located the following directory: <code>modules/dashboard-showcase/src/test/resources/log4j.xml</code>.
-
-Configure the following parameter to the desired file:
-
-    <param name="file" value="/tmp/dashbuilder-app.log"/>
-
 Compile and build
 ----------------------
 

modules/dashboard-commons/src/main/java/org/jboss/dashboard/CoreServices.java

@@ -20,7 +20,6 @@
 import org.jboss.dashboard.filesystem.FileSystemManager;
 import org.jboss.dashboard.database.hibernate.HibernateSessionFactoryProvider;
 import org.jboss.dashboard.error.ErrorManager;
-import org.jboss.dashboard.log.Log4JManager;
 import org.jboss.dashboard.profiler.Profiler;
 import org.jboss.dashboard.commons.cdi.CDIBeanLocator;
 import org.jboss.dashboard.scheduler.Scheduler;
@@ -43,9 +42,6 @@ public static CoreServices lookup() {
     @Inject
     protected HibernateSessionFactoryProvider hibernateSessionFactoryProvider;
 
-    @Inject
-    protected Log4JManager log4JManager;
-
     @Inject
     protected Profiler profiler;
 
@@ -77,14 +73,6 @@ public void setHibernateInitializer(HibernateInitializer hibernateInitializer) {
         this.hibernateInitializer = hibernateInitializer;
     }
 
-    public Log4JManager getLog4JManager() {
-        return log4JManager;
-    }
-
-    public void setLog4JManager(Log4JManager log4JManager) {
-        this.log4JManager = log4JManager;
-    }
-
     public Profiler getProfiler() {
         return profiler;
     }