Author: rhauch Date: 2009-04-27 21:50:54 -0400 (Mon, 27 Apr 2009) New Revision: 859 Removed: trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/jackrabbitcdnsupport/ Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/SequencerConfig.java trunk/docs/examples/gettingstarted/sequencers/src/main/java/org/jboss/example/dna/sequencer/SequencingClient.java trunk/docs/examples/gettingstarted/sequencers/src/test/java/org/jboss/example/dna/sequencer/SequencingClientTest.java trunk/extensions/dna-sequencer-java/pom.xml trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java Log: DNA-384 Trouble compiling Java sequencer using Eclipse JDT and its dependencies Adjusted the Eclipse JDT dependency fragments, removing some of its dependencies that remain unused in the "dna-sequencer-java" project. Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/SequencerConfig.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/SequencerConfig.java 2009-04-27 18:58:29 UTC (rev 858) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencer/SequencerConfig.java 2009-04-28 01:50:54 UTC (rev 859) @@ -39,11 +39,30 @@ private final Set<SequencerPathExpression> pathExpressions; - public SequencerConfig( String name, String description, Map<String, Object> properties, String classname, String[] classpath, String... pathExpressions ) { + public SequencerConfig( String name, + String description, + String classname, + String[] classpath, + String... pathExpressions ) { + this(name, description, System.currentTimeMillis(), null, classname, classpath, pathExpressions); + } + + public SequencerConfig( String name, + String description, + Map<String, Object> properties, + String classname, + String[] classpath, + String... pathExpressions ) { this(name, description, System.currentTimeMillis(), properties, classname, classpath, pathExpressions); } - public SequencerConfig( String name, String description, long timestamp, Map<String, Object> properties, String classname, String[] classpath, String... pathExpressions ) { + public SequencerConfig( String name, + String description, + long timestamp, + Map<String, Object> properties, + String classname, + String[] classpath, + String... pathExpressions ) { super(name, description, timestamp, properties, classname, classpath); this.pathExpressions = buildPathExpressionSet(pathExpressions); } Modified: trunk/docs/examples/gettingstarted/sequencers/src/main/java/org/jboss/example/dna/sequencer/SequencingClient.java =================================================================== --- trunk/docs/examples/gettingstarted/sequencers/src/main/java/org/jboss/example/dna/sequencer/SequencingClient.java 2009-04-27 18:58:29 UTC (rev 858) +++ trunk/docs/examples/gettingstarted/sequencers/src/main/java/org/jboss/example/dna/sequencer/SequencingClient.java 2009-04-28 01:50:54 UTC (rev 859) @@ -168,7 +168,8 @@ try { // Register the node types (only valid the first time) ... - JackrabbitNodeTypeManager mgr = (JackrabbitNodeTypeManager)this.keepAliveSession.getWorkspace().getNodeTypeManager(); + JackrabbitNodeTypeManager mgr = (JackrabbitNodeTypeManager)this.keepAliveSession.getWorkspace() + .getNodeTypeManager(); mgr.registerNodeTypes(cndFile.openStream(), JackrabbitNodeTypeManager.TEXT_X_JCR_CND); } catch (RepositoryException e) { if (!e.getMessage().contains("already exists")) throw e; @@ -287,9 +288,11 @@ this.sequencingService.getAdministrator().shutdown(); this.sequencingService.getAdministrator().awaitTermination(5, TimeUnit.SECONDS); - // Shut down the observation service ... - this.observationService.getAdministrator().shutdown(); - this.observationService.getAdministrator().awaitTermination(5, TimeUnit.SECONDS); + if (this.observationService != null) { + // Shut down the observation service ... + this.observationService.getAdministrator().shutdown(); + this.observationService.getAdministrator().awaitTermination(5, TimeUnit.SECONDS); + } } /** @@ -396,7 +399,8 @@ // import informations javaElements = new ArrayList<Properties>(); try { - for (NodeIterator singleImportIterator = javaCompilationUnit.getNode("java:import/java:importDeclaration/java:singleImport").getNodes(); singleImportIterator.hasNext();) { + for (NodeIterator singleImportIterator = javaCompilationUnit.getNode("java:import/java:importDeclaration/java:singleImport") + .getNodes(); singleImportIterator.hasNext();) { Node javasingleTypeImportDeclarationNode = singleImportIterator.nextNode(); javaElements.add(extractJavaInfo(javasingleTypeImportDeclarationNode)); } @@ -407,7 +411,8 @@ javaElements = new ArrayList<Properties>(); try { - for (NodeIterator javaImportOnDemandIterator = javaCompilationUnit.getNode("java:import/java:importDeclaration/java:importOnDemand").getNodes(); javaImportOnDemandIterator.hasNext();) { + for (NodeIterator javaImportOnDemandIterator = javaCompilationUnit.getNode("java:import/java:importDeclaration/java:importOnDemand") + .getNodes(); javaImportOnDemandIterator.hasNext();) { Node javaImportOnDemandtDeclarationNode = javaImportOnDemandIterator.nextNode(); javaElements.add(extractJavaInfo(javaImportOnDemandtDeclarationNode)); } @@ -424,7 +429,8 @@ // field member informations javaElements = new ArrayList<Properties>(); - for (NodeIterator javaFieldTypeIterator = javaCompilationUnit.getNode("java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType").getNodes(); javaFieldTypeIterator.hasNext();) { + for (NodeIterator javaFieldTypeIterator = javaCompilationUnit.getNode("java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType") + .getNodes(); javaFieldTypeIterator.hasNext();) { Node rootFieldTypeNode = javaFieldTypeIterator.nextNode(); if (rootFieldTypeNode.hasNode("java:primitiveType")) { Node javaPrimitiveTypeNode = rootFieldTypeNode.getNode("java:primitiveType"); @@ -449,7 +455,8 @@ // constructor informations javaElements = new ArrayList<Properties>(); - for (NodeIterator javaConstructorIterator = javaCompilationUnit.getNode("java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor").getNodes(); javaConstructorIterator.hasNext();) { + for (NodeIterator javaConstructorIterator = javaCompilationUnit.getNode("java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor") + .getNodes(); javaConstructorIterator.hasNext();) { Node javaConstructor = javaConstructorIterator.nextNode(); javaElements.add(extractJavaInfo(javaConstructor)); } @@ -457,7 +464,8 @@ // method informations javaElements = new ArrayList<Properties>(); - for (NodeIterator javaMethodIterator = javaCompilationUnit.getNode("java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method").getNodes(); javaMethodIterator.hasNext();) { + for (NodeIterator javaMethodIterator = javaCompilationUnit.getNode("java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method") + .getNodes(); javaMethodIterator.hasNext();) { Node javaMethod = javaMethodIterator.nextNode(); javaElements.add(extractJavaInfo(javaMethod)); } Modified: trunk/docs/examples/gettingstarted/sequencers/src/test/java/org/jboss/example/dna/sequencer/SequencingClientTest.java =================================================================== --- trunk/docs/examples/gettingstarted/sequencers/src/test/java/org/jboss/example/dna/sequencer/SequencingClientTest.java 2009-04-27 18:58:29 UTC (rev 858) +++ trunk/docs/examples/gettingstarted/sequencers/src/test/java/org/jboss/example/dna/sequencer/SequencingClientTest.java 2009-04-28 01:50:54 UTC (rev 859) @@ -31,7 +31,6 @@ import java.net.MalformedURLException; import java.net.URL; import org.jboss.dna.common.util.FileUtil; -import org.jboss.example.dna.sequencer.SequencingClient; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -65,9 +64,15 @@ @After public void afterEach() throws Exception { - client.shutdownDnaServices(); - client.shutdownRepository(); - FileUtil.delete("target/repositoryData"); + try { + client.shutdownDnaServices(); + } finally { + try { + client.shutdownRepository(); + } finally { + FileUtil.delete("target/repositoryData"); + } + } } @Test Modified: trunk/extensions/dna-sequencer-java/pom.xml =================================================================== --- trunk/extensions/dna-sequencer-java/pom.xml 2009-04-27 18:58:29 UTC (rev 858) +++ trunk/extensions/dna-sequencer-java/pom.xml 2009-04-28 01:50:54 UTC (rev 859) @@ -87,49 +87,49 @@ <groupId>net.jcip</groupId> <artifactId>jcip-annotations</artifactId> </dependency> - <dependency> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - <version>3.2.3.v_686_R32x</version> - </dependency> - <dependency> - <groupId>org.eclipse.core</groupId> - <artifactId>runtime</artifactId> - <version>3.3.100-v20070530</version> - <!-- Exclude this problem library --> - <exclusions> - <exclusion> - <groupId>org.eclipse.equinox</groupId> - <artifactId>app</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.core</groupId> - <artifactId>resources</artifactId> - <version>3.3.0-v20070604</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> <!-- - Apache Jackrabbit (JCR Implementation) + Eclipse Java Development Tools (JDT) parser and its (many) required libraries --> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-core</artifactId> - </dependency> + <dependency> + <groupId>org.eclipse.jdt</groupId> + <artifactId>core</artifactId> + <version>3.4.2.v_883_R34x</version> + </dependency> + <dependency> + <groupId>org.eclipse.core</groupId> + <artifactId>resources</artifactId> + <version>[3.2.0,4.0.0)</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.core.runtime.compatibility</groupId> + <artifactId>auth</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.equinox</groupId> + <artifactId>app</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.eclipse</groupId> + <artifactId>osgi</artifactId> + <version>[3.2.0,4.0.0)</version> + </dependency> + <dependency> + <groupId>org.eclipse.core</groupId> + <artifactId>runtime</artifactId> + <version>[3.2.0,4.0.0)</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.core.runtime.compatibility</groupId> + <artifactId>auth</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.equinox</groupId> + <artifactId>app</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <reporting> <plugins> Modified: trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java =================================================================== --- trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java 2009-04-27 18:58:29 UTC (rev 858) +++ trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java 2009-04-28 01:50:54 UTC (rev 859) @@ -26,7 +26,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -import org.apache.commons.lang.StringUtils; import org.jboss.dna.graph.property.NameFactory; import org.jboss.dna.graph.property.Path; import org.jboss.dna.graph.property.PathFactory; @@ -200,7 +199,8 @@ // sequence package declaration of a unit. PackageMetadata packageMetadata = javaMetadata.getPackageMetadata(); if (packageMetadata != null) { - if (StringUtils.isNotEmpty(packageMetadata.getName())) { + String packageName = packageMetadata.getName(); + if (packageName != null && packageName.length() != 0) { Path javaPackageDeclarationChildNode = pathFactory.create(JAVA_COMPILATION_UNIT_NODE + SLASH + JAVA_PACKAGE_CHILD_NODE + SLASH