You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/01/27 22:08:36 UTC
svn commit: r615649 [5/14] - in /jackrabbit/trunk:
jackrabbit-classloader/src/main/java/org/apache/jackrabbit/classloader/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ jackra...
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/TreeComparator.java Sun Jan 27 13:08:08 2008
@@ -79,7 +79,7 @@
public void setSession(Session session) {
this.session = session;
}
-
+
/**
* Makes sure that the source and target folder exist, and are empty
*/
@@ -242,7 +242,7 @@
// the UUID during serialization.
if (!referenceable.isNodeType(mixReferenceable)) {
referenceable.addMixin(mixReferenceable);
- // some implementations may require a save after addMixin()
+ // some implementations may require a save after addMixin()
session.save();
}
@@ -593,7 +593,7 @@
/**
* Checks if a given property should be skipped during xml import.
- *
+ *
* @param propertyName
* @return
*/
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyBetweenWorkspacesReferenceableTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyBetweenWorkspacesReferenceableTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyBetweenWorkspacesReferenceableTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyBetweenWorkspacesReferenceableTest.java Sun Jan 27 13:08:08 2008
@@ -37,7 +37,7 @@
public void testCopyNodesReferenceableNodesNewUUID() throws RepositoryException {
// add mixin referenceable to node1
addMixinReferenceableToNode(node1);
-
+
// copy referenceable node below non-referenceable node
String dstAbsPath = node2W2.getPath() + "/" + node1.getName();
workspaceW2.copy(workspace.getName(), node1.getPath(), dstAbsPath);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyReferenceableTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyReferenceableTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyReferenceableTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyReferenceableTest.java Sun Jan 27 13:08:08 2008
@@ -47,7 +47,7 @@
public void testCopyNodesNewUUID() throws RepositoryException {
// add mixin referenceable to node1
addMixinReferenceableToNode(node1);
-
+
// copy referenceable node below non-referenceable node
String dstAbsPath = node2.getPath() + "/" + node1.getName();
workspace.copy(node1.getPath(), dstAbsPath);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveReferenceableTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveReferenceableTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveReferenceableTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveReferenceableTest.java Sun Jan 27 13:08:08 2008
@@ -39,7 +39,7 @@
protected void initNodesW2() throws RepositoryException {
// nothing to do.
}
-
+
/**
* Copies of referenceable nodes (nodes with UUIDs) remains their original
* UUIDs.
@@ -47,7 +47,7 @@
public void testMoveNodesReferenceableNodesNewUUID() throws RepositoryException {
// add mixin referenceable to node1
addMixinReferenceableToNode(node1);
-
+
// copy referenceable node below non-referenceable node
String dstAbsPath = node2.getPath() + "/" + node1.getName();
String originalUUID = node1.getUUID(); // remember for check
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveVersionableTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveVersionableTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveVersionableTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveVersionableTest.java Sun Jan 27 13:08:08 2008
@@ -41,7 +41,7 @@
protected void initNodesW2() throws RepositoryException {
// nothing to do.
}
-
+
/**
* A VersionException is thrown if the parent node of destAbsPath is
* versionable and checked-in, or is non-versionable but its nearest
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java Sun Jan 27 13:08:08 2008
@@ -277,7 +277,7 @@
// retry with a deep lock
node.lock(true, false);
}
-
+
assertTrue("Locking of a checked-in node failed.",
node.isLocked());
@@ -637,7 +637,7 @@
* Tests if locks are maintained when child nodes are reordered
*/
public void testReorder() throws Exception {
-
+
Node testNode = setUpSameNameSiblings();
// lock last node (3)
@@ -660,7 +660,7 @@
* Tests if locks are maintained when child nodes are reordered
*/
public void testReorder2() throws Exception {
-
+
setUpSameNameSiblings();
// lock first node (1)
@@ -724,7 +724,7 @@
Session session = testRootNode.getSession();
Node n1, n2;
-
+
try {
// create two same-name sibling nodes
n1 = testRootNode.addNode(nodeName1, testNodeType);
@@ -738,7 +738,7 @@
n1.addMixin("mix:lockable");
n2.addMixin("mix:lockable");
session.save();
-
+
// lock both nodes
n1.lock(true, true);
n2.lock(true, true);
@@ -768,7 +768,7 @@
}
return false;
}
-
+
/**
* Create three child nodes with identical names
*/
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryTest.java Sun Jan 27 13:08:08 2008
@@ -305,15 +305,15 @@
}
return (Node[]) nodes.toArray(new Node[nodes.size()]);
}
-
+
/**
* Escape an identifier suitable for the SQL parser
- * @TODO currently only handles dash character
+ * @TODO currently only handles dash character
*/
protected String escapeIdentifierForSQL(String identifier) {
-
+
boolean needsEscaping = identifier.indexOf('-') >= 0;
-
+
if (!needsEscaping) {
return identifier;
}
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/ElementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/ElementTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/ElementTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/ElementTest.java Sun Jan 27 13:08:08 2008
@@ -33,7 +33,7 @@
* <code>nodetype</code> or <code>nt:base</code>
* @tck.config nodename3 node name for a child node of type
* <code>nodetype</code> or <code>nt:base</code>
- *
+ *
* @test
* @sources ElementTest.java
* @executeClass org.apache.jackrabbit.test.api.query.ElementTest
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetSupportedQueryLanguagesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetSupportedQueryLanguagesTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetSupportedQueryLanguagesTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetSupportedQueryLanguagesTest.java Sun Jan 27 13:08:08 2008
@@ -62,7 +62,7 @@
* Tests if all implementations return {@link Query#XPATH} with
* {@link QueryManager#getSupportedQueryLanguages()}. Tests if repositores
* that have the SQL descriptor set in the repository return {@link Query#SQL}.
- */
+ */
public void testGetSupportedQueryLanguages() throws RepositoryException {
List langs = Arrays.asList(session.getWorkspace().getQueryManager().getSupportedQueryLanguages());
// all repositories must support XPath
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJcrPathTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJcrPathTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJcrPathTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJcrPathTest.java Sun Jan 27 13:08:08 2008
@@ -57,7 +57,7 @@
}
super.tearDown();
}
-
+
/**
* Verify that the jcr:path is present in the query result.
*/
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/TextNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/TextNodeTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/TextNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/TextNodeTest.java Sun Jan 27 13:08:08 2008
@@ -38,7 +38,7 @@
* {@link javax.jcr.Node#addNode(String)}, without giving an explicit node
* type.
* @tck.config nodename1 name of a child node under <code>testroot</code>.
- *
+ *
* @test
* @sources TextNodeTest.java
* @executeClass org.apache.jackrabbit.test.api.query.TextNodeTest
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathPosIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathPosIndexTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathPosIndexTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathPosIndexTest.java Sun Jan 27 13:08:08 2008
@@ -34,7 +34,7 @@
* The tests require the following content in the default workspace:
* <p/>
* At least three nodes with the name {@link #nodeName1} under the
- * {@link #testRoot}.
+ * {@link #testRoot}.
*
* @test
* @sources XPathPosIndexTest.java
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionAbortTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionAbortTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionAbortTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionAbortTest.java Sun Jan 27 13:08:08 2008
@@ -55,7 +55,7 @@
/**
* Test the restore of a OnParentVersion-ABORT node
- *
+ *
* @throws RepositoryException
* @throws NotExecutableException
*/
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionIgnoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionIgnoreTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionIgnoreTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionIgnoreTest.java Sun Jan 27 13:08:08 2008
@@ -71,7 +71,7 @@
// add 'ignore' child
String childName = addChildNode(OPVAction).getName();
versionableNode.save();
-
+
versionableNode.restore(v, false);
if (!versionableNode.hasNode(childName)) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java Sun Jan 27 13:08:08 2008
@@ -484,7 +484,7 @@
*
* @throws UnsupportedRepositoryOperationException
* @throws RepositoryException if the sanity check on this item fails.
- * See {@link ItemImpl#checkStatus()}.
+ * See {@link ItemImpl#checkStatus()}.
* @see ItemStateValidator
*/
protected boolean isWritable() throws RepositoryException {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java Sun Jan 27 13:08:08 2008
@@ -58,7 +58,7 @@
/**
* A cache for item instances created by this <code>ItemManagerImpl</code>.
- *
+ *
* The <code>ItemState</code>s act as keys for the map. In contrast to
* o.a.j.core the item state are copied to transient space for reading and
* will therefor not change upon transient modifications.
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java Sun Jan 27 13:08:08 2008
@@ -693,7 +693,7 @@
* those, that have been transiently removed.<br>
* NOTE, that the result of this method, does NOT represent the list of
* mixin-types that currently affect this node.
- *
+ *
* @return
*/
private List getMixinTypes() {
@@ -1366,7 +1366,7 @@
throws ConstraintViolationException, RepositoryException {
QPropertyDefinition def = getApplicablePropertyDefinition(qName, type, true);
int targetType = def.getRequiredType();
- // make sure, the final type is not set to undefined
+ // make sure, the final type is not set to undefined
if (targetType == PropertyType.UNDEFINED) {
if (type == PropertyType.UNDEFINED) {
// try to retrieve type from the values array
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java Sun Jan 27 13:08:08 2008
@@ -442,7 +442,7 @@
*/
private QValue getQValue() throws ValueFormatException, RepositoryException {
checkStatus();
- if (isMultiple()) {
+ if (isMultiple()) {
throw new ValueFormatException(safeGetJCRPath() + " is multi-valued and can therefore only be retrieved as an array of values");
}
// avoid unnecessary object creation if possible
@@ -521,7 +521,7 @@
}
/**
- *
+ *
* @param value
* @param propertyType
* @throws ValueFormatException
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/RepositoryImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/RepositoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/RepositoryImpl.java Sun Jan 27 13:08:08 2008
@@ -161,9 +161,9 @@
if (obj instanceof Reference) {
Reference ref = (Reference)obj;
String classname = ref.getClassName();
-
+
if (RepositoryImpl.class.getName().equals(classname)) {
-
+
RefAddr rfac = ref.get(RCF);
if (rfac == null || !(rfac instanceof StringRefAddr)) {
throw new Exception("Address type " + RCF + " missing or of wrong class: " + rfac);
@@ -177,7 +177,7 @@
String repositoryConfigClassName = (String)((StringRefAddr)rclas).getContent();
Object rof = Class.forName(configFactoryClassName).newInstance();
-
+
if (! (rof instanceof ObjectFactory)) {
throw new Exception(rof + " must implement ObjectFactory");
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java Sun Jan 27 13:08:08 2008
@@ -182,7 +182,7 @@
/**
* Always returns an empty String array.
- *
+ *
* @see javax.jcr.Session#getAttributeNames()
*/
public String[] getAttributeNames() {
@@ -639,7 +639,7 @@
protected SessionItemStateManager createSessionItemStateManager(UpdatableItemStateManager workspaceStateManager, ItemStateFactory isf) throws RepositoryException {
return new SessionItemStateManager(workspaceStateManager, getValidator(), getQValueFactory(), isf, this);
}
-
+
protected ItemManager createItemManager(HierarchyManager hierarchyManager) {
return new ItemManagerImpl(hierarchyManager, this);
}
@@ -776,7 +776,7 @@
SessionImpl switchWorkspace(String workspaceName) throws AccessDeniedException,
NoSuchWorkspaceException, RepositoryException {
checkAccessibleWorkspace(workspaceName);
-
+
SessionInfo info = config.getRepositoryService().obtain(sessionInfo, workspaceName);
if (info instanceof XASessionInfo) {
return new XASessionImpl((XASessionInfo) info, repository, config);
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java Sun Jan 27 13:08:08 2008
@@ -471,7 +471,7 @@
UpdatableItemStateManager getUpdatableItemStateManager() {
return wspManager;
}
-
+
ItemStateFactory getItemStateFactory() {
return wspManager.getItemStateFactory();
}
@@ -484,7 +484,7 @@
private ItemStateValidator getValidator() {
return session.getValidator();
}
-
+
//-----------------------------------------------------< initialization >---
/**
* Create the workspace state manager. May be overridden by subclasses.
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/XASessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/XASessionImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/XASessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/XASessionImpl.java Sun Jan 27 13:08:08 2008
@@ -52,7 +52,7 @@
/**
* @inheritDoc
- * @see org.apache.jackrabbit.jcr2spi.XASession#getXAResource()
+ * @see org.apache.jackrabbit.jcr2spi.XASession#getXAResource()
*/
public XAResource getXAResource() {
return sessionInfo.getXAResource();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntries.java Sun Jan 27 13:08:08 2008
@@ -57,7 +57,7 @@
* @throws RepositoryException
*/
void reload() throws ItemNotFoundException, RepositoryException;
-
+
/**
* Returns an unmodifiable iterator over all NodeEntry objects present in
* this ChildNodeEntries collection irrespective of their status.
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java Sun Jan 27 13:08:08 2008
@@ -40,7 +40,7 @@
/**
* <code>ChildNodeEntriesImpl</code> implements a memory sensitive implementation
- * of the <code>ChildNodeEntries</code> interface.
+ * of the <code>ChildNodeEntries</code> interface.
*/
final class ChildNodeEntriesImpl implements ChildNodeEntries {
@@ -591,7 +591,7 @@
/**
* Return true if more than one NodeEnty with the given name exists.
- *
+ *
* @param qName
* @return
*/
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntries.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntries.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntries.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntries.java Sun Jan 27 13:08:08 2008
@@ -45,7 +45,7 @@
/**
* Returns an unmodifiable collection containing all <code>PropertyEntry</code>
* objects present.
- *
+ *
* @return Collection of all <code>PropertyEntry</code> objects present.
*/
public Collection getPropertyEntries();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java Sun Jan 27 13:08:08 2008
@@ -71,7 +71,7 @@
this.name = name;
this.factory = factory;
}
-
+
/**
* Resolves this <code>HierarchyEntryImpl</code> and returns the target
* <code>ItemState</code> of this reference. This method may return a
@@ -129,7 +129,7 @@
abstract Path buildPath(boolean workspacePath) throws RepositoryException;
/**
- *
+ *
* @return
*/
ItemState internalGetItemState() {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManager.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManager.java Sun Jan 27 13:08:08 2008
@@ -35,7 +35,7 @@
public void dispose();
/**
- *
+ *
* @return
*/
public NodeEntry getRootEntry();
@@ -76,7 +76,7 @@
/**
* Retrieves the <code>HierarchyEntry</code> corresponding to the given
- * path and resolves it to the underlying <code>ItemState</code>.
+ * path and resolves it to the underlying <code>ItemState</code>.
*
* @param qPath
* @return
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManager.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManager.java Sun Jan 27 13:08:08 2008
@@ -27,7 +27,7 @@
* Defines the functionality needed for locking and unlocking nodes.
*/
public interface LockManager {
-
+
/**
* Lock a node. Checks whether the node is not locked and then
* returns a lock object for this node.
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java Sun Jan 27 13:08:08 2008
@@ -428,7 +428,7 @@
}
return null;
}
-
+
//----------------------------< Notification about modified lock-tokens >---
/**
* Notify all <code>Lock</code>s that have been accessed so far about the
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java Sun Jan 27 13:08:08 2008
@@ -78,7 +78,7 @@
*
* @param ntReg
* @param ntd
- * @param ntdMap
+ * @param ntdMap
* @return
* @throws NodeTypeConflictException
* @throws NoSuchNodeTypeException
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java Sun Jan 27 13:08:08 2008
@@ -105,7 +105,7 @@
private QValueFactory qValueFactory() throws RepositoryException {
return mgrProvider.getQValueFactory();
}
-
+
/**
* Returns the applicable property definition for a property with the
* specified name and type.
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java Sun Jan 27 13:08:08 2008
@@ -336,7 +336,7 @@
throw new NoSuchNodeTypeException(nodeTypeName, e);
}
}
-
+
//-----------------------------------------------------------< Dumpable >---
/**
* {@inheritDoc}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java Sun Jan 27 13:08:08 2008
@@ -213,7 +213,7 @@
// do some preliminary checks
for (Iterator iter = nodeTypeNames.iterator(); iter.hasNext();) {
Name ntName = (Name) iter.next();
-
+
// Best effort check for node types other than those to be
// unregistered that depend on the given node types
Set dependents = registeredNTDefs.getDependentNodeTypes(ntName);
@@ -747,7 +747,7 @@
ps.println(" (declared in " + pd[i].getDeclaringNodeType() + ") ");
ps.println("\t\tName\t\t" + (pd[i].definesResidual() ? "*" : pd[i].getName().toString()));
String type = pd[i].getRequiredType() == 0 ? "null" : PropertyType.nameFromValue(pd[i].getRequiredType());
- ps.println("\t\tRequiredType\t" + type);
+ ps.println("\t\tRequiredType\t" + type);
String[] vca = pd[i].getValueConstraints();
StringBuffer constraints = new StringBuffer();
if (vca == null) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java Sun Jan 27 13:08:08 2008
@@ -66,7 +66,7 @@
}
/**
- *
+ *
* @param nodePath
* @param hierMgr
* @param resolver
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java Sun Jan 27 13:08:08 2008
@@ -54,7 +54,7 @@
public void persisted() {
// nothing to do.
}
-
+
//----------------------------------------< Access Operation Parameters >---
public NodeId getNodeId() {
return nodeState.getNodeId();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/OperationVisitor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/OperationVisitor.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/OperationVisitor.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/OperationVisitor.java Sun Jan 27 13:08:08 2008
@@ -76,5 +76,5 @@
public void visit(RemoveVersion operation) throws VersionException, AccessDeniedException, ReferentialIntegrityException, RepositoryException;
- public void visit(WorkspaceImport operation) throws RepositoryException;
+ public void visit(WorkspaceImport operation) throws RepositoryException;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java Sun Jan 27 13:08:08 2008
@@ -97,7 +97,7 @@
* if the state returned by {@link #getNodeState()} is the target.
*
* @return
- * @see javax.jcr.Node#restore(Version, String, boolean)
+ * @see javax.jcr.Node#restore(Version, String, boolean)
*/
public Path getRelativePath() {
return relQPath;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java Sun Jan 27 13:08:08 2008
@@ -56,7 +56,7 @@
/**
*
* @param visitor
- * @see Operation#accept(OperationVisitor)
+ * @see Operation#accept(OperationVisitor)
*/
public void accept(OperationVisitor visitor) throws AccessDeniedException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
visitor.visit(this);
@@ -79,7 +79,7 @@
public NodeId getNodeId() {
return nodeId;
}
-
+
public Name[] getMixinNames() {
return mixinNames;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java Sun Jan 27 13:08:08 2008
@@ -53,7 +53,7 @@
/**
* Invalidates the <code>NodeState</code> that has been updated and all
* its decendants.
- *
+ *
* @see Operation#persisted()
*/
public void persisted() {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java Sun Jan 27 13:08:08 2008
@@ -77,7 +77,7 @@
this.itemMgr = itemMgr;
this.hierarchyMgr = hierarchyMgr;
this.rows = queryInfo.getRows();
-
+
fetchNext();
}
@@ -209,7 +209,7 @@
// reset
next = null;
nextScore = 0;
-
+
while (next == null && rows.hasNext()) {
try {
QueryResultRow row = (QueryResultRow) rows.next();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java Sun Jan 27 13:08:08 2008
@@ -160,7 +160,7 @@
}
/**
- * @see Query#execute()
+ * @see Query#execute()
*/
public QueryResult execute() throws RepositoryException {
QueryInfo qI = wspManager.executeQuery(statement, language,
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java Sun Jan 27 13:08:08 2008
@@ -64,7 +64,7 @@
}
/**
- *
+ *
* @param createdState
*/
void notifyCreated(ItemState createdState) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java Sun Jan 27 13:08:08 2008
@@ -290,7 +290,7 @@
}
/**
- *
+ *
* @param parentState
* @param propertyName
* @param definition
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java Sun Jan 27 13:08:08 2008
@@ -247,7 +247,7 @@
return values[0];
}
}
-
+
/**
* Sets the value(s) of this property.
*
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java Sun Jan 27 13:08:08 2008
@@ -108,7 +108,7 @@
ItemStateValidator validator,
QValueFactory qValueFactory,
ItemStateFactory isf, ManagerProvider mgrProvider) {
-
+
this.workspaceItemStateMgr = workspaceItemStateMgr;
this.transientStateMgr = new TransientItemStateManager();
isf.addCreationListener(transientStateMgr);
@@ -311,7 +311,7 @@
| ItemStateValidator.CHECK_LOCK
| ItemStateValidator.CHECK_VERSIONING
| ItemStateValidator.CHECK_CONSTRAINTS);
-
+
// retrieve applicable definition at the new place
ItemDefinitionProvider defProvider = mgrProvider.getItemDefinitionProvider();
QNodeDefinition newDefinition = defProvider.getQNodeDefinition(destParent, operation.getDestinationName(), srcState.getNodeTypeName());
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java Sun Jan 27 13:08:08 2008
@@ -365,7 +365,7 @@
}
/**
- *
+ *
* @param qLabel
* @return
* @throws VersionException
@@ -414,7 +414,7 @@
}
/**
- *
+ *
* @param entry
* @throws RepositoryException
*/
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTest.java Sun Jan 27 13:08:08 2008
@@ -51,7 +51,7 @@
destParentNode = testRootNode.addNode(nodeName3, testNodeType);
// save the new nodes
testRootNode.save();
-
+
destinationPath = destParentNode.getPath() + "/" + nodeName2;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RenameTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RenameTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RenameTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RenameTest.java Sun Jan 27 13:08:08 2008
@@ -55,5 +55,5 @@
superuser.refresh(false);
assertEquals(moveNode.getName(), nodeName2);
- }
+ }
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RevertMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RevertMoveTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RevertMoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RevertMoveTest.java Sun Jan 27 13:08:08 2008
@@ -37,7 +37,7 @@
* Implementation specific test, that expects that the scope of a refresh(false)
* must include all nodes affected by the operations that affected the
* subtree to be refreshed.
- *
+ *
* @throws RepositoryException
*/
public void testRevertMovedNode() throws RepositoryException {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java Sun Jan 27 13:08:08 2008
@@ -316,7 +316,7 @@
/**
* Test if the lock token has been automatically added to the set of lock
* tokens present with the Session that created the new Lock.
- *
+ *
* @throws RepositoryException
*/
public void testLockTokenPresentWithSession() throws RepositoryException {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java Sun Jan 27 13:08:08 2008
@@ -30,7 +30,7 @@
public class OpenScopedLockTest extends AbstractLockTest {
private static Logger log = LoggerFactory.getLogger(OpenScopedLockTest.class);
-
+
boolean isSessionScoped() {
return false;
}
@@ -169,7 +169,7 @@
assertFalse("Lock has been release by another session.", lockedNode.holdsLock());
assertFalse("Lock has been release by another session.", lock.isLive());
- assertFalse("Lock has been release by another session.", lock.getNode().isLocked());
+ assertFalse("Lock has been release by another session.", lock.getNode().isLocked());
try {
lockedNode.getLock();
fail("Lock has been release by another session.");
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/NodeTypeManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/NodeTypeManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/NodeTypeManager.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/NodeTypeManager.java Sun Jan 27 13:08:08 2008
@@ -47,7 +47,7 @@
* @author <a href="mailto:okiessler@apache.org">Oliver Kiessler</a>
*/
public interface NodeTypeManager {
-
+
/** Creates a new namespace in the repository.
*
* @param namespace Namespace
@@ -55,19 +55,19 @@
*/
void createNamespace(Session session, String namespace, String namespaceUri)
throws NamespaceCreationException;
-
+
/** This method creates JCR node types based on the MappingDescriptor object
* which is created by a jcr-mapping Mapper implementation. A
* Mapper reads one to many jcr mapping XML File.
*
* @param session Repository session
- * @param mappingDescriptor Mapping descriptor object created by
+ * @param mappingDescriptor Mapping descriptor object created by
* jcr-mapping
* @throws NodeTypeCreationException NodeTypeCreationException
*/
void createNodeTypes(Session session, MappingDescriptor mappingDescriptor)
throws NodeTypeCreationException;
-
+
/** This method creates JCR node types based on ClassDescriptor objects
* which are created by a jcr-mapping Mapper implementation. A
* Mapper reads one to many jcr mapping XML File.
@@ -79,7 +79,7 @@
*/
void createNodeTypes(Session session, ClassDescriptor[] classDescriptors)
throws NodeTypeCreationException;
-
+
/** This method creates JCR node types based on jcr-mapping xml
* files.
*
@@ -90,7 +90,7 @@
void createNodeTypesFromMappingFiles(Session session,
InputStream[] mappingXmlFiles)
throws NodeTypeCreationException;
-
+
/** This method creates a single JCR node type identified by its ClassDescriptor
* read from the jcr mapping file.
*
@@ -102,7 +102,7 @@
*/
void createSingleNodeType(Session session, ClassDescriptor classDescriptor)
throws NodeTypeCreationException;
-
+
/** This method creates a single JCR node type identified by its jcrNodeType
* name defined in a jcr-mapping xml file.
*
@@ -115,7 +115,7 @@
void createSingleNodeTypeFromMappingFile(Session session,
InputStream mappingXmlFile, String jcrNodeType)
throws NodeTypeCreationException;
-
+
/** This method creates a JCR node type from a given Java Bean class by using
* reflection. It creates required JCR property definitions from primitive
* Java class properties using the same property name. Non-primitive class
@@ -130,7 +130,7 @@
void createNodeTypeFromClass(Session session, Class clazz,
String jcrNodeType, boolean reflectSuperClasses)
throws NodeTypeCreationException;
-
+
/** This method creates JCR node types from a JCR vendor specific
* configuration file.
*
@@ -142,7 +142,7 @@
void createNodeTypesFromConfiguration(Session session,
InputStream jcrRepositoryConfigurationFile)
throws OperationNotSupportedException, NodeTypeCreationException;
-
+
/** This method removes all JCR node types that are defined in one to many
* jcr-mapping XML files.
*
@@ -152,7 +152,7 @@
*/
void removeNodeTypesFromMappingFile(Session session, InputStream[] mappingXmlFiles)
throws NodeTypeRemovalException;
-
+
/**
* This method removes JCR node types from a JCR vendor specific configuration file
* @param session Repository session
@@ -160,8 +160,8 @@
* @throws NodeTypeRemovalException
*/
void removeNodeTypesFromConfiguration(Session session, InputStream jcrRepositoryConfigurationFile)
- throws NodeTypeRemovalException;
-
+ throws NodeTypeRemovalException;
+
/** This method removes a single JCR node type identified by its jcrNodeType
* name.
*
@@ -171,7 +171,7 @@
*/
void removeSingleNodeType(Session session, String jcrNodeType)
throws NodeTypeRemovalException;
-
+
/** Returns the names of all node types in the repository identified by a
* given namespace.
*
@@ -179,7 +179,7 @@
* @return list of matching JCR node types
*/
List getPrimaryNodeTypeNames(Session session, String namespace);
-
+
/** Returns a list of all JCR node types.
*
* @return list of all JCR node types
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/RepositorySession.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/RepositorySession.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/RepositorySession.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/RepositorySession.java Sun Jan 27 13:08:08 2008
@@ -26,9 +26,9 @@
*/
public interface RepositorySession
{
-
+
/** Connects to a JCR repository and returns a session to it.
- *
+ *
* @param username Username to connect to repository
* @param password Password
* @param configuration Repository configuration
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/BaseNodeManagementException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/BaseNodeManagementException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/BaseNodeManagementException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/BaseNodeManagementException.java Sun Jan 27 13:08:08 2008
@@ -29,12 +29,12 @@
/** Root exception.
*/
private Exception wrappedException;
-
+
/** Creates a new instance of BaseNodeManagementException. */
public BaseNodeManagementException()
{
}
-
+
/** Creates a new instance of BaseNodeManagementException.
* @param message Exception message
*/
@@ -42,17 +42,17 @@
{
super(message);
}
-
+
/** Creates a new instance of BaseNodeManagementException.
* @param rootException Root Exception
*/
public BaseNodeManagementException(Exception rootException)
{
setWrappedException(rootException);
- }
+ }
/** Getter for property wrappedException.
- *
+ *
* @return wrappedException
*/
public Exception getWrappedException()
@@ -61,7 +61,7 @@
}
/** Setter for property wrappedException.
- *
+ *
* @param object wrappedException
*/
public void setWrappedException(Exception object)
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NamespaceCreationException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NamespaceCreationException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NamespaceCreationException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NamespaceCreationException.java Sun Jan 27 13:08:08 2008
@@ -27,8 +27,8 @@
public NamespaceCreationException()
{
}
-
- /** Creates a new instance of NamespaceCreationException.
+
+ /** Creates a new instance of NamespaceCreationException.
* @param wrappedException Root exception
*/
public NamespaceCreationException(Exception wrappedException)
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NodeTypeCreationException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NodeTypeCreationException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NodeTypeCreationException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NodeTypeCreationException.java Sun Jan 27 13:08:08 2008
@@ -22,19 +22,19 @@
*/
public class NodeTypeCreationException extends BaseNodeManagementException
{
-
+
/** Creates a new instance of NodeTypeCreationException. */
public NodeTypeCreationException()
{
}
-
+
/** Creates a new instance of NodeTypeCreationException. */
public NodeTypeCreationException(String message)
{
super(message);
- }
-
- /** Creates a new instance of NodeTypeCreationException.
+ }
+
+ /** Creates a new instance of NodeTypeCreationException.
* @param wrappedException Root exception
*/
public NodeTypeCreationException(Exception wrappedException)
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NodeTypeRemovalException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NodeTypeRemovalException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NodeTypeRemovalException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/NodeTypeRemovalException.java Sun Jan 27 13:08:08 2008
@@ -22,13 +22,13 @@
*/
public class NodeTypeRemovalException extends BaseNodeManagementException
{
-
+
/** Creates a new instance of NodeTypeRemovalException. */
public NodeTypeRemovalException()
{
}
-
- /** Creates a new instance of NodeTypeRemovalException.
+
+ /** Creates a new instance of NodeTypeRemovalException.
* @param wrappedException Root exception
*/
public NodeTypeRemovalException(Exception wrappedException)
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/OperationNotSupportedException.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/OperationNotSupportedException.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/OperationNotSupportedException.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/exception/OperationNotSupportedException.java Sun Jan 27 13:08:08 2008
@@ -23,13 +23,13 @@
*/
public class OperationNotSupportedException extends BaseNodeManagementException
{
-
+
/** Creates a new instance of NodeTypeRemovalException. */
public OperationNotSupportedException()
{
}
-
- /** Creates a new instance of NodeTypeRemovalException.
+
+ /** Creates a new instance of NodeTypeRemovalException.
* @param wrappedException Root exception
*/
public OperationNotSupportedException(Exception wrappedException)
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/BaseNamespaceHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/BaseNamespaceHelper.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/BaseNamespaceHelper.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/BaseNamespaceHelper.java Sun Jan 27 13:08:08 2008
@@ -21,15 +21,15 @@
* @author <a href="mailto:okiessler@apache.org">Oliver Kiessler</a>
*/
public abstract class BaseNamespaceHelper {
-
+
/** Default namespace if none is specified.
*/
// public static final String DEFAULT_NAMESPACE = "";
-
+
/** Default namespace URI if none is specified.
*/
- public static final String DEFAULT_NAMESPACE_URI = "";
-
+ public static final String DEFAULT_NAMESPACE_URI = "";
+
/** Creates a new instance of BaseNamespaceHelper. */
public BaseNamespaceHelper() {
}
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/JackrabbitRepositorySession.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/JackrabbitRepositorySession.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/JackrabbitRepositorySession.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/JackrabbitRepositorySession.java Sun Jan 27 13:08:08 2008
@@ -27,12 +27,12 @@
*/
public class JackrabbitRepositorySession implements RepositorySession
{
-
+
/** Creates a new instance of JackrabbitRepositorySession. */
public JackrabbitRepositorySession()
{
}
-
+
/**
* @see org.apache.jackrabbit.ocm.nodemanagement.RepositorySession#getSession
*/
@@ -43,12 +43,12 @@
RepositoryUtil.registerRepository(configuration.getRepositoryName(),
configuration.getConfigurationFile(),
configuration.getRepositoryPath());
-
+
Repository repository =
RepositoryUtil.getRepository(configuration.getRepositoryName());
-
+
Session session = RepositoryUtil.login(repository, username, password);
RepositoryUtil.setupSession(session);
- return session;
+ return session;
}
}
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryConfiguration.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryConfiguration.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryConfiguration.java Sun Jan 27 13:08:08 2008
@@ -22,31 +22,31 @@
*/
public class RepositoryConfiguration
{
-
+
/**
*/
private String configurationFile;
-
+
/**
*/
private String repositoryPath;
-
+
/**
*/
private String repositoryName;
-
+
/**
*/
private String workspaceName;
-
+
/**
*/
private boolean useJNDI;
-
+
/**
*/
private String jndiName;
-
+
/** Creates a new instance of RepositoryConfiguration. */
public RepositoryConfiguration()
{
@@ -62,7 +62,7 @@
this.configurationFile = configurationFile;
}
- public String getRepositoryPath()
+ public String getRepositoryPath()
{
return repositoryPath;
}
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositorySessionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositorySessionFactory.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositorySessionFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositorySessionFactory.java Sun Jan 27 13:08:08 2008
@@ -24,21 +24,21 @@
* @author <a href="mailto:okiessler@apache.org">Oliver Kiessler</a>
*/
public class RepositorySessionFactory {
-
- public static final String JACKRABBIT = "jackrabbit";
+
+ public static final String JACKRABBIT = "jackrabbit";
private static Session session;
-
- /**
+
+ /**
* Private constructor.
*/
private RepositorySessionFactory()
{
}
-
+
/** Returns a session to a JCR repository.
- *
- * @param jcrRepository
+ *
+ * @param jcrRepository
* @param username Username to logon
* @param password Password
* @return session JCR repository session
@@ -47,7 +47,7 @@
String username, String password,
RepositoryConfiguration configuration)
{
-
+
if (session == null)
{
if (jcrRepository != null)
@@ -56,7 +56,7 @@
{
session = new JackrabbitRepositorySession().getSession(username, password, configuration);
}
-
+
}
}
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryUtil.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryUtil.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/RepositoryUtil.java Sun Jan 27 13:08:08 2008
@@ -43,28 +43,28 @@
*/
public class RepositoryUtil
{
-
+
/** namespace prefix constant */
public static final String OCM_NAMESPACE_PREFIX = "ocm";
/** namespace constant */
- public static final String OCM_NAMESPACE = "http://jackrabbit.apache.org/ocm";
-
+ public static final String OCM_NAMESPACE = "http://jackrabbit.apache.org/ocm";
+
/** Item path separator */
public static final String PATH_SEPARATOR = "/";
-
+
private final static Log log = LogFactory.getLog(RepositoryUtil.class);
-
+
/**
- * Register a new repository
- *
+ * Register a new repository
+ *
* @param repositoryName The repository unique name
* @param configFile The JCR config file
* @param homeDir The directory containing the complete repository settings (workspace, node types, ...)
- *
+ *
* @throws RepositoryException when it is not possible to register the repository
*/
- public static void registerRepository(String repositoryName, String configFile, String homeDir)
+ public static void registerRepository(String repositoryName, String configFile, String homeDir)
{
try
{
@@ -76,19 +76,19 @@
RegistryHelper.registerRepository(ctx, repositoryName, configFile, homeDir, true);
}
catch (Exception e)
- {
- throw new RepositoryException("Impossible to register the respository : " +
+ {
+ throw new RepositoryException("Impossible to register the respository : " +
repositoryName + " - config file : " + configFile, e);
- }
-
+ }
+
}
-
-
+
+
/**
- * Unregister a repository
- *
+ * Unregister a repository
+ *
* @param repositoryName The repository unique name
- *
+ *
* @throws RepositoryException when it is not possible to unregister the repository
*/
public static void unRegisterRepository(String repositoryName) throws RepositoryException
@@ -104,19 +104,19 @@
}
catch (Exception e)
{
- throw new RepositoryException("Impossible to unregister the respository : " +
+ throw new RepositoryException("Impossible to unregister the respository : " +
repositoryName , e);
- }
-
+ }
+
}
-
+
/**
* Get a repository
- *
+ *
* @param repositoryName The repository name
* @return a JCR repository reference
- *
- * @throws RepositoryException when it is not possible to get the repository.
+ *
+ * @throws RepositoryException when it is not possible to get the repository.
* Before calling this method, the repository has to be registered (@see RepositoryUtil#registerRepository(String, String, String)
*/
public static Repository getRepository(String repositoryName) throws RepositoryException
@@ -127,49 +127,49 @@
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory");
env.put(Context.PROVIDER_URL, "localhost");
InitialContext ctx = new InitialContext(env);
-
+
Repository repository = (Repository) ctx.lookup(repositoryName);
return repository;
}
catch (Exception e)
{
throw new RepositoryException("Impossible to get the repository : " + repositoryName, e);
- }
+ }
}
-
+
/**
* Connect to a JCR repository
- *
- * @param repository The JCR repository
+ *
+ * @param repository The JCR repository
* @param user The user name
* @param password The password
- * @return a valid JCR session
- *
- * @throws RepositoryException when it is not possible to connect to the JCR repository
+ * @return a valid JCR session
+ *
+ * @throws RepositoryException when it is not possible to connect to the JCR repository
*/
public static Session login(Repository repository, String user, String password) throws RepositoryException
{
try
{
Session session = repository.login(new SimpleCredentials(user, password.toCharArray()), null);
-
-
- return session;
+
+
+ return session;
}
catch (Exception e)
{
throw new RepositoryException("Impossible to login ", e);
}
}
-
-
-
-
+
+
+
+
/**
- * Setup the session.
+ * Setup the session.
* Until now, we check only if the namespace prefix exist in the repository
- *
+ *
*/
public static void setupSession(Session session) throws RepositoryException
{
@@ -187,18 +187,18 @@
log.debug("Jackrabbit OCM namespace exists.");
}
}
-
+
if (createNamespace)
{
session.getWorkspace().getNamespaceRegistry().registerNamespace(OCM_NAMESPACE_PREFIX, OCM_NAMESPACE);
log.info("Successfully created Jackrabbit OCM namespace.");
}
-
+
if (session.getRootNode() != null)
{
log.info("Jcr session setup successfull.");
}
-
+
}
catch (Exception e)
@@ -209,12 +209,12 @@
}
/**
- * Encode a path
+ * Encode a path
* @TODO : drop Jackrabbit dependency
- *
+ *
* @param path the path to encode
- * @return the encoded path
- *
+ * @return the encoded path
+ *
*/
public static String encodePath(String path)
{
Modified: jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NamespaceHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NamespaceHelper.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NamespaceHelper.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm-nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/impl/jackrabbit/NamespaceHelper.java Sun Jan 27 13:08:08 2008
@@ -31,25 +31,25 @@
*/
public class NamespaceHelper extends BaseNamespaceHelper
{
-
+
/** JCR namespace registry.
*/
private NamespaceRegistry registry;
-
+
/** Creates a new instance of NamespaceHelper. */
public NamespaceHelper()
{
}
/** Returns a QName object from a given JCR item name.
- *
+ *
* @param nodeName JCR item name
* @return qName
*/
public Name getName(String itemName)
{
Name name = null;
-
+
if (itemName != null && itemName.length() > 0)
{
if (itemName.equals("*"))
@@ -60,27 +60,27 @@
{
String[] parts = itemName.split(":");
if (parts.length == 2)
- {
+ {
name = NameFactoryImpl.getInstance().create(getNamespaceUri(parts[0]),parts[1]);
}
- else if (parts.length == 1)
+ else if (parts.length == 1)
{
// no namespace set, use default namespace
name = NameFactoryImpl.getInstance().create(DEFAULT_NAMESPACE_URI, parts[0]);
}
}
}
-
+
return name;
}
/** Returns the namespace URI from a given namespace prefix.
- *
- * @param namespacePrefix
+ *
+ * @param namespacePrefix
* @return uri
*/
public String getNamespaceUri(String namespacePrefix)
- {
+ {
String uri = null;
try
{
@@ -93,9 +93,9 @@
return uri;
}
-
+
/** Getter for property registry.
- *
+ *
* @return registry
*/
public NamespaceRegistry getRegistry()
@@ -104,7 +104,7 @@
}
/** Setter for property registry.
- *
+ *
* @param object registry
*/
public void setRegistry(NamespaceRegistry object)