5:43 p.m.
Author: rhauch
Date: 2009-06-19 18:43:29 -0400 (Fri, 19 Jun 2009)
New Revision: 1054
Removed:
trunk/dna-jcr/.settings/org.eclipse.jdt.core.prefs
trunk/dna-jcr/.settings/org.eclipse.wst.common.component
trunk/dna-jcr/.settings/org.eclipse.wst.common.project.facet.core.xml
Modified:
trunk/dna-integration-tests/pom.xml
trunk/dna-jcr-tck/pom.xml
trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/SessionCacheTest.java
trunk/docs/examples/gettingstarted/repositories/pom.xml
trunk/docs/examples/gettingstarted/sequencers/pom.xml
trunk/extensions/dna-classloader-maven/pom.xml
Log:
Correct several POM files to more accurately reflect direct dependencies and usage
Modified: trunk/dna-integration-tests/pom.xml
===================================================================
--- trunk/dna-integration-tests/pom.xml 2009-06-17 17:19:39 UTC (rev 1053)
+++ trunk/dna-integration-tests/pom.xml 2009-06-19 22:43:29 UTC (rev 1054)
@@ -7,8 +7,8 @@
</parent>
<!-- The groupId and version values are inherited from parent -->
<artifactId>dna-integration-tests</artifactId>
+ <description>The JBoss DNA integration tests</description>
<packaging>jar</packaging>
- <version>0.6-SNAPSHOT</version>
<name>JBoss DNA Integration Tests</name>
<url>http://labs.jboss.org/dna</url>
Deleted: trunk/dna-jcr/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/dna-jcr/.settings/org.eclipse.jdt.core.prefs 2009-06-17 17:19:39 UTC (rev 1053)
+++ trunk/dna-jcr/.settings/org.eclipse.jdt.core.prefs 2009-06-19 22:43:29 UTC (rev 1054)
@@ -1,7 +0,0 @@
-#Fri May 15 17:59:45 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
Deleted: trunk/dna-jcr/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/dna-jcr/.settings/org.eclipse.wst.common.component 2009-06-17 17:19:39 UTC (rev
1053)
+++ trunk/dna-jcr/.settings/org.eclipse.wst.common.component 2009-06-19 22:43:29 UTC (rev
1054)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="dna-jcr">
- <wb-resource deploy-path="/"
source-path="/src/main/java"/>
- <wb-resource deploy-path="/"
source-path="/src/main/resources"/>
- <wb-resource deploy-path="/"
source-path="/src/test/java"/>
- <wb-resource deploy-path="/"
source-path="/src/test/resources"/>
- </wb-module>
-</project-modules>
Deleted: trunk/dna-jcr/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/dna-jcr/.settings/org.eclipse.wst.common.project.facet.core.xml 2009-06-17
17:19:39 UTC (rev 1053)
+++ trunk/dna-jcr/.settings/org.eclipse.wst.common.project.facet.core.xml 2009-06-19
22:43:29 UTC (rev 1054)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <installed facet="jst.java" version="6.0"/>
- <installed facet="jst.utility" version="1.0"/>
-</faceted-project>
Modified: trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/SessionCacheTest.java
===================================================================
--- trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/SessionCacheTest.java 2009-06-17
17:19:39 UTC (rev 1053)
+++ trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/SessionCacheTest.java 2009-06-19
22:43:29 UTC (rev 1054)
@@ -60,6 +60,7 @@
import org.jboss.dna.graph.property.ValueFactory;
import org.jboss.dna.jcr.SessionCache.NodeEditor;
import org.jboss.dna.jcr.Vehicles.Lexicon;
+import org.jboss.dna.jcr.cache.ChildNode;
import org.jboss.dna.jcr.cache.Children;
import org.jboss.dna.jcr.cache.NodeInfo;
import org.jboss.dna.jcr.cache.PropertyInfo;
@@ -744,4 +745,32 @@
db9 = cache.findNodeInfo(root.getUuid(),
path("/vehix:Vehicles/vehix:Cars/vehix:Sports/vehix:Aston Martin DB9"));
assertNoProperty(db9, Lexicon.LENGTH_IN_INCHES);
}
+
+ protected void walkInfosForNodesUnder( NodeInfo parentInfo,
+ Stopwatch sw ) throws Exception {
+ for (ChildNode child : parentInfo.getChildren()) {
+ sw.start();
+ NodeInfo childInfo = cache.findNodeInfo(child.getUuid());
+ cache.getPathFor(childInfo);
+ sw.stop();
+
+ // Walk the infos for nodes under the child (this is recursive) ...
+ walkInfosForNodesUnder(childInfo, sw);
+ }
+ }
+
+ @Test
+ public void shouldFindInfoForAllNodesInGraph() throws Exception {
+ Stopwatch sw = new Stopwatch();
+
+ // Get the root ...
+ sw.start();
+ NodeInfo root = cache.findNodeInfoForRoot();
+ cache.getPathFor(root);
+ sw.stop();
+
+ // Walk the infos for nodes under the root (this is recursive) ...
+ walkInfosForNodesUnder(root, sw);
+ System.out.println("Statistics for walking nodes using SessionCache: "
+ sw.getSimpleStatistics());
+ }
}
Modified: trunk/dna-jcr-tck/pom.xml
===================================================================
--- trunk/dna-jcr-tck/pom.xml 2009-06-17 17:19:39 UTC (rev 1053)
+++ trunk/dna-jcr-tck/pom.xml 2009-06-19 22:43:29 UTC (rev 1054)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.dna</groupId>
<artifactId>dna</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.6-SNAPSHOT</version>
</parent>
<!-- The groupId and version values are inherited from parent -->
<artifactId>dna-jcr-tck</artifactId>
Modified: trunk/docs/examples/gettingstarted/repositories/pom.xml
===================================================================
--- trunk/docs/examples/gettingstarted/repositories/pom.xml 2009-06-17 17:19:39 UTC (rev
1053)
+++ trunk/docs/examples/gettingstarted/repositories/pom.xml 2009-06-19 22:43:29 UTC (rev
1054)
@@ -18,15 +18,15 @@
<dependencies>
<dependency>
<groupId>org.jboss.dna</groupId>
+ <artifactId>dna-graph</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.dna</groupId>
<artifactId>dna-repository</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.dna</groupId>
<artifactId>dna-jcr</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.dna</groupId>
Modified: trunk/docs/examples/gettingstarted/sequencers/pom.xml
===================================================================
--- trunk/docs/examples/gettingstarted/sequencers/pom.xml 2009-06-17 17:19:39 UTC (rev
1053)
+++ trunk/docs/examples/gettingstarted/sequencers/pom.xml 2009-06-19 22:43:29 UTC (rev
1054)
@@ -18,9 +18,15 @@
<dependencies>
<dependency>
<groupId>org.jboss.dna</groupId>
+ <artifactId>dna-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.dna</groupId>
+ <artifactId>dna-graph</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.dna</groupId>
<artifactId>dna-jcr</artifactId>
- <version>${pom.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jboss.dna</groupId>
Modified: trunk/extensions/dna-classloader-maven/pom.xml
===================================================================
--- trunk/extensions/dna-classloader-maven/pom.xml 2009-06-17 17:19:39 UTC (rev 1053)
+++ trunk/extensions/dna-classloader-maven/pom.xml 2009-06-19 22:43:29 UTC (rev 1054)
@@ -4,6 +4,7 @@
<groupId>org.jboss.dna</groupId>
<artifactId>dna</artifactId>
<version>0.6-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
<!-- The groupId and version values are inherited from parent -->
<artifactId>dna-classloader-maven</artifactId>