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 2013/08/20 00:12:09 UTC
svn commit: r1515639 [2/3] - in /chemistry/opencmis/trunk:
chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/
chemistry-opencmis-android/chemistry-opencmis-android-clien...
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java Mon Aug 19 22:12:07 2013
@@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingExcept
import java.math.BigInteger;
import org.apache.chemistry.opencmis.commons.data.ContentStream;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
/**
* Content stream data implementation.
@@ -57,12 +58,15 @@ public class ContentStreamImpl extends A
* Convenience constructor for tests.
*/
public ContentStreamImpl(String filename, String mimetype, String string) {
- byte[] bytes;
+ if (string == null) {
+ throw new IllegalArgumentException("String must be set!");
+ }
+
+ byte[] bytes = null;
try {
bytes = string.getBytes("UTF-8");
} catch (UnsupportedEncodingException e) {
- // cannot happen
- bytes = string.getBytes();
+ throw new CmisRuntimeException("Unsupported encoding 'UTF-8'!", e);
}
this.filename = filename;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java Mon Aug 19 22:12:07 2013
@@ -62,6 +62,7 @@ public class ObjectDataImpl extends Abst
try {
return BaseTypeId.fromValue((String) value);
} catch (Exception e) {
+ // invalid base type -> return null
}
}
@@ -155,7 +156,7 @@ public class ObjectDataImpl extends Abst
public String toString() {
return "Object Data [properties=" + properties + ", allowable actions=" + allowableActions
+ ", change event info=" + changeEventInfo + ", ACL=" + acl + ", is exact ACL=" + isExactAcl
- + ", policy ids=" + policyIds + ", relationships=" + relationships + ", renditions=" + renditions
- + "]" + super.toString();
+ + ", policy ids=" + policyIds + ", relationships=" + relationships + ", renditions=" + renditions + "]"
+ + super.toString();
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PermissionDefinitionDataImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PermissionDefinitionDataImpl.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PermissionDefinitionDataImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PermissionDefinitionDataImpl.java Mon Aug 19 22:12:07 2013
@@ -38,14 +38,6 @@ public class PermissionDefinitionDataImp
this.permission = permission;
}
- /**
- * @deprecated use {@link #setId(String)} instead
- */
- @Deprecated
- public void setPermission(String permission) {
- this.permission = permission;
- }
-
public String getDescription() {
return description;
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONValue.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONValue.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONValue.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/json/JSONValue.java Mon Aug 19 22:12:07 2013
@@ -26,8 +26,8 @@ import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
-import org.apache.chemistry.opencmis.commons.impl.json.parser.JSONParser;
import org.apache.chemistry.opencmis.commons.impl.json.parser.JSONParseException;
+import org.apache.chemistry.opencmis.commons.impl.json.parser.JSONParser;
/**
* (Taken from JSON.simple <http://code.google.com/p/json-simple/> and modified
Added: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/IOUtilsTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/IOUtilsTest.java?rev=1515639&view=auto
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/IOUtilsTest.java (added)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/IOUtilsTest.java Mon Aug 19 22:12:07 2013
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+package org.apache.chemistry.opencmis.commons.impl.misc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.chemistry.opencmis.commons.impl.IOUtils;
+import org.junit.Test;
+
+public class IOUtilsTest {
+
+ @Test
+ public void testEncoding() {
+ String url = "http://example.com/abc?key=äöü @!§$%&/";
+
+ assertEquals(url, IOUtils.decodeURL(IOUtils.encodeURL(url)));
+ assertNull(IOUtils.encodeURL(null));
+ assertNull(IOUtils.decodeURL(null));
+ }
+
+ @Test
+ public void testConsumeAndClose() {
+ ByteArrayInputStream stream = new ByteArrayInputStream(IOUtils.getUTF8Bytes("test"));
+
+ IOUtils.consumeAndClose(stream);
+ assertEquals(0, stream.available());
+ }
+
+ @Test
+ public void testFirstLine() throws IOException {
+ String content = "line 1\nline 2\nline 3";
+ InputStream stream = createStream(content);
+
+ assertEquals("line 1", IOUtils.readFirstLine(stream));
+ }
+
+ @Test
+ public void testAllLines() throws IOException {
+ String content = "line 1\nline 2\nline 3";
+ InputStream stream = createStream(content);
+
+ assertEquals("line 1\nline 2\nline 3\n", IOUtils.readAllLines(stream));
+ }
+
+ @Test
+ public void testAllLinesAndSkipHeader1() throws IOException {
+ String content = "#header\n\nline 1\nline 2";
+ InputStream stream = createStream(content);
+
+ assertEquals("line 1\nline 2\n", IOUtils.readAllLinesAndRemoveHeader(stream));
+ }
+
+ @Test
+ public void testAllLinesAndSkipHeader2() throws IOException {
+ String content = "/* header 1\n * header 2\n*/\n\nline 1\nline 2";
+ InputStream stream = createStream(content);
+
+ assertEquals("line 1\nline 2\n", IOUtils.readAllLinesAndRemoveHeader(stream));
+ }
+
+ @Test
+ public void testIgnoreComments() throws IOException {
+ String content = "#comment1\n\nline 1\n # comment 2\nline 2\nline 3";
+ InputStream stream = createStream(content);
+
+ assertEquals("line 1\nline 2\nline 3\n", IOUtils.readAllLinesAndIgnoreComments(stream));
+ }
+
+ @Test
+ public void testAsList() throws IOException {
+ String content = "#comment1\n\nline 1\n # comment 2\nline 2\nline 3";
+ InputStream stream = createStream(content);
+
+ List<String> list = IOUtils.readAllLinesAsList(stream);
+
+ assertNotNull(list);
+ assertEquals(3, list.size());
+ assertEquals("line 1", list.get(0));
+ assertEquals("line 2", list.get(1));
+ assertEquals("line 3", list.get(2));
+ }
+
+ @Test
+ public void testAsMap() throws IOException {
+ String content = "#comment1\nkey1\n # comment 2\nkey2=value2\nkey3 = value3";
+ InputStream stream = createStream(content);
+
+ Map<String, String> map = IOUtils.readAllLinesAsMap(stream);
+
+ assertNotNull(map);
+ assertEquals(3, map.size());
+ assertEquals("", map.get("key1"));
+ assertEquals("value2", map.get("key2"));
+ assertEquals("value3", map.get("key3"));
+ }
+
+ private InputStream createStream(String content) {
+ return new ByteArrayInputStream(IOUtils.getUTF8Bytes(content));
+ }
+}
Propchange: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/IOUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/xml/AbstractXMLConverterTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/xml/AbstractXMLConverterTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/xml/AbstractXMLConverterTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/xml/AbstractXMLConverterTest.java Mon Aug 19 22:12:07 2013
@@ -59,6 +59,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.data.PropertyId;
import org.apache.chemistry.opencmis.commons.enums.CmisVersion;
import org.apache.chemistry.opencmis.commons.enums.PropertyType;
+import org.apache.chemistry.opencmis.commons.impl.IOUtils;
import org.apache.chemistry.opencmis.commons.impl.XMLConstants;
import org.apache.chemistry.opencmis.commons.impl.XMLUtils;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.AbstractPropertyData;
@@ -144,14 +145,14 @@ public abstract class AbstractXMLConvert
InputStream schema10stream = AbstractXMLConverterTest.class.getResourceAsStream("/schema/cmis10/CMIS-core.xsd");
if (schema10stream != null) {
StreamSource core10 = new StreamSource(schema10stream);
- StreamSource test10 = new StreamSource(new ByteArrayInputStream(TEST_SCHEMA10.getBytes("UTF-8")));
+ StreamSource test10 = new StreamSource(new ByteArrayInputStream(IOUtils.getUTF8Bytes(TEST_SCHEMA10)));
schema10 = sf.newSchema(new Source[] { core10, test10 });
}
InputStream schema11stream = AbstractXMLConverterTest.class.getResourceAsStream("/schema/cmis11/CMIS-core.xsd");
if (schema11stream != null) {
StreamSource core11 = new StreamSource(schema11stream);
- StreamSource test11 = new StreamSource(new ByteArrayInputStream(TEST_SCHEMA11.getBytes("UTF-8")));
+ StreamSource test11 = new StreamSource(new ByteArrayInputStream(IOUtils.getUTF8Bytes(TEST_SCHEMA11)));
schema11 = sf.newSchema(new Source[] { core11, test11 });
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomDocumentBase.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomDocumentBase.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomDocumentBase.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomDocumentBase.java Mon Aug 19 22:12:07 2013
@@ -18,18 +18,16 @@
*/
package org.apache.chemistry.opencmis.server.impl.atompub;
-import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
-import java.net.URLEncoder;
import java.util.GregorianCalendar;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
import org.apache.chemistry.opencmis.commons.impl.Base64;
import org.apache.chemistry.opencmis.commons.impl.Constants;
import org.apache.chemistry.opencmis.commons.impl.DateTimeHelper;
+import org.apache.chemistry.opencmis.commons.impl.IOUtils;
import org.apache.chemistry.opencmis.commons.impl.XMLConstants;
import org.apache.chemistry.opencmis.commons.impl.XMLUtils;
@@ -49,11 +47,7 @@ public abstract class AtomDocumentBase e
return ID_DUMMY;
}
- try {
- return ID_PREFIX + Base64.encodeBytes(input.getBytes("UTF-8"));
- } catch (UnsupportedEncodingException e) {
- return ID_DUMMY;
- }
+ return ID_PREFIX + Base64.encodeBytes(IOUtils.getUTF8Bytes(input));
}
/**
@@ -177,12 +171,8 @@ public abstract class AtomDocumentBase e
}
public void writeServiceLink(String href, String repositoryId) throws XMLStreamException {
- try {
- writeLink(Constants.REL_SERVICE, href + "?repositoryId=" + URLEncoder.encode(repositoryId, "UTF-8"),
- Constants.MEDIATYPE_SERVICE, null);
- } catch (UnsupportedEncodingException e) {
- throw new CmisRuntimeException("Unsupported encoding 'UTF-8'", e);
- }
+ writeLink(Constants.REL_SERVICE, href + "?repositoryId=" + IOUtils.encodeURL(repositoryId),
+ Constants.MEDIATYPE_SERVICE, null);
}
public void writeSelfLink(String href, String type, String id) throws XMLStreamException {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java Mon Aug 19 22:12:07 2013
@@ -420,7 +420,7 @@ public class AtomEntryParser {
cappedStream.deductBytes(bytes.length);
}
} else if (event == XMLStreamReader.START_ELEMENT) {
- throw new RuntimeException("Unexpected tag: " + parser.getName());
+ throw new CmisInvalidArgumentException("Unexpected tag: " + parser.getName());
}
if (!XMLUtils.next(parser)) {
@@ -469,7 +469,7 @@ public class AtomEntryParser {
cappedStream.deductBytes(len);
}
} else if (event == XMLStreamReader.START_ELEMENT) {
- throw new RuntimeException("Unexpected tag: " + parser.getName());
+ throw new CmisInvalidArgumentException("Unexpected tag: " + parser.getName());
}
if (!XMLUtils.next(parser)) {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/AbstractBrowserServiceCall.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/AbstractBrowserServiceCall.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/AbstractBrowserServiceCall.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/AbstractBrowserServiceCall.java Mon Aug 19 22:12:07 2013
@@ -19,10 +19,8 @@
package org.apache.chemistry.opencmis.server.impl.browser;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.GregorianCalendar;
@@ -44,9 +42,9 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
import org.apache.chemistry.opencmis.commons.impl.Base64;
import org.apache.chemistry.opencmis.commons.impl.Constants;
+import org.apache.chemistry.opencmis.commons.impl.IOUtils;
import org.apache.chemistry.opencmis.commons.impl.TypeCache;
import org.apache.chemistry.opencmis.commons.impl.UrlBuilder;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlEntryImpl;
@@ -181,7 +179,7 @@ public abstract class AbstractBrowserSer
return "cmis%";
}
- return "cmis_" + Base64.encodeBytes(token.getBytes()).replace('=', '%');
+ return "cmis_" + Base64.encodeBytes(IOUtils.getUTF8Bytes(token)).replace('=', '%');
}
/**
@@ -205,12 +203,7 @@ public abstract class AbstractBrowserSer
public void setCookie(HttpServletRequest request, HttpServletResponse response, String repositoryId, String token,
String value, int expiry) {
if (token != null && token.length() > 0) {
- String cookieValue = value;
- try {
- cookieValue = URLEncoder.encode(value, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new CmisRuntimeException("Unsupported encoding 'UTF-8'", e);
- }
+ String cookieValue = IOUtils.encodeURL(value);
Cookie transactionCookie = new Cookie(getCookieName(token), cookieValue);
transactionCookie.setMaxAge(expiry);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ControlParser.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ControlParser.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ControlParser.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/ControlParser.java Mon Aug 19 22:12:07 2013
@@ -109,6 +109,7 @@ public class ControlParser {
result = -1;
}
} catch (NumberFormatException e) {
+ // return default value (-1)
}
return result;
@@ -131,6 +132,7 @@ public class ControlParser {
result = -1;
}
} catch (NumberFormatException e) {
+ // return default value (-1)
}
return result;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/MultipartParser.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/MultipartParser.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/MultipartParser.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/MultipartParser.java Mon Aug 19 22:12:07 2013
@@ -124,7 +124,8 @@ public class MultipartParser {
byte[][] values = rawFields.get(name);
if (values == null) {
- rawFields.put(name, new byte[][] { value });
+ byte[][] newValue = new byte[][] { value };
+ rawFields.put(name, newValue);
} else {
byte[][] newValues = new byte[values.length + 1][];
System.arraycopy(values, 0, newValues, 0, values.length);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RepositoryService.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RepositoryService.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RepositoryService.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/RepositoryService.java Mon Aug 19 22:12:07 2013
@@ -28,7 +28,6 @@ import static org.apache.chemistry.openc
import static org.apache.chemistry.opencmis.commons.impl.Constants.PARAM_TYPE_ID;
import java.math.BigInteger;
-import java.net.URLDecoder;
import java.util.List;
import java.util.Map;
@@ -42,6 +41,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinitionList;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
+import org.apache.chemistry.opencmis.commons.impl.IOUtils;
import org.apache.chemistry.opencmis.commons.impl.JSONConverter;
import org.apache.chemistry.opencmis.commons.impl.json.JSONArray;
import org.apache.chemistry.opencmis.commons.impl.json.JSONObject;
@@ -128,7 +128,7 @@ public class RepositoryService {
if (request.getCookies() != null) {
for (Cookie cookie : request.getCookies()) {
if (cookieName.equals(cookie.getName())) {
- cookieValue = URLDecoder.decode(cookie.getValue(), "UTF-8");
+ cookieValue = IOUtils.decodeURL(cookie.getValue());
break;
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java Mon Aug 19 22:12:07 2013
@@ -506,8 +506,9 @@ public class ObjectService extends Abstr
List<BulkUpdateObjectIdAndChangeToken> result = service.bulkUpdateProperties(repositoryId,
objectIdsAndChangeTokens, properties, addSecondaryTypeIds, removeSecondaryTypeIds, extData);
- if (objectIdAndChangeToken != null) {
- // TODO: fix
+ if (objectIdAndChangeToken != null && result != null) {
+ // TODO: add workaround
+ // see: https://tools.oasis-open.org/issues/browse/CMIS-754
}
setExtensionValues(extData, extension);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java Mon Aug 19 22:12:07 2013
@@ -72,6 +72,7 @@ public final class ExceptionHelper {
return node;
}
} catch (Exception e) {
+ assert false;
}
return null;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java Mon Aug 19 22:12:07 2013
@@ -18,13 +18,11 @@
*/
package org.apache.chemistry.opencmis.server.shared;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
+import org.apache.chemistry.opencmis.commons.impl.IOUtils;
public class HttpUtils {
@@ -67,12 +65,7 @@ public class HttpUtils {
String[] result = p.substring(1).split("/");
for (int i = 0; i < result.length; i++) {
- try {
- result[i] = URLDecoder.decode(result[i], "UTF-8");
- } catch (UnsupportedEncodingException e) {
- // should not happen
- throw new CmisRuntimeException("Unsupported encoding 'UTF-8'", e);
- }
+ result[i] = IOUtils.decodeURL(result[i]);
}
return result;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/QueryStringHttpServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/QueryStringHttpServletRequestWrapper.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/QueryStringHttpServletRequestWrapper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/QueryStringHttpServletRequestWrapper.java Mon Aug 19 22:12:07 2013
@@ -19,7 +19,6 @@
package org.apache.chemistry.opencmis.server.shared;
import java.io.IOException;
-import java.net.URLDecoder;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -28,6 +27,8 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
+import org.apache.chemistry.opencmis.commons.impl.IOUtils;
+
/**
* HttpServletRequest wrapper that reads the query string in container
* independent way and decodes the parameter values with UTF-8.
@@ -57,12 +58,12 @@ public class QueryStringHttpServletReque
for (String nameValuePair : nameValuePairs) {
int x = nameValuePair.indexOf('=');
if (x > 0) {
- String name = URLDecoder.decode(nameValuePair.substring(0, x), "UTF-8");
- String value = (x == nameValuePair.length() - 1 ? "" : URLDecoder.decode(
- nameValuePair.substring(x + 1), "UTF-8"));
+ String name = IOUtils.decodeURL(nameValuePair.substring(0, x));
+ String value = (x == nameValuePair.length() - 1 ? "" : IOUtils
+ .decodeURL(nameValuePair.substring(x + 1)));
addParameter(name, value);
} else {
- String name = URLDecoder.decode(nameValuePair, "UTF-8");
+ String name = IOUtils.decodeURL(nameValuePair);
addParameter(name, (String) null);
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStreamFactory.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStreamFactory.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStreamFactory.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ThresholdOutputStreamFactory.java Mon Aug 19 22:12:07 2013
@@ -23,7 +23,7 @@ import java.io.File;
/**
* A factory for {@link ThresholdOutputStream} objects.
*/
-public class ThresholdOutputStreamFactory {
+public final class ThresholdOutputStreamFactory {
private File tempDir;
private int memoryThreshold;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/MultipartParserTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/MultipartParserTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/MultipartParserTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/MultipartParserTest.java Mon Aug 19 22:12:07 2013
@@ -75,13 +75,13 @@ public class MultipartParserTest {
byte[] content = "Test content!".getBytes("ISO-8859-1");
byte[] formdata = ("\r\n--"
+ boundary
- + "\r\nContent-Disposition: form-data; name=\"fileUploader\"; filename=\"ä.txt\"\r\nContent-Type: text/plain\r\n\r\n"
+ + "\r\nContent-Disposition: form-data; name=\"fileUploader\"; filename=\"Ã.txt\"\r\nContent-Type: text/plain\r\n\r\n"
+ new String(content) + "\r\n--" + boundary
+ "\r\nContent-Disposition: form-data; name=\"fileUploader-data\"\r\n\r\n\r\n--" + boundary
+ "\r\nContent-Disposition: form-data; name=\"objectid\"\r\n\r\nf6bad54b4696bf2ac9249805\r\n--"
+ boundary + "\r\nContent-Disposition: form-data; name=\"cmisaction\"\r\n\r\ncreateDocument\r\n--"
+ boundary + "\r\nContent-Disposition: form-data; name=\"propertyId[0]\"\r\n\r\ncmis:name\r\n--"
- + boundary + "\r\nContent-Disposition: form-data; name=\"propertyValue[0]\"\r\n\r\nä.txt\r\n--"
+ + boundary + "\r\nContent-Disposition: form-data; name=\"propertyValue[0]\"\r\n\r\nÃ.txt\r\n--"
+ boundary
+ "\r\nContent-Disposition: form-data; name=\"propertyId[1]\"\r\n\r\ncmis:objectTypeId\r\n--"
+ boundary + "\r\nContent-Disposition: form-data; name=\"propertyValue[1]\"\r\n\r\ncmis:document\r\n--"
@@ -96,12 +96,12 @@ public class MultipartParserTest {
values.put("objectid", "f6bad54b4696bf2ac9249805");
values.put("cmisaction", "createDocument");
values.put("propertyId[0]", "cmis:name");
- values.put("propertyValue[0]", "ä.txt");
+ values.put("propertyValue[0]", "Ã.txt");
values.put("propertyId[1]", "cmis:objectTypeId");
values.put("propertyValue[1]", "cmis:document");
values.put("token", "855475d8a6169b5f57111f5921f56136");
- assertMultipartBasics(parser, 9, values, true, "ä.txt", "text/plain", content);
+ assertMultipartBasics(parser, 9, values, true, "Ã.txt", "text/plain", content);
}
@Test
@@ -351,7 +351,7 @@ public class MultipartParserTest {
@Test(expected = CmisInvalidArgumentException.class)
public void testTwoContentParts() throws Exception {
String boundary = "-?-";
- byte[] content = "abcäöü".getBytes();
+ byte[] content = "abc������".getBytes();
byte[] formdata = ("\r\n--" + boundary + "\r\n"
+ "Content-Disposition: form-data; name=\"content1\"; filename=\"file1\"\r\n"
+ "Content-Type: application/something\r\n" + "Content-Transfer-Encoding: binary\r\n" + "\r\n"
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryServiceFactoryImpl.java Mon Aug 19 22:12:07 2013
@@ -62,7 +62,6 @@ import org.apache.chemistry.opencmis.inm
import org.apache.chemistry.opencmis.inmemory.storedobj.impl.StoreManagerFactory;
import org.apache.chemistry.opencmis.inmemory.storedobj.impl.StoreManagerImpl;
import org.apache.chemistry.opencmis.server.support.CmisServiceWrapper;
-import org.apache.chemistry.opencmis.server.support.TypeManager;
import org.apache.chemistry.opencmis.util.repository.ObjectGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.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/AclTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AclTest.java Mon Aug 19 22:12:07 2013
@@ -36,9 +36,9 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.inmemory.storedobj.impl.InMemoryAce;
import org.apache.chemistry.opencmis.inmemory.storedobj.impl.InMemoryAcl;
import org.apache.chemistry.opencmis.inmemory.storedobj.impl.Permission;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.junit.Test;
public class AclTest {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.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/ObjectCreator.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java Mon Aug 19 22:12:07 2013
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.Map.Entry;
import junit.framework.Assert;
+
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.data.Acl;
import org.apache.chemistry.opencmis.commons.data.ContentStream;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/ProcessQueryTest.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/query/ProcessQueryTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/ProcessQueryTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/ProcessQueryTest.java Mon Aug 19 22:12:07 2013
@@ -34,10 +34,10 @@ import org.apache.chemistry.opencmis.inm
import org.apache.chemistry.opencmis.server.support.query.CalendarHelper;
import org.apache.chemistry.opencmis.server.support.query.CmisQlStrictLexer;
import org.apache.chemistry.opencmis.server.support.query.TextSearchLexer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ProcessQueryTest extends AbstractQueryTest {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.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/query/QueryParseTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/query/QueryParseTest.java Mon Aug 19 22:12:07 2013
@@ -42,10 +42,10 @@ import org.apache.chemistry.opencmis.ser
import org.apache.chemistry.opencmis.server.support.query.QueryObject.SortSpec;
import org.apache.chemistry.opencmis.server.support.query.QueryUtilStrict;
import org.apache.chemistry.opencmis.server.support.query.TextSearchLexer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class QueryParseTest extends AbstractQueryTest {
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrBinary.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrBinary.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrBinary.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrBinary.java Mon Aug 19 22:12:07 2013
@@ -19,8 +19,6 @@
package org.apache.chemistry.opencmis.jcr;
-import javax.jcr.Binary;
-import javax.jcr.RepositoryException;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -31,6 +29,9 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.RandomAccessFile;
+import javax.jcr.Binary;
+import javax.jcr.RepositoryException;
+
/**
* <code>JcrBinary</code> implements the JCR <code>Binary</code> interface.
* This is mostly a copy from org.apache.jackrabbit.value.BinaryImpl in
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrDocument.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrDocument.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrDocument.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrDocument.java Mon Aug 19 22:12:07 2013
@@ -19,6 +19,17 @@
package org.apache.chemistry.opencmis.jcr;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Set;
+
+import javax.jcr.Binary;
+import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.Property;
+import javax.jcr.RepositoryException;
+
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.data.ContentStream;
import org.apache.chemistry.opencmis.commons.enums.Action;
@@ -34,16 +45,6 @@ import org.apache.chemistry.opencmis.jcr
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.Binary;
-import javax.jcr.Node;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
-import javax.jcr.RepositoryException;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Set;
-
/**
* Instances of this class represent a cmis:document backed by an underlying JCR <code>Node</code>.
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrService.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrService.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrService.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrService.java Mon Aug 19 22:12:07 2013
@@ -19,6 +19,15 @@
*/
package org.apache.chemistry.opencmis.jcr;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.jcr.Credentials;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
import org.apache.chemistry.opencmis.commons.data.Acl;
import org.apache.chemistry.opencmis.commons.data.AllowableActions;
import org.apache.chemistry.opencmis.commons.data.ContentStream;
@@ -42,14 +51,6 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.server.CallContext;
import org.apache.chemistry.opencmis.commons.spi.Holder;
-import javax.jcr.Credentials;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* JCR service implementation.
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrTypeManager.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrTypeManager.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrTypeManager.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrTypeManager.java Mon Aug 19 22:12:07 2013
@@ -18,6 +18,13 @@
*/
package org.apache.chemistry.opencmis.jcr;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.definitions.DocumentTypeDefinition;
import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition;
@@ -48,13 +55,6 @@ import org.apache.chemistry.opencmis.ser
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* Type Manager.
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrUnversionedDocument.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrUnversionedDocument.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrUnversionedDocument.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrUnversionedDocument.java Mon Aug 19 22:12:07 2013
@@ -19,13 +19,14 @@
package org.apache.chemistry.opencmis.jcr;
-import org.apache.chemistry.opencmis.commons.enums.Action;
-import org.apache.chemistry.opencmis.jcr.impl.DefaultUnversionedDocumentTypeHandler;
-import org.apache.chemistry.opencmis.jcr.type.JcrTypeHandlerManager;
+import java.util.Set;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import java.util.Set;
+
+import org.apache.chemistry.opencmis.commons.enums.Action;
+import org.apache.chemistry.opencmis.jcr.impl.DefaultUnversionedDocumentTypeHandler;
+import org.apache.chemistry.opencmis.jcr.type.JcrTypeHandlerManager;
/**
* Instances of this class represent a non versionable cmis:document backed by an underlying JCR <code>Node</code>.
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrVersionBase.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrVersionBase.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrVersionBase.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/JcrVersionBase.java Mon Aug 19 22:12:07 2013
@@ -19,6 +19,17 @@
package org.apache.chemistry.opencmis.jcr;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.version.Version;
+import javax.jcr.version.VersionException;
+import javax.jcr.version.VersionHistory;
+import javax.jcr.version.VersionIterator;
+
import org.apache.chemistry.opencmis.commons.data.ContentStream;
import org.apache.chemistry.opencmis.commons.data.Properties;
import org.apache.chemistry.opencmis.commons.enums.Action;
@@ -32,16 +43,6 @@ import org.apache.chemistry.opencmis.jcr
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.version.Version;
-import javax.jcr.version.VersionException;
-import javax.jcr.version.VersionHistory;
-import javax.jcr.version.VersionIterator;
-import java.util.Iterator;
-import java.util.Set;
-
/**
* Instances of this class represent a versionable cmis:document and its versions backed by an underlying
* JCR <code>Node</code>.
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/PathManager.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/PathManager.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/PathManager.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/PathManager.java Mon Aug 19 22:12:07 2013
@@ -19,14 +19,14 @@
package org.apache.chemistry.opencmis.jcr;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-
/**
* Utility class for mapping JCR paths to CMIS paths
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/PropertyHelper.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/PropertyHelper.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/PropertyHelper.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/PropertyHelper.java Mon Aug 19 22:12:07 2013
@@ -19,6 +19,11 @@
package org.apache.chemistry.opencmis.jcr;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.GregorianCalendar;
+import java.util.List;
+
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.data.Properties;
import org.apache.chemistry.opencmis.commons.data.PropertyData;
@@ -36,11 +41,6 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyUriImpl;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.GregorianCalendar;
-import java.util.List;
-
/**
* Helper class with utility functions for handling {@link Properties}.
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/impl/DefaultUnversionedDocumentTypeHandler.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/impl/DefaultUnversionedDocumentTypeHandler.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/impl/DefaultUnversionedDocumentTypeHandler.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/impl/DefaultUnversionedDocumentTypeHandler.java Mon Aug 19 22:12:07 2013
@@ -18,6 +18,10 @@
*/
package org.apache.chemistry.opencmis.jcr.impl;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.nodetype.NodeType;
+
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.enums.ContentStreamAllowed;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.DocumentTypeDefinitionImpl;
@@ -26,10 +30,6 @@ import org.apache.chemistry.opencmis.jcr
import org.apache.chemistry.opencmis.jcr.JcrUnversionedDocument;
import org.apache.chemistry.opencmis.jcr.query.IdentifierMap;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.NodeType;
-
/**
* Type handler that provides cmis:unversioned-document.
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/EvaluatorBase.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/EvaluatorBase.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/EvaluatorBase.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/EvaluatorBase.java Mon Aug 19 22:12:07 2013
@@ -19,11 +19,11 @@
package org.apache.chemistry.opencmis.jcr.query;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
-
import java.util.GregorianCalendar;
import java.util.List;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
+
/**
* This abstract base class implements all methods of the {@link Evaluator} interface
* by throwing a {@link CmisNotSupportedException}.
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/EvaluatorXPath.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/EvaluatorXPath.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/EvaluatorXPath.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/EvaluatorXPath.java Mon Aug 19 22:12:07 2013
@@ -19,12 +19,12 @@
package org.apache.chemistry.opencmis.jcr.query;
-import org.apache.chemistry.opencmis.jcr.util.ISO8601;
-import org.apache.chemistry.opencmis.jcr.util.Iterables;
-
import java.util.GregorianCalendar;
import java.util.List;
+import org.apache.chemistry.opencmis.jcr.util.ISO8601;
+import org.apache.chemistry.opencmis.jcr.util.Iterables;
+
/**
* This implementation of {@link Evaluator} results in an instance of a {@link XPathBuilder} which
* can be used to validated the where clause of the original CMIS query and translate it to a
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/IdentifierMapBase.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/IdentifierMapBase.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/IdentifierMapBase.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/IdentifierMapBase.java Mon Aug 19 22:12:07 2013
@@ -18,11 +18,11 @@
*/
package org.apache.chemistry.opencmis.jcr.query;
-import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
+
/**
* This abstract base class provides support for implementing {@link IdentifierMap}.
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/ParseTreeWalker.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/ParseTreeWalker.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/ParseTreeWalker.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/ParseTreeWalker.java Mon Aug 19 22:12:07 2013
@@ -19,6 +19,9 @@
package org.apache.chemistry.opencmis.jcr.query;
+import java.util.ArrayList;
+import java.util.List;
+
import org.antlr.runtime.tree.Tree;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
@@ -27,9 +30,6 @@ import org.apache.chemistry.opencmis.ser
import org.apache.chemistry.opencmis.server.support.query.PredicateWalkerBase;
import org.apache.chemistry.opencmis.server.support.query.TextSearchLexer;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* This implementation of {@link PredicateWalkerBase} traverses the parse tree of a CMIS query.
* It uses an {@link Evaluator} to accumulate the result of the traversal. <code>Evaluator</code>
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslator.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslator.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslator.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslator.java Mon Aug 19 22:12:07 2013
@@ -19,6 +19,8 @@
package org.apache.chemistry.opencmis.jcr.query;
+import java.util.List;
+
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.jcr.JcrTypeManager;
@@ -27,8 +29,6 @@ import org.apache.chemistry.opencmis.ser
import org.apache.chemistry.opencmis.server.support.query.QueryObject.SortSpec;
import org.apache.chemistry.opencmis.server.support.query.QueryUtil;
-import java.util.List;
-
/**
* Abstract base class for translating a CMIS query statement to a JCR XPath
* query statement.
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrDocumentTypeHandler.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrDocumentTypeHandler.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrDocumentTypeHandler.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrDocumentTypeHandler.java Mon Aug 19 22:12:07 2013
@@ -18,6 +18,9 @@
*/
package org.apache.chemistry.opencmis.jcr.type;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
import org.apache.chemistry.opencmis.commons.data.ContentStream;
import org.apache.chemistry.opencmis.commons.data.Properties;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
@@ -25,9 +28,6 @@ import org.apache.chemistry.opencmis.jcr
import org.apache.chemistry.opencmis.jcr.JcrFolder;
import org.apache.chemistry.opencmis.jcr.JcrNode;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-
/**
* Implemented by type handlers that provides a type that is or inherits from cmis:document.
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrFolderTypeHandler.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrFolderTypeHandler.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrFolderTypeHandler.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrFolderTypeHandler.java Mon Aug 19 22:12:07 2013
@@ -18,11 +18,11 @@
*/
package org.apache.chemistry.opencmis.jcr.type;
+import javax.jcr.Node;
+
import org.apache.chemistry.opencmis.commons.data.Properties;
import org.apache.chemistry.opencmis.jcr.JcrFolder;
-import javax.jcr.Node;
-
/**
* Implemented by type handlers that provides a type that is or inherits from cmis:folder.
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrTypeHandler.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrTypeHandler.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrTypeHandler.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrTypeHandler.java Mon Aug 19 22:12:07 2013
@@ -18,15 +18,15 @@
*/
package org.apache.chemistry.opencmis.jcr.type;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.jcr.JcrNode;
import org.apache.chemistry.opencmis.jcr.JcrTypeManager;
import org.apache.chemistry.opencmis.jcr.PathManager;
import org.apache.chemistry.opencmis.jcr.query.IdentifierMap;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-
/**
* Provides operations for a specific CMIS object type.
*
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrTypeHandlerManager.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrTypeHandlerManager.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrTypeHandlerManager.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/type/JcrTypeHandlerManager.java Mon Aug 19 22:12:07 2013
@@ -18,6 +18,12 @@
*/
package org.apache.chemistry.opencmis.jcr.type;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
import org.apache.chemistry.opencmis.jcr.JcrNode;
@@ -28,11 +34,6 @@ import org.apache.chemistry.opencmis.jcr
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Manages a set of registered type handlers.
*/
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/util/Iterables.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/util/Iterables.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/util/Iterables.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/main/java/org/apache/chemistry/opencmis/jcr/util/Iterables.java Mon Aug 19 22:12:07 2013
@@ -19,12 +19,12 @@
package org.apache.chemistry.opencmis.jcr.util;
+import java.util.Iterator;
+
import org.apache.commons.collections.iterators.EmptyIterator;
import org.apache.commons.collections.iterators.IteratorChain;
import org.apache.commons.collections.iterators.SingletonIterator;
-import java.util.Iterator;
-
public class Iterables {
private Iterables() {}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/JcrObservationJournalTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/JcrObservationJournalTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/JcrObservationJournalTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/JcrObservationJournalTest.java Mon Aug 19 22:12:07 2013
@@ -22,6 +22,7 @@ package org.apache.chemistry.opencmis.jc
import java.math.BigInteger;
import junit.framework.Assert;
+
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.data.ChangeEventInfo;
import org.apache.chemistry.opencmis.commons.data.ObjectList;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslatorTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslatorTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslatorTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/QueryTranslatorTest.java Mon Aug 19 22:12:07 2013
@@ -19,6 +19,12 @@
package org.apache.chemistry.opencmis.jcr.query;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.util.GregorianCalendar;
+
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
@@ -33,10 +39,6 @@ import org.apache.chemistry.opencmis.ser
import org.junit.Before;
import org.junit.Test;
-import java.util.GregorianCalendar;
-
-import static org.junit.Assert.*;
-
public class QueryTranslatorTest {
private String jcrTypeCondition;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/XPathBuilderTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/XPathBuilderTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/XPathBuilderTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/chemistry/opencmis/jcr/query/XPathBuilderTest.java Mon Aug 19 22:12:07 2013
@@ -19,6 +19,16 @@
package org.apache.chemistry.opencmis.jcr.query;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Arrays;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
import org.apache.chemistry.opencmis.jcr.JcrTypeManager;
@@ -34,13 +44,6 @@ import org.apache.chemistry.opencmis.ser
import org.junit.Before;
import org.junit.Test;
-import java.util.Arrays;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
public class XPathBuilderTest {
private JcrTypeManager typeManager;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/jackrabbit/core/security/TestSecurityManager.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/jackrabbit/core/security/TestSecurityManager.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/jackrabbit/core/security/TestSecurityManager.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-jcr/src/test/java/org/apache/jackrabbit/core/security/TestSecurityManager.java Mon Aug 19 22:12:07 2013
@@ -20,8 +20,10 @@
package org.apache.jackrabbit.core.security;
import java.lang.reflect.Field;
+
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.core.SessionImpl;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/filter/LoggingFilter.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/filter/LoggingFilter.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/filter/LoggingFilter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/filter/LoggingFilter.java Mon Aug 19 22:12:07 2013
@@ -21,8 +21,9 @@ package org.apache.chemistry.opencmis.se
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
@@ -174,9 +175,9 @@ public class LoggingFilter implements Fi
private void writeTextToFile(String filename, String content) {
PrintWriter pw = null;
- FileWriter fw = null;
+ OutputStreamWriter fw = null;
try {
- fw = new FileWriter(filename);
+ fw = new OutputStreamWriter(new FileOutputStream(filename), "UTF-8");
pw = new PrintWriter(fw);
Scanner scanner = new Scanner(content);
@@ -188,11 +189,9 @@ public class LoggingFilter implements Fi
pw.flush();
} catch (IOException e) {
- e.printStackTrace();
+ LOG.error(e.getMessage(), e);
} finally {
- if (pw != null) {
- pw.close();
- }
+ IOUtils.closeQuietly(pw);
IOUtils.closeQuietly(fw);
}
}
@@ -428,8 +427,7 @@ public class LoggingFilter implements Fi
}
return writer;
} catch (IOException e) {
- LOG.error("Failed to get PrintWriter in LoggingFilter: " + e);
- e.printStackTrace();
+ LOG.error("Failed to get PrintWriter in LoggingFilter: " + e, e);
return null;
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactoryTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactoryTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactoryTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactoryTest.java Mon Aug 19 22:12:07 2013
@@ -20,7 +20,10 @@
*/
package org.apache.chemistry.opencmis.server.support;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.math.BigInteger;
import java.util.HashMap;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/java/org/apache/chemistry/opencmis/server/support/query/StringUtilTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/java/org/apache/chemistry/opencmis/server/support/query/StringUtilTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/java/org/apache/chemistry/opencmis/server/support/query/StringUtilTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/test/java/org/apache/chemistry/opencmis/server/support/query/StringUtilTest.java Mon Aug 19 22:12:07 2013
@@ -18,7 +18,8 @@
*/
package org.apache.chemistry.opencmis.server.support.query;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import org.junit.Test;
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-browser/src/main/java/org/apache/chemistry/opencmis/browser/BrowseServlet.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-browser/src/main/java/org/apache/chemistry/opencmis/browser/BrowseServlet.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-browser/src/main/java/org/apache/chemistry/opencmis/browser/BrowseServlet.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-browser/src/main/java/org/apache/chemistry/opencmis/browser/BrowseServlet.java Mon Aug 19 22:12:07 2013
@@ -91,7 +91,7 @@ public class BrowseServlet extends HttpS
builderFactory.setNamespaceAware(true);
builder = builderFactory.newDocumentBuilder();
} catch (Exception e) {
- e.printStackTrace();
+ LOG.error(e.getMessage(), e);
return;
}
@@ -118,7 +118,7 @@ public class BrowseServlet extends HttpS
LOG.info("Stylesheet: '" + stylesheetKey + "' -> '" + stylesheetFileName + "'");
} catch (Exception e) {
- e.printStackTrace();
+ LOG.error(e.getMessage(), e);
}
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java Mon Aug 19 22:12:07 2013
@@ -418,7 +418,7 @@ public abstract class AbstractSessionTes
byte[] contentBytes = null;
Document result = null;
try {
- contentBytes = content.getBytes("UTF-8");
+ contentBytes = IOUtils.getUTF8Bytes(content);
ContentStream contentStream = new ContentStreamImpl(name, BigInteger.valueOf(contentBytes.length),
"text/plain", new ByteArrayInputStream(contentBytes));
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/WrapperCmisTestGroup.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/WrapperCmisTestGroup.java?rev=1515639&r1=1515638&r2=1515639&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/WrapperCmisTestGroup.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/WrapperCmisTestGroup.java Mon Aug 19 22:12:07 2013
@@ -28,7 +28,7 @@ import org.apache.chemistry.opencmis.tck
public class WrapperCmisTestGroup extends AbstractCmisTestGroup {
private final CmisTest test;
- public WrapperCmisTestGroup(CmisTest test) throws Exception {
+ public WrapperCmisTestGroup(CmisTest test) {
if (test == null) {
throw new IllegalArgumentException("Test is null!");
}