You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2009/04/03 11:50:15 UTC
svn commit: r761589 - in /jackrabbit/sandbox/spi: client/pom.xml
client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java
client/src/main/java/org/apache/jackrabbit/client/spilogger/RepositoryConfigImpl.java
pom.xml spi-logger/
Author: angela
Date: Fri Apr 3 09:50:14 2009
New Revision: 761589
URL: http://svn.apache.org/viewvc?rev=761589&view=rev
Log:
JCR-1695 Improve and promote spi-logger
Completing the promotion by removing the original sandbox project
Removed:
jackrabbit/sandbox/spi/spi-logger/
Modified:
jackrabbit/sandbox/spi/client/pom.xml
jackrabbit/sandbox/spi/client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java
jackrabbit/sandbox/spi/client/src/main/java/org/apache/jackrabbit/client/spilogger/RepositoryConfigImpl.java
jackrabbit/sandbox/spi/pom.xml
Modified: jackrabbit/sandbox/spi/client/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi/client/pom.xml?rev=761589&r1=761588&r2=761589&view=diff
==============================================================================
--- jackrabbit/sandbox/spi/client/pom.xml (original)
+++ jackrabbit/sandbox/spi/client/pom.xml Fri Apr 3 09:50:14 2009
@@ -88,10 +88,6 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-spi-logger</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
<dependency>
Modified: jackrabbit/sandbox/spi/client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi/client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java?rev=761589&r1=761588&r2=761589&view=diff
==============================================================================
--- jackrabbit/sandbox/spi/client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java (original)
+++ jackrabbit/sandbox/spi/client/src/main/java/org/apache/jackrabbit/client/RepositoryFactoryImpl.java Fri Apr 3 09:50:14 2009
@@ -20,6 +20,7 @@
import org.apache.jackrabbit.jcr2spi.config.RepositoryConfig;
import org.apache.jackrabbit.jcr2spi.config.CacheBehaviour;
import org.apache.jackrabbit.api.jsr283.RepositoryFactory;
+import org.apache.jackrabbit.spi.commons.logging.LogWriter;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
@@ -97,8 +98,8 @@
if (config != null) {
Object spiLogWriter = parameters.get(REPOSITORY_SPILOG_WRITER);
- if (spiLogWriter != null && spiLogWriter instanceof Writer) {
- config = new org.apache.jackrabbit.client.spilogger.RepositoryConfigImpl(config, ((Writer) spiLogWriter));
+ if (spiLogWriter != null && spiLogWriter instanceof LogWriter) {
+ config = new org.apache.jackrabbit.client.spilogger.RepositoryConfigImpl(config, ((LogWriter) spiLogWriter));
}
return RepositoryImpl.create(config);
} else {
Modified: jackrabbit/sandbox/spi/client/src/main/java/org/apache/jackrabbit/client/spilogger/RepositoryConfigImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi/client/src/main/java/org/apache/jackrabbit/client/spilogger/RepositoryConfigImpl.java?rev=761589&r1=761588&r2=761589&view=diff
==============================================================================
--- jackrabbit/sandbox/spi/client/src/main/java/org/apache/jackrabbit/client/spilogger/RepositoryConfigImpl.java (original)
+++ jackrabbit/sandbox/spi/client/src/main/java/org/apache/jackrabbit/client/spilogger/RepositoryConfigImpl.java Fri Apr 3 09:50:14 2009
@@ -19,7 +19,8 @@
import org.apache.jackrabbit.jcr2spi.config.CacheBehaviour;
import org.apache.jackrabbit.jcr2spi.config.RepositoryConfig;
import org.apache.jackrabbit.spi.RepositoryService;
-import org.apache.jackrabbit.spi.logger.RepositoryServiceLogger;
+import org.apache.jackrabbit.spi.commons.logging.RepositoryServiceLogger;
+import org.apache.jackrabbit.spi.commons.logging.LogWriter;
import javax.jcr.RepositoryException;
import java.io.Writer;
@@ -28,11 +29,11 @@
public class RepositoryConfigImpl implements RepositoryConfig {
private final RepositoryConfig config;
- private final Writer writer;
+ private final LogWriter writer;
private RepositoryService service;
- public RepositoryConfigImpl(RepositoryConfig config, Writer writer) throws RepositoryException {
+ public RepositoryConfigImpl(RepositoryConfig config, LogWriter writer) {
super();
this.config = config;
this.writer = writer;
Modified: jackrabbit/sandbox/spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi/pom.xml?rev=761589&r1=761588&r2=761589&view=diff
==============================================================================
--- jackrabbit/sandbox/spi/pom.xml (original)
+++ jackrabbit/sandbox/spi/pom.xml Fri Apr 3 09:50:14 2009
@@ -37,7 +37,6 @@
<modules>
<module>spi-rmi</module>
<module>client</module>
- <module>spi-logger</module>
</modules>
<scm>
@@ -198,11 +197,6 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-spi-logger</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>