+ * The internal value representation of committed value states and + * value type conversion is delegated to an associated value factory instance + * that is expected to always return values in the committed state. + *
+ * A {@link Session} implementation can use this class as follows: + *
+ * class MySession implements Session {
+ *
+ * private final ValueFactory valueFactory;
+ *
+ * MySession() {
+ * valueFactory = new GenericValueFactory(this);
+ * }
+ *
+ * public ValueFactory getValueFactory() {
+ * return valueFactory;
+ * }
+ *
+ * }
+ *
+ */
+public class GenericValueFactory implements ValueFactory {
+
+ /**
+ * Committed value factory. Used for creating the committed value states.
+ */
+ private final ValueFactory factory;
+
+ /**
+ * Creates a generic value factory.
+ *
+ * @param factory committed value factory
+ */
+ public GenericValueFactory(ValueFactory factory) {
+ this.factory = factory;
+ }
+
+ /**
+ * Creates a generic value factory with a {@link CommittedValueFactory}
+ * instance based on the given namespace resolver as the committed value
+ * factory.
+ *
+ * @param resolver namespace resolver
+ */
+ public GenericValueFactory(NamespaceResolver resolver) {
+ this(new CommittedValueFactory(resolver));
+ }
+
+ /**
+ * Creates a generic value factory with a {@link CommittedValueFactory}
+ * instance based on a {@link SessionNamespaceResolver} the committed value
+ * factory.
+ *
+ * @param session session
+ */
+ public GenericValueFactory(Session session) {
+ this(new SessionNamespaceResolver(session));
+ }
+
+ //--------------------------------------------------------< ValueFactory >
+
+ /**
+ * Creates a generic string value.
+ *
+ * @param value string value
+ * @return generic string value
+ */
+ public Value createValue(String value) {
+ return new GenericValue(factory.createValue(value), factory);
+ }
+
+ /**
+ * Creates a generic long value.
+ *
+ * @param value long value
+ * @return generic long value
+ */
+ public Value createValue(long value) {
+ return new GenericValue(factory.createValue(value), factory);
+ }
+
+ /**
+ * Creates a generic double value.
+ *
+ * @param value double value
+ * @return generic double value
+ */
+ public Value createValue(double value) {
+ return new GenericValue(factory.createValue(value), factory);
+ }
+
+ /**
+ * Creates a generic boolean value.
+ *
+ * @param value boolean value
+ * @return generic boolean value
+ */
+ public Value createValue(boolean value) {
+ return new GenericValue(factory.createValue(value), factory);
+ }
+
+ /**
+ * Creates a generic date value.
+ *
+ * @param value date value
+ * @return generic date value
+ */
+ public Value createValue(Calendar value) {
+ return new GenericValue(factory.createValue(value), factory);
+ }
+
+ /**
+ * Creates a generic binary value.
+ *
+ * @param value binary value
+ * @return generic binary value
+ */
+ public Value createValue(InputStream value) {
+ return new GenericValue(factory.createValue(value), factory);
+ }
+
+ /**
+ * Creates a generic reference value.
+ *
+ * @param value referenced node
+ * @return generic node value
+ * @throws RepositoryException if the node is not referenceable,
+ * or if the reference could not be created
+ */
+ public Value createValue(Node value) throws RepositoryException {
+ return new GenericValue(factory.createValue(value), factory);
+ }
+
+ /**
+ * Creates a generic value of the given type.
+ *
+ * @param value string representation of the value
+ * @param type value type
+ * @return generic value
+ * @throws ValueFormatException if value conversion fails
+ * @see PropertyType
+ */
+ public Value createValue(String value, int type)
+ throws ValueFormatException {
+ return new GenericValue(factory.createValue(value, type), factory);
+ }
+
+}
Property changes on: src/main/java/org/apache/jackrabbit/value/GenericValueFactory.java
___________________________________________________________________
Name: svn:eol-style
+ native
Index: src/main/java/org/apache/jackrabbit/value/CommittedPrefixNameValue.java
===================================================================
--- src/main/java/org/apache/jackrabbit/value/CommittedPrefixNameValue.java (revision 0)
+++ src/main/java/org/apache/jackrabbit/value/CommittedPrefixNameValue.java (revision 0)
@@ -0,0 +1,126 @@
+/*
+ * 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.jackrabbit.value;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.name.NamespaceResolver;
+
+/**
+ * Committed prefixed name value.
+ */
+class CommittedPrefixNameValue extends CommittedScalarValue
+ implements Serializable {
+
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 6235905509583018237L;
+
+ /**
+ * Prefixed name.
+ */
+ private String name;
+
+ /**
+ * Namespace prefix.
+ */
+ private String prefix;
+
+ /**
+ * Namespace URI.
+ */
+ private final String namespace;
+
+ /**
+ * Namespace resolver. This field is transient to prevent serialization.
+ * During deserialization the {@link CommittedValueFactory} class is used
+ * to retrieve the current namespace resolver to be associated with the
+ * deserialized object. If a current namespace resolver is not set, then
+ * the prefix of the deserialized name will never change.
+ */
+ private transient NamespaceResolver resolver;
+
+ /**
+ * Creates a committed prefixed name value.
+ *
+ * @param name original prefixed name
+ * @param prefix original prefix
+ * @param namespace namespace URI
+ * @param resolver namespace resolver
+ */
+ CommittedPrefixNameValue(
+ String name, String prefix, String namespace,
+ NamespaceResolver resolver) {
+ this.name = name;
+ this.prefix = prefix;
+ this.namespace = namespace;
+ this.resolver = resolver;
+ }
+
+ //---------------------------------------------------------------< Value >
+
+ /**
+ * Returns {@link PropertyType#NAME}.
+ *
+ * @return {@link PropertyType#NAME}
+ */
+ public int getType() {
+ return PropertyType.NAME;
+ }
+
+ /**
+ * Returns the prefixed name. Rewrites the name if the previous prefix
+ * differs from the current prefix associated with the namespace URI.
+ *
+ * @return prefixed name
+ * @throws RepositoryException if namespace resolution fails
+ */
+ public String getString() throws RepositoryException {
+ if (resolver != null) {
+ String current = resolver.getPrefix(namespace);
+ if (!prefix.equals(current)) {
+ name = current + name.substring(prefix.length());
+ prefix = current;
+ }
+ }
+ return name;
+ }
+
+ //--------------------------------------------------------< Serializable >
+
+ /**
+ * Uses the default deserialization to reads the value from the object
+ * stream and then associates the value with the current namespace
+ * resolver from the {@link CommittedValueFactory} class.
+ *
+ * @param stream object stream
+ * @throws IOException if the serialized object could not be read
+ * @throws ClassNotFoundException if a serialized class is not found
+ */
+ private void readObject(ObjectInputStream stream)
+ throws IOException, ClassNotFoundException {
+ stream.defaultReadObject();
+ resolver = CommittedValueFactory.getCurrentResolver();
+ }
+
+}
Property changes on: src/main/java/org/apache/jackrabbit/value/CommittedPrefixNameValue.java
___________________________________________________________________
Name: svn:eol-style
+ native
Index: src/main/java/org/apache/jackrabbit/value/CommittedReferenceValue.java
===================================================================
--- src/main/java/org/apache/jackrabbit/value/CommittedReferenceValue.java (revision 0)
+++ src/main/java/org/apache/jackrabbit/value/CommittedReferenceValue.java (revision 0)
@@ -0,0 +1,68 @@
+/*
+ * 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.jackrabbit.value;
+
+import java.io.Serializable;
+
+import javax.jcr.PropertyType;
+
+/**
+ * Committed reference value.
+ */
+class CommittedReferenceValue extends CommittedScalarValue
+ implements Serializable {
+
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = -251816646031815951L;
+
+ /**
+ * Reference value.
+ */
+ private final String value;
+
+ /**
+ * Creates a committed reference value.
+ *
+ * @param value reference value
+ */
+ CommittedReferenceValue(String value) {
+ this.value = value;
+ }
+
+ //---------------------------------------------------------------< Value >
+
+ /**
+ * Returns {@link PropertyType#REFERENCE}.
+ *
+ * @return {@link PropertyType#REFERENCE}
+ */
+ public int getType() {
+ return PropertyType.REFERENCE;
+ }
+
+ /**
+ * Returns the reference value.
+ *
+ * @return reference value
+ */
+ public String getString() {
+ return value;
+ }
+
+}
Property changes on: src/main/java/org/apache/jackrabbit/value/CommittedReferenceValue.java
___________________________________________________________________
Name: svn:eol-style
+ native
Index: src/main/java/org/apache/jackrabbit/value/SerializableInputStream.java
===================================================================
--- src/main/java/org/apache/jackrabbit/value/SerializableInputStream.java (revision 0)
+++ src/main/java/org/apache/jackrabbit/value/SerializableInputStream.java (revision 0)
@@ -0,0 +1,199 @@
+/*
+ * 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.jackrabbit.value;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+/**
+ * Decorator, that makes input streams be serializable and to automatically
+ * close themselves when the last byte has been read.
+ *
+ * This class contains a transient reference to a normal {@link InputStream}
+ * instance. The standard stream access methods are simply delegated to the
+ * referenced stream until it is closed either implicitly when detecting the
+ * end of the stream or explicitly when the {@link #close()} method is called.
+ * When the stream gets closed, the {@link #stream} reference is set to
+ * null and the stream access methods switch to an end-of-stream
+ * mode.
+ *
+ * During serialization the entire remaining stream contents are read into an
+ * in-memory buffer that is then serialized as a single instance. The consumed
+ * and closed stream is replaced by a {@link ByteArrayInputStream} instance
+ * based on the content buffer to avoid modifying the external state of the
+ * stream.
+ */
+class SerializableInputStream extends InputStream implements Serializable {
+
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = -8914357720474921367L;
+
+ /**
+ * Underlying binary stream. Set to
+ * The internal value representation and the value conversion rules are
+ * delegated to the associated committed value states and a value factory
+ * for creating those states.
+ */
+class GenericValue implements Value, Serializable {
+
+ /**
+ * Serial value UID.
+ */
+ private static final long serialVersionUID = -1087747028146744179L;
+
+ /**
+ * UTF-8 character encoding.
+ */
+ private static final Charset UTF8 = Charset.forName("UTF-8");
+
+ /**
+ * Value type. The type of the generic value does not change even if
+ * the value state changes from binary to non-binary or vice versa.
+ */
+ private final int type;
+
+ /**
+ * Value state. The value state is initially set to an instance of
+ * the {@link InitialBinaryValue} or {@link InitialScalarValue} class,
+ * and changed to a direct reference to an underlying committed value
+ * state when the first value getter is called. The value state is not
+ * changed after the first getter invocation.
+ */
+ private Value value;
+
+ /**
+ * Creates a generic value. The given value factory is used if value
+ * state conversions are needed. The value factory must create value
+ * instances that are already in the committed state.
+ *
+ * @param committed committed value state
+ * @param factory value factory for potential state conversions
+ */
+ GenericValue(Value committed, ValueFactory factory) {
+ this.type = committed.getType();
+ if (type == PropertyType.BINARY) {
+ this.value = new InitialBinaryValue(committed, factory);
+ } else {
+ this.value = new InitialScalarValue(committed, factory);
+ }
+ }
+
+ //---------------------------------------------------------------< Value >
+
+ /**
+ * Returns the value type. The type never changes even if the underlying
+ * value state may change.
+ *
+ * @return value type
+ * @see PropertyType
+ */
+ public int getType() {
+ return type;
+ }
+
+ /**
+ * Returns the boolean value. Commits the value state to non-binary if this
+ * is the first value getter call.
+ *
+ * @return boolean value
+ * @throws IllegalStateException if the value is in committed binary state
+ * @throws RepositoryException if value access or conversion fails
+ */
+ public boolean getBoolean()
+ throws IllegalStateException, RepositoryException {
+ return value.getBoolean();
+ }
+
+ /**
+ * Returns the date value. Commits the value state to non-binary if this
+ * is the first value getter call.
+ *
+ * @return date value
+ * @throws IllegalStateException if the value is in committed binary state
+ * @throws RepositoryException if value access or conversion fails
+ */
+ public Calendar getDate()
+ throws IllegalStateException, RepositoryException {
+ return value.getDate();
+ }
+
+ /**
+ * Returns the double value. Commits the value state to non-binary if this
+ * is the first value getter call.
+ *
+ * @return double value
+ * @throws IllegalStateException if the value is in committed binary state
+ * @throws RepositoryException if value access or conversion fails
+ */
+ public double getDouble()
+ throws IllegalStateException, RepositoryException {
+ return value.getDouble();
+ }
+
+ /**
+ * Returns the long value. Commits the value state to non-binary if this
+ * is the first value getter call.
+ *
+ * @return long value
+ * @throws IllegalStateException if the value is in committed binary state
+ * @throws RepositoryException if value access or conversion fails
+ */
+ public long getLong()
+ throws IllegalStateException, RepositoryException {
+ return value.getLong();
+ }
+
+ /**
+ * Returns the binary value. Commits the value state to binary if this
+ * is the first value getter call.
+ *
+ * @return long value
+ * @throws IllegalStateException
+ * if the value is in committed non-binary state
+ * @throws RepositoryException if value access or conversion fails
+ */
+ public InputStream getStream()
+ throws IllegalStateException, RepositoryException {
+ return value.getStream();
+ }
+
+ /**
+ * Returns the string value. Commits the value state to non-binary if this
+ * is the first value getter call.
+ *
+ * @return string value
+ * @throws IllegalStateException if the value is in committed binary state
+ * @throws RepositoryException if value access or conversion fails
+ */
+ public String getString()
+ throws IllegalStateException, RepositoryException {
+ return value.getString();
+ }
+
+ //--------------------------------------------------------------< Object >
+
+ /**
+ * Compares two values for equality. Implements the exact equality
+ * semantics specified by JSR 170, i.e. values are equal if and only if
+ * their types and string representations are equal.
+ *
+ * Returns
+ * Note that this method may change the underlying value state!
+ *
+ * @param other other object
+ * @return
+ * Returns
+ * Note that this method may change the underlying value state!
+ *
+ * @return hash code
+ */
+ public int hashCode() {
+ try {
+ int code = 17;
+ code = 37 * code + getType();
+ code = 37 * code + getString().hashCode();
+ return code;
+ } catch (IllegalStateException e) {
+ return 0;
+ } catch (RepositoryException e) {
+ return 0;
+ }
+ }
+
+ /**
+ * Returns a string representation (not necessarily {@link #getString()})
+ * of the underlying value. Does not change the value state.
+ *
+ * @return string representation of the value
+ */
+ public String toString() {
+ return value.toString();
+ }
+
+ //--------------------------------------------------< InitialBinaryValue >
+
+ /**
+ * Initial state of a binary value. The task of this class is to intercept
+ * the first binary or non-binary value getter method and to change the
+ * state of the containing generic value accordingly.
+ */
+ private class InitialBinaryValue implements Value, Serializable {
+
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 2525692776896914509L;
+
+ /**
+ * Underlying committed value state.
+ */
+ private final Value committed;
+
+ /**
+ * Committed value factory for the potential scalar value conversion.
+ */
+ private transient ValueFactory factory;
+
+ /**
+ * Creates an initial binary value state. The given value factory instance
+ * must create value instances that are already in the committed state.
+ *
+ * @param committed underlying committed binary value state
+ * @param factory value factory for the potential scalar value conversion
+ */
+ public InitialBinaryValue(Value committed, ValueFactory factory) {
+ this.committed = committed;
+ this.factory = factory;
+ }
+
+ /**
+ * Converts the {@link #committed underlying binary value} to a string
+ * by reading it as a {@link #UTF8 UTF-8} stream.
+ *
+ * @return string contents of the stream
+ * @throws RepositoryException if the stream could not be read as UTF-8
+ */
+ private Value toStringValue() throws RepositoryException {
+ try {
+ Reader reader =
+ new InputStreamReader(committed.getStream(), UTF8);
+ try {
+ StringWriter writer = new StringWriter();
+ char[] buffer = new char[1000];
+ int n = reader.read(buffer);
+ while (n != -1) {
+ writer.write(buffer, 0, n);
+ n = reader.read(buffer);
+ }
+ return factory.createValue(writer.toString());
+ } finally {
+ reader.close();
+ }
+ } catch (IOException e) {
+ throw new RepositoryException("Error reading binary value", e);
+ }
+ }
+
+ //-----------------------------------------------------------< Value >
+
+ /**
+ * Returns {@link PropertyType#BINARY}.
+ *
+ * @return {@link PropertyType#BINARY}
+ */
+ public int getType() {
+ return PropertyType.BINARY;
+ }
+
+ /**
+ * Converts the {@link #committed underlying binary value} to boolean by
+ * reading the stream as UTF-8 and using the
+ * {@link #factory associated value factory}. Sets the boolean value as
+ * the committed non-binary state of the containing generic value and
+ * restarts the method call.
+ *
+ * @return boolean value
+ * @throws RepositoryException if the value retrieval fails
+ */
+ public boolean getBoolean() throws RepositoryException {
+ value = toStringValue();
+ return value.getBoolean();
+ }
+
+ /**
+ * Converts the {@link #committed underlying binary value} to date by
+ * reading the stream as UTF-8 and using the
+ * {@link #factory associated value factory}. Sets the date value as
+ * the committed non-binary state of the containing generic value and
+ * restarts the method call.
+ *
+ * @return date value
+ * @throws RepositoryException if the value retrieval fails
+ */
+ public Calendar getDate() throws RepositoryException {
+ value = toStringValue();
+ return value.getDate();
+ }
+
+ /**
+ * Converts the {@link #committed underlying binary value} to double by
+ * reading the stream as UTF-8 and using the
+ * {@link #factory associated value factory}. Sets the double value as
+ * the committed non-binary state of the containing generic value and
+ * restarts the method call.
+ *
+ * @return double value
+ * @throws RepositoryException if the value retrieval fails
+ */
+ public double getDouble() throws RepositoryException {
+ value = toStringValue();
+ return value.getDouble();
+ }
+
+ /**
+ * Converts the {@link #committed underlying binary value} to long by
+ * reading the stream as UTF-8 and using the
+ * {@link #factory associated value factory}. Sets the long value as
+ * the committed non-binary state of the containing generic value and
+ * restarts the method call.
+ *
+ * @return long value
+ * @throws RepositoryException if the value retrieval fails
+ */
+ public long getLong() throws RepositoryException {
+ value = toStringValue();
+ return value.getLong();
+ }
+
+ /**
+ * Sets the {@link #committed underlying binary value} as the committed
+ * state of the containing generic value and restarts the method call.
+ *
+ * @return binary value
+ * @throws RepositoryException if the value retrieval fails
+ */
+ public InputStream getStream() throws RepositoryException {
+ value = committed;
+ return value.getStream();
+ }
+
+ /**
+ * Converts the {@link #committed underlying binary value} to string by
+ * reading the stream as UTF-8 and using the
+ * {@link #factory associated value factory}. Sets the string value as
+ * the committed non-binary state of the containing generic value and
+ * restarts the method call.
+ *
+ * @return string value
+ * @throws RepositoryException if the value retrieval fails
+ */
+ public String getString() throws RepositoryException {
+ value = toStringValue();
+ return value.getString();
+ }
+
+ //----------------------------------------------------< Serializable >
+
+ /**
+ * Uses the default deserialization to reads the values from the object
+ * stream and then associates the instance with the current
+ * {@link CommittedValueFactory} instance.
+ *
+ * @param stream object stream
+ * @throws IOException if the serialized object could not be read
+ * @throws ClassNotFoundException if a serialized class is not found
+ */
+ private void readObject(ObjectInputStream stream)
+ throws IOException, ClassNotFoundException {
+ stream.defaultReadObject();
+ factory = CommittedValueFactory.getCurrentFactory();
+ }
+
+ //----------------------------------------------------------< Object >
+
+ /**
+ * Returns "null when the stream
+ * is closed.
+ */
+ private transient InputStream stream;
+
+ /**
+ * Creates a new serializable decorator for the given binary stream.
+ *
+ * @param stream binary stream
+ */
+ public SerializableInputStream(InputStream stream) {
+ this.stream = stream;
+ }
+
+ /**
+ * Closes the underlying binary stream. Does nothing if the stream has
+ * already been closed.
+ *
+ * @throws IOException if the stream could not be closed
+ */
+ public void close() throws IOException {
+ if (stream != null) {
+ stream.close();
+ stream = null;
+ }
+ }
+
+ /**
+ * Returns the number of available bytes in the underlying stream, or
+ * 0 if the stream has closed.
+ *
+ * @return number of available bytes, or 0
+ * @throws IOException if the number of available bytes is unavailable
+ */
+ public int available() throws IOException {
+ if (stream != null) {
+ return stream.available();
+ } else {
+ return 0;
+ }
+ }
+
+ /**
+ * Reads and returns a single byte from the underlying input stream.
+ * Closes the stream automatically if no more bytes are available.
+ *
+ * @return read byte, or -1 if no more bytes are available
+ * @throws IOException if the stream can not be read
+ */
+ public int read() throws IOException {
+ if (stream != null) {
+ int rv = stream.read();
+ if (rv == -1) {
+ close();
+ }
+ return rv;
+ } else {
+ return -1;
+ }
+ }
+
+ /**
+ * Reads and returns a sequence bytes from the underlying input stream.
+ * Closes the stream automatically if no more bytes are available.
+ *
+ * @param b byte buffer
+ * @param off buffer offset
+ * @param len maximum number of bytes to read
+ * @return number of bytes read,
+ * or -1 if no more bytes are available
+ * @throws IOException if the stream can not be read
+ */
+ public int read(byte[] b, int off, int len) throws IOException {
+ if (stream != null) {
+ int rv = stream.read(b, off, len);
+ if (rv == -1) {
+ close();
+ }
+ return rv;
+ } else {
+ return -1;
+ }
+ }
+
+ /**
+ * Skips at most the given number of bytes and returns the number of
+ * bytes skipped. Returns 0 if the stream has closed.
+ *
+ * @param n maximum number of bytes to skip
+ * @return number of bytes skipped
+ * @throws IOException if skipping failed
+ */
+ public long skip(long n) throws IOException {
+ if (stream != null) {
+ return stream.skip(n);
+ } else {
+ return 0;
+ }
+ }
+
+ //--------------------------------------------------------< Serializable >
+
+ /**
+ * Deserializes a stream by reading it as a byte array.
+ *
+ * @param input object stream
+ * @throws IOException if deserialization fails
+ * @throws ClassNotFoundException if a deserialized class is not found
+ */
+ private void readObject(ObjectInputStream input)
+ throws IOException, ClassNotFoundException {
+ input.defaultReadObject();
+ byte[] bytes = (byte[]) input.readObject();
+ if (bytes != null) {
+ stream = new ByteArrayInputStream(bytes);
+ } else {
+ stream = null;
+ }
+ }
+
+ /**
+ * Serializes the stream by reading (the rest of) the stream contents
+ * into a byte array and serializing that.
+ *
+ * @param output object stream
+ * @throws IOException if serialization fails
+ */
+ private void writeObject(ObjectOutputStream output) throws IOException {
+ output.defaultWriteObject();
+ byte[] bytes = null;
+ if (stream != null) {
+ try {
+ bytes = new byte[4096];
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ for (int n = stream.read(bytes); n != -1; n = stream.read(bytes)) {
+ buffer.write(bytes, 0, n);
+ }
+ bytes = buffer.toByteArray();
+ } finally {
+ stream.close();
+ }
+ stream = new ByteArrayInputStream(bytes);
+ }
+ output.writeObject(bytes);
+ }
+
+}
Property changes on: src/main/java/org/apache/jackrabbit/value/SerializableInputStream.java
___________________________________________________________________
Name: svn:eol-style
+ native
Index: src/main/java/org/apache/jackrabbit/value/CommittedLongValue.java
===================================================================
--- src/main/java/org/apache/jackrabbit/value/CommittedLongValue.java (revision 0)
+++ src/main/java/org/apache/jackrabbit/value/CommittedLongValue.java (revision 0)
@@ -0,0 +1,97 @@
+/*
+ * 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.jackrabbit.value;
+
+import java.io.Serializable;
+import java.util.Calendar;
+
+import javax.jcr.PropertyType;
+
+/**
+ * Committed long value.
+ */
+class CommittedLongValue extends CommittedScalarValue implements Serializable {
+
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 3491104429903010061L;
+
+ /**
+ * Long value.
+ */
+ private final long value;
+
+ /**
+ * Creates a committed long value.
+ *
+ * @param value long value
+ */
+ CommittedLongValue(long value) {
+ this.value = value;
+ }
+
+ //---------------------------------------------------------------< Value >
+
+ /**
+ * Returns {@link PropertyType#LONG}.
+ *
+ * @return {@link PropertyType#LONG}
+ */
+ public int getType() {
+ return PropertyType.LONG;
+ }
+
+ /**
+ * Returns the long value as a date.
+ *
+ * @return date value
+ */
+ public Calendar getDate() {
+ Calendar date = Calendar.getInstance();
+ date.setTimeInMillis(value);
+ return date;
+ }
+
+ /**
+ * Returns the long value as a double.
+ *
+ * @return double value
+ */
+ public double getDouble() {
+ return (double) value;
+ }
+
+ /**
+ * Returns the long value.
+ *
+ * @return long value
+ */
+ public long getLong() {
+ return value;
+ }
+
+ /**
+ * Returns the long value as a string.
+ *
+ * @return string value
+ */
+ public String getString() {
+ return Long.toString(value);
+ }
+
+}
Property changes on: src/main/java/org/apache/jackrabbit/value/CommittedLongValue.java
___________________________________________________________________
Name: svn:eol-style
+ native
Index: src/main/java/org/apache/jackrabbit/value/CommittedScalarValue.java
===================================================================
--- src/main/java/org/apache/jackrabbit/value/CommittedScalarValue.java (revision 0)
+++ src/main/java/org/apache/jackrabbit/value/CommittedScalarValue.java (revision 0)
@@ -0,0 +1,104 @@
+/*
+ * 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.jackrabbit.value;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.Calendar;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.ValueFormatException;
+
+/**
+ * Abstract base class for committed non-binary values. This class throws
+ * an {@link IllegalStateException} from {@link #getStream()} and defaults
+ * to throwing a {@link ValueFormatException} from the other value getters.
+ * Subclasses should implement {@link Value#getType()} and the non-binary
+ * value getters for which a value conversion is defined.
+ */
+abstract class CommittedScalarValue implements Value, Serializable {
+
+ //---------------------------------------------------------------< Value >
+
+ /**
+ * Throws a {@link ValueFormatException}, unless overridden by a subclass.
+ *
+ * @return nothing
+ * @throws ValueFormatException always thrown, unless overridden
+ */
+ public boolean getBoolean() throws ValueFormatException {
+ throw new ValueFormatException("Invalid boolean format: " + this);
+ }
+
+ /**
+ * Throws a {@link ValueFormatException}, unless overridden by a subclass.
+ *
+ * @return nothing
+ * @throws ValueFormatException always thrown, unless overridden
+ */
+ public Calendar getDate() throws ValueFormatException {
+ throw new ValueFormatException("Invalid date format: " + this);
+ }
+
+ /**
+ * Throws a {@link ValueFormatException}, unless overridden by a subclass.
+ *
+ * @return nothing
+ * @throws ValueFormatException always thrown, unless overridden
+ */
+ public double getDouble() throws ValueFormatException {
+ throw new ValueFormatException("Invalid double format: " + this);
+ }
+
+ /**
+ * Throws a {@link ValueFormatException}, unless overridden by a subclass.
+ *
+ * @return nothing
+ * @throws ValueFormatException always thrown, unless overridden
+ */
+ public long getLong() throws ValueFormatException {
+ throw new ValueFormatException("Invalid long format: " + this);
+ }
+
+ /**
+ * Throws an {@link IllegalStateException}.
+ *
+ * @return nothing
+ * @throws IllegalStateException always thrown
+ */
+ public InputStream getStream() throws IllegalStateException {
+ throw new IllegalStateException("Illegal value state");
+ }
+
+ //--------------------------------------------------------------< Object >
+
+ /**
+ * Returns the string representation of this value.
+ *
+ * @return return value of {@link Value#getString()},
+ * or <value> if the method fails
+ */
+ public String toString() {
+ try {
+ return getString();
+ } catch (RepositoryException e) {
+ return "false if either this or the other value is in
+ * committed binary state (in which case the string representation is
+ * not available) or if one of the string value getters fails.
+ * true if the values are equal,
+ * false otherwise
+ */
+ public boolean equals(Object other) {
+ try {
+ return (other instanceof Value)
+ && getType() == ((Value) other).getType()
+ && getString().equals(((Value) other).getString());
+ } catch (IllegalStateException e) {
+ return false;
+ } catch (RepositoryException e) {
+ return false;
+ }
+ }
+
+ /**
+ * Returns the hash code of this value. The hash code is computed based
+ * on the value type and string representation to be consistent with the
+ * {@link #equals(Object)} implementation.
+ * 0 if this value is in commmitted binary state
+ * (in which case the string representation is not available) or if the
+ * string value getter fails.
+ * <binary>".
+ *
+ * @return "<binary>"
+ */
+ public String toString() {
+ return "true value.
+ */
+class CommittedTrueValue extends CommittedScalarValue implements Serializable {
+
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 7566891337364047387L;
+
+ /**
+ * The singleton instance of this class.
+ */
+ public static final Value INSTANCE = new CommittedTrueValue();
+
+ /**
+ * Private constructor to enforce the singleton instance.
+ */
+ private CommittedTrueValue() {
+ }
+
+ //---------------------------------------------------------------< Value >
+
+ /**
+ * Returns {@link PropertyType#BOOLEAN}.
+ *
+ * @return {@link PropertyType#BOOLEAN}
+ */
+ public int getType() {
+ return PropertyType.BOOLEAN;
+ }
+
+ /**
+ * Returns true.
+ *
+ * @return true
+ */
+ public boolean getBoolean() {
+ return true;
+ }
+
+ /**
+ * Returns "true".
+ *
+ * @return "true"
+ */
+ public String getString() {
+ return Boolean.TRUE.toString();
+ }
+
+ //--------------------------------------------------------< Serializable >
+
+ /**
+ * Enforces the singleton instance of this class by returning it as the
+ * result of deserialization.
+ *
+ * @return {@link #INSTANCE}
+ */
+ private Object readResolve() {
+ return INSTANCE;
+ }
+
+}
Property changes on: src/main/java/org/apache/jackrabbit/value/CommittedTrueValue.java
___________________________________________________________________
Name: svn:eol-style
+ native
Index: src/main/java/org/apache/jackrabbit/value/CommittedNameValue.java
===================================================================
--- src/main/java/org/apache/jackrabbit/value/CommittedNameValue.java (revision 0)
+++ src/main/java/org/apache/jackrabbit/value/CommittedNameValue.java (revision 0)
@@ -0,0 +1,69 @@
+/*
+ * 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.jackrabbit.value;
+
+import java.io.Serializable;
+
+import javax.jcr.PropertyType;
+
+/**
+ * Committed unprefixed name value. Unprefixed names are easy to handle as
+ * no prefix remappings can affect the string representation of the value.
+ * See the {@link CommittedPrefixNameValue} for handling of prefixed names.
+ */
+class CommittedNameValue extends CommittedScalarValue implements Serializable {
+
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = -4823273796633809803L;
+
+ /**
+ * Unprefixed name value.
+ */
+ private final String value;
+
+ /**
+ * Creates a committed unprefixed name value.
+ *
+ * @param value unprefixed name
+ */
+ CommittedNameValue(String value) {
+ this.value = value;
+ }
+
+ //---------------------------------------------------------------< Value >
+
+ /**
+ * Returns {@link PropertyType#NAME}.
+ *
+ * @return {@link PropertyType#NAME}
+ */
+ public int getType() {
+ return PropertyType.NAME;
+ }
+
+ /**
+ * Returns the unprefixed name.
+ *
+ * @return unprefixed name
+ */
+ public String getString() {
+ return value;
+ }
+
+}
Property changes on: src/main/java/org/apache/jackrabbit/value/CommittedNameValue.java
___________________________________________________________________
Name: svn:eol-style
+ native
Index: src/main/java/org/apache/jackrabbit/value/CommittedBinaryValue.java
===================================================================
--- src/main/java/org/apache/jackrabbit/value/CommittedBinaryValue.java (revision 0)
+++ src/main/java/org/apache/jackrabbit/value/CommittedBinaryValue.java (revision 0)
@@ -0,0 +1,132 @@
+/*
+ * 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.jackrabbit.value;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.Calendar;
+
+import javax.jcr.PropertyType;
+import javax.jcr.Value;
+
+/**
+ * Committed binary value. This class throws an {@link IllegalStateException}
+ * from all the value getters other than {@link #getStream()}.
+ */
+class CommittedBinaryValue implements Value, Serializable {
+
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = 6752015631871189215L;
+
+ /**
+ * The binary stream.
+ */
+ private final InputStream stream;
+
+ /**
+ * Creates a new committed binary value.
+ *
+ * @param value binary stream
+ */
+ CommittedBinaryValue(InputStream value) {
+ this.stream = new SerializableInputStream(value);
+ }
+
+ //---------------------------------------------------------------< Value >
+
+ /**
+ * Returns {@link PropertyType#BINARY}.
+ *
+ * @return {@link PropertyType#BINARY}
+ */
+ public int getType() {
+ return PropertyType.BINARY;
+ }
+
+ /**
+ * Throws an {@link IllegalStateException}.
+ *
+ * @return nothing
+ * @throws IllegalStateException always thrown
+ */
+ public boolean getBoolean() throws IllegalStateException {
+ throw new IllegalStateException("Illegal value state");
+ }
+
+ /**
+ * Throws an {@link IllegalStateException}.
+ *
+ * @return nothing
+ * @throws IllegalStateException always thrown
+ */
+ public Calendar getDate() throws IllegalStateException {
+ throw new IllegalStateException("Illegal value state");
+ }
+
+ /**
+ * Throws an {@link IllegalStateException}.
+ *
+ * @return nothing
+ * @throws IllegalStateException always thrown
+ */
+ public double getDouble() throws IllegalStateException {
+ throw new IllegalStateException("Illegal value state");
+ }
+
+ /**
+ * Throws an {@link IllegalStateException}.
+ *
+ * @return nothing
+ * @throws IllegalStateException always thrown
+ */
+ public long getLong() throws IllegalStateException {
+ throw new IllegalStateException("Illegal value state");
+ }
+
+ /**
+ * Returns the binary stream.
+ *
+ * @return binary stream
+ */
+ public InputStream getStream() {
+ return stream;
+ }
+
+ /**
+ * Throws an {@link IllegalStateException}.
+ *
+ * @return nothing
+ * @throws IllegalStateException always thrown
+ */
+ public String getString() throws IllegalStateException {
+ throw new IllegalStateException("Illegal value state");
+ }
+
+ //--------------------------------------------------------------< Object >
+
+ /**
+ * Returns "<binary>".
+ *
+ * @return "<binary>"
+ */
+ public String toString() {
+ return "true if the character is non-space,
+ * false otherwise
+ */
+ private static boolean isNonSpace(char ch) {
+ return ch != '/' && ch != ':' && ch != '[' && ch != ']'
+ && ch != '*' && ch != '\'' && ch != '"' && ch != '|'
+ && !Character.isSpaceChar(ch);
+ }
+
+ /**
+ * Checks the value of a character within a string.
+ *
+ * @param i index of the character within the string
+ * @param ch expected value of the indexed character
+ * @throws ValueFormatException if the indexed character is not as expected
+ * @throws IndexOutOfBoundsException if the index is outside the string
+ */
+ private void expect(int i, char ch)
+ throws ValueFormatException, IndexOutOfBoundsException {
+ if (value.charAt(i) != ch) {
+ throw new ValueFormatException("Invalid value format: " + value);
+ }
+ }
+
+ /**
+ * Parses a numeric part within a string. Returns the number of characters
+ * parsed.
+ *
+ * @param i index of the first character of the numeric part
+ * @param n lenght of the numeric part
+ * @param date the calendar object where the parsed number is saved
+ * @param field the calendar field where the parsed number is saved
+ * @param adjust an optional adjustment that is added to the parsed number
+ * @return lenght of the numeric part
+ * @throws ValueFormatException if the part is not numeric
+ * @throws IndexOutOfBoundsException if the index is outside the string
+ */
+ private int parse(int i, int n, Calendar date, int field, int adjust)
+ throws ValueFormatException, IndexOutOfBoundsException {
+ int number = 0;
+ for (int j = 0; j < n; j++) {
+ char ch = value.charAt(i + j);
+ if (ch >= '0' && ch <= '9') {
+ number = number * 10 + (ch - '0');
+ } else {
+ throw new ValueFormatException("Invalid value format: " + value);
+ }
+ }
+ date.set(field, number + adjust);
+ return n;
+ }
+
+ /**
+ * Checks that the specified part of the value string is a local name as
+ * specified by JSR 170.
+ *
+ * @param begin begin index of the local name part
+ * @param end endn index of the local name part
+ * @throws ValueFormatException if the specified part is not a local name
+ */
+ private void expectLocalName(int begin, int end)
+ throws ValueFormatException {
+ if (begin >= end) {
+ throw new ValueFormatException("Empty local name: " + value);
+ } else if (!isNonSpace(value.charAt(begin))) {
+ throw new ValueFormatException("Invalid first character: " + value);
+ } else if (!isNonSpace(value.charAt(end - 1))) {
+ throw new ValueFormatException("Invalid last character: " + value);
+ }
+
+ for (int i = begin + 1; i < end - 1; i++) {
+ char ch = value.charAt(i);
+ if (!isNonSpace(ch) && ch != ' ') {
+ throw new ValueFormatException("Invalid name character: " + value);
+ }
+ }
+ }
+
+ /**
+ * Parses the string as a JSR 170 path and returns the name as a committed
+ * value instance.
+ *
+ * @param resolver namespace resolver
+ * @return committed name value
+ * @throws ValueFormatException on name format errors
+ */
+ public Value createName(NamespaceResolver resolver)
+ throws ValueFormatException {
+ if (value.equals(".") || value.equals("..")) {
+ throw new ValueFormatException("Invalid name: " + value);
+ }
+
+ int colon = value.indexOf(':');
+ expectLocalName(colon + 1, value.length());
+ if (colon == -1) {
+ return new CommittedNameValue(value);
+ } else {
+ try {
+ String prefix = value.substring(0, colon);
+ String namespace = resolver.getURI(prefix);
+ return new CommittedPrefixNameValue(
+ value, prefix, namespace, resolver);
+ } catch (RepositoryException e) {
+ throw new ValueFormatException("Invalid namespace: " + value);
+ }
+ }
+ }
+
+ /**
+ * Checks that the specified part of the value string is a path element as
+ * specified by JSR 170.
+ *
+ * @param begin begin index of the path element
+ * @param end end index of the path element
+ * @param namespaces prefix to namespace URI mappings
+ * @param resolver namespace resolver
+ * @throws ValueFormatException if the specified part is not a path element
+ */
+ private void expectPathElement(
+ int begin, int end, Map namespaces, NamespaceResolver resolver)
+ throws ValueFormatException {
+ if (end == begin) {
+ throw new ValueFormatException("Empty path element: " + value);
+ }
+ if (end == begin + 1 && !isNonSpace(value.charAt(begin))) {
+ throw new ValueFormatException("Invalid path element: " + value);
+ }
+ if (end == begin + 2 && (!isNonSpace(value.charAt(begin))
+ || !isNonSpace(value.charAt(begin + 1)))) {
+ throw new ValueFormatException("Invalid path element: " + value);
+ }
+
+ // Indexed? "x[1]"
+ if (end >= begin + 4 && value.charAt(end - 1) == ']') {
+ int index = value.lastIndexOf('[', end - 3);
+ if (index <= begin) {
+ throw new ValueFormatException("Invalid path index: " + value);
+ }
+ for (int i = index + 1; i < end - 1; i--) {
+ char ch = value.charAt(i);
+ if (ch < '0' || ch > '9') {
+ throw new ValueFormatException("Invalid path index: " + value);
+ }
+ }
+ end = index;
+ }
+
+ // Prefixed? "a:b"
+ int colon = value.indexOf(':', begin + 1);
+ if (colon != -1 && colon < end - 1) {
+ String prefix = value.substring(begin, colon);
+ if (!namespaces.containsKey(prefix)) {
+ try {
+ namespaces.put(prefix, resolver.getURI(prefix));
+ } catch (NamespaceException e) {
+ throw new ValueFormatException(
+ "Invalid path prefix: " + value, e);
+ }
+ }
+ begin = colon + 1;
+ }
+
+ expectLocalName(begin, end);
+ }
+
+ /**
+ * Parses the string as a JSR 170 path and returns the path as a committed
+ * value instance.
+ *
+ * @param resolver namespace resolver
+ * @return committed path value
+ * @throws ValueFormatException on path format errors
+ */
+ public Value createPath(NamespaceResolver resolver)
+ throws ValueFormatException {
+ if (value.length() == 0) {
+ throw new ValueFormatException("Empty path");
+ }
+ if (value.equals("/")) {
+ return new CommittedPathValue("/");
+ }
+
+ Map namespaces = new HashMap();
+
+ int position = -1;
+ if (value.charAt(0) == '/') {
+ position = 0;
+ }
+ while (position < value.length()) {
+ int slash = value.indexOf('/', position + 1);
+ if (slash == -1) {
+ slash = value.length();
+ }
+ expectPathElement(position + 1, slash, namespaces, resolver);
+ position = slash;
+ }
+
+ if (namespaces.isEmpty()) {
+ return new CommittedPathValue(value);
+ } else {
+ return new CommittedPrefixPathValue(value, namespaces, resolver);
+ }
+ }
+
+ /**
+ * Returns the string as a boolean value.
+ *
+ * @return boolean value
+ */
+ public boolean getBoolean() {
+ return Boolean.valueOf(value).booleanValue();
+ }
+
+ /**
+ * Parses the string as a ISO8601 date as specified by JSR 170 and returns
+ * the parsed date value.
+ *
+ * @return date value
+ * @throws ValueFormatException on ISO8601 parse errors
+ */
+ public Calendar getDate() throws ValueFormatException {
+ try {
+ long milliseconds;
+ Calendar date = GregorianCalendar.getInstance(UTC);
+ int i = 0;
+
+ char sign = value.charAt(i);
+ if (sign == '-') {
+ date.set(Calendar.ERA, GregorianCalendar.BC);
+ } else {
+ date.set(Calendar.ERA, GregorianCalendar.AD);
+ }
+ if (sign == '-' || sign == '+') {
+ i++;
+ }
+
+ i += parse(i, 4, date, Calendar.YEAR, 0);
+ expect(i++, '-');
+ i += parse(i, 2, date, Calendar.MONTH, -1);
+ expect(i++, '-');
+ i += parse(i, 2, date, Calendar.DAY_OF_MONTH, 0);
+ expect(i++, 'T');
+ i += parse(i, 2, date, Calendar.HOUR_OF_DAY, 0);
+ expect(i++, ':');
+ i += parse(i, 2, date, Calendar.MINUTE, 0);
+ expect(i++, ':');
+ i += parse(i, 2, date, Calendar.SECOND, 0);
+ expect(i++, '.');
+ i += parse(i, 3, date, Calendar.MILLISECOND, 0);
+
+ milliseconds = date.getTimeInMillis();
+ char tz = value.charAt(i++);
+ if (tz == 'Z' && i == value.length()) {
+ // do nothing
+ } else if ((tz == '-' || tz == '+') && i + 5 == value.length()) {
+ i += parse(i, 2, date, Calendar.HOUR_OF_DAY, 0);
+ expect(i++, ':');
+ i += parse(i, 2, date, Calendar.MINUTE, 0);
+ long offset = date.get(Calendar.HOUR_OF_DAY) * 60
+ + date.get(Calendar.MINUTE);
+ if (tz == '-') {
+ milliseconds += offset * 60 * 1000;
+ } else {
+ milliseconds -= offset * 60 * 1000;
+ }
+ } else {
+ throw new ValueFormatException("Invalid date format: " + value);
+ }
+
+ date = Calendar.getInstance();
+ date.setTimeInMillis(milliseconds);
+ return date;
+ } catch (IndexOutOfBoundsException e) {
+ throw new ValueFormatException("Invalid date format: " + value, e);
+ }
+ }
+
+ /**
+ * Returns the string as a double value.
+ *
+ * @return double value
+ * @throws ValueFormatException if the string to double conversion fails
+ */
+ public double getDouble() throws ValueFormatException {
+ try {
+ return Double.valueOf(value).doubleValue();
+ } catch (NumberFormatException e) {
+ throw new ValueFormatException("Invalid double value: " + value);
+ }
+ }
+
+ /**
+ * Returns the string as a long value.
+ *
+ * @return long value
+ * @throws ValueFormatException if the string to long conversion fails
+ */
+ public long getLong() throws ValueFormatException {
+ try {
+ return Long.valueOf(value).longValue();
+ } catch (NumberFormatException e) {
+ throw new ValueFormatException("Invalid long value: " + value);
+ }
+ }
+
+ /**
+ * Returns the string as a UTF-8 encoded binary stream.
+ *
+ * @return binary stream
+ * @throws ValueFormatException if the UTF-8 encoding is not available
+ */
+ public InputStream getStream() throws ValueFormatException {
+ try {
+ return new ByteArrayInputStream(value.getBytes("UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ throw new ValueFormatException("UTF-8 not supported", e);
+ }
+ }
+}
Property changes on: src/main/java/org/apache/jackrabbit/value/ValueParser.java
___________________________________________________________________
Name: svn:eol-style
+ native
Index: src/main/java/org/apache/jackrabbit/value/CommittedFalseValue.java
===================================================================
--- src/main/java/org/apache/jackrabbit/value/CommittedFalseValue.java (revision 0)
+++ src/main/java/org/apache/jackrabbit/value/CommittedFalseValue.java (revision 0)
@@ -0,0 +1,86 @@
+/*
+ * 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.jackrabbit.value;
+
+import java.io.Serializable;
+
+import javax.jcr.PropertyType;
+import javax.jcr.Value;
+
+/**
+ * Committed boolean false value.
+ */
+class CommittedFalseValue extends CommittedScalarValue implements Serializable {
+
+ /**
+ * Serial version UID.
+ */
+ private static final long serialVersionUID = -4462976650304732295L;
+
+ /**
+ * The singleton instance of this class.
+ */
+ public static final Value INSTANCE = new CommittedFalseValue();
+
+ /**
+ * Private constructor to enforce the singleton instance.
+ */
+ private CommittedFalseValue() {
+ }
+
+ //---------------------------------------------------------------< Value >
+
+ /**
+ * Returns {@link PropertyType#BOOLEAN}.
+ *
+ * @return {@link PropertyType#BOOLEAN}
+ */
+ public int getType() {
+ return PropertyType.BOOLEAN;
+ }
+
+ /**
+ * Returns false.
+ *
+ * @return false
+ */
+ public boolean getBoolean() {
+ return false;
+ }
+
+ /**
+ * Returns "false".
+ *
+ * @return "false"
+ */
+ public String getString() {
+ return Boolean.FALSE.toString();
+ }
+
+ //--------------------------------------------------------< Serializable >
+
+ /**
+ * Enforces the singleton instance of this class by returning it as the
+ * result of deserialization.
+ *
+ * @return {@link #INSTANCE}
+ */
+ private Object readResolve() {
+ return INSTANCE;
+ }
+
+}
Property changes on: src/main/java/org/apache/jackrabbit/value/CommittedFalseValue.java
___________________________________________________________________
Name: svn:eol-style
+ native