[idwsfconsumer] branch master updated: Change to XSURI interface contract.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository idwsfconsumer.

View the commit online:
http://git.shibboleth.net/view/?p=idwsfconsumer.git;a=commit;h=8287687aabde1f99239ce293f0bd5d39f61665e5

The following commit(s) were added to refs/heads/master by this push:
       new  8287687   Change to XSURI interface contract.
8287687 is described below

commit 8287687aabde1f99239ce293f0bd5d39f61665e5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 25 14:18:51 2019 -0500

    Change to XSURI interface contract.
---
 .classpath                                         |  1 +
 .project                                           | 17 +++++++++++--
 .../org/openliberty/xmltooling/dst2_1/DSTURI.java  | 29 +++-------------------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/.classpath b/.classpath
index 0fb79cf..fa86072 100644
--- a/.classpath
+++ b/.classpath
@@ -32,6 +32,7 @@
 	<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="output" path="target/classes"/>
diff --git a/.project b/.project
index 634eb8c..9e24351 100644
--- a/.project
+++ b/.project
@@ -6,12 +6,12 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -25,10 +25,23 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/src/main/java/org/openliberty/xmltooling/dst2_1/DSTURI.java b/src/main/java/org/openliberty/xmltooling/dst2_1/DSTURI.java
index 7b3da3d..0497fa5 100644
--- a/src/main/java/org/openliberty/xmltooling/dst2_1/DSTURI.java
+++ b/src/main/java/org/openliberty/xmltooling/dst2_1/DSTURI.java
@@ -1,24 +1,21 @@
 package org.openliberty.xmltooling.dst2_1;
 
-import java.util.List;
 
 import org.openliberty.xmltooling.Konstantz;
-import org.opensaml.core.xml.AbstractXMLObject;
 import org.opensaml.core.xml.AbstractXMLObjectBuilder;
-import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.schema.XSURI;
+import org.opensaml.core.xml.schema.impl.XSURIImpl;
 
-public class DSTURI extends AbstractXMLObject implements XSURI
+public class DSTURI extends XSURIImpl implements XSURI
 {
 
     private LeafAttributes attributes;
-    private String value;               // xs:anyURI
 
     
     public DSTURI(String elementLocalName, String value)
     {
         super(Konstantz.DST_NS, elementLocalName, Konstantz.DST_PREFIX);
-        this.setValue(value);
+        setURI(value);
         attributes = new LeafAttributes();      
     }
     
@@ -37,7 +34,7 @@ public class DSTURI extends AbstractXMLObject implements XSURI
     {
         if(null!=dSTURI)
         {
-            String uri = dSTURI.getValue();
+            String uri = dSTURI.getURI();
             if(null==uri || uri.trim().length()==0) return false;                
         }
         
@@ -48,24 +45,6 @@ public class DSTURI extends AbstractXMLObject implements XSURI
     {
         return isValid(this);
     }
-
-    public void setValue(String value) 
-    {
-        // TODO: enforce URI type??
-        this.value = prepareForAssignment(this.value, value);
-    }
-
-    public String getValue() 
-    { 
-        return value; 
-    }
-
-    // no child elements
-    public List<XMLObject> getOrderedChildren() 
-    {
-        return null;
-    }
-
     
     
     /**

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.