You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fg...@apache.org on 2009/07/29 12:56:11 UTC
svn commit: r798855 - in /incubator/chemistry/trunk/chemistry:
chemistry-api/src/main/java/org/apache/chemistry/
chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/
chemistry-atompub-client/src/main/java/org/apache/chemistry/ato...
Author: fguillaume
Date: Wed Jul 29 10:56:06 2009
New Revision: 798855
URL: http://svn.apache.org/viewvc?rev=798855&view=rev
Log:
CMIS-44: removed URI and contentStreamUri
Modified:
incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java
incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ContentStream.java
incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Property.java
incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPDocument.java
incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java
incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java
incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java
incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java
incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java
incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleDocument.java
incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java
incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java
incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java
incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrObjectEntry.java
incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicHelper.java
Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java Wed Jul 29 10:56:06 2009
@@ -302,8 +302,6 @@
String getId();
- URI getURI();
-
String getTypeId();
String getCreatedBy();
Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ContentStream.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ContentStream.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ContentStream.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ContentStream.java Wed Jul 29 10:56:06 2009
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
/**
* A CMIS Content Stream.
@@ -41,11 +40,6 @@
String getFilename();
/**
- * The content stream URI.
- */
- URI getURI();
-
- /**
* The actual byte stream for this content stream.
*
* @throws IOException
Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Property.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Property.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Property.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Property.java Wed Jul 29 10:56:06 2009
@@ -29,8 +29,6 @@
String ID = "cmis:ObjectId";
- String URI = "cmis:Uri";
-
String TYPE_ID = "cmis:ObjectTypeId";
String BASE_TYPE_ID = "cmis:BaseTypeId";
@@ -77,8 +75,6 @@
String CONTENT_STREAM_FILENAME = "cmis:ContentStreamFilename";
- String CONTENT_STREAM_URI = "cmis:ContentStreamUri";
-
/*
* ----- Folder -----
*/
Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPDocument.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPDocument.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPDocument.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPDocument.java Wed Jul 29 10:56:06 2009
@@ -94,13 +94,6 @@
return filename;
}
- public URI getURI() {
- if (uri == UNINITIALIZED_URI) {
- uri = APPDocument.this.getURI(Property.CONTENT_STREAM_URI);
- }
- return uri;
- }
-
public long getLength() {
if (length == -1) {
Integer value = getInteger(Property.CONTENT_STREAM_LENGTH);
Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java Wed Jul 29 10:56:06 2009
@@ -18,8 +18,6 @@
package org.apache.chemistry.atompub.client;
import java.io.Serializable;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -257,23 +255,4 @@
}
}
- // ----- overriden from base class -----
-
- // TODO make sure getProperties returns that too
- @Override
- public URI getURI() {
- String value = entry.getEditLink();
- if (value == null) {
- value = entry.getLink("self");
- if (value == null) {
- value = entry.getLink("alternate");
- }
- }
- try {
- return new URI(value);
- } catch (URISyntaxException e) {
- throw new IllegalArgumentException("Not an URI: " + value);
- }
- }
-
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java Wed Jul 29 10:56:06 2009
@@ -122,11 +122,6 @@
String id = p.getId();
PropertyDefinition def = entryType.getPropertyDefinition(id);
if (def == null) {
- if (id.equals("ContentStreamURI") || id.equals("BaseType")) {
- // Alfresco COMPAT
- // see org.apache.chemistry.atompub.abdera.PropertiesElement
- return;
- }
throw new ParseException("No such property definition: " + id
+ " in type: " + entryType);
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java Wed Jul 29 10:56:06 2009
@@ -161,12 +161,8 @@
// entry.addLink("XXX", CMIS.LINK_ALLOWABLE_ACTIONS);
// entry.addLink("XXX", CMIS.LINK_RELATIONSHIPS);
- // ContentStreamUri needs to know the media link
- String mediaLink = isMediaEntry(object) ? getMediaLink(object.getId(),
- request) : null;
Type objectType = repository.getType(object.getTypeId());
- entry.addExtension(new ObjectElement(factory, object, objectType,
- mediaLink));
+ entry.addExtension(new ObjectElement(factory, object, objectType));
return link;
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java Wed Jul 29 10:56:06 2009
@@ -142,8 +142,7 @@
doc3.setValue("title", "doc 3 title");
doc3.setValue("description", "The doc 3 descr");
ContentStream cs = new SimpleContentStream(
- TEST_FILE_CONTENT.getBytes("UTF-8"), "text/plain", "doc3.txt",
- null);
+ TEST_FILE_CONTENT.getBytes("UTF-8"), "text/plain", "doc3.txt");
doc3.setContentStream(cs);
doc3.save();
doc3id = doc3.getId();
Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java Wed Jul 29 10:56:06 2009
@@ -37,21 +37,22 @@
/**
* Constructor used when parsing XML.
+ *
* @param repository
*/
public ObjectElement(Element internal, Repository repository) {
super(internal);
Element propsel = getFirstChild(CMIS.PROPERTIES);
- properties = propsel == null ? null : new PropertiesElement(propsel, repository);
+ properties = propsel == null ? null : new PropertiesElement(propsel,
+ repository);
}
/**
* Constructor used when generating XML.
*/
- public ObjectElement(Factory factory, ObjectEntry object, Type type,
- String contentStreamURI) {
+ public ObjectElement(Factory factory, ObjectEntry object, Type type) {
super(factory, CMIS.OBJECT);
- properties = new PropertiesElement(getFactory(), contentStreamURI);
+ properties = new PropertiesElement(getFactory());
addExtension(properties);
setProperties(object.getValues(), type);
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java Wed Jul 29 10:56:06 2009
@@ -60,27 +60,10 @@
/**
* Constructor used when generating XML.
- * <p>
- * ContentStreamUri is special-cased as it depends on the server context
- * (base URL).
*/
- public PropertiesElement(Factory factory, String contentStreamURI) {
+ public PropertiesElement(Factory factory) {
super(factory, CMIS.PROPERTIES);
repository = null;
- if (contentStreamURI != null) {
- ExtensibleElement el = addExtension(CMIS.PROPERTY_URI);
- el.setAttributeValue(CMIS.PDID, Property.CONTENT_STREAM_URI);
- Element val = el.addExtension(CMIS.VALUE);
- // don't merge these two lines as JDK 5 has problems compiling it
- val.setText(contentStreamURI);
-
- // Alfresco COMPAT (incorrect property name and type):
- el = addExtension(CMIS.PROPERTY_STRING);
- el.setAttributeValue(CMIS.PDID, "ContentStreamURI");
- val = el.addExtension(CMIS.VALUE);
- // don't merge these two lines
- val.setText(contentStreamURI);
- }
}
public Map<String, Serializable> getProperties() {
@@ -155,12 +138,8 @@
public void setProperties(Map<String, Serializable> values, Type type) {
for (PropertyDefinition propertyDefinition : type.getPropertyDefinitions()) {
- String id = propertyDefinition.getId();
- if (id.equals(Property.CONTENT_STREAM_URI)) {
- // special-cased in constructor
- continue;
- }
- setProperty(values.get(id), propertyDefinition);
+ setProperty(values.get(propertyDefinition.getId()),
+ propertyDefinition);
}
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java Wed Jul 29 10:56:06 2009
@@ -137,10 +137,6 @@
return getString(Property.ID);
}
- public URI getURI() {
- return getURI(Property.URI);
- }
-
public String getTypeId() {
return getId(Property.TYPE_ID);
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java Wed Jul 29 10:56:06 2009
@@ -20,7 +20,6 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
import org.apache.chemistry.ContentStream;
@@ -33,26 +32,21 @@
protected final String filename;
- protected final URI uri;
-
protected final byte[] bytes;
protected final long length;
- public SimpleContentStream(byte[] bytes, String mimeType, String filename,
- URI uri) {
+ public SimpleContentStream(byte[] bytes, String mimeType, String filename) {
this.mimeType = mimeType;
this.filename = filename;
- this.uri = uri;
this.bytes = bytes;
length = bytes.length;
}
public SimpleContentStream(InputStream stream, String mimeType,
- String filename, URI uri) throws IOException {
+ String filename) throws IOException {
this.mimeType = mimeType;
this.filename = filename;
- this.uri = uri;
bytes = getBytes(stream);
length = bytes.length;
}
@@ -79,10 +73,6 @@
return filename;
}
- public URI getURI() {
- return uri;
- }
-
public InputStream getStream() {
return new ByteArrayInputStream(bytes);
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleDocument.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleDocument.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleDocument.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleDocument.java Wed Jul 29 10:56:06 2009
@@ -19,7 +19,6 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
import java.util.Collection;
import org.apache.chemistry.ContentStream;
@@ -83,8 +82,7 @@
// length is recomputed, no need to read it
String mimeType = getString(Property.CONTENT_STREAM_MIME_TYPE);
String filename = getString(Property.CONTENT_STREAM_FILENAME);
- URI uri = getURI(Property.CONTENT_STREAM_URI);
- return new SimpleContentStream(contentBytes, mimeType, filename, uri);
+ return new SimpleContentStream(contentBytes, mimeType, filename);
}
public void setContentStream(ContentStream contentStream)
@@ -100,7 +98,6 @@
entry.setValue(Property.CONTENT_STREAM_LENGTH, null);
entry.setValue(Property.CONTENT_STREAM_MIME_TYPE, null);
entry.setValue(Property.CONTENT_STREAM_FILENAME, null);
- entry.setValue(Property.CONTENT_STREAM_URI, null);
entry.setValue(SimpleProperty.CONTENT_BYTES_KEY, null);
} else {
entry.setValue(Property.CONTENT_STREAM_LENGTH,
@@ -110,7 +107,6 @@
contentStream.getMimeType());
entry.setValue(Property.CONTENT_STREAM_FILENAME,
contentStream.getFilename());
- entry.setValue(Property.CONTENT_STREAM_URI, contentStream.getURI());
entry.setValue(SimpleProperty.CONTENT_BYTES_KEY,
SimpleContentStream.getBytes(contentStream.getStream()));
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java Wed Jul 29 10:56:06 2009
@@ -40,11 +40,6 @@
PropertyType.ID, false, null, false, true, null,
Updatability.READ_ONLY, true, true, 0, null, null, -1, null);
- public static final SimplePropertyDefinition PROP_URI = new SimplePropertyDefinition(
- Property.URI, "def:uri", null, Property.URI, "URI", "", false,
- PropertyType.URI, false, null, false, false, null,
- Updatability.READ_ONLY, true, true, 0, null, null, -1, null);
-
public static final SimplePropertyDefinition PROP_TYPE_ID = new SimplePropertyDefinition(
Property.TYPE_ID, "def:typeid", null, Property.TYPE_ID, "Type ID",
"", false, PropertyType.ID, false, null, false, true, null,
@@ -170,12 +165,6 @@
"", false, PropertyType.STRING, false, null, false, false, null,
Updatability.READ_WRITE, true, true, 0, null, null, -1, null);
- public static final SimplePropertyDefinition PROP_CONTENT_STREAM_URI = new SimplePropertyDefinition(
- Property.CONTENT_STREAM_URI, "def:contentstreamuri", null,
- Property.CONTENT_STREAM_URI, "Content Stream URI", "", false,
- PropertyType.URI, false, null, false, false, null,
- Updatability.READ_ONLY, true, true, 0, null, null, -1, null);
-
public static final SimplePropertyDefinition PROP_PARENT_ID = new SimplePropertyDefinition(
Property.PARENT_ID, "def:parentid", null, Property.PARENT_ID,
"Parent Id", "", false, PropertyType.ID, false, null, false, true,
@@ -212,7 +201,6 @@
null);
private static final PropertyDefinition[] PROPS_COMMON = { PROP_ID, //
- PROP_URI, //
PROP_TYPE_ID, //
PROP_BASE_TYPE_ID, //
PROP_CREATED_BY, //
@@ -243,8 +231,7 @@
PROP_CHECKIN_COMMENT, //
PROP_CONTENT_STREAM_LENGTH, //
PROP_CONTENT_STREAM_MIME_TYPE, //
- PROP_CONTENT_STREAM_FILENAME, //
- PROP_CONTENT_STREAM_URI);
+ PROP_CONTENT_STREAM_FILENAME);
public static final List<PropertyDefinition> PROPS_FOLDER_BASE = commonPlus(
PROP_NAME, //
Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java Wed Jul 29 10:56:06 2009
@@ -16,7 +16,6 @@
*/
package org.apache.chemistry.impl.simple;
-import java.net.URI;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -192,8 +191,7 @@
Document d1 = root.newDocument("doc");
String string = "Houston, we have a problem...";
ContentStream cs = new SimpleContentStream(string.getBytes("UTF-8"),
- "text/plain", "houston.txt", new URI(
- "http://houston.example.com"));
+ "text/plain", "houston.txt");
d1.setContentStream(cs);
d1.save();
@@ -202,7 +200,6 @@
assertEquals(29, cs.getLength());
assertEquals("text/plain", cs.getMimeType());
assertEquals("houston.txt", cs.getFilename());
- assertEquals(new URI("http://houston.example.com"), cs.getURI());
byte[] bytes = SimpleContentStream.getBytes(cs.getStream());
assertEquals(string, new String(bytes, "UTF-8"));
Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java Wed Jul 29 10:56:06 2009
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
@@ -81,8 +80,4 @@
return null;
}
- public URI getURI() {
- // TODO Auto-generated method stub
- return null;
- }
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrObjectEntry.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrObjectEntry.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrObjectEntry.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrObjectEntry.java Wed Jul 29 10:56:06 2009
@@ -359,10 +359,6 @@
return (URI) getValue(id);
}
- public URI getURI() {
- return getURI(Property.URI);
- }
-
public URI[] getURIs(String id) {
return (URI[]) getValue(id);
}
Modified: incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicHelper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicHelper.java?rev=798855&r1=798854&r2=798855&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicHelper.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicHelper.java Wed Jul 29 10:56:06 2009
@@ -101,8 +101,7 @@
doc3.setName("doc 3");
// no title, description or date
ContentStream cs = new SimpleContentStream(
- TEST_FILE_CONTENT.getBytes("UTF-8"), "text/plain", "doc3.txt",
- null);
+ TEST_FILE_CONTENT.getBytes("UTF-8"), "text/plain", "doc3.txt");
doc3.setContentStream(cs);
doc3.save();
@@ -111,7 +110,7 @@
doc4.setValue("title", "A Dog");
doc4.setValue("description", "This is a small dog");
InputStream stream = MainServlet.class.getResourceAsStream("/dog.jpg");
- cs = new SimpleContentStream(stream, "image/jpeg", "dog.jpg", null);
+ cs = new SimpleContentStream(stream, "image/jpeg", "dog.jpg");
doc4.setContentStream(cs);
doc4.save();