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/08 17:24:55 UTC
svn commit: r1511831 - in /chemistry/opencmis/trunk:
chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/
chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/...
Author: fmui
Date: Thu Aug 8 15:24:55 2013
New Revision: 1511831
URL: http://svn.apache.org/r1511831
Log:
more code clean up
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/MultipartParser.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactory.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/main/ObjGenApp.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TckDialog.java
Modified: chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java Thu Aug 8 15:24:55 2013
@@ -18,6 +18,7 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.atompub;
+import java.io.IOException;
import java.io.OutputStream;
import org.apache.chemistry.opencmis.client.bindings.spi.BindingSession;
@@ -62,7 +63,7 @@ public class MultiFilingServiceImpl exte
// post addObjectToFolder request
post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -88,7 +89,7 @@ public class MultiFilingServiceImpl exte
// post removeObjectFromFolder request
post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
Modified: chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java Thu Aug 8 15:24:55 2013
@@ -18,6 +18,7 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.atompub;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigInteger;
@@ -113,7 +114,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -152,7 +153,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -199,7 +200,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -242,7 +243,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -286,7 +287,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -325,7 +326,7 @@ public class ObjectServiceImpl extends A
// update
Response resp = put(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -395,7 +396,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(new UrlBuilder(link), Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -653,7 +654,7 @@ public class ObjectServiceImpl extends A
// post move request
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -785,7 +786,7 @@ public class ObjectServiceImpl extends A
// send content
Response resp = put(url, contentStream.getMimeType(), headers, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
int b;
byte[] buffer = new byte[4096];
Modified: chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java Thu Aug 8 15:24:55 2013
@@ -18,6 +18,7 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.atompub;
+import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
@@ -64,7 +65,7 @@ public class PolicyServiceImpl extends A
// post applyPolicy request
post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
Modified: chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java Thu Aug 8 15:24:55 2013
@@ -18,6 +18,7 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.atompub;
+import java.io.IOException;
import java.io.OutputStream;
import java.math.BigInteger;
import java.util.ArrayList;
@@ -245,7 +246,7 @@ public class RepositoryServiceImpl exten
// post the new type definition
Response resp = post(new UrlBuilder(link), Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -303,7 +304,7 @@ public class RepositoryServiceImpl exten
// post the new type definition
Response resp = put(new UrlBuilder(link), Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
Modified: chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-android/chemistry-opencmis-android-client/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java Thu Aug 8 15:24:55 2013
@@ -18,6 +18,7 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.atompub;
+import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
@@ -78,7 +79,7 @@ public class VersioningServiceImpl exten
// post move request
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
@@ -159,7 +160,7 @@ public class VersioningServiceImpl exten
// update
Response resp = put(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws IOException {
entryWriter.write(out);
}
});
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/MultiFilingServiceImpl.java Thu Aug 8 15:24:55 2013
@@ -18,8 +18,11 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.atompub;
+import java.io.IOException;
import java.io.OutputStream;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.chemistry.opencmis.client.bindings.spi.BindingSession;
import org.apache.chemistry.opencmis.client.bindings.spi.http.Output;
import org.apache.chemistry.opencmis.commons.data.ExtensionsData;
@@ -62,7 +65,7 @@ public class MultiFilingServiceImpl exte
// post addObjectToFolder request
post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
@@ -88,7 +91,7 @@ public class MultiFilingServiceImpl exte
// post removeObjectFromFolder request
post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java Thu Aug 8 15:24:55 2013
@@ -18,6 +18,7 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.atompub;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigInteger;
@@ -26,6 +27,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.chemistry.opencmis.client.bindings.spi.BindingSession;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomAllowableActions;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomElement;
@@ -114,7 +117,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
@@ -153,7 +156,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
@@ -200,7 +203,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
@@ -243,7 +246,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
@@ -287,7 +290,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
@@ -328,7 +331,7 @@ public class ObjectServiceImpl extends A
// update
Response resp = put(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
@@ -398,7 +401,7 @@ public class ObjectServiceImpl extends A
// post the new folder object
Response resp = post(new UrlBuilder(link), Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
@@ -673,7 +676,7 @@ public class ObjectServiceImpl extends A
// post move request
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/PolicyServiceImpl.java Thu Aug 8 15:24:55 2013
@@ -18,10 +18,13 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.atompub;
+import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.chemistry.opencmis.client.bindings.spi.BindingSession;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomElement;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomEntry;
@@ -64,7 +67,7 @@ public class PolicyServiceImpl extends A
// post applyPolicy request
post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java Thu Aug 8 15:24:55 2013
@@ -18,6 +18,7 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.atompub;
+import java.io.IOException;
import java.io.OutputStream;
import java.math.BigInteger;
import java.util.ArrayList;
@@ -25,6 +26,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.chemistry.opencmis.client.bindings.spi.BindingSession;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomElement;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomEntry;
@@ -245,7 +248,7 @@ public class RepositoryServiceImpl exten
// post the new type definition
Response resp = post(new UrlBuilder(link), Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
@@ -303,7 +306,7 @@ public class RepositoryServiceImpl exten
// post the new type definition
Response resp = put(new UrlBuilder(link), Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java Thu Aug 8 15:24:55 2013
@@ -18,10 +18,13 @@
*/
package org.apache.chemistry.opencmis.client.bindings.spi.atompub;
+import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.chemistry.opencmis.client.bindings.spi.BindingSession;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomElement;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomEntry;
@@ -78,7 +81,7 @@ public class VersioningServiceImpl exten
// post move request
Response resp = post(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
@@ -159,7 +162,7 @@ public class VersioningServiceImpl exten
// update
Response resp = put(url, Constants.MEDIATYPE_ENTRY, new Output() {
- public void write(OutputStream out) throws Exception {
+ public void write(OutputStream out) throws XMLStreamException, IOException {
entryWriter.write(out);
}
});
Modified: chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AbstractPortProvider.java Thu Aug 8 15:24:55 2013
@@ -234,9 +234,9 @@ public abstract class AbstractPortProvid
}
private BindingSession session;
- protected boolean useCompression;
- protected boolean useClientCompression;
- protected String acceptLanguage;
+ private boolean useCompression;
+ private boolean useClientCompression;
+ private String acceptLanguage;
private final ReentrantLock portObjectLock = new ReentrantLock();
private final EnumMap<CmisWebSerivcesService, LinkedList<SoftReference<BindingProvider>>> portObjectCache = new EnumMap<CmisWebSerivcesService, LinkedList<SoftReference<BindingProvider>>>(
@@ -260,6 +260,18 @@ public abstract class AbstractPortProvid
}
}
+ public boolean useCompression() {
+ return useCompression;
+ }
+
+ public boolean useClientCompression() {
+ return useClientCompression;
+ }
+
+ public String getAcceptLanguage() {
+ return acceptLanguage;
+ }
+
/**
* Return the Repository Service port object.
*/
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=1511831&r1=1511830&r2=1511831&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 Thu Aug 8 15:24:55 2013
@@ -133,10 +133,10 @@ public class MultipartParser {
}
private void extractBoundary() {
- String contentType = request.getContentType();
+ String requestContentType = request.getContentType();
// parse content type and extract boundary
- byte[] extractedBoundary = MimeHelper.getBoundaryFromMultiPart(contentType);
+ byte[] extractedBoundary = MimeHelper.getBoundaryFromMultiPart(requestContentType);
if (extractedBoundary == null) {
throw new CmisInvalidArgumentException("Invalid multipart request!");
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactory.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/TypeDefinitionFactory.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactory.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/TypeDefinitionFactory.java Thu Aug 8 15:24:55 2013
@@ -649,22 +649,24 @@ public class TypeDefinitionFactory {
public int compare(TypeDefinition td1, TypeDefinition td2) {
String pid1 = td1.getParentTypeId();
String pid2 = td2.getParentTypeId();
- if (pid1 == null && pid2 != null) {
- return -1;
- }
- if (pid1 != null && pid2 == null) {
- return 1;
- }
- if (pid1 == null && pid2 == null) {
- return td1.getId().compareTo(td2.getId());
- }
+ if (pid1 == null) {
+ if (pid2 == null) {
+ return td1.getId().compareTo(td2.getId());
+ } else {
+ return -1;
+ }
+ } else {
+ if (pid2 == null) {
+ return 1;
+ } else {
+ int c = pid1.compareTo(pid2);
+ if (c == 0) {
+ return td1.getId().compareTo(td2.getId());
+ }
- int c = pid1.compareTo(pid2);
- if (c == 0) {
- return td1.getId().compareTo(td2.getId());
+ return c;
+ }
}
-
- return c;
}
});
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.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/query/QueryObject.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/QueryObject.java Thu Aug 8 15:24:55 2013
@@ -423,8 +423,9 @@ public class QueryObject {
&& join.onRight.getTypeDefinition().getBaseTypeId() == BaseTypeId.CMIS_SECONDARY && join.onLeft
.getPropertyId().equals(PropertyIds.OBJECT_ID)) || (join.onLeft.getPropertyId() == null
&& join.onLeft.getTypeDefinition().getBaseTypeId() == BaseTypeId.CMIS_SECONDARY && join.onRight
- .getPropertyId().equals(PropertyIds.OBJECT_ID)))))
+ .getPropertyId().equals(PropertyIds.OBJECT_ID))))) {
return null;
+ }
}
return secondaryTypeIds;
}
@@ -616,9 +617,10 @@ public class QueryObject {
} else {
hasProp = TypeValidator.typeContainsPropertyWithQueryName(td, colRef.getPropertyQueryName());
if (!hasProp && td.getBaseTypeId() == BaseTypeId.CMIS_SECONDARY
- && colRef.getPropertyQueryName().equals(PropertyIds.OBJECT_ID))
+ && colRef.getPropertyQueryName().equals(PropertyIds.OBJECT_ID)) {
hasProp = true; // special handling for object id on secondary
// types which are required for JOINS
+ }
}
if (!hasProp) {
throw new CmisQueryException(colRef.getPropertyQueryName() + " is not a valid property query name in type "
Modified: chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/main/ObjGenApp.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/main/ObjGenApp.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/main/ObjGenApp.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/tools/main/ObjGenApp.java Thu Aug 8 15:24:55 2013
@@ -46,12 +46,9 @@ import org.apache.chemistry.opencmis.uti
import org.apache.chemistry.opencmis.util.repository.ObjectGenerator;
import org.apache.chemistry.opencmis.util.repository.ObjectGenerator.CONTENT_KIND;
import org.apache.chemistry.opencmis.util.repository.TimeLogger;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ObjGenApp {
- private static final Logger LOG = LoggerFactory.getLogger(ObjGenApp.class.getName());
private static final String PROP_USER = SessionParameter.USER;
private static final String PROP_PASSWORD = SessionParameter.PASSWORD;
private static final String DEFAULT_USER = "user";
@@ -185,15 +182,15 @@ public class ObjGenApp {
} else {
fContentKind = null;
}
- } else if (kind.equals("static/text"))
+ } else if (kind.equals("static/text")) {
fContentKind = ObjectGenerator.CONTENT_KIND.StaticText;
- else if (kind.equals("lorem/text"))
+ } else if (kind.equals("lorem/text")) {
fContentKind = ObjectGenerator.CONTENT_KIND.LoremIpsumText;
- else if (kind.equals("lorem/html"))
+ } else if (kind.equals("lorem/html")) {
fContentKind = ObjectGenerator.CONTENT_KIND.LoremIpsumHtml;
- else if (kind.equals("fractal/jpeg"))
+ } else if (kind.equals("fractal/jpeg")) {
fContentKind = ObjectGenerator.CONTENT_KIND.ImageFractalJpeg;
- else {
+ } else {
System.out.println("Unknown content kind: " + options.valueOf(fContentKindStr));
System.out.println(" must be one of static/text, lorem/text, lorem/html, fractal/jpeg");
usage(parser);
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/AclEditorFrame.java Thu Aug 8 15:24:55 2013
@@ -522,17 +522,17 @@ public class AclEditorFrame extends JFra
}
public Ace getAce() {
- List<String> permissions = new ArrayList<String>();
+ List<String> permissionsList = new ArrayList<String>();
for (JComboBox box : permissionBoxes) {
String permission = box.getSelectedItem().toString().trim();
if (permission.length() > 0) {
- permissions.add(permission);
+ permissionsList.add(permission);
}
}
return new AccessControlEntryImpl(new AccessControlPrincipalDataImpl(principalBox.getSelectedItem()
- .toString()), permissions);
+ .toString()), permissionsList);
}
}
}
Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TckDialog.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TckDialog.java?rev=1511831&r1=1511830&r2=1511831&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TckDialog.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/TckDialog.java Thu Aug 8 15:24:55 2013
@@ -295,8 +295,8 @@ public class TckDialog {
}
}
- DefaultTreeModel model = ((DefaultTreeModel) tree.getModel());
- model.nodeChanged((TreeNode) model.getRoot());
+ DefaultTreeModel treeModel = ((DefaultTreeModel) tree.getModel());
+ treeModel.nodeChanged((TreeNode) treeModel.getRoot());
}
private JComboBox addComboBox(JPanel panel, String title, String rootTypeId, String defaultTypeId,
@@ -372,7 +372,7 @@ public class TckDialog {
}
public void setEnabled(boolean enabled) {
- DefaultTreeModel model = ((DefaultTreeModel) tree.getModel());
+ DefaultTreeModel treeModel = ((DefaultTreeModel) tree.getModel());
if (group != null) {
group.setEnabled(enabled);
@@ -380,7 +380,7 @@ public class TckDialog {
for (int i = 0; i < getChildCount(); i++) {
TestTreeNode node = (TestTreeNode) getChildAt(i);
node.setEnabled(enabled);
- model.nodeChanged(node);
+ treeModel.nodeChanged(node);
}
return;
@@ -391,7 +391,7 @@ public class TckDialog {
if (enabled) {
TestTreeNode node = (TestTreeNode) getParent();
node.getGroup().setEnabled(true);
- model.nodeChanged(node);
+ treeModel.nodeChanged(node);
}
}
}