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 2009/11/25 15:04:50 UTC
svn commit: r884108 [10/10] - in /jackrabbit/sandbox/JCR-1456: ./
jackrabbit-api/
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/
jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/user/
jackrabbit-core/ jackrabbit-core/sr...
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java Wed Nov 25 14:04:38 2009
@@ -281,7 +281,7 @@
}
// unless the child-info are omitted by the SPI impl -> make sure
- // the childentries the nodeentry are initialized or updated.
+ // the child entries the node entry are initialized or updated.
Iterator<ChildInfo> childInfos = info.getChildInfos();
if (childInfos != null) {
entry.setNodeEntries(childInfos);
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java Wed Nov 25 14:04:38 2009
@@ -175,7 +175,7 @@
checkStatus();
Name qLabel = getQLabel(label);
NodeState vState = getVersionState(versionName);
- // delegate to version manager that operates on workspace directely
+ // delegate to version manager that operates on workspace directly
session.getVersionStateManager().addVersionLabel((NodeState) getItemState(), vState, qLabel, moveLabel);
}
@@ -187,7 +187,7 @@
Name qLabel = getQLabel(label);
Version version = getVersionByLabel(qLabel);
NodeState vState = getVersionState(version.getName());
- // delegate to version manager that operates on workspace directely
+ // delegate to version manager that operates on workspace directly
session.getVersionStateManager().removeVersionLabel((NodeState) getItemState(), vState, qLabel);
}
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java Wed Nov 25 14:04:38 2009
@@ -130,7 +130,7 @@
checkStatus();
if (otherItem instanceof VersionImpl) {
// since all versions are referenceable, protected and live
- // in the same workspace, a simple comparision of the UUIDs is sufficient
+ // in the same workspace, a simple comparison of the UUIDs is sufficient
VersionImpl other = ((VersionImpl) otherItem);
try {
return getUUID().equals(other.getUUID());
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java Wed Nov 25 14:04:38 2009
@@ -219,7 +219,7 @@
Attributes atts) throws SAXException {
// check if new context needs to be started
if (!nsContextStarted) {
- // there hasn't been a preceeding startPrefixMapping event
+ // there hasn't been a proceeding startPrefixMapping event
// so enter new namespace context
nsContext.pushContext();
} else {
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java Wed Nov 25 14:04:38 2009
@@ -256,7 +256,7 @@
try {
checkSession();
- // adjust references refering to remapped uuids
+ // adjust references referring to remapped uuids
stateMgr.adjustReferences(refTracker);
} finally {
// close this importer since we are done.
@@ -493,7 +493,7 @@
throw new ItemExistsException(LogUtil.safeGetJCRPath(existing, session.getPathResolver()));
}
} catch (ItemNotFoundException e) {
- // property apperently doesn't exist any more
+ // property doesn't exist any more
// -> ignore
}
}
@@ -593,7 +593,7 @@
iv = session.getQValueFactory().create(baos.toByteArray());
} else {
// >= 65kb: deserialize BINARY type
- // using Reader and temporay file
+ // using Reader and temporary file
TransientFileFactory fileFactory = TransientFileFactory.getInstance();
File tmpFile = fileFactory.createTransientFile("bin", null, null);
FileOutputStream out = new FileOutputStream(tmpFile);
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/main/resources/META-INF/services/javax.jcr.RepositoryFactory Wed Nov 25 14:04:38 2009
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.jackrabbit.jcr2spi.factory.Jcr2spiRepositoryFactory
+org.apache.jackrabbit.jcr2spi.Jcr2spiRepositoryFactory
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java Wed Nov 25 14:04:38 2009
@@ -198,7 +198,7 @@
testSession.getItem(destPath);
assertItemStatus(refNode2, Status.STALE_DESTROYED);
- // the uuid must be transfered to the 'moved' node
+ // the uuid must be transferred to the 'moved' node
Node n = testSession.getNodeByUUID(uuid);
// TODO: for generic jsr 170 test assertSame must be replace by 'Item.isSame'
assertSame(n, testSession.getItem(destPath));
@@ -221,7 +221,7 @@
}
assertItemStatus(refNode2, Status.REMOVED);
- // the uuid must be transfered to the 'moved' node
+ // the uuid must be transferred to the 'moved' node
Node n = testSession.getNodeByUUID(uuid);
// TODO: for generic jsr 170 test assertSame must be replace by 'Item.isSame'
assertSame(n, testSession.getItem(destPath));
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/IsSameTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/IsSameTest.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/IsSameTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/IsSameTest.java Wed Nov 25 14:04:38 2009
@@ -69,7 +69,7 @@
}
public void testIsSameProperty3() throws RepositoryException {
- // create a node (nt:resource) that implicitely is referenceable
+ // create a node (nt:resource) that implicitly is referenceable
Node n = testRootNode.addNode("aFile", "nt:file");
n = n.addNode("jcr:content", "nt:resource");
n.setProperty("jcr:lastModified", Calendar.getInstance());
@@ -88,7 +88,7 @@
}
public void testIsSameProperty4() throws RepositoryException {
- // create a node (nt:resource) that implicitely is referenceable
+ // create a node (nt:resource) that implicitly is referenceable
Node n = testRootNode.addNode("aFile", "nt:file");
n = n.addNode("jcr:content", "nt:resource");
n.setProperty("jcr:lastModified", Calendar.getInstance());
@@ -107,7 +107,7 @@
}
public void testIsSameNode() throws RepositoryException {
- // create a node (nt:resource) that implicitely is referenceable
+ // create a node (nt:resource) that implicitly is referenceable
Node n = testRootNode.addNode("aFile", "nt:file");
n = n.addNode("jcr:content", "nt:resource");
n.setProperty("jcr:lastModified", Calendar.getInstance());
@@ -126,7 +126,7 @@
}
public void testIsSameNode2() throws RepositoryException {
- // create a node (nt:resource) that implicitely is referenceable
+ // create a node (nt:resource) that implicitly is referenceable
Node n = testRootNode.addNode("aFile", "nt:file");
n = n.addNode("jcr:content", "nt:resource");
n.setProperty("jcr:lastModified", Calendar.getInstance());
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java Wed Nov 25 14:04:38 2009
@@ -144,7 +144,7 @@
assertTrue(destParentNode.isNew());
assertFalse(destParentNode.hasNode(nodeName2));
- // remove the tmp dest parent node.
+ // remove the tmp destination parent node.
destParentNode.remove();
assertTrue(newParent.isNew());
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMoveTest.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMoveTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMoveTest.java Wed Nov 25 14:04:38 2009
@@ -143,7 +143,7 @@
assertFalse(srcParent.hasNode(snsName+"[4]"));
assertFalse(srcParent.hasNode(snsName+"[5]"));
- // check if move have been successfull
+ // check if move have been successful
assertEquals(children[2].getPath(), destPath);
assertTrue(children[2].getIndex() == Path.INDEX_DEFAULT);
assertEquals(children[1].getPath(), destPath+"[2]");
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java Wed Nov 25 14:04:38 2009
@@ -164,7 +164,7 @@
// call the update method on test node in default workspace
testRootNode.update(srcWorkspace);
- // ok first check if node has no longer propertis
+ // ok first check if node has no longer properties
assertFalse("Node updated with Node.update() should have property removed", testRootNode.hasProperty(propertyName2));
} catch (PathNotFoundException e) {
throw new NotExecutableException();
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java Wed Nov 25 14:04:38 2009
@@ -204,7 +204,7 @@
assertTrue("First node locked: ", lockedNode.isLocked());
assertTrue("Second node locked: ", lockedNode2.isLocked());
} catch (RepositoryException e) {
- // mk sure all locks are release again
+ // make sure all locks are release again
lockedNode.unlock();
lockedNode2.unlock();
throw new RepositoryException(e);
@@ -219,7 +219,7 @@
assertTrue("Second node locked: ", lockedNode2.isLocked());
} finally {
- // mk sure all locks are release again
+ // make sure all locks are release again
lockedNode2.unlock();
}
}
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java Wed Nov 25 14:04:38 2009
@@ -36,7 +36,7 @@
}
public void testLogoutHasNoEffect() throws Exception {
- // create a second session session. since loggin-out the 'superuser'
+ // create a second session session. since logout of the 'superuser'
// will cause all inherited tear-down to fail
Node testRoot2 = (Node) otherSession.getItem(testRootNode.getPath());
@@ -47,7 +47,7 @@
Lock lock2 = lockedNode2.lock(false, isSessionScoped());
// force reloading of the testroot in order to be aware of the
- // locked noded added by another session
+ // locked node added by another session
testRootNode.refresh(false);
Node n2 = (Node) superuser.getItem(lockedNode2.getPath());
try {
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-parent/pom.xml?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-parent/pom.xml Wed Nov 25 14:04:38 2009
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<modelVersion>4.0.0</modelVersion>
<!-- ====================================================================== -->
@@ -30,7 +27,7 @@
<parent>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<artifactId>jackrabbit-parent</artifactId>
@@ -45,7 +42,7 @@
<properties>
<slf4j.version>1.5.3</slf4j.version>
<jetty.version>6.1.14</jetty.version>
- <tika.version>0.4</tika.version>
+ <tika.version>0.5</tika.version>
</properties>
<build>
@@ -66,7 +63,7 @@
<aggregate>true</aggregate>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://www.day.com/maven/jsr170/javadocs/jcr-1.0/</link>
+ <link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0/</link>
</links>
</configuration>
</plugin>
@@ -86,6 +83,12 @@
<downloadSources>true</downloadSources>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
@@ -325,5 +328,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
</project>
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-spi-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-spi-commons/pom.xml?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-spi-commons/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-spi-commons/pom.xml Wed Nov 25 14:04:38 2009
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- ====================================================================== -->
@@ -72,11 +69,11 @@
<echo>Remove files that have been customized in Jackrabbit</echo>
<delete>
<fileset dir="${project.build.directory}/generated-sources/javacc/org/apache/jackrabbit/spi/commons/query">
- <include name="sql/ASTLiteral.java"/>
- <include name="sql/ASTContainsExpression.java"/>
- <include name="sql/ASTPredicate.java"/>
- <include name="sql/ASTIdentifier.java"/>
- <include name="xpath/SimpleNode.java"/>
+ <include name="sql/ASTLiteral.java" />
+ <include name="sql/ASTContainsExpression.java" />
+ <include name="sql/ASTPredicate.java" />
+ <include name="sql/ASTIdentifier.java" />
+ <include name="xpath/SimpleNode.java" />
</fileset>
</delete>
</tasks>
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DefaultTraversingQOMTreeVisitor.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DefaultTraversingQOMTreeVisitor.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DefaultTraversingQOMTreeVisitor.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DefaultTraversingQOMTreeVisitor.java Wed Nov 25 14:04:38 2009
@@ -41,6 +41,14 @@
}
/**
+ * Calls accept on the static operand in the fulltext search constraint.
+ */
+ public Object visit(FullTextSearchImpl node, Object data) throws Exception {
+ ((StaticOperandImpl) node.getFullTextSearchExpression()).accept(this, data);
+ return data;
+ }
+
+ /**
* Calls accept on the two sources and the join condition in the join node.
*/
public Object visit(JoinImpl node, Object data) throws Exception {
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-spi/pom.xml?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-spi/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-spi/pom.xml Wed Nov 25 14:04:38 2009
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- ====================================================================== -->
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-spi2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-spi2dav/pom.xml?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-spi2dav/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-spi2dav/pom.xml Wed Nov 25 14:04:38 2009
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- ====================================================================== -->
@@ -67,7 +64,7 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi</artifactId>
<version>2.0-SNAPSHOT</version>
- <classifier></classifier>
+ <classifier />
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -126,7 +123,7 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr2spi</artifactId>
<version>2.0-SNAPSHOT</version>
- <classifier></classifier>
+ <classifier />
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/QValueFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/QValueFactoryImpl.java?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/QValueFactoryImpl.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/QValueFactoryImpl.java Wed Nov 25 14:04:38 2009
@@ -352,7 +352,7 @@
// for both the value has not been loaded yet
if (!initialized) {
if (other.uri != null) {
- return uri.equals(uri);
+ return other.uri.equals(uri);
} else {
// need to load the binary value in order to be able
// to compare the 2 values.
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-spi2jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-spi2jcr/pom.xml?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-spi2jcr/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-spi2jcr/pom.xml Wed Nov 25 14:04:38 2009
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- ====================================================================== -->
@@ -103,7 +100,7 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi</artifactId>
<version>2.0-SNAPSHOT</version>
- <classifier></classifier>
+ <classifier />
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -164,7 +161,7 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr2spi</artifactId>
<version>2.0-SNAPSHOT</version>
- <classifier></classifier>
+ <classifier />
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-standalone/pom.xml?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-standalone/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-standalone/pom.xml Wed Nov 25 14:04:38 2009
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- ====================================================================== -->
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-webapp/pom.xml?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-webapp/pom.xml Wed Nov 25 14:04:38 2009
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- ====================================================================== -->
@@ -127,8 +124,7 @@
<phase>package</phase>
<configuration>
<tasks>
- <jar basedir="${project.build.outputDirectory}"
- destfile="${project.build.directory}/jackrabbit-webapp-${project.version}.jar"/>
+ <jar basedir="${project.build.outputDirectory}" destfile="${project.build.directory}/jackrabbit-webapp-${project.version}.jar" />
</tasks>
</configuration>
<goals>
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-webapp/src/main/webapp/about.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-webapp/src/main/webapp/about.jsp?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-webapp/src/main/webapp/about.jsp (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-webapp/src/main/webapp/about.jsp Wed Nov 25 14:04:38 2009
@@ -67,7 +67,7 @@
<a href="http://www.apache.org/">Apache Software Foundation</a>.
</p>
<h2>Copyright Notice</h2>
-<pre><% output("/META-INF/NOTICE.txt", out); %></pre>
+<pre><% output("/META-INF/NOTICE", out); %></pre>
<h2>License Information</h2>
-<pre><% output("/META-INF/LICENSE.txt", out); %></pre>
+<pre><% output("/META-INF/LICENSE", out); %></pre>
<jsp:include page="footer.jsp"/>
Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-webdav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-webdav/pom.xml?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-webdav/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-webdav/pom.xml Wed Nov 25 14:04:38 2009
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- ====================================================================== -->
Modified: jackrabbit/sandbox/JCR-1456/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/pom.xml?rev=884108&r1=884107&r2=884108&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/pom.xml Wed Nov 25 14:04:38 2009
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<modelVersion>4.0.0</modelVersion>
<!-- ====================================================================== -->
@@ -74,4 +71,30 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>