You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2009/04/21 21:26:03 UTC
svn commit: r767264 [2/2] - in /portals/pluto/trunk: ./ pluto-container/
pluto-container/src/main/java/org/apache/pluto/container/impl/
pluto-container/src/main/java/org/apache/pluto/container/util/
pluto-portal-driver-impl/ pluto-portal-driver-impl/sr...
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceInActionTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceInActionTest.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceInActionTest.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceInActionTest.java Tue Apr 21 19:26:01 2009
@@ -24,8 +24,8 @@
import javax.portlet.ReadOnlyException;
import javax.portlet.ValidatorException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.testsuite.TestResult;
import org.apache.pluto.testsuite.TestUtils;
import org.apache.pluto.testsuite.annotations.DefaultTestPhase;
@@ -37,7 +37,7 @@
public class PreferenceInActionTest extends PreferenceCommonTest {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PreferenceInActionTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PreferenceInActionTest.class);
// Test Methods ------------------------------------------------------------
@@ -79,7 +79,7 @@
preferences.setValue("TEST", "OK");
preferences.reset("TEST");
} catch (Throwable th) {
- LOG.error(th);
+ LOG.error(th.getMessage(),th);
}
}
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/RenderResponseNoContentTypeTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/RenderResponseNoContentTypeTest.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/RenderResponseNoContentTypeTest.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/RenderResponseNoContentTypeTest.java Tue Apr 21 19:26:01 2009
@@ -21,8 +21,8 @@
import javax.portlet.PortletResponse;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.testsuite.TestResult;
import org.apache.pluto.testsuite.TestUtils;
@@ -33,7 +33,7 @@
public class RenderResponseNoContentTypeTest
extends AbstractReflectivePortletTest {
- private static final Log LOG = LogFactory.getLog(RenderResponseNoContentTypeTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RenderResponseNoContentTypeTest.class);
/**
* Overwrite super implementation to return null. This test requires that
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SessionTimeoutTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SessionTimeoutTest.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SessionTimeoutTest.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SessionTimeoutTest.java Tue Apr 21 19:26:01 2009
@@ -19,14 +19,14 @@
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.testsuite.TestResult;
public class SessionTimeoutTest extends AbstractReflectivePortletTest {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(SessionTimeoutTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SessionTimeoutTest.class);
/**
* Render parameter name indicating if the max inactive interval is set to
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/event/BaseEventTest.java Tue Apr 21 19:26:01 2009
@@ -24,8 +24,8 @@
import javax.portlet.PortletRequest;
import javax.portlet.StateAwareResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.testsuite.TestResult;
import org.apache.pluto.testsuite.annotations.DefaultTestPhase;
import org.apache.pluto.testsuite.annotations.TestPhase;
@@ -36,7 +36,7 @@
private int numMethodsCache = -1;
- protected Log LOG = LogFactory.getLog(getClass());
+ protected Logger LOG = LoggerFactory.getLogger(getClass());
@TestPhase(PortletRequest.ACTION_PHASE)
public TestResult checkFireEventsFromActionPhase(ActionRequest request,
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/filter/BaseFilter.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/filter/BaseFilter.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/filter/BaseFilter.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/jsr286/filter/BaseFilter.java Tue Apr 21 19:26:01 2009
@@ -21,8 +21,8 @@
import javax.portlet.filter.FilterConfig;
import javax.portlet.filter.PortletFilter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Provides simple implementations of the PortletFilter callback methods.
@@ -34,7 +34,7 @@
private FilterConfig filterConfig;
- private Log LOG = LogFactory.getLog(getClass());
+ private Logger LOG = LoggerFactory.getLogger(getClass());
public void destroy() {
LOG.debug("destroy called on " +
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java Tue Apr 21 19:26:01 2009
@@ -26,8 +26,8 @@
import javax.portlet.PreferencesValidator;
import javax.portlet.ValidatorException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implementation of the portlet preferences validator.
@@ -35,7 +35,7 @@
public class PreferencesValidatorImpl implements PreferencesValidator {
/** Logger. */
- private static final Log LOG = LogFactory.getLog(PreferencesValidatorImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PreferencesValidatorImpl.class);
public static final String CHECK_VALIDATOR_COUNT = "checkValidatorCount";
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/pom.xml?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Tue Apr 21 19:26:01 2009
@@ -54,17 +54,11 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>${commons-digester.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>${commons-logging.version}</version>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -72,6 +66,11 @@
<version>${commons-io.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AbstractArchiveAssembler.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AbstractArchiveAssembler.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AbstractArchiveAssembler.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AbstractArchiveAssembler.java Tue Apr 21 19:26:01 2009
@@ -20,8 +20,8 @@
import java.io.IOException;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.util.UtilityException;
/**
@@ -32,7 +32,7 @@
*/
public abstract class AbstractArchiveAssembler extends WebXmlRewritingAssembler {
- private static final Log LOG = LogFactory.getLog( AbstractArchiveAssembler.class );
+ private static final Logger LOG = LoggerFactory.getLogger( AbstractArchiveAssembler.class );
/**
* This implementation throws <code>UtilityException</code> if the source
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/ByteArrayAssemblySink.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/ByteArrayAssemblySink.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/ByteArrayAssemblySink.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/ByteArrayAssemblySink.java Tue Apr 21 19:26:01 2009
@@ -23,15 +23,15 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Stores assembled bytes in an underlying <code>ByteArrayOutputStream</code>
*/
class ByteArrayAssemblySink extends AssemblySink {
- private static final Log LOG = LogFactory.getLog( ByteArrayAssemblySink.class );
+ private static final Logger LOG = LoggerFactory.getLogger( ByteArrayAssemblySink.class );
ByteArrayAssemblySink(ByteArrayOutputStream out) {
super(out);
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/EarAssembler.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/EarAssembler.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/EarAssembler.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/EarAssembler.java Tue Apr 21 19:26:01 2009
@@ -27,8 +27,8 @@
import java.util.jar.JarOutputStream;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.util.UtilityException;
import org.apache.pluto.util.assemble.AbstractArchiveAssembler;
import org.apache.pluto.util.assemble.AssemblerConfig;
@@ -41,7 +41,7 @@
*/
public class EarAssembler extends AbstractArchiveAssembler {
- private static final Log LOG = LogFactory.getLog( EarAssembler.class );
+ private static final Logger LOG = LoggerFactory.getLogger( EarAssembler.class );
private static final int BUFLEN = 1024 * 8; // 8kb
public void assembleInternal( AssemblerConfig config ) throws UtilityException, IOException {
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/FileAssemblySink.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/FileAssemblySink.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/FileAssemblySink.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/ear/FileAssemblySink.java Tue Apr 21 19:26:01 2009
@@ -25,15 +25,15 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Stores assembled bytes in an underlying <code>File</code>.
*/
class FileAssemblySink extends AssemblySink {
- private static final Log LOG = LogFactory.getLog( FileAssemblySink.class );
+ private static final Logger LOG = LoggerFactory.getLogger( FileAssemblySink.class );
private File sink = null;
FileAssemblySink(File file) throws FileNotFoundException {
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/JarStreamingAssembly.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/JarStreamingAssembly.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/JarStreamingAssembly.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/JarStreamingAssembly.java Tue Apr 21 19:26:01 2009
@@ -28,8 +28,8 @@
import java.util.zip.ZipEntry;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.pluto.util.assemble.Assembler;
/**
@@ -39,7 +39,7 @@
*/
public class JarStreamingAssembly {
- private static final Log LOG = LogFactory.getLog( JarStreamingAssembly.class );
+ private static final Logger LOG = LoggerFactory.getLogger( JarStreamingAssembly.class );
/**
* Reads the source JarInputStream, copying entries to the destination JarOutputStream.
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/TomcatCrossContextGenerator.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/TomcatCrossContextGenerator.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/TomcatCrossContextGenerator.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/TomcatCrossContextGenerator.java Tue Apr 21 19:26:01 2009
@@ -22,8 +22,8 @@
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* TODO JavaDoc
@@ -33,7 +33,7 @@
*/
public class TomcatCrossContextGenerator {
private static final String PLUTO_TEMP_DIR = "PlutoDomain";
- private static Log LOG = LogFactory.getLog(TomcatCrossContextGenerator.class);
+ private static Logger LOG = LoggerFactory.getLogger(TomcatCrossContextGenerator.class);
public static void main(String[] args) throws IOException {
Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ArchiveBasedAssemblyTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ArchiveBasedAssemblyTest.java?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ArchiveBasedAssemblyTest.java (original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/ArchiveBasedAssemblyTest.java Tue Apr 21 19:26:01 2009
@@ -20,8 +20,8 @@
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Common base test class that should be used by assembler implementations that
@@ -31,7 +31,7 @@
*/
public abstract class ArchiveBasedAssemblyTest extends TestCase {
- private static final Log LOG = LogFactory.getLog( ArchiveBasedAssemblyTest.class );
+ private static final Logger LOG = LoggerFactory.getLogger( ArchiveBasedAssemblyTest.class );
protected void setUp() throws Exception {
super.setUp();
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?rev=767264&r1=767263&r2=767264&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Tue Apr 21 19:26:01 2009
@@ -258,8 +258,7 @@
<taglibs.standard.version>1.1.2</taglibs.standard.version>
<xerces.version>2.6.2</xerces.version>
<jaxb.version>2.1</jaxb.version>
- <jaxb-impl.version>2.1.8</jaxb-impl.version>
- <stax.api.version>1.0.1</stax.api.version>
+ <jaxb-impl.version>2.1.9</jaxb-impl.version>
<stax.impl.version>1.2.0</stax.impl.version>
<xalan.version>2.7.0</xalan.version>
<castor.version>1.1.1</castor.version>
@@ -268,7 +267,7 @@
<commons-cli.version>1.0</commons-cli.version>
<commons-httpclient.version>3.0</commons-httpclient.version>
<commons-beanutils.version>1.7.0</commons-beanutils.version>
- <commons-logging.version>1.1</commons-logging.version>
+ <slf4j.version>1.5.6</slf4j.version>
<log4j.version>1.2.14</log4j.version>
<springframework.version>2.0.2</springframework.version>
<maven.version>2.0.5</maven.version>