Work needed to get a VdbBuilder kit for DV

- reverted code to use JDK 1.6 - code now uses the teiid-modeshape project that contains the Teiid VDB sequencers and the the Teiid DDL sequencer
Teiid-Designer · Feb 4, 2016 · 675a923 · 675a923
1 parent 306bd51
commit 675a923
Show file tree

Hide file tree

Showing 389 changed files with 2,566 additions and 3,033 deletions.
diff --git a/komodo-core-tests/.classpath b/komodo-core-tests/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -22,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/komodo-core-tests/pom.xml b/komodo-core-tests/pom.xml
@@ -9,7 +9,7 @@
 	<artifactId>komodo-core-tests</artifactId>
 	<name>Komodo Core Tests</name>
 	<description>Tests for Komodo Core that would otherwise cause cyclic dependencies</description>
-
+<!--
 	<build>
 		<plugins>
 			<plugin>
@@ -22,7 +22,7 @@
 			</plugin>
 		</plugins>
 	</build>
-
+-->
 	<dependencies>
 		<dependency>
 			<groupId>org.komodo</groupId>

diff --git a/komodo-core/.classpath b/komodo-core/.classpath
@@ -17,17 +17,13 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/komodo-core/.project b/komodo-core/.project
@@ -5,11 +5,21 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -19,5 +29,7 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 	</natures>
 </projectDescription>
diff --git a/komodo-core/pom.xml b/komodo-core/pom.xml
@@ -9,7 +9,7 @@
 	<artifactId>komodo-core</artifactId>
 	<name>Komodo Core</name>
 	<description>Komodo Core</description>
-
+<!--
 	<build>
 		<plugins>
 			<plugin>
@@ -22,7 +22,7 @@
 			</plugin>
 		</plugins>
 	</build>
-
+-->
 	<dependencies>
 		<dependency>
 			<groupId>org.komodo</groupId>

diff --git a/komodo-core/src/main/java/org/komodo/core/KomodoLexicon.java b/komodo-core/src/main/java/org/komodo/core/KomodoLexicon.java
@@ -9,7 +9,7 @@
 
 import org.komodo.spi.constants.StringConstants;
 import org.modeshape.jcr.JcrNtLexicon;
