Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 70275 invoked from network); 24 Jul 2006 14:53:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Jul 2006 14:53:23 -0000 Received: (qmail 73962 invoked by uid 500); 24 Jul 2006 14:53:23 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 73871 invoked by uid 500); 24 Jul 2006 14:53:23 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 73862 invoked by uid 99); 24 Jul 2006 14:53:23 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jul 2006 07:53:23 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jul 2006 07:53:22 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E2EEA1A981A; Mon, 24 Jul 2006 07:53:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r425079 - in /jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr: DefaultItemCollection.java DefaultItemResource.java property/ValuesProperty.java search/SearchResultProperty.java Date: Mon, 24 Jul 2006 14:53:01 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060724145301.E2EEA1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Mon Jul 24 07:53:00 2006 New Revision: 425079 URL: http://svn.apache.org/viewvc?rev=425079&view=rev Log: remove usage of ValueFactoryImpl introduced with rev.424227 in order to get rid of deprecated calls -> pass ValueFactory instead Modified: jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemResource.java jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/ValuesProperty.java jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/search/SearchResultProperty.java Modified: jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java?rev=425079&r1=425078&r2=425079&view=diff ============================================================================== --- jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java (original) +++ jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java Mon Jul 24 07:53:00 2006 @@ -902,7 +902,7 @@ try { Document reqBody = DomUtil.BUILDER_FACTORY.newDocumentBuilder().parse(in); DavProperty defaultProp = DefaultDavProperty.createFromXml(reqBody.getDocumentElement()); - ValuesProperty vp = new ValuesProperty(defaultProp, PropertyType.STRING); + ValuesProperty vp = new ValuesProperty(defaultProp, PropertyType.STRING, getRepositorySession().getValueFactory()); return vp; } catch (IOException e) { log.debug(errorMsg, e); Modified: jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemResource.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemResource.java?rev=425079&r1=425078&r2=425079&view=diff ============================================================================== --- jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemResource.java (original) +++ jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DefaultItemResource.java Mon Jul 24 07:53:00 2006 @@ -50,6 +50,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.ValueFormatException; +import javax.jcr.ValueFactory; import javax.xml.parsers.ParserConfigurationException; import java.io.InputStream; import java.io.IOException; @@ -166,9 +167,10 @@ try { Property prop = (Property) item; int defaultType = prop.getType(); - ValuesProperty vp = new ValuesProperty(property, defaultType); + ValueFactory vfact = getRepositorySession().getValueFactory(); + ValuesProperty vp = new ValuesProperty(property, defaultType, vfact); if (property.getName().equals(JCR_VALUE)) { - prop.setValue(vp.getJcrValue(vp.getValueType())); + prop.setValue(vp.getJcrValue(vp.getValueType(), vfact)); } else if (property.getName().equals(JCR_VALUES)) { prop.setValue(vp.getJcrValues()); } else { Modified: jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/ValuesProperty.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/ValuesProperty.java?rev=425079&r1=425078&r2=425079&view=diff ============================================================================== --- jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/ValuesProperty.java (original) +++ jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/property/ValuesProperty.java Mon Jul 24 07:53:00 2006 @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.webdav.jcr.property; -import org.apache.jackrabbit.value.ValueFactoryImpl; import org.apache.jackrabbit.value.ValueHelper; import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavServletResponse; @@ -34,6 +33,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.ValueFormatException; +import javax.jcr.ValueFactory; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -79,8 +79,12 @@ * @param defaultType default type of the values to be deserialized. If however * the {@link #XML_VALUE 'value'} elements provide a {@link #ATTR_VALUE_TYPE 'type'} * attribute, the default value is ignored. + * @param valueFactory Factory used to retrieve JCR values from the value + * of the given DavProperty. */ - public ValuesProperty(DavProperty property, int defaultType) throws RepositoryException, DavException { + public ValuesProperty(DavProperty property, int defaultType, + ValueFactory valueFactory) + throws RepositoryException, DavException { super(property.getName(), false); if (!(JCR_VALUES.equals(property.getName()) || JCR_VALUE.equals(getName()))) { @@ -113,7 +117,7 @@ Element[] elems = (Element[])valueElements.toArray(new Element[valueElements.size()]); jcrValues = new Value[elems.length]; for (int i = 0; i < elems.length; i++) { - jcrValues[i] = getJcrValue(elems[i], defaultType); + jcrValues[i] = getJcrValue(elems[i], defaultType, valueFactory); } } } @@ -136,7 +140,9 @@ * @throws ValueFormatException * @throws RepositoryException */ - private static Value getJcrValue(Element valueElement, int defaultType) throws ValueFormatException, RepositoryException { + private static Value getJcrValue(Element valueElement, int defaultType, + ValueFactory valueFactory) + throws ValueFormatException, RepositoryException { if (valueElement == null) { return null; } @@ -145,7 +151,7 @@ String typeStr = DomUtil.getAttribute(valueElement, ATTR_VALUE_TYPE, ItemResourceConstants.NAMESPACE); int type = (typeStr == null) ? defaultType : PropertyType.valueFromName(typeStr); // deserialize value ->> see #toXml where values are serialized - return ValueHelper.deserialize(value, type, true, ValueFactoryImpl.getInstance()); + return ValueHelper.deserialize(value, type, true, valueFactory); } /** @@ -155,11 +161,11 @@ * @throws ValueFormatException if convertion of the internal jcr values to * the specified value type fails. */ - public Value[] getJcrValues(int propertyType) throws ValueFormatException { + public Value[] getJcrValues(int propertyType, ValueFactory valueFactory) throws ValueFormatException { checkPropertyName(JCR_VALUES); Value[] vs = new Value[jcrValues.length]; for (int i = 0; i < jcrValues.length; i++) { - vs[i] = ValueHelper.convert(jcrValues[i], propertyType, ValueFactoryImpl.getInstance()); + vs[i] = ValueHelper.convert(jcrValues[i], propertyType, valueFactory); } return jcrValues; } @@ -180,11 +186,11 @@ * @return * @throws ValueFormatException */ - public Value getJcrValue(int propertyType) throws ValueFormatException { + public Value getJcrValue(int propertyType, ValueFactory valueFactory) throws ValueFormatException { checkPropertyName(JCR_VALUE); return (jcrValues.length == 0) ? null - : ValueHelper.convert(jcrValues[0], propertyType, ValueFactoryImpl.getInstance()); + : ValueHelper.convert(jcrValues[0], propertyType, valueFactory); } /** Modified: jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/search/SearchResultProperty.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/search/SearchResultProperty.java?rev=425079&r1=425078&r2=425079&view=diff ============================================================================== --- jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/search/SearchResultProperty.java (original) +++ jackrabbit/trunk/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/search/SearchResultProperty.java Mon Jul 24 07:53:00 2006 @@ -17,7 +17,6 @@ package org.apache.jackrabbit.webdav.jcr.search; import org.apache.jackrabbit.value.ValueHelper; -import org.apache.jackrabbit.value.ValueFactoryImpl; import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants; import org.apache.jackrabbit.webdav.property.AbstractDavProperty; import org.apache.jackrabbit.webdav.property.DavProperty; @@ -32,6 +31,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.ValueFormatException; +import javax.jcr.ValueFactory; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -67,11 +67,13 @@ * Wrap the specified DavProperty in a new SearchResultProperty. * * @param property + * @param valueFactory factory used to deserialize the xml value to a JCR value. * @throws RepositoryException if an error occurs while build the property value * @throws IllegalArgumentException if the specified property does have the * required form. + * @see #getValues() */ - public SearchResultProperty(DavProperty property) throws RepositoryException { + public SearchResultProperty(DavProperty property, ValueFactory valueFactory) throws RepositoryException { super(property.getName(), true); if (!SEARCH_RESULT_PROPERTY.equals(getName())) { throw new IllegalArgumentException("SearchResultProperty may only be created from a property named " + SEARCH_RESULT_PROPERTY.toString()); @@ -85,11 +87,11 @@ while (elemIt.hasNext()) { Object el = elemIt.next(); if (el instanceof Element) { - parseColumnElement((Element)el, colList, valList); + parseColumnElement((Element)el, colList, valList, valueFactory); } } } else if (propValue instanceof Element) { - parseColumnElement((Element)property.getValue(), colList, valList); + parseColumnElement((Element)property.getValue(), colList, valList, valueFactory); } else { new IllegalArgumentException("SearchResultProperty requires a list of 'dcr:column' xml elements."); } @@ -98,7 +100,9 @@ values = (Value[]) valList.toArray(new Value[valList.size()]); } - private void parseColumnElement(Element columnElement, List columnNames, List values) throws ValueFormatException, RepositoryException { + private void parseColumnElement(Element columnElement, List columnNames, + List values, ValueFactory valueFactory) + throws ValueFormatException, RepositoryException { if (!DomUtil.matches(columnElement, COLUMN, ItemResourceConstants.NAMESPACE)) { log.debug("dcr:column element expected within search result."); return; @@ -110,7 +114,7 @@ if (valueElement != null) { String typeStr = DomUtil.getAttribute(valueElement, ATTR_VALUE_TYPE, ItemResourceConstants.NAMESPACE); jcrValue = ValueHelper.deserialize(DomUtil.getText(valueElement), - PropertyType.valueFromName(typeStr), true, ValueFactoryImpl.getInstance()); + PropertyType.valueFromName(typeStr), true, valueFactory); } else { jcrValue = null; }