Merge pull request #442 from dbluhm/reference-fixes

Fix references to IDataElement, etc. after move

org.eclipse.ice.data/pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.data</artifactId>
-	<version>3.0-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>org.eclipse.ice.data</name>

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/pom.xml

@@ -100,7 +100,7 @@
 			<groupId>org.eclipse.ice</groupId>
 			<artifactId>org.eclipse.ice.data</artifactId>
 			<version>3.0.0-SNAPSHOT</version>
-			<scope>provided</scope>
+			<scope>compile</scope>
 		</dependency>
 	</dependencies>
 

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/java/org/eclipse/ice/dev/annotations/processors/DataElementSpec.java

@@ -12,7 +12,6 @@
 package org.eclipse.ice.dev.annotations.processors;
 
 import java.util.Arrays;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/resources/templates/DataElement.vm

@@ -22,6 +22,8 @@ import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import lombok.Setter;
 
+import org.eclipse.ice.data.JavascriptValidator;
+
 /**
  * This is an implementation of $interface that satisfies the dependencies of
  * the @DataElement Annotation and was auto-generated by the ICE Framework.

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/resources/templates/ElementInterface.vm

@@ -3,7 +3,7 @@
 package $package;
 #end
 
-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 
 /**
  * This interface satisfies the dependencies of the @DataElement Annotation and

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/main/resources/templates/PersistenceHandler.vm

@@ -3,7 +3,7 @@ package $package;
 #end
 
 import org.bson.Document;
-import org.eclipse.ice.dev.annotations.IPersistenceHandler;
+import org.eclipse.ice.data.IPersistenceHandler;
 import org.eclipse.ice.dev.annotations.PersistenceFilters;
 
 import com.fasterxml.jackson.databind.ObjectMapper;

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/Defaults.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {}
\ No newline at end of file

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/DefaultsImplementation.java

@@ -18,5 +18,5 @@ public class TestImplementation implements Test, Serializable {
 	@NonNull protected java.lang.String context = "default";
 	protected boolean required = false;
 	protected boolean secret = false;
-	protected org.eclipse.ice.dev.annotations.JavascriptValidator<Test> validator;
+	protected org.eclipse.ice.data.JavascriptValidator<Test> validator;
 }
\ No newline at end of file

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/Getter.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {
 	public void setTest(int test);
 }
\ No newline at end of file

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/Many.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {
 	public byte getTestByte();
 	public void setTestByte(byte testByte);

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/ManyNonPrimitive.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {
 	public java.util.UUID getTestUuid();
 	public void setTestUuid(java.util.UUID testUuid);

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/Setter.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {
 	public int getTest();
 }
\ No newline at end of file

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/Single.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {
 	public int getTestInt();
 	public void setTestInt(int testInt);

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/src/test/resources/patterns/DataElement/SingleNonPrimitive.java

-import org.eclipse.ice.dev.annotations.IDataElement;
+import org.eclipse.ice.data.IDataElement;
 public interface Test extends IDataElement<Test> {
 	public java.util.UUID getTestUuid();
 	public void setTestUuid(java.util.UUID testUuid);