incubator-wink-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	mart...@apache.org
Subject	svn commit: r789304 [1/2] - in /incubator/wink/trunk: ./ wink-client/ wink-client/src/main/java/org/apache/wink/client/ wink-client/src/test/java/org/apache/wink/client/ wink-common/ wink-common/src/main/java/org/apache/wink/common/internal/application...
Date	Mon, 29 Jun 2009 12:10:50 GMT
Author: martins Date: Mon Jun 29 12:10:48 2009 New Revision: 789304 URL: http://svn.apache.org/viewvc?rev=789304&view=rev Log: Use SLF4J instead of JCL for logging facade. NOTE: Wink is shipped with slf4j-simple bridge. JIRA issue https://issues.apache.org/jira/browse/WINK-6 Modified: incubator/wink/trunk/ (props changed) incubator/wink/trunk/pom.xml incubator/wink/trunk/wink-client/pom.xml incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ConfigurationTest.java incubator/wink/trunk/wink-common/pom.xml incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/CreationUtils.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/DefaultOFFactory.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomEntryProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomFeedProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/AbstractJsonXmlProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ContextAccessor.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/GenericsUtils.java incubator/wink/trunk/wink-component-test-support/pom.xml incubator/wink/trunk/wink-examples/apps/Bookmarks/pom.xml incubator/wink/trunk/wink-examples/apps/HelloWorld/pom.xml incubator/wink/trunk/wink-examples/apps/QADefect/pom.xml incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/pom.xml incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/java/org/apache/wink/example/qadefect/store/DataStore.java incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/legacy/DataStore.java incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.java incubator/wink/trunk/wink-examples/client/QADefects-client/ (props changed) incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml incubator/wink/trunk/wink-examples/core/Preconditions/pom.xml incubator/wink/trunk/wink-examples/core/Preconditions/src/main/java/org/apache/wink/example/locking/store/DataStore.java incubator/wink/trunk/wink-examples/ext/History/pom.xml incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/java/org/apache/wink/example/webdav/WebDAVDefectsResource.java incubator/wink/trunk/wink-server/pom.xml incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindRootResourceHandler.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java incubator/wink/trunk/wink-spring-support/pom.xml incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java incubator/wink/trunk/wink-webdav/pom.xml incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java Propchange: incubator/wink/trunk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Jun 29 12:10:48 2009 @@ -1 +1,3 @@ +.project target +dir_conflicts.prej Modified: incubator/wink/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/pom.xml (original) +++ incubator/wink/trunk/pom.xml Mon Jun 29 12:10:48 2009 @@ -267,12 +267,24 @@ <groupId>org.springframework</groupId> <artifactId>spring</artifactId> <version>2.5</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> <version>2.5</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>xmlunit</groupId> @@ -286,7 +298,21 @@ <version>4.4</version> <scope>test</scope> </dependency> - + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.8</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.5.8</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>1.5.6</version> + </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee_1.4_spec</artifactId> @@ -337,29 +363,6 @@ <artifactId>xercesImpl</artifactId> <version>2.6.2</version> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - <exclusions> - <exclusion> - <artifactId>avalon-framework</artifactId> - <groupId>avalon-framework</groupId> - </exclusion> - <exclusion> - <artifactId>servlet-api</artifactId> - <groupId>javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>logkit</artifactId> - <groupId>logkit</groupId> - </exclusion> - <exclusion> - <artifactId>log4j</artifactId> - <groupId>log4j</groupId> - </exclusion> - </exclusions> - </dependency> </dependencies> </dependencyManagement> <reporting> Modified: incubator/wink/trunk/wink-client/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-client/pom.xml (original) +++ incubator/wink/trunk/wink-client/pom.xml Mon Jun 29 12:10:48 2009 @@ -62,6 +62,14 @@ <artifactId>wink-server</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> + <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> </dependency> Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java (original) +++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java Mon Jun 29 12:10:48 2009 @@ -26,8 +26,8 @@ import javax.ws.rs.core.Application; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.client.internal.ResourceImpl; import org.apache.wink.common.SymphonyApplication; import org.apache.wink.common.internal.application.ApplicationValidator; @@ -57,7 +57,7 @@ / public class RestClient { - private static final Log logger = LogFactory.getLog(RestClient.class); + private static final Logger logger = LoggerFactory.getLogger(RestClient.class); private ProvidersRegistry providersRegistry; private ClientConfig config; Modified: incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ConfigurationTest.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ConfigurationTest.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ConfigurationTest.java (original) +++ incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ConfigurationTest.java Mon Jun 29 12:10:48 2009 @@ -38,8 +38,8 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.client.ClientConfig; import org.apache.wink.client.ClientConfigException; import org.apache.wink.client.ClientRuntimeException; @@ -187,7 +187,7 @@ public static class FooProvider implements MessageBodyReader<Foo>, MessageBodyWriter<Foo> { - private static final Log logger = LogFactory.getLog(StringProvider.class); + private static final Logger logger = LoggerFactory.getLogger(StringProvider.class); public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) { return type == Foo.class ; @@ -212,11 +212,9 @@ public void writeTo(Foo t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException { - - if (logger.isDebugEnabled()) { - logger.debug(String.format("Writing %s to stream using %s", t, getClass().getName())); - } - + + logger.debug(String.format("Writing %s to stream using %s", t, getClass().getName())); + entityStream.write(t.foo.getBytes(ProviderUtils.getCharset(mediaType))); } } Modified: incubator/wink/trunk/wink-common/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/pom.xml (original) +++ incubator/wink/trunk/wink-common/pom.xml Mon Jun 29 12:10:48 2009 @@ -22,6 +22,14 @@ <groupId>org.apache.wink</groupId> <artifactId>wink-component-test-support</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> @@ -31,10 +39,6 @@ <artifactId>junit</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </dependency> Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java Mon Jun 29 12:10:48 2009 @@ -29,8 +29,8 @@ import javax.ws.rs.WebApplicationException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector; import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector; import org.apache.wink.common.internal.utils.FileLoader; @@ -45,7 +45,7 @@ / public class ApplicationFileLoader { - private static final Log logger = LogFactory.getLog(ApplicationFileLoader.class); + private static final Logger logger = LoggerFactory.getLogger(ApplicationFileLoader.class); private static final String CORE_APPLICATION = "META-INF/core/symphony.app"; private final Set<Class<?>> classes = new LinkedHashSet<Class<?>>(); Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java Mon Jun 29 12:10:48 2009 @@ -25,8 +25,8 @@ import javax.ws.rs.Path; import javax.ws.rs.ext.Provider; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.DynamicResource; import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector; import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector; @@ -43,7 +43,7 @@ / private final Set<Class<?>> singletonClasses = new LinkedHashSet<Class<?>>(); - private static final Log logger = LogFactory.getLog(ApplicationValidator.class); + private static final Logger logger = LoggerFactory.getLogger(ApplicationValidator.class); /* * Returns true if the resource is valid resource and false otherwise. Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java Mon Jun 29 12:10:48 2009 @@ -24,8 +24,8 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.SymphonyApplication; import org.apache.wink.common.internal.utils.FileLoader; @@ -36,7 +36,7 @@ / public class SimpleSymphonyApplication extends SymphonyApplication { - private static final Log logger = LogFactory.getLog(SimpleSymphonyApplication.class); + private static final Logger logger = LoggerFactory.getLogger(SimpleSymphonyApplication.class); private static final String FILE_SEPARATOR = ";"; private Set<Class<?>> jaxRSClasses; private String applicationConfigFiles; Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/CreationUtils.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/CreationUtils.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/CreationUtils.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/CreationUtils.java Mon Jun 29 12:10:48 2009 @@ -31,8 +31,8 @@ import javax.ws.rs.WebApplicationException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.internal.registry.Injectable; import org.apache.wink.common.internal.registry.InjectableFactory; import org.apache.wink.common.internal.registry.metadata.ClassMetadata; @@ -44,7 +44,7 @@ public class CreationUtils { - private static final Log logger = LogFactory.getLog(CreationUtils.class); + private static final Logger logger = LoggerFactory.getLogger(CreationUtils.class); private CreationUtils() { } Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/DefaultOFFactory.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/DefaultOFFactory.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/DefaultOFFactory.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/DefaultOFFactory.java Mon Jun 29 12:10:48 2009 @@ -21,8 +21,8 @@ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector; import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector; @@ -49,7 +49,7 @@ / class DefaultOFFactory<T> implements OFFactory<T> { - static final Log logger = LogFactory.getLog(DefaultOFFactory.class); + static final Logger logger = LoggerFactory.getLogger(DefaultOFFactory.class); /** * The default implementation, returns a SingletonFactory for all objects. @@ -59,10 +59,7 @@ throw new NullPointerException("object"); } - if (logger.isDebugEnabled()) { - logger.debug(String.format("Creating a %s for %s.", - String.valueOf(SingletonObjectFactory.class), String.valueOf(object))); - } + logger.debug("Creating a {} for {}", SingletonObjectFactory.class, object); return new SingletonObjectFactory<T>(object); } Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java Mon Jun 29 12:10:48 2009 @@ -44,8 +44,8 @@ import javax.ws.rs.ext.Provider; import javax.ws.rs.ext.Providers; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.annotations.Asset; import org.apache.wink.common.annotations.Scope; import org.apache.wink.common.annotations.Scope.ScopeType; @@ -62,7 +62,7 @@ @Provider public class AssetProvider implements MessageBodyReader<Object>, MessageBodyWriter<Object> { - private static final Log logger = LogFactory.getLog(AssetProvider.class); + private static final Logger logger = LoggerFactory.getLogger(AssetProvider.class); @Context private Providers providers; Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java Mon Jun 29 12:10:48 2009 @@ -37,15 +37,15 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Provider @Produces("/") @Consumes("/") public class FileProvider implements MessageBodyWriter<File>, MessageBodyReader<File> { - private static final Log logger = LogFactory.getLog(FileProvider.class); + private static final Logger logger = LoggerFactory.getLogger(FileProvider.class); private String prefix = "FP_PRE"; private String uploadDir = null; private String suffix = "FP_SUF"; Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java Mon Jun 29 12:10:48 2009 @@ -34,8 +34,8 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.utils.ProviderUtils; @@ -45,7 +45,7 @@ public class StringProvider implements MessageBodyReader<String>, MessageBodyWriter<String> { - private static final Log logger = LogFactory.getLog(StringProvider.class); + private static final Logger logger = LoggerFactory.getLogger(StringProvider.class); public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) { return type == String.class; Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomEntryProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomEntryProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomEntryProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomEntryProvider.java Mon Jun 29 12:10:48 2009 @@ -35,8 +35,8 @@ import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.model.atom.AtomEntry; import org.apache.wink.common.model.atom.AtomJAXBUtils; import org.apache.wink.common.model.atom.ObjectFactory; @@ -46,7 +46,7 @@ public abstract class AbstractAtomEntryProvider<T> { - private static final Log logger = LogFactory.getLog(AbstractAtomEntryProvider.class); + private static final Logger logger = LoggerFactory.getLogger(AbstractAtomEntryProvider.class); protected ObjectFactory atomObjectFactory = new org.apache.wink.common.model.atom.ObjectFactory(); Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomFeedProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomFeedProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomFeedProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomFeedProvider.java Mon Jun 29 12:10:48 2009 @@ -35,8 +35,8 @@ import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.model.atom.AtomFeed; import org.apache.wink.common.model.atom.AtomJAXBUtils; import org.apache.wink.common.model.atom.ObjectFactory; @@ -46,7 +46,7 @@ public abstract class AbstractAtomFeedProvider<T> { - private static final Log logger = LogFactory.getLog(AbstractAtomFeedProvider.class); + private static final Logger logger = LoggerFactory.getLogger(AbstractAtomFeedProvider.class); protected ObjectFactory atomObjectFactory = new org.apache.wink.common.model.atom.ObjectFactory(); Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/AbstractJsonXmlProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/AbstractJsonXmlProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/AbstractJsonXmlProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/AbstractJsonXmlProvider.java Mon Jun 29 12:10:48 2009 @@ -31,8 +31,8 @@ import javax.xml.bind.Marshaller; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.internal.providers.entity.xml.AbstractJAXBProvider; import org.apache.wink.common.model.atom.AtomJAXBUtils; import org.apache.wink.common.model.json.JSONException; @@ -45,7 +45,7 @@ public class AbstractJsonXmlProvider extends AbstractJAXBProvider { - private static final Log logger = LogFactory.getLog(AbstractJsonXmlProvider.class); + private static final Logger logger = LoggerFactory.getLogger(AbstractJsonXmlProvider.class); protected static SAXParserFactory spf; static { Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java Mon Jun 29 12:10:48 2009 @@ -38,8 +38,8 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.annotations.Scope; import org.apache.wink.common.annotations.Scope.ScopeType; import org.apache.wink.common.internal.utils.MediaTypeUtils; @@ -51,7 +51,7 @@ @Produces( { MediaType.APPLICATION_JSON, MediaTypeUtils.JAVASCRIPT }) public class JsonJAXBProvider extends AbstractJsonXmlProvider implements MessageBodyWriter<Object> { - private static final Log logger = LogFactory.getLog(JsonJAXBProvider.class); + private static final Logger logger = LoggerFactory.getLogger(JsonJAXBProvider.class); @Context private Providers providers; Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonProvider.java Mon Jun 29 12:10:48 2009 @@ -37,8 +37,8 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.RestConstants; import org.apache.wink.common.internal.providers.entity.xml.AbstractJAXBProvider; import org.apache.wink.common.internal.utils.MediaTypeUtils; @@ -51,7 +51,7 @@ @Produces({MediaType.APPLICATION_JSON, MediaTypeUtils.JAVASCRIPT}) public class JsonProvider extends AbstractJAXBProvider implements MessageBodyWriter<JSONObject> { - private static final Log logger = LogFactory.getLog(JsonProvider.class); + private static final Logger logger = LoggerFactory.getLogger(JsonProvider.class); @Context private UriInfo uriInfo; Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java Mon Jun 29 12:10:48 2009 @@ -40,14 +40,14 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.internal.utils.MediaTypeUtils; public abstract class AbstractJAXBProvider { - private static final Log logger = LogFactory.getLog(AbstractJAXBProvider.class); + private static final Logger logger = LoggerFactory.getLogger(AbstractJAXBProvider.class); private static final Map<Class<?>, JAXBContext> jaxbDefaultContexts = new WeakHashMap<Class<?>, JAXBContext>(); @Context Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java Mon Jun 29 12:10:48 2009 @@ -42,8 +42,8 @@ import javax.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.utils.ProviderUtils; @@ -53,7 +53,7 @@ @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.WILDCARD }) public class JAXBElementXmlProvider extends AbstractJAXBProvider implements MessageBodyReader<JAXBElement<?>>, MessageBodyWriter<JAXBElement<?>> { - private static final Log logger = LogFactory.getLog(JAXBElementXmlProvider.class); + private static final Logger logger = LoggerFactory.getLogger(JAXBElementXmlProvider.class); public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) { return isJAXBElement(type, genericType) && isSupportedMediaType(mediaType); Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java Mon Jun 29 12:10:48 2009 @@ -41,8 +41,8 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.transform.stream.StreamSource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.utils.ProviderUtils; @@ -52,7 +52,7 @@ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.WILDCARD}) public class JAXBXmlProvider extends AbstractJAXBProvider implements MessageBodyReader<Object>, MessageBodyWriter<Object> { - private static final Log logger = LogFactory.getLog(JAXBXmlProvider.class); + private static final Logger logger = LoggerFactory.getLogger(JAXBXmlProvider.class); public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) { return isJAXBObject(type, genericType) && isSupportedMediaType(mediaType); Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java Mon Jun 29 12:10:48 2009 @@ -26,14 +26,14 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MediaTypeHeaderDelegate implements HeaderDelegate<MediaType> { - private static final Log logger = LogFactory.getLog(MediaTypeHeaderDelegate.class); + private static final Logger logger = LoggerFactory.getLogger(MediaTypeHeaderDelegate.class); private static final Pattern EQUALS = Pattern.compile("="); private static final Pattern SEMICOLON = Pattern.compile(";"); private static final Pattern SLASH = Pattern.compile("/"); Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ContextAccessor.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ContextAccessor.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ContextAccessor.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ContextAccessor.java Mon Jun 29 12:10:48 2009 @@ -38,7 +38,7 @@ public class ContextAccessor { // private static Object[] EMPTY_ARRAY = new Object[0]; -// private static final Log logger = LogFactory.getLog(ContextAccessor.class); +// private static final Logger logger = LoggerFactory.getLogger(ContextAccessor.class); // private static final Map<Class<?>,Method> contextAccessors = new HashMap<Class<?>,Method>(); Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java Mon Jun 29 12:10:48 2009 @@ -45,8 +45,8 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.SymphonyApplication; import org.apache.wink.common.internal.application.ApplicationValidator; import org.apache.wink.common.internal.factory.OFFactoryRegistry; @@ -63,7 +63,7 @@ / public class ProvidersRegistry { - private static final Log logger = LogFactory.getLog(ProvidersRegistry.class); + private static Logger logger = LoggerFactory.getLogger(ProvidersRegistry.class); private final ProducesMediaTypeMap<ContextResolver<?>> contextResolvers = new ProducesMediaTypeMap<ContextResolver<?>>( ContextResolver.class); Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java Mon Jun 29 12:10:48 2009 @@ -36,8 +36,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.DynamicResource; import org.apache.wink.common.annotations.Parent; import org.apache.wink.common.annotations.Workspace; @@ -50,7 +50,7 @@ / public class ResourceMetadataCollector extends AbstractMetadataCollector { - private static final Log logger = LogFactory.getLog(ResourceMetadataCollector.class); + private static final Logger logger = LoggerFactory.getLogger(ResourceMetadataCollector.class); private ResourceMetadataCollector(Class<?> clazz) { super(clazz); Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java Mon Jun 29 12:10:48 2009 @@ -30,14 +30,14 @@ import java.net.URISyntaxException; import java.net.URL; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FileLoader { protected FileLoader(){} - private static final Log logger = LogFactory.getLog(FileLoader.class); + private static final Logger logger = LoggerFactory.getLogger(FileLoader.class); /** * search for file using classloaders only and returns URL to the file if Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/GenericsUtils.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/GenericsUtils.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/GenericsUtils.java (original) +++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/GenericsUtils.java Mon Jun 29 12:10:48 2009 @@ -26,12 +26,12 @@ import java.lang.reflect.TypeVariable; import java.lang.reflect.WildcardType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class GenericsUtils { - private static final Log logger = LogFactory.getLog(GenericsUtils.class); + private static final Logger logger = LoggerFactory.getLogger(GenericsUtils.class); private GenericsUtils() { // prevents creating this class Modified: incubator/wink/trunk/wink-component-test-support/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-component-test-support/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-component-test-support/pom.xml (original) +++ incubator/wink/trunk/wink-component-test-support/pom.xml Mon Jun 29 12:10:48 2009 @@ -26,6 +26,10 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee_1.4_spec</artifactId> </dependency> Modified: incubator/wink/trunk/wink-examples/apps/Bookmarks/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/Bookmarks/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/Bookmarks/pom.xml (original) +++ incubator/wink/trunk/wink-examples/apps/Bookmarks/pom.xml Mon Jun 29 12:10:48 2009 @@ -1,35 +1,35 @@ <?xml version="1.0" encoding="utf-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <!-- Project detailes --> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.wink.example</groupId> - <artifactId>Bookmarks</artifactId> - <packaging>war</packaging> - <version>0.1-SNAPSHOT</version> - <name>${artifactId}:${version}</name> - <properties> - <module.relative.path>../../../</module.relative.path> - </properties> - <parent> - <groupId>org.apache.wink.example</groupId> - <artifactId>apps</artifactId> - <version>0.1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <!-- Build section --> - <build> - <finalName>Bookmarks</finalName> - </build> - <!-- Dependency on Symphony SDK library --> - <dependencies> - <dependency> - <groupId>org.apache.wink</groupId> - <artifactId>wink-common</artifactId> - </dependency> - <dependency> - <groupId>org.apache.wink</groupId> - <artifactId>wink-server</artifactId> - </dependency> - </dependencies> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <!-- Project detailes --> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.wink.example</groupId> + <artifactId>Bookmarks</artifactId> + <packaging>war</packaging> + <version>0.1-SNAPSHOT</version> + <name>${artifactId}:${version}</name> + <properties> + <module.relative.path>../../../</module.relative.path> + </properties> + <parent> + <groupId>org.apache.wink.example</groupId> + <artifactId>apps</artifactId> + <version>0.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <!-- Build section --> + <build> + <finalName>Bookmarks</finalName> + </build> + <!-- Dependency on Symphony SDK library --> + <dependencies> + <dependency> + <groupId>org.apache.wink</groupId> + <artifactId>wink-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.wink</groupId> + <artifactId>wink-server</artifactId> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: incubator/wink/trunk/wink-examples/apps/HelloWorld/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/HelloWorld/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/HelloWorld/pom.xml (original) +++ incubator/wink/trunk/wink-examples/apps/HelloWorld/pom.xml Mon Jun 29 12:10:48 2009 @@ -50,6 +50,11 @@ <artifactId>spring-test</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee_1.4_spec</artifactId> <scope>provided</scope> Modified: incubator/wink/trunk/wink-examples/apps/QADefect/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/QADefect/pom.xml (original) +++ incubator/wink/trunk/wink-examples/apps/QADefect/pom.xml Mon Jun 29 12:10:48 2009 @@ -57,5 +57,10 @@ <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java (original) +++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java Mon Jun 29 12:10:48 2009 @@ -29,8 +29,8 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.example.qadefect.resources.DefectsResource; import org.apache.wink.example.qadefect.utils.SearchMap; @@ -44,7 +44,7 @@ private static DataStore defectStore = createSingletonInstance(); - private final static Log logger = LogFactory.getLog(DataStore.class); + private final static Logger logger = LoggerFactory.getLogger(DataStore.class); /** * Constructor of mock defect store. It is initialized with test data. @@ -292,10 +292,8 @@ l_defects: for (DefectBean defect : defects.values()) { for (Entry<String, String> entry : searchParameters.entrySet()) { String value = entry.getValue(); - if (logger.isDebugEnabled()) { - logger.debug("Parameter: " + entry.getKey() - + "; value: " + value); - } + logger.debug("Parameter: {}; value: {}", entry.getKey(), value); + if (entry.getKey().equals(DefectsResource.ASSIGNED_TO)) { if (defect.getAssignedTo() == null \|\| !defect.getAssignedTo().equalsIgnoreCase(value)) { Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java (original) +++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java Mon Jun 29 12:10:48 2009 @@ -31,8 +31,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.annotations.Workspace; import org.apache.wink.example.qadefect.legacy.DataStore; import org.apache.wink.example.qadefect.legacy.DefectBean; @@ -53,7 +53,7 @@ @Workspace(workspaceTitle = "QA Defects", collectionTitle = "Tests of Defect") public class DefectTestsResource { - private static final Log logger = LogFactory.getLog(DefectTestsResource.class); + private static final Logger logger = LoggerFactory.getLogger(DefectTestsResource.class); /** * Method is handling GET requests to retrieve tests that are related to the Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java (original) +++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java Mon Jun 29 12:10:48 2009 @@ -41,8 +41,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.annotations.Workspace; import org.apache.wink.common.internal.utils.MediaTypeUtils; import org.apache.wink.common.internal.utils.OpenSearchUtils; @@ -61,7 +61,7 @@ @Path(DefectsResource.DEFECTS_PATH) public class DefectsResource { - private static final Log logger = LogFactory.getLog(DefectsResource.class); + private static final Logger logger = LoggerFactory.getLogger(DefectsResource.class); public static final String DEFECTS_PATH = "defects"; public static final String DEFECT_VAR = "defect"; Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java (original) +++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java Mon Jun 29 12:10:48 2009 @@ -33,8 +33,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.annotations.Workspace; import org.apache.wink.example.qadefect.legacy.DataStore; import org.apache.wink.example.qadefect.legacy.TestBean; @@ -44,7 +44,7 @@ @Path(TestsResource.TESTS_PATH) public class TestsResource { - private static final Log logger = LogFactory.getLog(TestsResource.class); + private static final Logger logger = LoggerFactory.getLogger(TestsResource.class); public static final String TESTS_PATH = "tests"; public static final String TEST_PATH = "{test}"; Modified: incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/pom.xml (original) +++ incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/pom.xml Mon Jun 29 12:10:48 2009 @@ -53,6 +53,10 @@ <artifactId>spring-test</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee_1.4_spec</artifactId> </dependency> Modified: incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/java/org/apache/wink/example/qadefect/store/DataStore.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/java/org/apache/wink/example/qadefect/store/DataStore.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/java/org/apache/wink/example/qadefect/store/DataStore.java (original) +++ incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/java/org/apache/wink/example/qadefect/store/DataStore.java Mon Jun 29 12:10:48 2009 @@ -29,8 +29,8 @@ import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.example.qadefect.legacy.DefectBean; import org.apache.wink.example.qadefect.legacy.TestBean; import org.apache.wink.example.qadefect.resources.DefectsResource; @@ -47,7 +47,7 @@ private static DataStore defectStore = createSingletonInstance(); - private final static Log logger = LogFactory.getLog(DataStore.class); + private final static Logger logger = LoggerFactory.getLogger(DataStore.class); /** * Constructor of mock defect store. It is initialized with test data. @@ -264,9 +264,8 @@ l_defects: for (DefectBean defect : defects.values()) { for (Entry<String, String> entry : searchParameters.entrySet()) { String value = entry.getValue(); - if (logger.isDebugEnabled()) { - logger.debug("Parameter: " + entry.getKey() + "; value: " + value); - } + logger.debug("Parameter: {}; value: {}", entry.getKey(), value); + if (entry.getKey().equals(DefectsResource.ASSIGNED_TO)) { if (defect.getAssignedTo() == null \|\| !defect.getAssignedTo().equalsIgnoreCase(value)) { Modified: incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/legacy/DataStore.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/legacy/DataStore.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/legacy/DataStore.java (original) +++ incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/legacy/DataStore.java Mon Jun 29 12:10:48 2009 @@ -27,8 +27,8 @@ import java.util.HashSet; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; / @@ -40,7 +40,7 @@ private static DataStore defectStore = createSingletonInstance(); - final static Log logger = LogFactory.getLog(DataStore.class); + final static Logger logger = LoggerFactory.getLogger(DataStore.class); / * Constructor of mock defect store. It is initialized with test data. Modified: incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.java (original) +++ incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.java Mon Jun 29 12:10:48 2009 @@ -39,8 +39,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.annotations.Workspace; import org.apache.wink.example.simpledefects.legacy.DataStore; import org.apache.wink.example.simpledefects.legacy.DefectBean; @@ -57,7 +57,7 @@ @Workspace(workspaceTitle = "QA Defects", collectionTitle = "Defects") public class DefectsResource { - private static final Log logger = LogFactory.getLog(DefectsResource.class); + private static final Logger logger = LoggerFactory.getLogger(DefectsResource.class); public static final String DEFECTS_URL = "/defects"; public static final String DEFECT = "defect"; Propchange: incubator/wink/trunk/wink-examples/client/QADefects-client/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Jun 29 12:10:48 2009 @@ -2,3 +2,4 @@ target .classpath .project +build Modified: incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml (original) +++ incubator/wink/trunk/wink-examples/core/Jaxb/pom.xml Mon Jun 29 12:10:48 2009 @@ -55,6 +55,11 @@ <artifactId>spring-test</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> Modified: incubator/wink/trunk/wink-examples/core/Preconditions/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/Preconditions/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/core/Preconditions/pom.xml (original) +++ incubator/wink/trunk/wink-examples/core/Preconditions/pom.xml Mon Jun 29 12:10:48 2009 @@ -42,6 +42,11 @@ <artifactId>spring-test</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee_1.4_spec</artifactId> </dependency> Modified: incubator/wink/trunk/wink-examples/core/Preconditions/src/main/java/org/apache/wink/example/locking/store/DataStore.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/core/Preconditions/src/main/java/org/apache/wink/example/locking/store/DataStore.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/core/Preconditions/src/main/java/org/apache/wink/example/locking/store/DataStore.java (original) +++ incubator/wink/trunk/wink-examples/core/Preconditions/src/main/java/org/apache/wink/example/locking/store/DataStore.java Mon Jun 29 12:10:48 2009 @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.example.locking.legacy.DefectBean; @@ -41,7 +41,7 @@ private static DataStore defectStore = createSingletonInstance(); - final static Log logger = LogFactory.getLog(DataStore.class); + final static Logger logger = LoggerFactory.getLogger(DataStore.class); /** * Constructor of mock defect store. It is initialized with test data. Modified: incubator/wink/trunk/wink-examples/ext/History/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/History/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/ext/History/pom.xml (original) +++ incubator/wink/trunk/wink-examples/ext/History/pom.xml Mon Jun 29 12:10:48 2009 @@ -45,6 +45,11 @@ <artifactId>spring-test</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-server</artifactId> </dependency> Modified: incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/java/org/apache/wink/example/webdav/WebDAVDefectsResource.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/java/org/apache/wink/example/webdav/WebDAVDefectsResource.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/java/org/apache/wink/example/webdav/WebDAVDefectsResource.java (original) +++ incubator/wink/trunk/wink-examples/ext/WebDAV/src/main/java/org/apache/wink/example/webdav/WebDAVDefectsResource.java Mon Jun 29 12:10:48 2009 @@ -35,8 +35,8 @@ import javax.ws.rs.core.UriInfo; import javax.ws.rs.ext.Providers; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.http.OPTIONS; import org.apache.wink.common.model.synd.SyndBase; import org.apache.wink.common.model.synd.SyndEntry; @@ -59,7 +59,7 @@ @Path(DefectsResource.DEFECTS_PATH) public class WebDAVDefectsResource extends DefectsResource { - private static final Log logger = LogFactory.getLog(WebDAVDefectsResource.class); + private static final Logger logger = LoggerFactory.getLogger(WebDAVDefectsResource.class); @Context private LinkBuilders linkProcessor; Modified: incubator/wink/trunk/wink-server/pom.xml URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/pom.xml?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/pom.xml (original) +++ incubator/wink/trunk/wink-server/pom.xml Mon Jun 29 12:10:48 2009 @@ -26,6 +26,10 @@ <artifactId>wink-component-test-support</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-j2ee_1.4_spec</artifactId> </dependency> @@ -39,6 +43,15 @@ <artifactId>spring-test</artifactId> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </dependency> + <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> </dependency> @@ -63,10 +76,6 @@ <artifactId>activation</artifactId> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java (original) +++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java Mon Jun 29 12:10:48 2009 @@ -35,8 +35,8 @@ import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.internal.application.ApplicationValidator; import org.apache.wink.common.internal.factory.OFFactoryRegistry; import org.apache.wink.common.internal.factory.ScopeOFFactory; @@ -76,8 +76,10 @@ public class DeploymentConfiguration { private static final String ALTERNATIVE_SHORTCUTS = "META-INF/symphony-alternateShortcutsMap.properties"; - private static final Log logger = LogFactory.getLog(DeploymentConfiguration.class); + private static final Logger logger = LoggerFactory.getLogger(DeploymentConfiguration.class); private static final String VALIDATE_LOCATION_HEADER = "wink.validateLocationHeader"; + + // handler chains private RequestHandlersChain requestHandlersChain; private ResponseHandlersChain responseHandlersChain; Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java (original) +++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java Mon Jun 29 12:10:48 2009 @@ -26,8 +26,8 @@ import javax.ws.rs.core.MediaType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.internal.utils.MediaTypeUtils; @@ -37,7 +37,7 @@ / public final class MediaTypeMapper { - private static final Log LOG = LogFactory.getLog(MediaTypeMapper.class); + private static final Logger logger = LoggerFactory.getLogger(MediaTypeMapper.class); private interface MappingRecord { @@ -85,7 +85,7 @@ public void addMapping(String userAgent, String resultMimeType, String typeToSend) { if (userAgent == null \|\| resultMimeType == null \|\| typeToSend == null) { - LOG.warn(String.format("Record %s is not complete => ignored", userAgent)); + logger.warn(String.format("Record %s is not complete => ignored", userAgent)); return; } this.mappings.add(new AgentStartsWith(userAgent, resultMimeType, typeToSend)); Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java (original) +++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java Mon Jun 29 12:10:48 2009 @@ -31,8 +31,8 @@ import javax.servlet.http.HttpServletResponse; import javax.ws.rs.WebApplicationException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.internal.application.ApplicationFileLoader; import org.apache.wink.common.internal.runtime.RuntimeContextTLS; import org.apache.wink.server.internal.handlers.ServerMessageContext; @@ -46,7 +46,7 @@ / public class RequestProcessor { - private static final Log logger = LogFactory.getLog(RequestProcessor.class); + private static final Logger logger = LoggerFactory.getLogger(RequestProcessor.class); private static final String PROPERTY_ROOT_RESOURCE_NONE = "none"; private static final String PROPERTY_ROOT_RESOURCE_ATOM = "atom"; private static final String PROPERTY_ROOT_RESOURCE_ATOM_HTML = "atom+html"; Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java (original) +++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java Mon Jun 29 12:10:48 2009 @@ -23,8 +23,8 @@ import javax.ws.rs.core.Application; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.SymphonyApplication; import org.apache.wink.common.internal.registry.ProvidersRegistry; import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector; @@ -46,7 +46,7 @@ */ public class ApplicationProcessor { - private static final Log logger = LogFactory.getLog(ApplicationProcessor.class); + private static final Logger logger = LoggerFactory.getLogger(ApplicationProcessor.class); private final Application application; private final ResourceRegistry resourceRegistry; Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java (original) +++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java Mon Jun 29 12:10:48 2009 @@ -34,8 +34,8 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.internal.MultivaluedMapImpl; import org.apache.wink.common.internal.PathSegmentImpl; import org.apache.wink.common.internal.uri.UriEncoder; @@ -47,7 +47,7 @@ public class UriInfoImpl implements UriInfo { - private static final Log logger = LogFactory.getLog(UriInfoImpl.class); + private static final Logger logger = LoggerFactory.getLogger(UriInfoImpl.class); private MessageContext messageContext; Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindRootResourceHandler.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindRootResourceHandler.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindRootResourceHandler.java (original) +++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindRootResourceHandler.java Mon Jun 29 12:10:48 2009 @@ -29,8 +29,8 @@ import javax.ws.rs.core.PathSegment; import javax.ws.rs.core.Response; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.server.handlers.HandlersChain; import org.apache.wink.server.handlers.MessageContext; import org.apache.wink.server.handlers.RequestHandler; @@ -41,7 +41,7 @@ public class FindRootResourceHandler implements RequestHandler { public static final String SEARCH_POLICY_CONTINUED_SEARCH_KEY = "symphony.searchPolicyContinuedSearch"; - private static final Log logger = LogFactory.getLog(FindRootResourceHandler.class); + private static final Logger logger = LoggerFactory.getLogger(FindRootResourceHandler.class); private boolean isContinuedSearchPolicy; Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java (original) +++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java Mon Jun 29 12:10:48 2009 @@ -41,8 +41,8 @@ import javax.ws.rs.ext.RuntimeDelegate; import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.internal.MultivaluedMapImpl; import org.apache.wink.server.handlers.AbstractHandler; import org.apache.wink.server.handlers.MessageContext; @@ -50,7 +50,7 @@ public class FlushResultHandler extends AbstractHandler { - private static final Log logger = LogFactory.getLog(FlushResultHandler.class); + private static final Logger logger = LoggerFactory.getLogger(FlushResultHandler.class); private static final RuntimeDelegate runtimeDelegate = RuntimeDelegate.getInstance(); @SuppressWarnings("unchecked") Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java (original) +++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java Mon Jun 29 12:10:48 2009 @@ -23,15 +23,15 @@ import java.lang.reflect.Method; import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.server.handlers.AbstractHandler; import org.apache.wink.server.handlers.MessageContext; public class InvokeMethodHandler extends AbstractHandler { - private static final Log logger = LogFactory.getLog(InvokeMethodHandler.class); + private static final Logger logger = LoggerFactory.getLogger(InvokeMethodHandler.class); public void handleRequest(MessageContext context) throws Throwable { try { Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java (original) +++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java Mon Jun 29 12:10:48 2009 @@ -24,8 +24,8 @@ import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.RuntimeDelegate; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.server.handlers.AbstractHandler; import org.apache.wink.server.handlers.MessageContext; @@ -33,7 +33,7 @@ public class PopulateErrorResponseHandler extends AbstractHandler { private static final RuntimeDelegate RUNTIME_DELEGATE = RuntimeDelegate.getInstance(); - private static final Log logger = LogFactory.getLog(PopulateErrorResponseHandler.class); + private static final Logger logger = LoggerFactory.getLogger(PopulateErrorResponseHandler.class); @SuppressWarnings("unchecked") public void handleResponse(MessageContext context) throws Throwable { Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java?rev=789304&r1=789303&r2=789304&view=diff ============================================================================== --- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java (original) +++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java Mon Jun 29 12:10:48 2009 @@ -28,8 +28,8 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.wink.common.DynamicResource; import org.apache.wink.common.internal.factory.OFFactoryRegistry; import org.apache.wink.common.internal.factory.ObjectFactory; @@ -40,7 +40,7 @@ public class ResourceRecordFactory { - private static final Log logger = LogFactory.getLog(ResourceRecordFactory.class); + private static final Logger logger = LoggerFactory.getLogger(ResourceRecordFactory.class); private final OFFactoryRegistry objectFactoryRegistry; private final Map<Class<?>,ResourceRecord> cacheByClass;
Mime	Unnamed text/plain (inline, 7-Bit, 88159 bytes)
	View raw message