You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2005/04/15 16:33:20 UTC
svn commit: r161470 [1/2] - in
incubator/jackrabbit/trunk/contrib/jcr-rmi/src:
java/org/apache/jackrabbit/rmi/client/
java/org/apache/jackrabbit/rmi/iterator/
java/org/apache/jackrabbit/rmi/remote/
java/org/apache/jackrabbit/rmi/server/ java/org/apache/jackrabbit/rmi/xml/
test/org/apache/jackrabbit/test/rmi/
Author: tripod
Date: Fri Apr 15 07:33:13 2005
New Revision: 161470
URL: http://svn.apache.org/viewcvs?view=rev&rev=161470
Log:
- updating to spec 0.16.4
Added:
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java (with props)
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java (with props)
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java (with props)
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java (with props)
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java (with props)
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java (with props)
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerItemDefinition.java (with props)
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeDefinition.java (with props)
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerPropertyDefinition.java (with props)
Removed:
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDef.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDef.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDef.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDef.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDef.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDef.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerItemDef.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeDef.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerPropertyDef.java
Modified:
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteProperty.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteSession.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerLock.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNode.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerNodeType.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerObject.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerProperty.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQuery.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerQueryResult.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerSession.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersion.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerVersionHistory.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/xml/SessionImportContentHandler.java
incubator/jackrabbit/trunk/contrib/jcr-rmi/src/test/org/apache/jackrabbit/test/rmi/RemoteAdapterTest.java
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientAdapterFactory.java Fri Apr 15 07:33:13 2005
@@ -24,11 +24,11 @@
import javax.jcr.Session;
import javax.jcr.Workspace;
import javax.jcr.lock.Lock;
-import javax.jcr.nodetype.ItemDef;
-import javax.jcr.nodetype.NodeDef;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeManager;
-import javax.jcr.nodetype.PropertyDef;
+import javax.jcr.nodetype.ItemDefinition;
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.PropertyDefinition;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
@@ -37,15 +37,15 @@
import javax.jcr.version.VersionHistory;
import org.apache.jackrabbit.rmi.remote.RemoteItem;
-import org.apache.jackrabbit.rmi.remote.RemoteItemDef;
+import org.apache.jackrabbit.rmi.remote.RemoteItemDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteLock;
import org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry;
import org.apache.jackrabbit.rmi.remote.RemoteNode;
-import org.apache.jackrabbit.rmi.remote.RemoteNodeDef;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
import org.apache.jackrabbit.rmi.remote.RemoteProperty;
-import org.apache.jackrabbit.rmi.remote.RemotePropertyDef;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteQuery;
import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
@@ -174,31 +174,31 @@
}
/**
- * Creates and returns a {@link ClientItemDef ClientItemDef} instance.
+ * Creates and returns a {@link ClientItemDefinition ClientItemDefinition} instance.
*
* {@inheritDoc}
*/
- public ItemDef getItemDef(RemoteItemDef remote) {
- return new ClientItemDef(remote, this);
+ public ItemDefinition getItemDef(RemoteItemDefinition remote) {
+ return new ClientItemDefinition(remote, this);
}
/**
- * Creates and returns a {@link ClientNodeDef ClientNodeDef} instance.
+ * Creates and returns a {@link ClientNodeDefinition ClientNodeDefinition} instance.
*
* {@inheritDoc}
*/
- public NodeDef getNodeDef(RemoteNodeDef remote) {
- return new ClientNodeDef(remote, this);
+ public NodeDefinition getNodeDef(RemoteNodeDefinition remote) {
+ return new ClientNodeDefinition(remote, this);
}
/**
- * Creates and returns a {@link ClientPropertyDef ClientPropertyDef}
+ * Creates and returns a {@link ClientPropertyDefinition ClientPropertyDefinition}
* instance.
*
* {@inheritDoc}
*/
- public PropertyDef getPropertyDef(RemotePropertyDef remote) {
- return new ClientPropertyDef(remote, this);
+ public PropertyDefinition getPropertyDef(RemotePropertyDefinition remote) {
+ return new ClientPropertyDefinition(remote, this);
}
/**
Added: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java?view=auto&rev=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java Fri Apr 15 07:33:13 2005
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Licensed 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.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.nodetype.ItemDefinition;
+import javax.jcr.nodetype.NodeType;
+
+import org.apache.jackrabbit.rmi.remote.RemoteItemDefinition;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteItemDefinition RemoteItemDefinition}
+ * inteface. This class makes a remote item definition locally available using
+ * the JCR {@link javax.jcr.nodetype.ItemDefinition ItemDef} interface. Used mainly
+ * as the base class for the
+ * {@link org.apache.jackrabbit.rmi.client.ClientPropertyDefinition ClientPropertyDefinition}
+ * and
+ * {@link org.apache.jackrabbit.rmi.client.ClientNodeDefinition ClientNodeDefinition} adapters.
+ *
+ * @author Jukka Zitting
+ * @see javax.jcr.nodetype.ItemDefinition
+ * @see org.apache.jackrabbit.rmi.remote.RemoteItemDefinition
+ */
+public class ClientItemDefinition extends ClientObject implements ItemDefinition {
+
+ /** The adapted remote item definition. */
+ private RemoteItemDefinition remote;
+
+ /**
+ * Creates a local adapter for the given remote item definition.
+ *
+ * @param remote remote item definition
+ * @param factory local adapter factory
+ */
+ public ClientItemDefinition(RemoteItemDefinition remote, LocalAdapterFactory factory) {
+ super(factory);
+ this.remote = remote;
+ }
+
+ /** {@inheritDoc} */
+ public NodeType getDeclaringNodeType() {
+ try {
+ return getFactory().getNodeType(remote.getDeclaringNodeType());
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public String getName() {
+ try {
+ return remote.getName();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean isAutoCreated() {
+ try {
+ return remote.isAutoCreated();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean isMandatory() {
+ try {
+ return remote.isMandatory();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public int getOnParentVersion() {
+ try {
+ return remote.getOnParentVersion();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean isProtected() {
+ try {
+ return remote.isProtected();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+}
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java
------------------------------------------------------------------------------
svn =
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientItemDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientLock.java Fri Apr 15 07:33:13 2005
@@ -90,7 +90,7 @@
}
/** {@inheritDoc} */
- public boolean isLive() {
+ public boolean isLive() throws RepositoryException {
try {
return remote.isLive();
} catch (RemoteException ex) {
@@ -107,4 +107,12 @@
}
}
+ /** {@inheritDoc} */
+ public boolean isSessionScoped() {
+ try {
+ return remote.isSessionScoped();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNode.java Fri Apr 15 07:33:13 2005
@@ -37,8 +37,8 @@
import javax.jcr.StringValue;
import javax.jcr.Value;
import javax.jcr.lock.Lock;
-import javax.jcr.nodetype.NodeDef;
import javax.jcr.nodetype.NodeType;
+import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.version.Version;
import javax.jcr.version.VersionHistory;
@@ -374,7 +374,7 @@
}
/** {@inheritDoc} */
- public NodeDef getDefinition() throws RepositoryException {
+ public NodeDefinition getDefinition() throws RepositoryException {
try {
return getFactory().getNodeDef(remote.getDefinition());
} catch (RemoteException ex) {
@@ -410,10 +410,10 @@
}
/** {@inheritDoc} */
- public void merge(String workspace, boolean bestEffort)
+ public NodeIterator merge(String workspace, boolean bestEffort)
throws RepositoryException {
try {
- remote.merge(workspace, bestEffort);
+ return getNodeIterator(getSession(), remote.merge(workspace, bestEffort));
} catch (RemoteException ex) {
throw new RemoteRepositoryException(ex);
}
@@ -516,6 +516,24 @@
} catch (RemoteException ex) {
throw new RemoteRepositoryException(ex);
}
+ }
+
+ /** {@inheritDoc} */
+ public Property setProperty(String name, Value value, int type)
+ throws RepositoryException {
+ try {
+ RemoteProperty property =
+ remote.setProperty(name, new SerialValue(value), type);
+ return getFactory().getProperty(getSession(), property);
+ } catch (RemoteException ex) {
+ throw new RemoteRepositoryException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public Property setProperty(String name, String value, int type)
+ throws RepositoryException {
+ return setProperty(name, new StringValue(value), type);
}
/** {@inheritDoc} */
Added: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java?view=auto&rev=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java Fri Apr 15 07:33:13 2005
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Licensed 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.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeType;
+
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition RemoteNodeDefinition}
+ * inteface. This class makes a remote node definition locally available using
+ * the JCR {@link javax.jcr.nodetype.NodeDefinition NodeDef} interface.
+ *
+ * @author Jukka Zitting
+ * @see javax.jcr.nodetype.NodeDefinition
+ * @see org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition
+ */
+public class ClientNodeDefinition extends ClientItemDefinition implements NodeDefinition {
+
+ /** The adapted remote node definition. */
+ private RemoteNodeDefinition remote;
+
+ /**
+ * Creates a local adapter for the given remote node definition.
+ *
+ * @param remote remote node definition
+ * @param factory local adapter factory
+ */
+ public ClientNodeDefinition(RemoteNodeDefinition remote, LocalAdapterFactory factory) {
+ super(remote, factory);
+ this.remote = remote;
+ }
+
+ /** {@inheritDoc} */
+ public NodeType[] getRequiredPrimaryTypes() {
+ try {
+ return getNodeTypeArray(remote.getRequiredPrimaryTypes());
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public NodeType getDefaultPrimaryType() {
+ try {
+ return getFactory().getNodeType(remote.getDefaultPrimaryType());
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean allowsSameNameSiblings() {
+ try {
+ return remote.allowsSameNameSiblings();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+}
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java
------------------------------------------------------------------------------
svn =
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientNodeType.java Fri Apr 15 07:33:13 2005
@@ -19,11 +19,11 @@
import java.rmi.RemoteException;
import javax.jcr.Value;
-import javax.jcr.nodetype.NodeDef;
+import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.nodetype.NodeType;
-import javax.jcr.nodetype.PropertyDef;
+import javax.jcr.nodetype.PropertyDefinition;
-import org.apache.jackrabbit.rmi.remote.RemoteNodeDef;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
import org.apache.jackrabbit.rmi.remote.SerialValue;
@@ -108,7 +108,7 @@
}
/** {@inheritDoc} */
- public PropertyDef[] getPropertyDefs() {
+ public PropertyDefinition[] getPropertyDefinitions() {
try {
return getPropertyDefArray(remote.getPropertyDefs());
} catch (RemoteException ex) {
@@ -117,7 +117,7 @@
}
/** {@inheritDoc} */
- public PropertyDef[] getDeclaredPropertyDefs() {
+ public PropertyDefinition[] getDeclaredPropertyDefinitions() {
try {
return getPropertyDefArray(remote.getDeclaredPropertyDefs());
} catch (RemoteException ex) {
@@ -126,9 +126,9 @@
}
/** {@inheritDoc} */
- public NodeDef[] getChildNodeDefs() {
+ public NodeDefinition[] getChildNodeDefinitions() {
try {
- RemoteNodeDef[] defs = remote.getChildNodeDefs();
+ RemoteNodeDefinition[] defs = remote.getChildNodeDefs();
return getNodeDefArray(defs);
} catch (RemoteException ex) {
throw new RemoteRuntimeException(ex);
@@ -136,9 +136,9 @@
}
/** {@inheritDoc} */
- public NodeDef[] getDeclaredChildNodeDefs() {
+ public NodeDefinition[] getDeclaredChildNodeDefinitions() {
try {
- RemoteNodeDef[] defs = remote.getDeclaredChildNodeDefs();
+ RemoteNodeDefinition[] defs = remote.getDeclaredChildNodeDefs();
return getNodeDefArray(defs);
} catch (RemoteException ex) {
throw new RemoteRuntimeException(ex);
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientObject.java Fri Apr 15 07:33:13 2005
@@ -22,10 +22,10 @@
import javax.jcr.Property;
import javax.jcr.PropertyIterator;
import javax.jcr.Session;
-import javax.jcr.nodetype.NodeDef;
+import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeIterator;
-import javax.jcr.nodetype.PropertyDef;
+import javax.jcr.nodetype.PropertyDefinition;
import javax.jcr.version.Version;
import javax.jcr.version.VersionIterator;
@@ -35,10 +35,10 @@
import org.apache.jackrabbit.rmi.iterator.ArrayVersionIterator;
import org.apache.jackrabbit.rmi.remote.RemoteItem;
import org.apache.jackrabbit.rmi.remote.RemoteNode;
-import org.apache.jackrabbit.rmi.remote.RemoteNodeDef;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
import org.apache.jackrabbit.rmi.remote.RemoteProperty;
-import org.apache.jackrabbit.rmi.remote.RemotePropertyDef;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteVersion;
import org.apache.jackrabbit.rmi.remote.RemoteVersionHistory;
@@ -116,7 +116,7 @@
} else if (remote instanceof RemoteVersionHistory) {
return factory.getVersionHistory(session, (RemoteVersionHistory) remote);
} else {
- return factory.getNode(session, (RemoteNode) remote);
+ return factory.getNode(session, remote);
}
}
@@ -254,15 +254,15 @@
* @param remotes remote node definitions
* @return local node definition array
*/
- protected NodeDef[] getNodeDefArray(RemoteNodeDef[] remotes) {
+ protected NodeDefinition[] getNodeDefArray(RemoteNodeDefinition[] remotes) {
if (remotes != null) {
- NodeDef[] defs = new NodeDef[remotes.length];
+ NodeDefinition[] defs = new NodeDefinition[remotes.length];
for (int i = 0; i < remotes.length; i++) {
defs[i] = factory.getNodeDef(remotes[i]);
}
return defs;
} else {
- return new NodeDef[0]; // for safety
+ return new NodeDefinition[0]; // for safety
}
}
@@ -276,15 +276,15 @@
* @param remotes remote property definitions
* @return local property definition array
*/
- protected PropertyDef[] getPropertyDefArray(RemotePropertyDef[] remotes) {
+ protected PropertyDefinition[] getPropertyDefArray(RemotePropertyDefinition[] remotes) {
if (remotes != null) {
- PropertyDef[] defs = new PropertyDef[remotes.length];
+ PropertyDefinition[] defs = new PropertyDefinition[remotes.length];
for (int i = 0; i < remotes.length; i++) {
defs[i] = factory.getPropertyDef(remotes[i]);
}
return defs;
} else {
- return new PropertyDef[0]; // for safety
+ return new PropertyDefinition[0]; // for safety
}
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientProperty.java Fri Apr 15 07:33:13 2005
@@ -33,7 +33,7 @@
import javax.jcr.Session;
import javax.jcr.StringValue;
import javax.jcr.Value;
-import javax.jcr.nodetype.PropertyDef;
+import javax.jcr.nodetype.PropertyDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteProperty;
import org.apache.jackrabbit.rmi.remote.SerialValue;
@@ -288,7 +288,7 @@
}
/** {@inheritDoc} */
- public PropertyDef getDefinition() throws RepositoryException {
+ public PropertyDefinition getDefinition() throws RepositoryException {
try {
return getFactory().getPropertyDef(remote.getDefinition());
} catch (RemoteException ex) {
Added: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java?view=auto&rev=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java Fri Apr 15 07:33:13 2005
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Licensed 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.rmi.client;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.Value;
+import javax.jcr.nodetype.PropertyDefinition;
+
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
+
+/**
+ * Local adapter for the JCR-RMI
+ * {@link org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition RemotePropertyDefinition}
+ * inteface. This class makes a remote property definition locally available
+ * using the JCR {@link javax.jcr.nodetype.PropertyDefinition PropertyDef} interface.
+ *
+ * @author Jukka Zitting
+ * @see javax.jcr.nodetype.PropertyDefinition
+ * @see org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition
+ */
+public class ClientPropertyDefinition extends ClientItemDefinition implements PropertyDefinition {
+
+ /** The adapted remote property. */
+ private RemotePropertyDefinition remote;
+
+ /**
+ * Creates a local adapter for the given remote property definition.
+ *
+ * @param remote remote property definition
+ * @param factory local adapter factory
+ */
+ public ClientPropertyDefinition(
+ RemotePropertyDefinition remote, LocalAdapterFactory factory) {
+ super(remote, factory);
+ this.remote = remote;
+ }
+
+ /** {@inheritDoc} */
+ public int getRequiredType() {
+ try {
+ return remote.getRequiredType();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public String[] getValueConstraints() {
+ try {
+ return remote.getValueConstraints();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public Value[] getDefaultValues() {
+ try {
+ return remote.getDefaultValues();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public boolean isMultiple() {
+ try {
+ return remote.isMultiple();
+ } catch (RemoteException ex) {
+ throw new RemoteRuntimeException(ex);
+ }
+ }
+
+}
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java
------------------------------------------------------------------------------
svn =
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientPropertyDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQuery.java Fri Apr 15 07:33:13 2005
@@ -20,6 +20,14 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
+import javax.jcr.ItemExistsException;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.version.VersionException;
import javax.jcr.query.Query;
import javax.jcr.query.QueryResult;
@@ -85,20 +93,21 @@
}
/** {@inheritDoc} */
- public String getPersistentQueryPath() throws RepositoryException {
+ public String getStoredQueryPath() throws RepositoryException {
try {
- return remote.getPersistentQueryPath();
+ return remote.getStoredQueryPath();
} catch (RemoteException ex) {
throw new RemoteRepositoryException(ex);
}
}
/** {@inheritDoc} */
- public void save(String absPath) throws RepositoryException {
+ public Node storeAsNode(String absPath) throws RepositoryException {
try {
- remote.save(absPath);
+ return getNode(session, remote.storeAsNode(absPath));
} catch (RemoteException ex) {
throw new RemoteRepositoryException(ex);
}
}
+
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientQueryResult.java Fri Apr 15 07:33:13 2005
@@ -66,9 +66,9 @@
}
/** {@inheritDoc} */
- public String[] getPropertyNames() throws RepositoryException {
+ public String[] getColumnNames() throws RepositoryException {
try {
- return remote.getPropertyNames();
+ return remote.getColumnNames();
} catch (RemoteException ex) {
throw new RemoteRepositoryException(ex);
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientSession.java Fri Apr 15 07:33:13 2005
@@ -87,9 +87,9 @@
}
/** {@inheritDoc} */
- public String getUserId() {
+ public String getUserID() {
try {
- return remote.getUserId();
+ return remote.getUserID();
} catch (RemoteException ex) {
throw new RemoteRuntimeException(ex);
}
@@ -161,7 +161,7 @@
}
/** {@inheritDoc} */
- public boolean itemExists(String path) {
+ public boolean itemExists(String path) throws RepositoryException {
try {
return remote.itemExists(path);
} catch (RemoteException ex) {
@@ -207,7 +207,7 @@
/** {@inheritDoc} */
public void checkPermission(String path, String actions)
- throws AccessControlException {
+ throws AccessControlException, RepositoryException{
try {
remote.checkPermission(path, actions);
} catch (RemoteException ex) {
@@ -216,7 +216,7 @@
}
/** {@inheritDoc} */
- public void importXML(String path, InputStream xml)
+ public void importXML(String path, InputStream xml, int mode)
throws IOException, RepositoryException {
try {
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
@@ -224,16 +224,16 @@
for (int n = xml.read(bytes); n != -1; n = xml.read(bytes)) {
buffer.write(bytes, 0, n);
}
- remote.importXML(path, buffer.toByteArray());
+ remote.importXML(path, buffer.toByteArray(), mode);
} catch (RemoteException ex) {
throw new RemoteRepositoryException(ex);
}
}
/** {@inheritDoc} */
- public ContentHandler getImportContentHandler(String path)
+ public ContentHandler getImportContentHandler(String path, int mode)
throws RepositoryException {
- return new SessionImportContentHandler(this, path);
+ return new SessionImportContentHandler(this, path, mode);
}
/** {@inheritDoc} */
@@ -318,12 +318,12 @@
*
* {@inheritDoc}
*/
- public void exportSysView(
+ public void exportSystemView(
String path, ContentHandler handler,
boolean binaryAsLink, boolean noRecurse)
throws SAXException, RepositoryException {
try {
- byte[] xml = remote.exportSysView(path, binaryAsLink, noRecurse);
+ byte[] xml = remote.exportSystemView(path, binaryAsLink, noRecurse);
Source source = new StreamSource(new ByteArrayInputStream(xml));
Result result = new SAXResult(handler);
@@ -350,12 +350,12 @@
*
* {@inheritDoc}
*/
- public void exportSysView(
+ public void exportSystemView(
String path, OutputStream output,
boolean binaryAsLink, boolean noRecurse)
throws IOException, RepositoryException {
try {
- byte[] xml = remote.exportSysView(path, binaryAsLink, noRecurse);
+ byte[] xml = remote.exportSystemView(path, binaryAsLink, noRecurse);
output.write(xml);
} catch (RemoteException ex) {
throw new RemoteRepositoryException(ex);
@@ -371,12 +371,12 @@
*
* {@inheritDoc}
*/
- public void exportDocView(
+ public void exportDocumentView(
String path, ContentHandler handler,
boolean binaryAsLink, boolean noRecurse)
throws SAXException, RepositoryException {
try {
- byte[] xml = remote.exportDocView(path, binaryAsLink, noRecurse);
+ byte[] xml = remote.exportDocumentView(path, binaryAsLink, noRecurse);
Source source = new StreamSource(new ByteArrayInputStream(xml));
Result result = new SAXResult(handler);
@@ -403,15 +403,26 @@
*
* {@inheritDoc}
*/
- public void exportDocView(
+ public void exportDocumentView(
String path, OutputStream output,
boolean binaryAsLink, boolean noRecurse)
throws IOException, RepositoryException {
try {
- byte[] xml = remote.exportDocView(path, binaryAsLink, noRecurse);
+ byte[] xml = remote.exportDocumentView(path, binaryAsLink, noRecurse);
output.write(xml);
} catch (RemoteException ex) {
throw new RemoteRepositoryException(ex);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isLive() {
+ try {
+ return remote.isLive();
+ } catch (RemoteException e) {
+ throw new RemoteRuntimeException(e);
}
}
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersion.java Fri Apr 15 07:33:13 2005
@@ -22,6 +22,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.version.Version;
+import javax.jcr.version.VersionHistory;
import org.apache.jackrabbit.rmi.remote.RemoteVersion;
@@ -79,4 +80,13 @@
throw new RemoteRepositoryException(ex);
}
}
+
+ /** {@inheritDoc */
+ public VersionHistory getContainingHistory() throws RepositoryException {
+ try {
+ return getFactory().getVersionHistory(getSession(), remote.getContainingHistory());
+ } catch (RemoteException ex) {
+ throw new RemoteRepositoryException(ex);
+ }
+ }
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/ClientVersionHistory.java Fri Apr 15 07:33:13 2005
@@ -114,7 +114,7 @@
}
/** {@inheritDoc} */
- public boolean hasVersionLabel(String label) {
+ public boolean hasVersionLabel(String label) throws RepositoryException {
try {
return remote.hasVersionLabel(label);
} catch (RemoteException ex) {
@@ -135,7 +135,7 @@
}
/** {@inheritDoc} */
- public String[] getVersionLabels() {
+ public String[] getVersionLabels() throws RepositoryException {
try {
return remote.getVersionLabels();
} catch (RemoteException ex) {
@@ -161,6 +161,15 @@
RepositoryException {
try {
remote.removeVersion(versionName);
+ } catch (RemoteException ex) {
+ throw new RemoteRepositoryException(ex);
+ }
+ }
+
+ /** {@inheritDoc} */
+ public String getVersionableUUID() throws RepositoryException {
+ try {
+ return remote.getVersionableUUID();
} catch (RemoteException ex) {
throw new RemoteRepositoryException(ex);
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/client/LocalAdapterFactory.java Fri Apr 15 07:33:13 2005
@@ -24,11 +24,11 @@
import javax.jcr.Session;
import javax.jcr.Workspace;
import javax.jcr.lock.Lock;
-import javax.jcr.nodetype.ItemDef;
-import javax.jcr.nodetype.NodeDef;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeManager;
-import javax.jcr.nodetype.PropertyDef;
+import javax.jcr.nodetype.ItemDefinition;
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.PropertyDefinition;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
@@ -37,15 +37,15 @@
import javax.jcr.version.VersionHistory;
import org.apache.jackrabbit.rmi.remote.RemoteItem;
-import org.apache.jackrabbit.rmi.remote.RemoteItemDef;
+import org.apache.jackrabbit.rmi.remote.RemoteItemDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteLock;
import org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry;
import org.apache.jackrabbit.rmi.remote.RemoteNode;
-import org.apache.jackrabbit.rmi.remote.RemoteNodeDef;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
import org.apache.jackrabbit.rmi.remote.RemoteProperty;
-import org.apache.jackrabbit.rmi.remote.RemotePropertyDef;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteQuery;
import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
@@ -184,15 +184,15 @@
* Factory method for creating a local adapter for a remote item
* definition. Note that before calling this method, the client may want to
* introspect the remote item definition to determine whether to use the
- * {@link #getNodeDef(RemoteNodeDef) getNodeDef} or
- * {@link #getPropertyDef(RemotePropertyDef) getPropertyDef} method
+ * {@link #getNodeDef(RemoteNodeDefinition) getNodeDef} or
+ * {@link #getPropertyDef(RemotePropertyDefinition) getPropertyDef} method
* instead, as the adapter returned by this method will only cover
- * the {@link ItemDef ItemDef} base interface.
+ * the {@link ItemDefinition ItemDef} base interface.
*
* @param remote remote item definition
* @return local item definition adapter
*/
- ItemDef getItemDef(RemoteItemDef remote);
+ ItemDefinition getItemDef(RemoteItemDefinition remote);
/**
* Factory method for creating a local adapter for a remote node
@@ -201,7 +201,7 @@
* @param remote remote node definition
* @return local node definition adapter
*/
- NodeDef getNodeDef(RemoteNodeDef remote);
+ NodeDefinition getNodeDef(RemoteNodeDefinition remote);
/**
* Factory method for creating a local adapter for a remote property
@@ -210,7 +210,7 @@
* @param remote remote property definition
* @return local property definition adapter
*/
- PropertyDef getPropertyDef(RemotePropertyDef remote);
+ PropertyDefinition getPropertyDef(RemotePropertyDefinition remote);
/**
* Factory method for creating a local adapter for a remote lock.
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/iterator/ArrayIterator.java Fri Apr 15 07:33:13 2005
@@ -71,7 +71,7 @@
}
/** {@inheritDoc} */
- public long getPos() {
+ public long getPosition() {
return position;
}
Added: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java?view=auto&rev=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java Fri Apr 15 07:33:13 2005
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Licensed 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.rmi.remote;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.nodetype.ItemDefinition ItemDef}
+ * interface. Used by the
+ * {@link org.apache.jackrabbit.rmi.server.ServerItemDefinition ServerItemDefinition} and
+ * {@link org.apache.jackrabbit.rmi.client.ClientItemDefinition ClientItemDefinition}
+ * adapter base classes to provide transparent RMI access to remote item
+ * definitions.
+ * <p>
+ * The methods in this interface are documented only with a reference
+ * to a corresponding ItemDef method. The remote object will simply forward
+ * the method call to the underlying ItemDef instance. Argument and return
+ * values, as well as possible exceptions, are copied over the network.
+ * Compex {@link javax.jcr.nodetype.NodeType NodeType} return values
+ * are returned as remote references to the
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeType RemoteNodeType}
+ * interface. RMI errors are signalled with RemoteExceptions.
+ *
+ * @author Jukka Zitting
+ * @see javax.jcr.nodetype.ItemDefinition
+ * @see org.apache.jackrabbit.rmi.client.ClientItemDefinition
+ * @see org.apache.jackrabbit.rmi.server.ServerItemDefinition
+ */
+public interface RemoteItemDefinition extends Remote {
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.ItemDefinition#getDeclaringNodeType() ItemDef.getDeclaringNodeType()}
+ * method.
+ *
+ * @return declaring node type
+ * @throws RemoteException on RMI errors
+ */
+ RemoteNodeType getDeclaringNodeType() throws RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.ItemDefinition#getName() ItemDef.getName()} method.
+ *
+ * @return item name
+ * @throws RemoteException on RMI errors
+ */
+ String getName() throws RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.ItemDefinition#isAutoCreated() ItemDef.isAutoCreate()}
+ * method.
+ *
+ * @return <code>true</code> if the item is automatically created,
+ * <code>false</code> otherwise
+ * @throws RemoteException on RMI errors
+ */
+ boolean isAutoCreated() throws RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.ItemDefinition#isMandatory() ItemDef.isMandatory()}
+ * method.
+ *
+ * @return <code>true</code> if the item is mandatory,
+ * <code>false</code> otherwise
+ * @throws RemoteException on RMI errors
+ */
+ boolean isMandatory() throws RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.ItemDefinition#getOnParentVersion() ItemDef.getOnParentVersion()}
+ * method.
+ *
+ * @return parent version behaviour
+ * @throws RemoteException on RMI errors
+ */
+ int getOnParentVersion() throws RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.ItemDefinition#isProtected() ItemDef.isProtected()}
+ * method.
+ *
+ * @return <code>true</code> if the item is protected,
+ * <code>false</code> otherwise
+ * @throws RemoteException on RMI errors
+ */
+ boolean isProtected() throws RemoteException;
+
+}
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java
------------------------------------------------------------------------------
svn =
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteItemDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteLock.java Fri Apr 15 07:33:13 2005
@@ -76,7 +76,7 @@
* <code>false</code> otherwise
* @throws RemoteException on RMI errors
*/
- boolean isLive() throws RemoteException;
+ boolean isLive() throws RepositoryException, RemoteException;
/**
* Remote version of the
@@ -86,5 +86,16 @@
* @throws RemoteException on RMI errors
*/
void refresh() throws RepositoryException, RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.lock.Lock#isSessionScoped()} () Lock.isSessionScoped()} method.
+ *
+ * @return <code>true</code> if the lock is live,
+ * <code>false</code> otherwise
+ * @throws RemoteException on RMI errors
+ */
+ boolean isSessionScoped() throws RemoteException;
+
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNode.java Fri Apr 15 07:33:13 2005
@@ -20,6 +20,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Value;
+import javax.jcr.NodeIterator;
/**
@@ -292,6 +293,21 @@
/**
* Remote version of the
+ * {@link javax.jcr.Node#setProperty(String,Value,int) Node.setProperty(String,Value)}
+ * method.
+ *
+ * @param name property name
+ * @param value property value
+ * @param type property type
+ * @return property
+ * @throws RepositoryException on repository errors
+ * @throws RemoteException on RMI errors
+ */
+ RemoteProperty setProperty(String name, Value value, int type)
+ throws RepositoryException, RemoteException;
+
+ /**
+ * Remote version of the
* {@link javax.jcr.Node#setProperty(String,Value[]) Node.setProperty(String,Value[])}
* method.
*
@@ -347,7 +363,7 @@
* @throws RepositoryException on repository errors
* @throws RemoteException on RMI errors
*/
- RemoteNodeDef getDefinition() throws RepositoryException, RemoteException;
+ RemoteNodeDefinition getDefinition() throws RepositoryException, RemoteException;
/**
* Remote version of the
@@ -388,7 +404,7 @@
* @throws RepositoryException on repository errors
* @throws RemoteException on RMI errors
*/
- void merge(String workspace, boolean bestEffort)
+ RemoteNode[] merge(String workspace, boolean bestEffort)
throws RepositoryException, RemoteException;
/**
Added: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java?view=auto&rev=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java Fri Apr 15 07:33:13 2005
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Licensed 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.rmi.remote;
+
+import java.rmi.RemoteException;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.nodetype.NodeDefinition NodeDefinition}
+ * interface. Used by the
+ * {@link org.apache.jackrabbit.rmi.server.ServerNodeDefinition ServerNodeDefinition} and
+ * {@link org.apache.jackrabbit.rmi.client.ClientNodeDefinition ClientNodeDefinition}
+ * adapters to provide transparent RMI access to remote node definitions.
+ * <p>
+ * The methods in this interface are documented only with a reference
+ * to a corresponding NodeDef method. The remote object will simply forward
+ * the method call to the underlying NodeDef instance. Return values
+ * and possible exceptions are copied over the network. Complex
+ * {@link javax.jcr.nodetype.NodeType NodeType} return values
+ * are returned as remote references to the
+ * {@link org.apache.jackrabbit.rmi.remote.RemoteNodeType RemoteNodeType}
+ * interface. RMI errors are signalled with RemoteExceptions.
+ *
+ * @author Jukka Zitting
+ * @see javax.jcr.nodetype.NodeDefinition
+ * @see org.apache.jackrabbit.rmi.client.ClientNodeDefinition
+ * @see org.apache.jackrabbit.rmi.server.ServerNodeDefinition
+ */
+public interface RemoteNodeDefinition extends RemoteItemDefinition {
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.NodeDefinition#getRequiredPrimaryTypes() NodeDef.getRequiredPrimaryTypes()}
+ * method.
+ *
+ * @return required primary node types
+ * @throws RemoteException on RMI errors
+ */
+ RemoteNodeType[] getRequiredPrimaryTypes() throws RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.NodeDefinition#getDefaultPrimaryType() NodeDef.getDefaultPrimaryType()}
+ * method.
+ *
+ * @return default primary node type
+ * @throws RemoteException on RMI errors
+ */
+ RemoteNodeType getDefaultPrimaryType() throws RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.NodeDefinition#allowsSameNameSiblings() NodeDef.allowSameNameSibs()}
+ * method.
+ *
+ * @return <code>true</code> if same name siblings are allowed,
+ * <code>false</code> otherwise
+ * @throws RemoteException on RMI errors
+ */
+ boolean allowsSameNameSiblings() throws RemoteException;
+
+}
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java
------------------------------------------------------------------------------
svn =
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteNodeType.java Fri Apr 15 07:33:13 2005
@@ -113,7 +113,7 @@
* @return property definitions
* @throws RemoteException on RMI errors
*/
- RemotePropertyDef[] getPropertyDefs() throws RemoteException;
+ RemotePropertyDefinition[] getPropertyDefs() throws RemoteException;
/**
* Remote version of the
@@ -123,7 +123,7 @@
* @return declared property definitions
* @throws RemoteException on RMI errors
*/
- RemotePropertyDef[] getDeclaredPropertyDefs() throws RemoteException;
+ RemotePropertyDefinition[] getDeclaredPropertyDefs() throws RemoteException;
/**
* Remote version of the
@@ -133,7 +133,7 @@
* @return child node definitions
* @throws RemoteException on RMI errors
*/
- RemoteNodeDef[] getChildNodeDefs() throws RemoteException;
+ RemoteNodeDefinition[] getChildNodeDefs() throws RemoteException;
/**
* Remote version of the
@@ -143,7 +143,7 @@
* @return declared child node definitions
* @throws RemoteException on RMI errors
*/
- RemoteNodeDef[] getDeclaredChildNodeDefs() throws RemoteException;
+ RemoteNodeDefinition[] getDeclaredChildNodeDefs() throws RemoteException;
/**
* Remote version of the
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteProperty.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteProperty.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteProperty.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteProperty.java Fri Apr 15 07:33:13 2005
@@ -32,9 +32,9 @@
* to a corresponding Property method. The remote object will simply forward
* the method call to the underlying Property instance. Argument and return
* values, as well as possible exceptions, are copied over the network.
- * Compex {@link javax.jcr.nodetype.PropertyDef PropertyDef} return values
+ * Compex {@link javax.jcr.nodetype.PropertyDefinition PropertyDef} return values
* are returned as remote references to the corresponding
- * {@link org.apache.jackrabbit.rmi.remote.RemotePropertyDef RemotePropertyDef}
+ * {@link org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition RemotePropertyDefinition}
* interface. RMI errors are signalled with RemoteExceptions.
* <p>
* Note that only the generic getValue and setValue methods are included
@@ -126,7 +126,7 @@
* @throws RepositoryException on repository errors
* @throws RemoteException on RMI errors
*/
- RemotePropertyDef getDefinition()
+ RemotePropertyDefinition getDefinition()
throws RepositoryException, RemoteException;
/**
Added: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java?view=auto&rev=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java (added)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java Fri Apr 15 07:33:13 2005
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Licensed 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.rmi.remote;
+
+import java.rmi.RemoteException;
+
+import javax.jcr.Value;
+
+/**
+ * Remote version of the JCR {@link javax.jcr.nodetype.PropertyDefinition PropertyDefinition}
+ * interface. Used by the
+ * {@link org.apache.jackrabbit.rmi.server.ServerPropertyDefinition ServerPropertyDefinition}
+ * and
+ * {@link org.apache.jackrabbit.rmi.client.ClientPropertyDefinition ClientPropertyDefinition}
+ * adapters to provide transparent RMI access to remote property definitions.
+ * <p>
+ * The methods in this interface are documented only with a reference
+ * to a corresponding PropertyDef method. The remote object will simply
+ * forward the method call to the underlying PropertyDef instance. Return
+ * values and possible exceptions are copied over the network. RMI errors
+ * are signalled with RemoteExceptions.
+ * <p>
+ * Note that returned Value objects must be serializable and implemented
+ * using classes available on both the client and server side. The
+ * {@link org.apache.jackrabbit.rmi.remote.SerialValue SerialValue}
+ * decorator utility provides a convenient way to satisfy these
+ * requirements.
+ *
+ * @author Jukka Zitting
+ * @see javax.jcr.nodetype.PropertyDefinition
+ * @see org.apache.jackrabbit.rmi.client.ClientPropertyDefinition
+ * @see org.apache.jackrabbit.rmi.server.ServerPropertyDefinition
+ */
+public interface RemotePropertyDefinition extends RemoteItemDefinition {
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.PropertyDefinition#getRequiredType() PropertyDefinition.getRequiredType()}
+ * method.
+ *
+ * @return required type
+ * @throws RemoteException on RMI errors
+ */
+ int getRequiredType() throws RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.PropertyDefinition#getValueConstraints() PropertyDefinition.getValueConstraints()}
+ * method.
+ *
+ * @return value constraints
+ * @throws RemoteException on RMI errors
+ */
+ String[] getValueConstraints() throws RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.PropertyDefinition#getDefaultValues() PropertyDefinition.getDefaultValues()}
+ * method.
+ *
+ * @return default values
+ * @throws RemoteException on RMI errors
+ */
+ Value[] getDefaultValues() throws RemoteException;
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.nodetype.PropertyDefinition#isMultiple() PropertyDefinition.isMultiple()}
+ * method.
+ *
+ * @return <code>true</code> if the property is multi-valued,
+ * <code>false</code> otherwise
+ * @throws RemoteException on RMI errors
+ */
+ boolean isMultiple() throws RemoteException;
+
+}
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java
------------------------------------------------------------------------------
svn =
Propchange: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemotePropertyDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQuery.java Fri Apr 15 07:33:13 2005
@@ -20,6 +20,7 @@
import java.rmi.RemoteException;
import javax.jcr.RepositoryException;
+import javax.jcr.Node;
/**
* Remote version of the JCR {@link javax.jcr.query.Query Query} interface.
@@ -62,21 +63,21 @@
String getLanguage() throws RemoteException;
/**
- * @see javax.jcr.query.Query#getPersistentQueryPath()
+ * @see javax.jcr.query.Query#getStoredQueryPath()
*
* @return path of the node representing this query.
* @throws RepositoryException on repository errors
* @throws RemoteException on RMI errors
*/
- String getPersistentQueryPath() throws RepositoryException, RemoteException;
+ String getStoredQueryPath() throws RepositoryException, RemoteException;
/**
- * @see javax.jcr.query.Query#save(String)
+ * @see javax.jcr.query.Query#storeAsNode(String)
*
* @param absPath path at which to persist this query.
* @throws RepositoryException on repository errors
* @throws RemoteException on RMI errors
*/
- void save(String absPath) throws RepositoryException, RemoteException;
+ RemoteNode storeAsNode(String absPath) throws RepositoryException, RemoteException;
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteQueryResult.java Fri Apr 15 07:33:13 2005
@@ -36,13 +36,13 @@
*/
public interface RemoteQueryResult extends Remote {
/**
- * @see javax.jcr.query.QueryResult#getPropertyNames()
+ * @see javax.jcr.query.QueryResult#getColumnNames()
*
* @return a <code>PropertyIterator</code>
* @throws RepositoryException on repository errors
* @throws RemoteException on RMI errors
*/
- String[] getPropertyNames() throws RepositoryException, RemoteException;
+ String[] getColumnNames() throws RepositoryException, RemoteException;
/**
* @see javax.jcr.query.QueryResult#getRows()
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteSession.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteSession.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteSession.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteSession.java Fri Apr 15 07:33:13 2005
@@ -49,13 +49,13 @@
/**
* Remote version of the
- * {@link javax.jcr.Session#getUserId() Session.getUserId()} method.
+ * {@link javax.jcr.Session#getUserID() Session.getUserID()} method.
*
* @return user id
* @throws RemoteException on RMI errors
- * @see javax.jcr.Session#getUserId()
+ * @see javax.jcr.Session#getUserID()
*/
- String getUserId() throws RemoteException;
+ String getUserID() throws RemoteException;
/**
* Returns the named attribute. Note that only serializable
@@ -139,7 +139,7 @@
* <code>false</code> otherwise
* @throws RemoteException on RMI errors
*/
- boolean itemExists(String path) throws RemoteException;
+ boolean itemExists(String path) throws RepositoryException, RemoteException;
/**
* Remote version of the
@@ -186,6 +186,16 @@
/**
* Remote version of the
+ * {@link javax.jcr.Session#isLive()} Session.isLive()}
+ * method.
+ * @return
+ *
+ * @throws RemoteException on RMI errors
+ */
+ boolean isLive() throws RemoteException;
+
+ /**
+ * Remote version of the
* {@link javax.jcr.Session#getRootNode() Session.getRootNode()} method.
*
* @return root node
@@ -217,7 +227,7 @@
* @throws RemoteException on RMI errors
*/
void checkPermission(String path, String actions)
- throws AccessControlException, RemoteException;
+ throws AccessControlException, RepositoryException, RemoteException;
/**
* Imports the system or document view XML data into a subtree of
@@ -232,9 +242,9 @@
* @throws IOException on IO errors
* @throws RepositoryException on repository errors
* @throws RemoteException on RMI errors
- * @see javax.jcr.Session#importXML(java.lang.String, java.io.InputStream)
+ * @see javax.jcr.Session#importXML(java.lang.String, java.io.InputStream, int)
*/
- void importXML(String path, byte[] xml)
+ void importXML(String path, byte[] xml, int mode)
throws IOException, RepositoryException, RemoteException;
/**
@@ -332,9 +342,9 @@
* @throws IOException on IO errors
* @throws RepositoryException on repository errors
* @throws RemoteException on RMI errors
- * @see javax.jcr.Workspace#exportSysView(java.lang.String, java.io.OutputStream, boolean, boolean)
+ * @see javax.jcr.Session#exportSystemView
*/
- byte[] exportSysView(String path, boolean binaryAsLink, boolean noRecurse)
+ byte[] exportSystemView(String path, boolean binaryAsLink, boolean noRecurse)
throws IOException, RepositoryException, RemoteException;
/**
@@ -352,9 +362,9 @@
* @throws IOException on IO errors
* @throws RepositoryException on repository errors
* @throws RemoteException on RMI errors
- * @see javax.jcr.Workspace#exportDocView(java.lang.String, java.io.OutputStream, boolean, boolean)
+ * @see javax.jcr.Session#exportDocumentView
*/
- byte[] exportDocView(String path, boolean binaryAsLink, boolean noRecurse)
+ byte[] exportDocumentView(String path, boolean binaryAsLink, boolean noRecurse)
throws IOException, RepositoryException, RemoteException;
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersion.java Fri Apr 15 07:33:13 2005
@@ -85,4 +85,16 @@
*/
RemoteVersion[] getPredecessors() throws RepositoryException, RemoteException;
+ /**
+ * Remote version of the
+ * {@link javax.jcr.version.Version#getContainingHistory()} Version.getContainingHistory()} method.
+ *
+ * @return a <code>RemoteVersionHistory</code>.
+ * @throws RepositoryException on repository errors
+ * @throws RemoteException on RMI errors
+ */
+ RemoteVersionHistory getContainingHistory() throws RepositoryException, RemoteException;
+
+
+
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/remote/RemoteVersionHistory.java Fri Apr 15 07:33:13 2005
@@ -144,11 +144,11 @@
* @return a <code>boolean</code>
* @throws RemoteException on RMI errors
*/
- boolean hasVersionLabel(String label) throws RemoteException;
+ boolean hasVersionLabel(String label) throws RepositoryException, RemoteException;
/**
* Remote version of the
- * {@link javax.jcr.version.VersionHistory#hasVersionLabel(RemoteVersion, String) hasVersionLabel(RemoteVersion, String)}
+ * {@link javax.jcr.version.VersionHistory#hasVersionLabel(javax.jcr.version.Version, String) hasVersionLabel(Version, String)}
* method.
*
* @param versionUUID The UUID of the version whose labels are to be returned.
@@ -168,11 +168,11 @@
* @return a <code>String</code> array containing all the labels of the version history
* @throws RemoteException on RMI errors
*/
- String[] getVersionLabels() throws RemoteException;
+ String[] getVersionLabels() throws RepositoryException, RemoteException;
/**
* Remote version of the
- * {@link javax.jcr.version.VersionHistory#getVersionLabels(RemoteVersion) VersionHistory.getVersionLabels(RemoteVersion)}
+ * {@link javax.jcr.version.VersionHistory#getVersionLabels(javax.jcr.version.Version) VersionHistory.getVersionLabels(Version)}
* method.
*
* @param versionUUID The UUID of the version whose labels are to be returned.
@@ -194,4 +194,17 @@
*/
void removeVersion(String versionName)
throws RepositoryException, RemoteException;
+
+
+ /**
+ * Remote version of the
+ * {@link javax.jcr.version.VersionHistory#getVersionableUUID()} VersionHistory.getVersionableUUID()}
+ * method.
+ *
+ * @return the uuid of the versionable node
+ * @throws RepositoryException if another error occurs.
+ * @throws RemoteException on RMI errors
+ */
+ String getVersionableUUID() throws RepositoryException, RemoteException;
+
}
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/RemoteAdapterFactory.java Fri Apr 15 07:33:13 2005
@@ -26,11 +26,11 @@
import javax.jcr.Session;
import javax.jcr.Workspace;
import javax.jcr.lock.Lock;
-import javax.jcr.nodetype.ItemDef;
-import javax.jcr.nodetype.NodeDef;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeManager;
-import javax.jcr.nodetype.PropertyDef;
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.PropertyDefinition;
+import javax.jcr.nodetype.ItemDefinition;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
@@ -39,15 +39,15 @@
import javax.jcr.version.VersionHistory;
import org.apache.jackrabbit.rmi.remote.RemoteItem;
-import org.apache.jackrabbit.rmi.remote.RemoteItemDef;
+import org.apache.jackrabbit.rmi.remote.RemoteItemDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteLock;
import org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry;
import org.apache.jackrabbit.rmi.remote.RemoteNode;
-import org.apache.jackrabbit.rmi.remote.RemoteNodeDef;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
import org.apache.jackrabbit.rmi.remote.RemoteProperty;
-import org.apache.jackrabbit.rmi.remote.RemotePropertyDef;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteQuery;
import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
@@ -190,17 +190,17 @@
/**
* Returns a remote adapter for the given local item definition.
* This method will return an adapter that implements <i>only</i> the
- * {@link ItemDef ItemDef} interface. The caller may want to introspect
+ * {@link ItemDefinition ItemDefinition} interface. The caller may want to introspect
* the local item definition to determine whether to use either the
- * {@link #getRemoteNodeDef(NodeDef) getRemoteNodeDef} or the
- * {@link #getRemotePropertyDef(PropertyDef) getRemotePropertyDef}
+ * {@link #getRemoteNodeDefinition(NodeDefinition) getRemoteNodeDef} or the
+ * {@link #getRemotePropertyDefinition(PropertyDefinition) getRemotePropertyDef}
* method instead.
*
* @param def local item definition
* @return remote item definition adapter
* @throws RemoteException on RMI errors
*/
- RemoteItemDef getRemoteItemDef(ItemDef def) throws RemoteException;
+ RemoteItemDefinition getRemoteItemDefinition(ItemDefinition def) throws RemoteException;
/**
* Returns a remote adapter for the given local node definition.
@@ -209,7 +209,7 @@
* @return remote node definition adapter
* @throws RemoteException on RMI errors
*/
- RemoteNodeDef getRemoteNodeDef(NodeDef def) throws RemoteException;
+ RemoteNodeDefinition getRemoteNodeDefinition(NodeDefinition def) throws RemoteException;
/**
* Returns a remote adapter for the given local property definition.
@@ -218,7 +218,7 @@
* @return remote property definition adapter
* @throws RemoteException on RMI errors
*/
- RemotePropertyDef getRemotePropertyDef(PropertyDef def)
+ RemotePropertyDefinition getRemotePropertyDefinition(PropertyDefinition def)
throws RemoteException;
/**
Modified: incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java?view=diff&r1=161469&r2=161470
==============================================================================
--- incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java (original)
+++ incubator/jackrabbit/trunk/contrib/jcr-rmi/src/java/org/apache/jackrabbit/rmi/server/ServerAdapterFactory.java Fri Apr 15 07:33:13 2005
@@ -26,11 +26,11 @@
import javax.jcr.Session;
import javax.jcr.Workspace;
import javax.jcr.lock.Lock;
-import javax.jcr.nodetype.ItemDef;
-import javax.jcr.nodetype.NodeDef;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeManager;
-import javax.jcr.nodetype.PropertyDef;
+import javax.jcr.nodetype.ItemDefinition;
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.PropertyDefinition;
import javax.jcr.query.Query;
import javax.jcr.query.QueryManager;
import javax.jcr.query.QueryResult;
@@ -39,15 +39,15 @@
import javax.jcr.version.VersionHistory;
import org.apache.jackrabbit.rmi.remote.RemoteItem;
-import org.apache.jackrabbit.rmi.remote.RemoteItemDef;
+import org.apache.jackrabbit.rmi.remote.RemoteItemDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteLock;
import org.apache.jackrabbit.rmi.remote.RemoteNamespaceRegistry;
import org.apache.jackrabbit.rmi.remote.RemoteNode;
-import org.apache.jackrabbit.rmi.remote.RemoteNodeDef;
+import org.apache.jackrabbit.rmi.remote.RemoteNodeDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteNodeType;
import org.apache.jackrabbit.rmi.remote.RemoteNodeTypeManager;
import org.apache.jackrabbit.rmi.remote.RemoteProperty;
-import org.apache.jackrabbit.rmi.remote.RemotePropertyDef;
+import org.apache.jackrabbit.rmi.remote.RemotePropertyDefinition;
import org.apache.jackrabbit.rmi.remote.RemoteQuery;
import org.apache.jackrabbit.rmi.remote.RemoteQueryManager;
import org.apache.jackrabbit.rmi.remote.RemoteQueryResult;
@@ -170,30 +170,30 @@
}
/**
- * Creates a {@link ServerItemDef ServerItemDef} instance.
+ * Creates a {@link ServerItemDefinition ServerItemDefinition} instance.
* {@inheritDoc}
*/
- public RemoteItemDef getRemoteItemDef(ItemDef def)
+ public RemoteItemDefinition getRemoteItemDefinition(ItemDefinition def)
throws RemoteException {
- return new ServerItemDef(def, this);
+ return new ServerItemDefinition(def, this);
}
/**
- * Creates a {@link ServerNodeDef ServerNodeDef} instance.
+ * Creates a {@link ServerNodeDefinition ServerNodeDefinition} instance.
* {@inheritDoc}
*/
- public RemoteNodeDef getRemoteNodeDef(NodeDef def)
+ public RemoteNodeDefinition getRemoteNodeDefinition(NodeDefinition def)
throws RemoteException {
- return new ServerNodeDef(def, this);
+ return new ServerNodeDefinition(def, this);
}
/**
- * Creates a {@link ServerPropertyDef ServerPropertyDef} instance.
+ * Creates a {@link ServerPropertyDefinition ServerPropertyDefinition} instance.
* {@inheritDoc}
*/
- public RemotePropertyDef getRemotePropertyDef(PropertyDef def)
+ public RemotePropertyDefinition getRemotePropertyDefinition(PropertyDefinition def)
throws RemoteException {
- return new ServerPropertyDef(def, this);
+ return new ServerPropertyDefinition(def, this);
}
/**