You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ma...@apache.org on 2009/06/29 14:10:50 UTC
svn commit: r789304 [2/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...
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java?rev=789304&r1=789303&r2=789304&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java Mon Jun 29 12:10:48 2009
@@ -37,8 +37,8 @@
import javax.ws.rs.core.MediaType;
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.common.SymphonyApplication;
import org.apache.wink.common.http.HttpStatus;
import org.apache.wink.common.internal.application.ApplicationValidator;
@@ -57,7 +57,7 @@
*/
public class ResourceRegistry {
- private static final Log logger = LogFactory.getLog(ResourceRegistry.class);
+ private static final Logger logger = LoggerFactory.getLogger(ResourceRegistry.class);
private List<ResourceRecord> rootResources;
private boolean dirty;
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java?rev=789304&r1=789303&r2=789304&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java Mon Jun 29 12:10:48 2009
@@ -29,8 +29,8 @@
import javax.servlet.http.HttpServletResponse;
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.server.internal.DeploymentConfiguration;
import org.apache.wink.server.internal.RequestProcessor;
import org.apache.wink.server.internal.application.ServletSymphonyApplication;
@@ -61,7 +61,7 @@
private static final long serialVersionUID = 8797036173835816706L;
- private static final Log logger = LogFactory.getLog(RestServlet.class);
+ private static final Logger logger = LoggerFactory.getLogger(RestServlet.class);
private static final String PROPERTIES_DEFAULT_FILE = "META-INF/configuration-default.properties";
private static final String PROPERTIES_INIT_PARAM = "symphony.propertiesLocation";
private static final String SYMPHONY_APP_LOCATION_PARAM = "symphony.applicationConfigLocation";
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java?rev=789304&r1=789303&r2=789304&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java Mon Jun 29 12:10:48 2009
@@ -24,14 +24,14 @@
import javax.servlet.ServletContext;
-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.FileLoader;
public class ServletFileLoader extends FileLoader {
- private static final Log logger = LogFactory.getLog(ServletFileLoader.class);
+ private static final Logger logger = LoggerFactory.getLogger(ServletFileLoader.class);
public static InputStream loadFileAsStream(ServletContext servletContext, String fileName) throws FileNotFoundException {
if (fileName == null || fileName.trim().equals("")) {
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java?rev=789304&r1=789303&r2=789304&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java Mon Jun 29 12:10:48 2009
@@ -25,8 +25,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-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.internal.providers.entity.html.OutputStreamHttpServletResponseWrapper;
import org.springframework.mock.web.MockRequestDispatcher;
import org.springframework.util.Assert;
@@ -38,7 +38,7 @@
* type of MockHttpServletResponse.
*/
public class HtmlMockRequestDispatcher extends MockRequestDispatcher {
- private final Log logger = LogFactory.getLog(super.getClass());
+ private final Logger logger = LoggerFactory.getLogger(super.getClass());
private final String url;
/**
Modified: incubator/wink/trunk/wink-spring-support/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/pom.xml?rev=789304&r1=789303&r2=789304&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/pom.xml (original)
+++ incubator/wink/trunk/wink-spring-support/pom.xml Mon Jun 29 12:10:48 2009
@@ -1,8 +1,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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-spring-support</artifactId>
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-spring-support</artifactId>
<packaging>jar</packaging>
<name>${artifactId}:${version}</name>
<properties>
@@ -14,31 +14,40 @@
<artifactId>wink</artifactId>
<version>0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
- </parent>
- <dependencies>
+ </parent>
+ <dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-component-test-support</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-</project>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-component-test-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Modified: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java?rev=789304&r1=789303&r2=789304&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java Mon Jun 29 12:10:48 2009
@@ -21,8 +21,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.factory.CreationUtils;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
import org.apache.wink.common.internal.runtime.RuntimeContextTLS;
@@ -32,7 +32,7 @@
public class DependenciesInjectionPostProcessor implements BeanPostProcessor {
- private static final Log logger = LogFactory.getLog(DependenciesInjectionPostProcessor.class);
+ private static final Logger logger = LoggerFactory.getLogger(DependenciesInjectionPostProcessor.class);
private SpringOFFactory<Object> springOFFactory;
public Object postProcessAfterInitialization(Object bean, String beanName)
Modified: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java?rev=789304&r1=789303&r2=789304&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java Mon Jun 29 12:10:48 2009
@@ -22,8 +22,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.common.DynamicResource;
import org.apache.wink.common.internal.factory.OFFactory;
import org.apache.wink.common.internal.factory.ObjectCreationException;
@@ -34,7 +34,7 @@
public class SpringOFFactory<T> implements OFFactory<T> {
- private static final Log logger = LogFactory.getLog(SpringOFFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(SpringOFFactory.class);
/**
* holds Static Resources and Providers
Modified: incubator/wink/trunk/wink-webdav/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/pom.xml?rev=789304&r1=789303&r2=789304&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/pom.xml (original)
+++ incubator/wink/trunk/wink-webdav/pom.xml Mon Jun 29 12:10:48 2009
@@ -1,56 +1,61 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-webdav</artifactId>
- <packaging>jar</packaging>
- <name>${artifactId}:${version}</name>
- <properties>
- <module.relative.path>../</module.relative.path>
- <javadoc.aggregate>false</javadoc.aggregate>
- </properties>
- <parent>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <!-- depending on the following jars -->
- <dependencies>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-component-test-support</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-webdav</artifactId>
+ <packaging>jar</packaging>
+ <name>${artifactId}:${version}</name>
+ <properties>
+ <module.relative.path>../</module.relative.path>
+ <javadoc.aggregate>false</javadoc.aggregate>
+ </properties>
+ <parent>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <!-- depending on the following jars -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-component-test-support</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java?rev=789304&r1=789303&r2=789304&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java Mon Jun 29 12:10:48 2009
@@ -30,8 +30,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.http.HttpStatus;
import org.apache.wink.common.model.synd.SyndBase;
import org.apache.wink.common.model.synd.SyndEntry;
@@ -61,7 +61,7 @@
public class WebDAVResponseBuilder {
- private static final Log logger = LogFactory.getLog(WebDAVResponseBuilder.class);
+ private static final Logger logger = LoggerFactory.getLogger(WebDAVResponseBuilder.class);
private UriInfo uriInfo;