Author: heiko.braun(a)jboss.com Date: 2009-08-25 09:14:24 -0400 (Tue, 25 Aug 2009) New Revision: 800 Modified: bpm-console/trunk/BPMC.iws bpm-console/trunk/server/war/pom.xml bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/util/DOMUtils.java Log: Fix BPMC-8: Correct RESTeasy logging. Thanks Jeff Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-08-24 20:44:21 UTC (rev 799) +++ bpm-console/trunk/BPMC.iws 2009-08-25 13:14:24 UTC (rev 800) @@ -17,11 +17,7 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css" afterPath="$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" afterPath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" /> </list> <list name="Failed commit: Default" comment="remove dependency on DTOParser" /> </component> @@ -204,44 +200,7 @@ </subPane> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="Header.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="113" column="52" selection-start="4195" selection-end="4195" vertical-scroll-proportion="0.7552795"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="console.css" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> - <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="37" selection-start="706" selection-end="706" vertical-scroll-proportion="0.60487807"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="LoginView.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="120" column="46" selection-start="3683" selection-end="3683" vertical-scroll-proportion="-1.484472"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Authentication.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="270" column="4" selection-start="7894" selection-end="7894" vertical-scroll-proportion="0.45217392"> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -759,10 +718,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -789,53 +744,7 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="BPMC.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="gui-war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/gui/war/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -1058,13 +967,13 @@ </component> <component name="ToolWindowManager"> <frame x="363" y="39" width="1304" height="967" extended-state="0" /> - <editor active="true" /> + <editor active="false" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25099602" order="0" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25099602" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.40229884" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24701196" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="8" /> @@ -1254,30 +1163,30 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="270" column="4" selection-start="7894" selection-end="7894" vertical-scroll-proportion="0.45217392"> + <state line="112" column="79" selection-start="4142" selection-end="4142" vertical-scroll-proportion="0.7354037"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> <provider selected="true" editor-type-id="text-editor"> - <state line="120" column="46" selection-start="3683" selection-end="3683" vertical-scroll-proportion="-1.484472"> + <state line="45" column="37" selection-start="706" selection-end="706" vertical-scroll-proportion="0.60487807"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="45" column="37" selection-start="706" selection-end="706" vertical-scroll-proportion="0.60487807"> + <state line="120" column="46" selection-start="3683" selection-end="3683" vertical-scroll-proportion="-1.484472"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="113" column="52" selection-start="4195" selection-end="4195" vertical-scroll-proportion="0.7552795"> + <state line="270" column="4" selection-start="7894" selection-end="7894" vertical-scroll-proportion="0.45217392"> <folding /> </state> </provider> Modified: bpm-console/trunk/server/war/pom.xml =================================================================== --- bpm-console/trunk/server/war/pom.xml 2009-08-24 20:44:21 UTC (rev 799) +++ bpm-console/trunk/server/war/pom.xml 2009-08-25 13:14:24 UTC (rev 800) @@ -18,6 +18,7 @@ <properties> <report.server.version>1.0.0-SNAPSHOT</report.server.version> <json-lib.version>2.2.3</json-lib.version> + <slf4j.version>1.5.2</slf4j.version> </properties> <dependencies> @@ -46,6 +47,27 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>javax.ejb</groupId> @@ -93,6 +115,14 @@ <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -158,11 +188,6 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.xml</groupId> <artifactId>jaxb-impl</artifactId> <scope>provided</scope> Modified: bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/util/DOMUtils.java =================================================================== --- bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/util/DOMUtils.java 2009-08-24 20:44:21 UTC (rev 799) +++ bpm-console/trunk/server/war/src/main/java/org/jboss/bpm/console/server/util/DOMUtils.java 2009-08-25 13:14:24 UTC (rev 800) @@ -21,7 +21,9 @@ */ package org.jboss.bpm.console.server.util; -import org.jboss.logging.Logger; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.w3c.dom.*; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -47,7 +49,7 @@ */ public final class DOMUtils { - private static Logger log = Logger.getLogger(DOMUtils.class); + private static Log log = LogFactory.getLog(DOMUtils.class); // All elements created by the same thread are created by the same builder and belong to the same doc private static ThreadLocal<Document> documentThreadLocal = new ThreadLocal<Document>();