[jbossws-commits] JBossWS SVN: r2399 - tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sun Feb 18 08:04:30 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-18 08:04:30 -0500 (Sun, 18 Feb 2007)
New Revision: 2399
Modified:
tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java
tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java
tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java
tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java
Log:
Update to xerces-2.9.0
Modified: tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java
===================================================================
--- tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2007-02-18 13:03:10 UTC (rev 2398)
+++ tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSElementDeclaration.java 2007-02-18 13:04:30 UTC (rev 2399)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ws.metadata.wsdl.xmlschema;
import org.apache.xerces.xs.ShortList;
@@ -28,23 +28,22 @@
import org.apache.xerces.xs.XSElementDeclaration;
import org.apache.xerces.xs.XSException;
import org.apache.xerces.xs.XSNamedMap;
+import org.apache.xerces.xs.XSObjectList;
import org.apache.xerces.xs.XSTypeDefinition;
-
+import org.jboss.util.NotImplementedException;
/**
* Represents an XS Element Declaration
* @author <mailto:Anil.Saldhana at jboss.org>Anil Saldhana
* @since May 3, 2005
*/
-public class JBossXSElementDeclaration
- extends JBossXSObject
- implements XSElementDeclaration
+public class JBossXSElementDeclaration extends JBossXSObject implements XSElementDeclaration
{
protected String targetNamespace = null;
protected JBossXSTypeDefinition xstype = null;
protected boolean nillable = false;
private XSElementDeclaration xsed;
-
+
/**
* Sole Annotation object
*/
@@ -74,31 +73,29 @@
*/
public JBossXSElementDeclaration(XSElementDeclaration xe)
{
- if(xe == null)
- throw new IllegalArgumentException("Illegal Null Argument:xe");
-
- xsed = xe;
- name= xe.getName();
- namespace = xe.getNamespace();
- XSTypeDefinition xt = xe.getTypeDefinition();
- if(xt instanceof JBossXSTypeDefinition == false
- && xt instanceof XSComplexTypeDefinition)
- {
- xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xt);
- }
- else
- if(xt instanceof JBossXSTypeDefinition == false)
- {
- xstype = new JBossXSTypeDefinition(xt);
- }
- this.annotation = xe.getAnnotation();
+ if (xe == null)
+ throw new IllegalArgumentException("Illegal Null Argument:xe");
+
+ xsed = xe;
+ name = xe.getName();
+ namespace = xe.getNamespace();
+ XSTypeDefinition xt = xe.getTypeDefinition();
+ if (xt instanceof JBossXSTypeDefinition == false && xt instanceof XSComplexTypeDefinition)
+ {
+ xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xt);
+ }
+ else if (xt instanceof JBossXSTypeDefinition == false)
+ {
+ xstype = new JBossXSTypeDefinition(xt);
+ }
+ this.annotation = xe.getAnnotation();
}
public XSElementDeclaration getXSElementDeclaration()
{
return xsed;
}
-
+
/**
* One of XSConstants.SCOPE_GLOBAL, XSConstants.SCOPE_LOCAL
* or XSConstants.SCOPE_ABSENT
@@ -112,12 +109,11 @@
return this.xstype;
}
- public void setTypeDefinition(XSTypeDefinition xst )
+ public void setTypeDefinition(XSTypeDefinition xst)
{
- if(xst instanceof JBossXSTypeDefinition)
- this.xstype = (JBossXSTypeDefinition)xst ;
- else
- if(xst instanceof XSComplexTypeDefinition)
+ if (xst instanceof JBossXSTypeDefinition)
+ this.xstype = (JBossXSTypeDefinition)xst;
+ else if (xst instanceof XSComplexTypeDefinition)
this.xstype = new JBossXSComplexTypeDefinition((XSComplexTypeDefinition)xst);
}
@@ -141,7 +137,7 @@
return this.enclosingCTDefinition;
}
- public void setEnclosingCTDefinition( XSComplexTypeDefinition enclosingCTDefinition)
+ public void setEnclosingCTDefinition(XSComplexTypeDefinition enclosingCTDefinition)
{
this.enclosingCTDefinition = enclosingCTDefinition;
}
@@ -154,7 +150,7 @@
public void setTargetNamespace(String targetNamespace)
{
this.targetNamespace = targetNamespace;
- this.setNamespace( targetNamespace );
+ this.setNamespace(targetNamespace);
}
public short getConstraintType()
@@ -231,7 +227,7 @@
{
return this.annotation;
}
-
+
/**
* Get the type
*/
@@ -240,4 +236,9 @@
{
return XSConstants.ELEMENT_DECLARATION;
}
+
+ public XSObjectList getAnnotations()
+ {
+ throw new NotImplementedException();
+ }
}
Modified: tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java
===================================================================
--- tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-18 13:03:10 UTC (rev 2398)
+++ tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModel.java 2007-02-18 13:04:30 UTC (rev 2399)
@@ -54,6 +54,7 @@
import org.apache.xerces.xs.XSTerm;
import org.apache.xerces.xs.XSTypeDefinition;
import org.jboss.logging.Logger;
+import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.utils.DOMUtils;
@@ -742,4 +743,9 @@
return anonymousTypeMap;
}
}
+
+ public XSObjectList getSubstitutionGroup(XSElementDeclaration arg0)
+ {
+ throw new NotImplementedException();
+ }
}
Modified: tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java
===================================================================
--- tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2007-02-18 13:03:10 UTC (rev 2398)
+++ tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSModelGroup.java 2007-02-18 13:04:30 UTC (rev 2399)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ws.metadata.wsdl.xmlschema;
import java.util.Iterator;
@@ -28,14 +28,14 @@
import org.apache.xerces.xs.XSConstants;
import org.apache.xerces.xs.XSModelGroup;
import org.apache.xerces.xs.XSObjectList;
+import org.jboss.util.NotImplementedException;
/**
* Implements a ModelGroup of the Xerces Schema API
* @author <mailto:Anil.Saldhana at jboss.org>Anil Saldhana
* @since Apr 21, 2005
*/
-public class JBossXSModelGroup extends JBossXSObject
- implements XSModelGroup
+public class JBossXSModelGroup extends JBossXSObject implements XSModelGroup
{
private JBossXSObjectList xsparts = new JBossXSObjectList();;
protected short compositor = 0;
@@ -73,21 +73,21 @@
Iterator iter = p.iterator();
while (iter.hasNext())
{
- xsparts.addItem((JBossXSParticle)iter.next());
+ xsparts.addItem((JBossXSParticle)iter.next());
}
}
public void setParticles(List p, boolean shouldSort)
{
xsparts = new JBossXSObjectList();
- if(shouldSort)
+ if (shouldSort)
setParticles(p);
else
{
Iterator iter = p.iterator();
while (iter.hasNext())
{
- xsparts.addItem((JBossXSParticle)iter.next(), false);
+ xsparts.addItem((JBossXSParticle)iter.next(), false);
}
}
@@ -106,4 +106,9 @@
{
return XSConstants.MODEL_GROUP;
}
+
+ public XSObjectList getAnnotations()
+ {
+ throw new NotImplementedException();
+ }
}
Modified: tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java
===================================================================
--- tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2007-02-18 13:03:10 UTC (rev 2398)
+++ tags/jbossws-1.2.0.CR3/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSParticle.java 2007-02-18 13:04:30 UTC (rev 2399)
@@ -1,36 +1,37 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.jboss.ws.metadata.wsdl.xmlschema;
import org.apache.xerces.xs.XSConstants;
+import org.apache.xerces.xs.XSObjectList;
import org.apache.xerces.xs.XSParticle;
import org.apache.xerces.xs.XSTerm;
+import org.jboss.util.NotImplementedException;
/**
* @author <mailto:Anil.Saldhana at jboss.org>Anil Saldhana
* @since Apr 21, 2005
*/
-public class JBossXSParticle
- extends JBossXSObject implements XSParticle, Comparable
+public class JBossXSParticle extends JBossXSObject implements XSParticle, Comparable
{
protected int minOccurs = 0;
protected int maxOccurs = 0;
@@ -111,22 +112,27 @@
public int compareTo(Object o)
{
int c = -1;
- if(o instanceof JBossXSParticle)
+ if (o instanceof JBossXSParticle)
{
JBossXSParticle w = (JBossXSParticle)o;
String oname = w.getTerm().getName();
- String termName = term.getName() ;
- if( termName != null )
- c = termName.compareTo(oname);
+ String termName = term.getName();
+ if (termName != null)
+ c = termName.compareTo(oname);
//In the case of doclit, need to be careful about String_1,SimpleType_2
- if( termName != null)
+ if (termName != null)
{
- char num1 = termName.charAt(termName.length()-1);
- char num2 = oname.charAt(oname.length()-1);
- if(Character.isDigit(num1) && Character.isDigit(num2))
- c = (""+num1).compareTo((""+num2));
+ char num1 = termName.charAt(termName.length() - 1);
+ char num2 = oname.charAt(oname.length() - 1);
+ if (Character.isDigit(num1) && Character.isDigit(num2))
+ c = ("" + num1).compareTo(("" + num2));
}
}
return c;
}
+
+ public XSObjectList getAnnotations()
+ {
+ throw new NotImplementedException();
+ }
}
More information about the jbossws-commits
mailing list