You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2015/12/22 10:06:08 UTC
svn commit: r1721318 [1/2] - in /chemistry/opencmis/trunk: ./
chemistry-opencmis-client/chemistry-opencmis-client-bindings/
chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framewo...
Author: fmui
Date: Tue Dec 22 09:06:07 2015
New Revision: 1721318
URL: http://svn.apache.org/viewvc?rev=1721318&view=rev
Log:
updated log4j and replaced (old) Jetty with (newish) Tomcat
Added:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/resources/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/classes/META-INF/
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/classes/META-INF/cxf/
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/classes/META-INF/cxf/org.apache.cxf.Logger
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/resources/
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/resources/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/webapp/WEB-INF/classes/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/WEB-INF/classes/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/resources/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/resources/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/test/resources/log4j2.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/resources/log4j2.xml
Removed:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j.properties
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j.properties
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/log4j.properties
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/resources/log4j.properties
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/resources/log4j.properties
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j.properties
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j.properties
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/readme.txt
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/META-INF/services/
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/jetty-web.xml
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/jackrabbit-repository-memory.xml
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/modeshape-repository-memory.json
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/resources/log4j.properties
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/resources/log4j.properties
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/test/resources/log4j.properties
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/resources/log4j.properties
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/ItemIterableTest.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/web.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository.properties
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/tck/AbstractTckIT.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientWriterAppender.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java
chemistry/opencmis/trunk/pom.xml
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml Tue Dec 22 09:06:07 2015
@@ -99,18 +99,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${apacheclient.version}</version>
@@ -126,6 +114,19 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java Tue Dec 22 09:06:07 2015
@@ -76,8 +76,8 @@ public abstract class AbstractCmisTestCa
public static final String DEFAULT_TESTS_ENABLED = "true";
public static final String DEFAULT_USERNAME = "admin";
public static final String DEFAULT_PASSWORD = "admin";
- public static final String DEFAULT_ATOMPUB_URL = "http://localhost:8080/chemistry-opencmis-server-jcr/atom";
- public static final String DEFAULT_WEBSERVICES_URLPREFIX = "http://localhost:8080/cmis/services/";
+ public static final String DEFAULT_ATOMPUB_URL = "http://localhost:8080/opencmis/atom11";
+ public static final String DEFAULT_WEBSERVICES_URLPREFIX = "http://localhost:8080/opencmis/services/";
public static final String DEFAULT_DOCTYPE = "cmis:document";
public static final String DEFAULT_FOLDERTYPE = "cmis:folder";
Added: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/resources/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="test.log" filePattern="test-%i.log" append="false">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="1" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml Tue Dec 22 09:06:07 2015
@@ -136,15 +136,15 @@
</dependency>
<!-- Test -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml Tue Dec 22 09:06:07 2015
@@ -37,12 +37,12 @@
<files>
<file>
<source>src/main/assembly/client-with-dependencies-assembly-license.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<destName>LICENSE</destName>
</file>
<file>
<source>src/main/assembly/client-with-dependencies-assembly-notice.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<destName>NOTICE</destName>
</file>
</files>
@@ -50,7 +50,7 @@
<!-- license, readme, etc. calculated at build time -->
<fileSet>
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<excludes>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/ItemIterableTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/ItemIterableTest.java?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/ItemIterableTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/ItemIterableTest.java Tue Dec 22 09:06:07 2015
@@ -32,7 +32,6 @@ import java.util.Properties;
import org.apache.chemistry.opencmis.client.api.ItemIterable;
import org.apache.chemistry.opencmis.client.runtime.util.AbstractPageFetcher;
import org.apache.chemistry.opencmis.client.runtime.util.CollectionIterable;
-import org.apache.log4j.PropertyConfigurator;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,16 +39,16 @@ import org.slf4j.LoggerFactory;
public class ItemIterableTest {
private static final Logger LOG = LoggerFactory.getLogger(ItemIterableTest.class);
- static {
- Properties p = new Properties();
- try {
- p.load(ItemIterableTest.class.getResourceAsStream("/log4j.properties"));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- PropertyConfigurator.configure(p);
-
- }
+// static {
+// Properties p = new Properties();
+// try {
+// p.load(ItemIterableTest.class.getResourceAsStream("/log4j.properties"));
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
+// PropertyConfigurator.configure(p);
+//
+// }
private final String[] data10 = { "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9" };
private final String[] data1 = { "A0" };
private final String[] data0 = {};
@@ -80,8 +79,7 @@ public class ItemIterableTest {
page.add(data[i]);
}
- Page<String> result = new AbstractPageFetcher.Page<String>(
- page, totalItems, hasMoreItems);
+ Page<String> result = new AbstractPageFetcher.Page<String>(page, totalItems, hasMoreItems);
return result;
}
Added: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/resources/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="test.log" filePattern="test-%i.log" append="false">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="1" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml Tue Dec 22 09:06:07 2015
@@ -55,6 +55,19 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Added: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/resources/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/resources/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/resources/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="test.log" filePattern="test-%i.log" append="false">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="1" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/pom.xml Tue Dec 22 09:06:07 2015
@@ -33,6 +33,13 @@
<artifactId>chemistry-opencmis-server-bindings</artifactId>
<version>${project.version}</version>
</dependency>
+ <!--
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>chemistry-opencmis-server-async</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ -->
<!-- Uncomment for CORS support
<dependency>
<groupId>com.thetransactioncompany</groupId>
@@ -40,11 +47,19 @@
<version>2.1.2</version>
</dependency>
-->
+ <!--
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
+ -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Added: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/classes/META-INF/cxf/org.apache.cxf.Logger
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/classes/META-INF/cxf/org.apache.cxf.Logger?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/classes/META-INF/cxf/org.apache.cxf.Logger (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/classes/META-INF/cxf/org.apache.cxf.Logger Tue Dec 22 09:06:07 2015
@@ -0,0 +1 @@
+org.apache.cxf.common.logging.Slf4jLogger
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/web.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/web.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings-war/src/main/webapp/WEB-INF/web.xml Tue Dec 22 09:06:07 2015
@@ -28,6 +28,11 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
+<!--
+ <listener>
+ <listener-class>org.apache.chemistry.opencmis.server.async.impl.CmisAsncPoolContextListener</listener-class>
+ </listener>
+ -->
<listener>
<listener-class>org.apache.chemistry.opencmis.server.impl.CmisRepositoryContextListener</listener-class>
</listener>
@@ -220,6 +225,18 @@
<load-on-startup>2</load-on-startup>
</servlet>
+ <!--
+ <servlet>
+ <servlet-name>cmisbrowser-async</servlet-name>
+ <servlet-class>org.apache.chemistry.opencmis.server.async.impl.browser.AsyncCmisBrowserBindingServlet</servlet-class>
+ <init-param>
+ <param-name>callContextHandler</param-name>
+ <param-value>org.apache.chemistry.opencmis.server.impl.browser.token.TokenCallContextHandler</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+ -->
+
<servlet>
<servlet-name>cmisendpoints</servlet-name>
<servlet-class>org.apache.chemistry.opencmis.server.impl.endpoints.SimpleCmisEndpointsDocumentServlet</servlet-class>
@@ -255,6 +272,13 @@
<url-pattern>/browser/*</url-pattern>
</servlet-mapping>
+ <!--
+ <servlet-mapping>
+ <servlet-name>cmisbrowser-async</servlet-name>
+ <url-pattern>/browser-async/*</url-pattern>
+ </servlet-mapping>
+ -->
+
<servlet-mapping>
<servlet-name>cmisendpoints</servlet-name>
<url-pattern>/cmis-endpoints.json</url-pattern>
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml Tue Dec 22 09:06:07 2015
@@ -81,6 +81,19 @@
<version>2.4</version>
<scope>provided</scope>
</dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
Added: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/resources/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/resources/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/resources/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="test.log" filePattern="test-%i.log" append="false">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="1" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/pom.xml Tue Dec 22 09:06:07 2015
@@ -96,9 +96,14 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<!-- Uncomment for CORS support
<dependency>
Added: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/webapp/WEB-INF/classes/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/webapp/WEB-INF/classes/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/webapp/WEB-INF/classes/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/webapp/WEB-INF/classes/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ <Logger name="org.apache.chemistry.opencmis.fileshare" level="info" />
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml Tue Dec 22 09:06:07 2015
@@ -127,9 +127,14 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
Added: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/WEB-INF/classes/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/WEB-INF/classes/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/WEB-INF/classes/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/webapp/WEB-INF/classes/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ <Logger name="org.apache.chemistry.opencmis.inmemory" level="info"/>
+ <Logger name="org.apache.chemistry.opencmis.server.support.filter" level="info"/>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java Tue Dec 22 09:06:07 2015
@@ -846,6 +846,7 @@ public class ObjectServiceTest extends A
log.info("... testAllowableActions() finished.");
}
+ @SuppressWarnings("unchecked")
@Test
public void testDefaultPropertiesDocument() {
log.info("starting testDefaultPropertiesDocument() ...");
@@ -877,6 +878,7 @@ public class ObjectServiceTest extends A
log.info("... testDefaultPropertiesDocument() finished.");
}
+ @SuppressWarnings("unchecked")
@Test
public void testDefaultPropertiesFolder() {
log.info("starting testDefaultPropertiesFolder() ...");
@@ -933,7 +935,7 @@ public class ObjectServiceTest extends A
log.info("starting testGetObjectByPath() with specal chars...");
log.info(" creating object");
- String docID = createDocument("H������nschen", fRootFolderId, false);
+ createDocument("H������nschen", fRootFolderId, false);
log.info(" getting object by path with special chars");
try {
ObjectData res = fObjSvc.getObjectByPath(fRepositoryId, "/H������nschen", "*", false,
@@ -1865,6 +1867,7 @@ public class ObjectServiceTest extends A
return cmisDocumentType;
}
+ @SuppressWarnings("serial")
private static TypeDefinition createDocumentTypeWithDefault() throws InstantiationException,
IllegalAccessException {
MutableTypeDefinition cmisDocumentType;
@@ -1933,6 +1936,7 @@ public class ObjectServiceTest extends A
return cmisDocumentType;
}
+ @SuppressWarnings("serial")
private static TypeDefinition createFolderTypeWithDefault() throws InstantiationException,
IllegalAccessException {
MutableFolderTypeDefinition cmisFolderType;
Added: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/resources/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="test.log" filePattern="test-%i.log" append="false">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="1" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml Tue Dec 22 09:06:07 2015
@@ -61,6 +61,19 @@
<version>2.4</version>
<scope>provided</scope>
</dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeValidator.java Tue Dec 22 09:06:07 2015
@@ -252,6 +252,7 @@ public final class TypeValidator {
validateProperties(typeDef, properties, checkMandatory, false);
}
+ @SuppressWarnings("unchecked")
public static <T> void validateProperties(TypeDefinition typeDef, Properties properties, boolean checkMandatory,
boolean cmis11) {
List<String> propDefsRequired = getMandatoryPropDefs(typeDef.getPropertyDefinitions());
@@ -290,6 +291,7 @@ public final class TypeValidator {
}
}
+ @SuppressWarnings("unchecked")
public static <T> void validateProperties(List<TypeDefinition> typeDefs, Properties properties,
boolean checkMandatory) {
if (properties == null) {
Added: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/resources/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="test.log" filePattern="test-%i.log" append="false">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="1" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml Tue Dec 22 09:06:07 2015
@@ -26,10 +26,7 @@
<properties>
<parentBasedir>../../</parentBasedir>
- <modeshape.version>3.2.0.Final</modeshape.version>
- <jackrabbit-core.version>2.6.1</jackrabbit-core.version>
- <maven-jetty-plugin.version>6.1.22</maven-jetty-plugin.version>
- <jcr.version>2.0</jcr.version>
+ <tomcat.version>7.0.67</tomcat.version>
<overlay.groupId />
<overlay.artifactId />
<factory.class />
@@ -62,15 +59,17 @@
<overlay>
<groupId>${overlay.groupId}</groupId>
<artifactId>${overlay.artifactId}</artifactId>
+ <includes>
+ </includes>
</overlay>
</overlays>
- <webResources>
+ <webResources>
<resource>
<directory>${project.basedir}/src/main/webapp/WEB-INF</directory>
<filtering>true</filtering>
<targetPath>WEB-INF</targetPath>
<includes>
- <include>**/*.*</include>
+ <include>**</include>
</includes>
</resource>
</webResources>
@@ -79,44 +78,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${failsafe.version}</version>
<configuration>
<encoding>UTF-8</encoding>
<reuseForks>true</reuseForks>
<forkCount>1</forkCount>
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>${maven-jetty-plugin.version}</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <stopPort>19966</stopPort>
- <stopKey>foo</stopKey>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>19080</port>
- <host>0.0.0.0</host>
- </connector>
- </connectors>
- <systemProperties>
- <systemProperty>
+ <systemPropertyVariables>
+ <systemProperty>
<name>org.apache.chemistry.opencmis.session.repository.id</name>
<value>${repository}</value>
</systemProperty>
@@ -152,28 +120,19 @@
<name>project.build.directory</name>
<value>${project.build.directory}</value>
</systemProperty>
- </systemProperties>
- <webAppConfig>
- <contextPath>/opencmis</contextPath>
- </webAppConfig>
+ </systemPropertyVariables>
</configuration>
<executions>
<execution>
- <id>start-jetty</id>
- <phase>pre-integration-test</phase>
+ <id>integration-test</id>
<goals>
- <goal>run-war</goal>
+ <goal>integration-test</goal>
</goals>
- <configuration>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- <daemon>true</daemon>
- </configuration>
</execution>
<execution>
- <id>stop-jetty</id>
- <phase>post-integration-test</phase>
+ <id>verify</id>
<goals>
- <goal>stop</goal>
+ <goal>verify</goal>
</goals>
</execution>
</executions>
@@ -194,66 +153,43 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-logging-juli</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jul</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ -->
</dependencies>
<profiles>
<profile>
- <id>jcr-modeshape-inmemory</id>
- <properties>
- <overlay.groupId>org.apache.chemistry.opencmis</overlay.groupId>
- <overlay.artifactId>chemistry-opencmis-server-jcr</overlay.artifactId>
- <factory.class>org.apache.chemistry.opencmis.jcr.JcrServiceFactory</factory.class>
- <!-- Used in ServiceLoader to look up impl. -->
- <service.factory.class>org.modeshape.jcr.JcrRepositoryFactory</service.factory.class>
- <repository>test</repository>
- <default.documentType>cmis:document</default.documentType>
- <default.versionableDocumentType>cmis:document</default.versionableDocumentType>
- <test.versionable>true</test.versionable>
- <test.notVersionable>false</test.notVersionable>
- <forkMode>never</forkMode>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.modeshape</groupId>
- <artifactId>modeshape-jcr</artifactId>
- <version>${modeshape.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>tika-parsers</artifactId>
- <groupId>org.apache.tika</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.chemistry.opencmis</groupId>
- <artifactId>chemistry-opencmis-server-jcr</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.chemistry.opencmis</groupId>
- <artifactId>chemistry-opencmis-server-bindings</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.chemistry.opencmis</groupId>
- <artifactId>chemistry-opencmis-server-jcr</artifactId>
- <version>${project.version}</version>
- <classifier>classes</classifier>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>chemistry-inmemory</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -277,74 +213,7 @@
<version>${project.version}</version>
<type>war</type>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
</dependencies>
</profile>
- <profile>
- <id>jcr-jackrabbit-inmemory</id>
- <properties>
- <overlay.groupId>${project.groupId}</overlay.groupId>
- <overlay.artifactId>chemistry-opencmis-server-bindings-war</overlay.artifactId>
- <factory.class>org.apache.chemistry.opencmis.jcr.JcrServiceFactory</factory.class>
- <!-- Used in ServiceLoader to look up impl. -->
- <service.factory.class>org.apache.jackrabbit.core.RepositoryFactoryImpl</service.factory.class>
- <repository>default</repository>
- <user>admin</user>
- <password>admin</password>
- <default.documentType>cmis:document</default.documentType>
- <default.versionableDocumentType>cmis:document</default.versionableDocumentType>
- <test.versionable>true</test.versionable>
- <test.notVersionable>false</test.notVersionable>
- <forkMode>never</forkMode>
- </properties>
- <dependencies>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>${jcr.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${jackrabbit-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.chemistry.opencmis</groupId>
- <artifactId>chemistry-opencmis-server-jcr</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.chemistry.opencmis</groupId>
- <artifactId>chemistry-opencmis-server-bindings</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.chemistry.opencmis</groupId>
- <artifactId>chemistry-opencmis-server-jcr</artifactId>
- <version>${project.version}</version>
- <classifier>classes</classifier>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
Added: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- InMemory logs -->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="fit-webapp.log" filePattern="fit-webapp-%i.log" append="true">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="10" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository.properties
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository.properties?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository.properties (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/main/webapp/WEB-INF/classes/repository.properties Tue Dec 22 09:06:07 2015
@@ -44,11 +44,3 @@ RepositoryFiller.DocumentProperty.0=Stri
#RepositoryFiller.FolderProperty.0=StringFolderProp
mount-path=/
-
-#Jackrabbit properties
-#jcr.org.apache.jackrabbit.repository.uri=file:///{project.basedir}/target/jcr-repository
-jcr.org.apache.jackrabbit.repository.home={project.basedir}/target/jackrabbit-repo
-jcr.org.apache.jackrabbit.repository.conf={project.basedir}/src/test/resources/jackrabbit-repository-memory.xml
-
-#Modeshape properties
-jcr.org.modeshape.jcr.URL=file:///{project.basedir}/src/test/resources/modeshape-repository-memory.json
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/tck/AbstractTckIT.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/tck/AbstractTckIT.java?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/tck/AbstractTckIT.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/tck/AbstractTckIT.java Tue Dec 22 09:06:07 2015
@@ -18,7 +18,7 @@
*/
package org.apache.chemistry.opencmis.fit.tck;
-import static org.apache.chemistry.opencmis.commons.impl.CollectionsHelper.*;
+import static org.apache.chemistry.opencmis.commons.impl.CollectionsHelper.isNullOrEmpty;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
@@ -28,6 +28,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.startup.Tomcat;
import org.apache.chemistry.opencmis.commons.SessionParameter;
import org.apache.chemistry.opencmis.commons.enums.BindingType;
import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
@@ -40,7 +42,9 @@ import org.apache.chemistry.opencmis.tck
import org.apache.chemistry.opencmis.tck.impl.TestParameters;
import org.apache.chemistry.opencmis.tck.report.TextReport;
import org.apache.chemistry.opencmis.tck.runner.AbstractRunner;
+import org.junit.AfterClass;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
public abstract class AbstractTckIT extends AbstractRunner {
@@ -93,6 +97,77 @@ public abstract class AbstractTckIT exte
return parameters;
}
+ private static Tomcat tomcat;
+ private static File tomcateBaseDir;
+
+ @BeforeClass
+ public static void startTomcat() throws LifecycleException, InterruptedException {
+ File targetDir = new File(System.getProperty("project.build.directory", "./target"));
+
+ File warFile = null;
+ for (File child : targetDir.listFiles()) {
+ if (child.getName().endsWith(".war")) {
+ warFile = child;
+ }
+ }
+
+ if (warFile == null) {
+ throw new RuntimeException("OpenCMIS WAR file not found!");
+ }
+
+ tomcateBaseDir = new File(targetDir, "tomcat.base");
+ if (!tomcateBaseDir.exists()) {
+ tomcateBaseDir.mkdir();
+ }
+
+ // Logger.getLogger("").setLevel(Level.WARNING);
+ System.setProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager");
+
+ tomcat = new Tomcat();
+ tomcat.setBaseDir(tomcateBaseDir.getAbsolutePath());
+ tomcat.setPort(PORT);
+ // tomcat.setSilent(true);
+ tomcat.getHost().setCreateDirs(true);
+ tomcat.getHost().setDeployOnStartup(true);
+ tomcat.getHost().setAutoDeploy(false);
+
+ File appDir = new File(tomcateBaseDir, tomcat.getHost().getAppBase());
+ if (!appDir.exists()) {
+ appDir.mkdir();
+ }
+
+ // Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).setLevel(Level.WARNING);
+
+ tomcat.addWebapp(null, "/opencmis", warFile.getAbsolutePath());
+ tomcat.init();
+ tomcat.start();
+
+ Thread.sleep(5000);
+ }
+
+ @AfterClass
+ public static void stopTomcat() throws LifecycleException, InterruptedException {
+ tomcat.stop();
+ tomcat.destroy();
+ deleteDirectory(tomcateBaseDir);
+ }
+
+ private static boolean deleteDirectory(File dir) {
+ if (!dir.exists()) {
+ return false;
+ }
+
+ for (File file : dir.listFiles()) {
+ if (file.isDirectory()) {
+ deleteDirectory(file);
+ } else {
+ file.delete();
+ }
+ }
+
+ return dir.delete();
+ }
+
@Before
public void checkTest() {
assumeTrue("Skipping all TCK tests.", getSystemPropertyBoolean(TEST));
Added: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- Tomcat logs -->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="fit.log" filePattern="fit-%i.log" append="true">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="1" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/pom.xml Tue Dec 22 09:06:07 2015
@@ -80,10 +80,15 @@
<version>2.0.1</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
</dependencies>
</project>
Added: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/resources/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/resources/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/resources/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="test.log" filePattern="test-%i.log" append="false">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="1" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p [%t] %c: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ <!--
+ <Logger name="org.apache.chemistry.opencmis.tools" level="debug"/>
+ <Logger name="org.apache.chemistry.opencmis.server.support.filter" level="info"/>
+ -->
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/pom.xml Tue Dec 22 09:06:07 2015
@@ -33,5 +33,18 @@
<artifactId>chemistry-opencmis-client-bindings</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Added: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/resources/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/resources/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/resources/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="test-util.log" filePattern="test-util-%i.log" append="false">
+ <PatternLayout pattern="%d{ISO8601} %-5p: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="1" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ <Logger name="org.apache.chemistry.opencmis.util" level="warn"/>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Added: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/test/resources/log4j2.xml?rev=1721318&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/test/resources/log4j2.xml (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/test/resources/log4j2.xml Tue Dec 22 09:06:07 2015
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<Configuration status="warn">
+ <Appenders>
+ <RollingFile name="FILE" fileName="test.log" filePattern="test-%i.log" append="false">
+ <PatternLayout pattern="%d{ISO8601} %-5p: %m%n" />
+ <SizeBasedTriggeringPolicy size="100KB" />
+ <DefaultRolloverStrategy max="1" />
+ </RollingFile>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601} %-5p: %m%n" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="warn">
+ <AppenderRef ref="FILE" />
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ <Logger name="org.apache.chemistry.opencmis.util" level="warn"/>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/pom.xml Tue Dec 22 09:06:07 2015
@@ -243,13 +243,13 @@
<version>2.4.5</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientWriterAppender.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientWriterAppender.java?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientWriterAppender.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientWriterAppender.java Tue Dec 22 09:06:07 2015
@@ -18,13 +18,30 @@
*/
package org.apache.chemistry.opencmis.workbench;
+import java.io.Serializable;
+
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
-import org.apache.log4j.WriterAppender;
-import org.apache.log4j.spi.LoggingEvent;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.StringLayout;
+import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginElement;
+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.layout.PatternLayout;
+
+@Plugin(name = "ClientWriterAppender", category = "Core", elementType = "appender")
+public class ClientWriterAppender extends AbstractAppender {
+
+ protected ClientWriterAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout) {
+ super(name, filter, layout);
+ }
-public class ClientWriterAppender extends WriterAppender {
+ private static final long serialVersionUID = 1L;
private static JTextArea logTextArea = null;
@@ -33,18 +50,37 @@ public class ClientWriterAppender extend
}
@Override
- public void append(LoggingEvent loggingEvent) {
+ public void append(LogEvent event) {
if (logTextArea == null) {
return;
}
- final String message = layout.format(loggingEvent);
+ final String message = ((StringLayout) getLayout()).toSerializable(event);
+
+ if (message.length() > 0) {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ logTextArea.append(message);
+ }
+ });
+ }
+ }
+
+ @PluginFactory
+ public static ClientWriterAppender createAppender(@PluginAttribute("name") String name,
+ @PluginAttribute("ignoreExceptions") boolean ignoreExceptions, @PluginElement("Layout") Layout<?> layout,
+ @PluginElement("Filters") Filter filter) {
+
+ if (name == null) {
+ LOGGER.error("No name provided for ClientWriterAppender");
+ return null;
+ }
+
+ if (layout == null) {
+ layout = PatternLayout.createDefaultLayout();
+ }
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- logTextArea.append(message);
- }
- });
+ return new ClientWriterAppender(name, filter, (StringLayout) layout);
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java?rev=1721318&r1=1721317&r2=1721318&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/LogFrame.java Tue Dec 22 09:06:07 2015
@@ -34,8 +34,10 @@ import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.WindowConstants;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
public class LogFrame extends JFrame {
@@ -84,11 +86,15 @@ public class LogFrame extends JFrame {
Level.OFF.toString() };
final JComboBox<String> levelBox = new JComboBox<String>(levels);
- levelBox.setSelectedItem(Logger.getRootLogger().getLevel().toString());
+ levelBox.setSelectedItem(LogManager.getRootLogger().getLevel().toString());
levelBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- Logger.getRootLogger().setLevel(Level.toLevel(levelBox.getSelectedItem().toString()));
+ LoggerContext logContext = (LoggerContext) LogManager.getContext(false);
+ Configuration configuration = logContext.getConfiguration();
+ configuration.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(
+ Level.toLevel(levelBox.getSelectedItem().toString()));
+ logContext.updateLoggers(configuration);
}
});
inputPanel.add(levelBox);