-import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon;
+import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon;
 
 /**
  * Constants for the JCR names of node types and properties related to the Komodo engine.

diff --git a/komodo-core/src/main/java/org/komodo/repository/KomodoTypeRegistry.java b/komodo-core/src/main/java/org/komodo/repository/KomodoTypeRegistry.java
@@ -24,17 +24,16 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-
 import org.komodo.core.KomodoLexicon;
 import org.komodo.modeshape.teiid.cnd.TeiidSqlLexicon;
 import org.komodo.spi.constants.StringConstants;
 import org.komodo.spi.repository.KomodoType;
 import org.komodo.spi.utils.KeyInValueHashMap;
 import org.komodo.spi.utils.KeyInValueHashMap.KeyFromValueAdapter;
 import org.komodo.utils.ArgCheck;
-import org.modeshape.sequencer.ddl.StandardDdlLexicon;
-import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon;
-import org.modeshape.sequencer.teiid.lexicon.VdbLexicon;
+import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon;
+import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon;
+import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon;
 
 /**
  *

diff --git a/komodo-core/src/main/java/org/komodo/repository/LocalRepository.java b/komodo-core/src/main/java/org/komodo/repository/LocalRepository.java
@@ -122,7 +122,7 @@ public String toString() {
         }
     }
 
-    private WeakHashMap< Session, UnitOfWork > sessions = new WeakHashMap<>();
+    private WeakHashMap< Session, UnitOfWork > sessions = new WeakHashMap< Session, UnitOfWork >();
 
     private State state = State.NOT_REACHABLE;
 

diff --git a/komodo-core/src/main/java/org/komodo/repository/ObjectImpl.java b/komodo-core/src/main/java/org/komodo/repository/ObjectImpl.java
@@ -42,10 +42,10 @@
 import org.modeshape.jcr.JcrNtLexicon;
 import org.modeshape.jcr.JcrSession;
 import org.modeshape.jcr.api.JcrTools;
-import org.modeshape.sequencer.ddl.DdlConstants;
-import org.modeshape.sequencer.ddl.StandardDdlLexicon;
-import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlConstants;
-import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon;
+import org.teiid.modeshape.sequencer.ddl.DdlConstants;
+import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon;
+import org.teiid.modeshape.sequencer.ddl.TeiidDdlConstants;
+import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon;
 
 /**
  * An implementation of a {@link KomodoObject Komodo object}.
@@ -985,7 +985,7 @@ public final PropertyDescriptor[] getRawPropertyDescriptors( final UnitOfWork tr
             return PropertyDescriptor.NO_DESCRIPTORS;
         }
 
-        final List< PropertyDescriptor > result = new ArrayList<>();
+        final List< PropertyDescriptor > result = new ArrayList< PropertyDescriptor >();
 
         for ( final Descriptor descriptor : getAllDescriptors( transaction, this ) ) {
             result.addAll( Arrays.asList( descriptor.getPropertyDescriptors( transaction ) ) );

diff --git a/komodo-core/src/main/java/org/komodo/repository/RepositoryImpl.java b/komodo-core/src/main/java/org/komodo/repository/RepositoryImpl.java
@@ -965,7 +965,7 @@ public void notify( final RepositoryClientEvent event ) {
     }
 
     protected void notifyObservers() {
-        final Set<RepositoryObserver> copy = new HashSet<>(this.observers);
+        final Set<RepositoryObserver> copy = new HashSet<RepositoryObserver>(this.observers);
 
         for (final RepositoryObserver observer : copy) {
             try {

diff --git a/komodo-core/src/main/java/org/komodo/repository/internal/KSequencers.java b/komodo-core/src/main/java/org/komodo/repository/internal/KSequencers.java
@@ -45,9 +45,9 @@
 import org.komodo.utils.KLog;
 import org.modeshape.jcr.api.JcrConstants;
 import org.modeshape.jcr.api.Session;
-import org.modeshape.sequencer.ddl.StandardDdlLexicon;
-import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon;
-import org.modeshape.sequencer.teiid.lexicon.VdbLexicon;
+import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon;
+import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon;
+import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon;
 
 
 /**

diff --git a/komodo-core/src/main/java/org/komodo/repository/search/ObjectSearcher.java b/komodo-core/src/main/java/org/komodo/repository/search/ObjectSearcher.java
@@ -64,7 +64,7 @@ public class ObjectSearcher implements SQLConstants {
 
     private String customWhereClause;
 
-    private Map<String, String> parameters = new HashMap<>();
+    private Map<String, String> parameters = new HashMap<String, String>();
 
     /**
      * @param repository the repository to search

diff --git a/komodo-core/src/main/java/org/komodo/repository/search/ParanthesisClause.java b/komodo-core/src/main/java/org/komodo/repository/search/ParanthesisClause.java
@@ -39,7 +39,7 @@
  */
 public class ParanthesisClause extends Clause {
 
-    private List<Clause> childClauses = new ArrayList<>();
+    private List<Clause> childClauses = new ArrayList<Clause>();
 
     /**
      * @param operator the logical operator preceding this clause (can be null if this is the only clause)

diff --git a/komodo-core/src/main/java/org/komodo/repository/validation/RuleImpl.java b/komodo-core/src/main/java/org/komodo/repository/validation/RuleImpl.java
@@ -395,7 +395,7 @@ private Result evaluateChildRule( final UnitOfWork transaction,
                 break;
             }
             case SAME_NAME_SIBLING: {
-                final Set< String > names = new HashSet<>();
+                final Set< String > names = new HashSet< String >();
 
                 for ( final KomodoObject kid : kobject.getChildrenOfType( transaction, childType ) ) {
                     final String name = kid.getName( transaction );

diff --git a/komodo-core/src/main/java/org/komodo/repository/validation/ValidationManagerImpl.java b/komodo-core/src/main/java/org/komodo/repository/validation/ValidationManagerImpl.java
@@ -11,12 +11,10 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.jcr.Node;
 import javax.jcr.Session;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
-
 import org.komodo.core.KomodoLexicon;
 import org.komodo.repository.ObjectImpl;
 import org.komodo.repository.RepositoryImpl;
@@ -47,8 +45,8 @@ public class ValidationManagerImpl implements ValidationManager {
      */
     public static class ValidationHandler extends DefaultHandler {
 
-        private final List< String > errors = new ArrayList<>();
-        private final List< String > fatals = new ArrayList<>();
+        private final List< String > errors = new ArrayList< String >();
+        private final List< String > fatals = new ArrayList< String >();
 
         /**
          * {@inheritDoc}
@@ -633,7 +631,7 @@ public List< String > validateRules( final File rulesXmlFile ) throws KException
             _parser.parse( rulesXmlFile, handler );
 
             // return any errors
-            List< String > result = new ArrayList<>();
+            List< String > result = new ArrayList< String >();
             result.addAll( handler.getFatalErrors() );
             result.addAll( handler.getErrors() );
             return result;

diff --git a/komodo-core/src/main/resources/org/komodo/repository/local-repository-config.json b/komodo-core/src/main/resources/org/komodo/repository/local-repository-config.json
@@ -66,7 +66,7 @@
         "threadPool" : "modeshape-workers",
         "sequencers" : {
             "VDB Dynamic Sequencer" : {
-				"classname" : "org.modeshape.sequencer.teiid.VdbDynamicSequencer"
+				"classname" : "org.teiid.modeshape.sequencer.vdb.VdbDynamicSequencer"
 			},
             "DDL Sequencer" : {
                 "classname" : "org.komodo.modeshape.lib.sequencer.KDdlSequencer"

diff --git a/komodo-importer/.classpath b/komodo-importer/.classpath
@@ -17,17 +17,13 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/komodo-importer/.project b/komodo-importer/.project
@@ -5,11 +5,21 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -19,5 +29,7 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 	</natures>
 </projectDescription>
diff --git a/komodo-importer/pom.xml b/komodo-importer/pom.xml
@@ -9,7 +9,7 @@
 	<artifactId>komodo-importer</artifactId>
 	<name>Komodo Importer</name>
 	<description>Importing of artifacts in komodo engine</description>
-
+<!--
 	<build>
 		<plugins>
 			<plugin>
@@ -22,7 +22,7 @@
 			</plugin>
 		</plugins>
 	</build>
-
+-->
 	<dependencies>
 		<dependency>
 			<groupId>org.komodo</groupId>

diff --git a/komodo-importer/src/main/java/org/komodo/importer/ImportMessages.java b/komodo-importer/src/main/java/org/komodo/importer/ImportMessages.java
@@ -29,7 +29,7 @@
 import org.komodo.spi.constants.StringConstants;
 import org.komodo.utils.ArgCheck;
 import org.modeshape.common.text.Position;
-import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlParsingException;
+import org.teiid.modeshape.sequencer.ddl.TeiidDdlParsingException;
 
 /**
  * ImportMessages

diff --git a/komodo-modeshape-sequencer-teiid-sql-tests/.classpath b/komodo-modeshape-sequencer-teiid-sql-tests/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -22,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/komodo-modeshape-sequencer-teiid-sql-tests/pom.xml b/komodo-modeshape-sequencer-teiid-sql-tests/pom.xml
@@ -9,7 +9,7 @@
 	<artifactId>komodo-modeshape-sequencer-teiid-sql-tests</artifactId>
 	<name>Komodo Modeshape Teiid SQL Sequencer Tests</name>
 	<description>Tests for sequencer that are separate to avoid cyclic dependencies</description>
-
+<!--
 	<build>
 		<plugins>
 			<plugin>
@@ -22,7 +22,7 @@
 			</plugin>
 		</plugins>
 	</build>
-
+-->
 	<dependencies>
 		<dependency>
 			<groupId>org.komodo</groupId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,7 +122,7 @@ public String toString() { @@
             }
         }
-        private WeakHashMap< Session, UnitOfWork > sessions = new WeakHashMap<>();
+        private WeakHashMap< Session, UnitOfWork > sessions = new WeakHashMap< Session, UnitOfWork >();
         private State state = State.NOT_REACHABLE;
@@ Expand Down @@