You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by su...@apache.org on 2011/05/19 01:26:16 UTC
svn commit: r1124462 - in
/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main:
java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ resources/model/
Author: suat
Date: Wed May 18 23:26:16 2011
New Revision: 1124462
URL: http://svn.apache.org/viewvc?rev=1124462&view=rev
Log:
STANBOL-206:
To distinguish ContentObjects and ClassificationObjects while processing them, two new complex type were created for them in the XSD model and java classes were regenerated.
Added:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ClassificationObject.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ContentObject.java
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/AnnotationType.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/CMSObject.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/CMSObjects.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ConnectionInfo.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectFactory.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectTypeDefinition.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectTypeDefinitions.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropType.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/Property.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertyAnnotation.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertyDefinition.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertySemantics.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/package-info.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/resources/model/CMSObjectModel.xsd
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/AnnotationType.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/AnnotationType.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/AnnotationType.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/AnnotationType.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -10,6 +10,7 @@ package org.apache.stanbol.cmsadapter.se
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
/**
@@ -33,25 +34,26 @@ import javax.xml.bind.annotation.XmlEnum
* </pre>
*
*/
+@XmlType(name = "annotationType")
@XmlEnum
public enum AnnotationType {
- @XmlEnumValue("disjointWith")
- DISJOINT_WITH("disjointWith"),
+ @XmlEnumValue("subsumption")
+ SUBSUMPTION("subsumption"),
+ @XmlEnumValue("transitive")
+ TRANSITIVE("transitive"),
+ @XmlEnumValue("inverseFunctional")
+ INVERSE_FUNCTIONAL("inverseFunctional"),
+ @XmlEnumValue("instanceOf")
+ INSTANCE_OF("instanceOf"),
@XmlEnumValue("equivalentClass")
EQUIVALENT_CLASS("equivalentClass"),
+ @XmlEnumValue("disjointWith")
+ DISJOINT_WITH("disjointWith"),
@XmlEnumValue("functional")
FUNCTIONAL("functional"),
- @XmlEnumValue("instanceOf")
- INSTANCE_OF("instanceOf"),
- @XmlEnumValue("inverseFunctional")
- INVERSE_FUNCTIONAL("inverseFunctional"),
- @XmlEnumValue("subsumption")
- SUBSUMPTION("subsumption"),
@XmlEnumValue("symmetric")
- SYMMETRIC("symmetric"),
- @XmlEnumValue("transitive")
- TRANSITIVE("transitive");
+ SYMMETRIC("symmetric");
private final String value;
AnnotationType(String v) {
@@ -68,7 +70,7 @@ public enum AnnotationType {
return c;
}
}
- throw new IllegalArgumentException(v.toString());
+ throw new IllegalArgumentException(v);
}
}
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/CMSObject.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/CMSObject.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/CMSObject.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/CMSObject.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -13,6 +13,7 @@ import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
@@ -57,23 +58,23 @@ import javax.xml.bind.annotation.XmlType
"property",
"children"
})
+@XmlSeeAlso({
+ ClassificationObject.class,
+ ContentObject.class
+})
public class CMSObject {
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String uniqueRef;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String localname;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
protected String namespace;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String objectTypeRef;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
protected String parentRef;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String path;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
protected List<Property> property;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
protected List<CMSObject> children;
/**
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/CMSObjects.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/CMSObjects.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/CMSObjects.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/CMSObjects.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -13,73 +13,74 @@ import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
/**
- * This element was created to use object types as a
- * list in general, regardless of being a content or classification
- * object.
- *
- *
- * <p>Java class for CMSObjects element declaration.
+ * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
- * <element name="CMSObjects">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="CMSObject" type="{web.model.servicesapi.cmsadapter.stanbol.apache.org}CMSObject" maxOccurs="unbounded"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <choice maxOccurs="unbounded">
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}classificationObject"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}contentObject"/>
+ * </choice>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "cmsObject"
+ "classificationObjectOrContentObject"
})
@XmlRootElement(name = "CMSObjects")
public class CMSObjects {
- @XmlElement(name = "CMSObject", namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
- protected List<CMSObject> cmsObject;
+ @XmlElements({
+ @XmlElement(name = "classificationObject", type = ClassificationObject.class),
+ @XmlElement(name = "contentObject", type = ContentObject.class)
+ })
+ protected List<CMSObject> classificationObjectOrContentObject;
/**
- * Gets the value of the cmsObject property.
+ * Gets the value of the classificationObjectOrContentObject property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the cmsObject property.
+ * This is why there is not a <CODE>set</CODE> method for the classificationObjectOrContentObject property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
- * getCMSObject().add(newItem);
+ * getClassificationObjectOrContentObject().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link CMSObject }
+ * {@link ClassificationObject }
+ * {@link ContentObject }
*
*
*/
- public List<CMSObject> getCMSObject() {
- if (cmsObject == null) {
- cmsObject = new ArrayList<CMSObject>();
+ public List<CMSObject> getClassificationObjectOrContentObject() {
+ if (classificationObjectOrContentObject == null) {
+ classificationObjectOrContentObject = new ArrayList<CMSObject>();
}
- return this.cmsObject;
+ return this.classificationObjectOrContentObject;
}
}
Added: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ClassificationObject.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ClassificationObject.java?rev=1124462&view=auto
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ClassificationObject.java (added)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ClassificationObject.java Wed May 18 23:26:16 2011
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
+//
+
+
+package org.apache.stanbol.cmsadapter.servicesapi.model.web;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ClassificationObject complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="ClassificationObject">
+ * <complexContent>
+ * <extension base="{web.model.servicesapi.cmsadapter.stanbol.apache.org}CMSObject">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ClassificationObject")
+public class ClassificationObject
+ extends CMSObject
+{
+
+
+}
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ConnectionInfo.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ConnectionInfo.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ConnectionInfo.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ConnectionInfo.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -12,33 +12,30 @@ import javax.xml.bind.annotation.XmlAcce
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
/**
- * defines repository paramaters
- *
- * <p>Java class for connectionInfo element declaration.
+ * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
- * <element name="connectionInfo">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}repositoryURL"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}workspaceName"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}username"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}password"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}connectionType"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}ontologyURI"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}repositoryURL"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}workspaceName"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}username"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}password"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}connectionType"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}ontologyURI"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
@@ -55,17 +52,18 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement(name = "connectionInfo")
public class ConnectionInfo {
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String repositoryURL;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String workspaceName;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String username;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String password;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String connectionType;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
+ @XmlSchemaType(name = "anyURI")
protected String ontologyURI;
/**
Added: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ContentObject.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ContentObject.java?rev=1124462&view=auto
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ContentObject.java (added)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ContentObject.java Wed May 18 23:26:16 2011
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
+//
+
+
+package org.apache.stanbol.cmsadapter.servicesapi.model.web;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ContentObject complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="ContentObject">
+ * <complexContent>
+ * <extension base="{web.model.servicesapi.cmsadapter.stanbol.apache.org}CMSObject">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ContentObject")
+public class ContentObject
+ extends CMSObject
+{
+
+
+}
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectFactory.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectFactory.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectFactory.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -32,8 +32,8 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
- private final static QName _UniqueRef_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "uniqueRef");
private final static QName _Namespace_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "namespace");
+ private final static QName _UniqueRef_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "uniqueRef");
private final static QName _ContainerObjectRef_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "containerObjectRef");
private final static QName _ContentObject_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "contentObject");
private final static QName _Password_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "password");
@@ -45,8 +45,8 @@ public class ObjectFactory {
private final static QName _ParentRef_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "parentRef");
private final static QName _ObjectTypeRef_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "objectTypeRef");
private final static QName _OntologyURI_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "ontologyURI");
- private final static QName _Cardinality_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "cardinality");
private final static QName _WorkspaceName_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "workspaceName");
+ private final static QName _Cardinality_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "cardinality");
private final static QName _Required_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "required");
private final static QName _Value_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "value");
private final static QName _Path_QNAME = new QName("web.model.servicesapi.cmsadapter.stanbol.apache.org", "path");
@@ -64,99 +64,100 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link ObjectTypeDefinitions }
+ * Create an instance of {@link ObjectTypeDefinition }
*
*/
- public ObjectTypeDefinitions createObjectTypeDefinitions() {
- return new ObjectTypeDefinitions();
+ public ObjectTypeDefinition createObjectTypeDefinition() {
+ return new ObjectTypeDefinition();
}
/**
- * Create an instance of {@link PropertySemantics }
+ * Create an instance of {@link PropertyDefinition }
*
*/
- public PropertySemantics createPropertySemantics() {
- return new PropertySemantics();
+ public PropertyDefinition createPropertyDefinition() {
+ return new PropertyDefinition();
}
/**
- * Create an instance of {@link CMSObjects }
+ * Create an instance of {@link PropertySemantics }
*
*/
- public CMSObjects createCMSObjects() {
- return new CMSObjects();
+ public PropertySemantics createPropertySemantics() {
+ return new PropertySemantics();
}
/**
- * Create an instance of {@link ChildObjectDefinition }
+ * Create an instance of {@link PropertyAnnotation }
*
*/
- public ChildObjectDefinition createChildObjectDefinition() {
- return new ChildObjectDefinition();
+ public PropertyAnnotation createPropertyAnnotation() {
+ return new PropertyAnnotation();
}
/**
- * Create an instance of {@link Property }
+ * Create an instance of {@link ObjectTypeDefinitions }
*
*/
- public Property createProperty() {
- return new Property();
+ public ObjectTypeDefinitions createObjectTypeDefinitions() {
+ return new ObjectTypeDefinitions();
}
/**
- * Create an instance of {@link ContentObjects }
+ * Create an instance of {@link ConnectionInfo }
*
*/
- public ContentObjects createContentObjects() {
- return new ContentObjects();
+ public ConnectionInfo createConnectionInfo() {
+ return new ConnectionInfo();
}
/**
- * Create an instance of {@link PropertyDefinition }
+ * Create an instance of {@link ClassificationObject }
*
*/
- public PropertyDefinition createPropertyDefinition() {
- return new PropertyDefinition();
+ public ClassificationObject createClassificationObject() {
+ return new ClassificationObject();
}
/**
- * Create an instance of {@link ObjectTypeDefinition }
+ * Create an instance of {@link CMSObjects }
*
*/
- public ObjectTypeDefinition createObjectTypeDefinition() {
- return new ObjectTypeDefinition();
+ public CMSObjects createCMSObjects() {
+ return new CMSObjects();
}
/**
- * Create an instance of {@link CMSObject }
+ * Create an instance of {@link ContentObject }
*
*/
- public CMSObject createCMSObject() {
- return new CMSObject();
+ public ContentObject createContentObject() {
+ return new ContentObject();
}
/**
- * Create an instance of {@link ConnectionInfo }
+ * Create an instance of {@link Property }
*
*/
- public ConnectionInfo createConnectionInfo() {
- return new ConnectionInfo();
+ public Property createProperty() {
+ return new Property();
}
/**
- * Create an instance of {@link ClassificationObjects }
+ * Create an instance of {@link CMSObject }
*
*/
- public ClassificationObjects createClassificationObjects() {
- return new ClassificationObjects();
+ public CMSObject createCMSObject() {
+ return new CMSObject();
}
/**
- * Create an instance of {@link PropertyAnnotation }
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- public PropertyAnnotation createPropertyAnnotation() {
- return new PropertyAnnotation();
+ @XmlElementDecl(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", name = "namespace")
+ public JAXBElement<String> createNamespace(String value) {
+ return new JAXBElement<String>(_Namespace_QNAME, String.class, null, value);
}
/**
@@ -172,27 +173,18 @@ public class ObjectFactory {
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", name = "namespace")
- public JAXBElement<String> createNamespace(String value) {
- return new JAXBElement<String>(_Namespace_QNAME, String.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
- *
- */
@XmlElementDecl(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", name = "containerObjectRef")
public JAXBElement<String> createContainerObjectRef(String value) {
return new JAXBElement<String>(_ContainerObjectRef_QNAME, String.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CMSObject }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link ContentObject }{@code >}}
*
*/
@XmlElementDecl(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", name = "contentObject")
- public JAXBElement<CMSObject> createContentObject(CMSObject value) {
- return new JAXBElement<CMSObject>(_ContentObject_QNAME, CMSObject.class, null, value);
+ public JAXBElement<ContentObject> createContentObject(ContentObject value) {
+ return new JAXBElement<ContentObject>(_ContentObject_QNAME, ContentObject.class, null, value);
}
/**
@@ -223,12 +215,12 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link CMSObject }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link ClassificationObject }{@code >}}
*
*/
@XmlElementDecl(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", name = "classificationObject")
- public JAXBElement<CMSObject> createClassificationObject(CMSObject value) {
- return new JAXBElement<CMSObject>(_ClassificationObject_QNAME, CMSObject.class, null, value);
+ public JAXBElement<ClassificationObject> createClassificationObject(ClassificationObject value) {
+ return new JAXBElement<ClassificationObject>(_ClassificationObject_QNAME, ClassificationObject.class, null, value);
}
/**
@@ -277,21 +269,21 @@ public class ObjectFactory {
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
- @XmlElementDecl(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", name = "cardinality")
- public JAXBElement<BigInteger> createCardinality(BigInteger value) {
- return new JAXBElement<BigInteger>(_Cardinality_QNAME, BigInteger.class, null, value);
+ @XmlElementDecl(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", name = "workspaceName")
+ public JAXBElement<String> createWorkspaceName(String value) {
+ return new JAXBElement<String>(_WorkspaceName_QNAME, String.class, null, value);
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
*
*/
- @XmlElementDecl(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", name = "workspaceName")
- public JAXBElement<String> createWorkspaceName(String value) {
- return new JAXBElement<String>(_WorkspaceName_QNAME, String.class, null, value);
+ @XmlElementDecl(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", name = "cardinality")
+ public JAXBElement<BigInteger> createCardinality(BigInteger value) {
+ return new JAXBElement<BigInteger>(_Cardinality_QNAME, BigInteger.class, null, value);
}
/**
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectTypeDefinition.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectTypeDefinition.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectTypeDefinition.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectTypeDefinition.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -18,35 +18,29 @@ import javax.xml.bind.annotation.XmlType
/**
- * defines a fixed and non-hierarchical set of
- * properties (âschemaâ) that all objects of that type have
- *
- *
- * <p>Java class for objectTypeDefinition element declaration.
+ * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
- * <element name="objectTypeDefinition">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}localname"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}namespace" minOccurs="0"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}uniqueRef"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}parentRef" maxOccurs="unbounded" minOccurs="0"/>
+ * <sequence>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}propertyDefinition" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
* <sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}localname"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}namespace" minOccurs="0"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}uniqueRef"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}parentRef" maxOccurs="unbounded" minOccurs="0"/>
- * <sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}propertyDefinition" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}childObjectDefinition" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}objectTypeDefinition" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
@@ -58,23 +52,19 @@ import javax.xml.bind.annotation.XmlType
"uniqueRef",
"parentRef",
"propertyDefinition",
- "childObjectDefinition"
+ "objectTypeDefinition"
})
@XmlRootElement(name = "objectTypeDefinition")
public class ObjectTypeDefinition {
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String localname;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
protected String namespace;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String uniqueRef;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
protected List<String> parentRef;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
protected List<PropertyDefinition> propertyDefinition;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
- protected List<ChildObjectDefinition> childObjectDefinition;
+ protected List<ObjectTypeDefinition> objectTypeDefinition;
/**
* Gets the value of the localname property.
@@ -207,32 +197,32 @@ public class ObjectTypeDefinition {
}
/**
- * Gets the value of the childObjectDefinition property.
+ * Gets the value of the objectTypeDefinition property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the childObjectDefinition property.
+ * This is why there is not a <CODE>set</CODE> method for the objectTypeDefinition property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
- * getChildObjectDefinition().add(newItem);
+ * getObjectTypeDefinition().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link ChildObjectDefinition }
+ * {@link ObjectTypeDefinition }
*
*
*/
- public List<ChildObjectDefinition> getChildObjectDefinition() {
- if (childObjectDefinition == null) {
- childObjectDefinition = new ArrayList<ChildObjectDefinition>();
+ public List<ObjectTypeDefinition> getObjectTypeDefinition() {
+ if (objectTypeDefinition == null) {
+ objectTypeDefinition = new ArrayList<ObjectTypeDefinition>();
}
- return this.childObjectDefinition;
+ return this.objectTypeDefinition;
}
}
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectTypeDefinitions.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectTypeDefinitions.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectTypeDefinitions.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/ObjectTypeDefinitions.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -12,28 +12,25 @@ import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
/**
- * <p>Java class for objectTypeDefinitions element declaration.
+ * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
- * <element name="objectTypeDefinitions">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}objectTypeDefinition" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}objectTypeDefinition" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
@@ -45,7 +42,6 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement(name = "objectTypeDefinitions")
public class ObjectTypeDefinitions {
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
protected List<ObjectTypeDefinition> objectTypeDefinition;
/**
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropType.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropType.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropType.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropType.java Wed May 18 23:26:16 2011
@@ -1,14 +1,15 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
package org.apache.stanbol.cmsadapter.servicesapi.model.web;
import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
/**
@@ -39,24 +40,25 @@ import javax.xml.bind.annotation.XmlEnum
* </pre>
*
*/
+@XmlType(name = "propType")
@XmlEnum
public enum PropType {
- BINARY,
+ STRING,
BOOLEAN,
- DATE,
DECIMAL,
- DOUBLE,
- HTML,
INTEGER,
+ DATE,
+ URI,
+ HTML,
+ REFERENCE,
+ WEAKREFERENCE,
LONG,
- NAME,
+ DOUBLE,
+ BINARY,
PATH,
- REFERENCE,
- STRING,
- UNDEFINED,
- URI,
- WEAKREFERENCE;
+ NAME,
+ UNDEFINED;
public String value() {
return name();
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/Property.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/Property.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/Property.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/Property.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -12,34 +12,30 @@ import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
/**
- * <p>Java class for property element declaration.
+ * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
- * <element name="property">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}localname"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}sourceObjectTypeRef"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}containerObjectRef" minOccurs="0"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}value" maxOccurs="unbounded"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}propertyDefinition" minOccurs="0"/>
- * </sequence>
- * <attribute ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}type"/>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}localname"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}sourceObjectTypeRef"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}containerObjectRef" minOccurs="0"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}value" maxOccurs="unbounded"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}propertyDefinition" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
@@ -55,18 +51,14 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement(name = "property")
public class Property {
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String localname;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String sourceObjectTypeRef;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
protected String containerObjectRef;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected List<String> value;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
protected PropertyDefinition propertyDefinition;
- @XmlAttribute(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
- protected PropType type;
/**
* Gets the value of the localname property.
@@ -193,28 +185,4 @@ public class Property {
this.propertyDefinition = value;
}
- /**
- * Gets the value of the type property.
- *
- * @return
- * possible object is
- * {@link PropType }
- *
- */
- public PropType getType() {
- return type;
- }
-
- /**
- * Sets the value of the type property.
- *
- * @param value
- * allowed object is
- * {@link PropType }
- *
- */
- public void setType(PropType value) {
- this.type = value;
- }
-
}
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertyAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertyAnnotation.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertyAnnotation.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertyAnnotation.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -16,65 +16,35 @@ import javax.xml.bind.annotation.XmlType
/**
- * <p>Java class for propertyAnnotation element declaration.
+ * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
- * <element name="propertyAnnotation">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}uniqueRef"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}annotation"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}annotation"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "uniqueRef",
"annotation"
})
@XmlRootElement(name = "propertyAnnotation")
public class PropertyAnnotation {
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
- protected String uniqueRef;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected AnnotationType annotation;
/**
- * Gets the value of the uniqueRef property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUniqueRef() {
- return uniqueRef;
- }
-
- /**
- * Sets the value of the uniqueRef property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setUniqueRef(String value) {
- this.uniqueRef = value;
- }
-
- /**
* Gets the value of the annotation property.
*
* @return
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertyDefinition.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertyDefinition.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertyDefinition.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertyDefinition.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -19,32 +19,30 @@ import javax.xml.bind.annotation.XmlType
/**
- * <p>Java class for propertyDefinition element declaration.
+ * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
- * <element name="propertyDefinition">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}sourceObjectTypeRef" minOccurs="0"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}localname"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}namespace" minOccurs="0"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}uniqueRef"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}propertyType"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}cardinality" minOccurs="0"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}required" minOccurs="0"/>
* <sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}sourceObjectTypeRef" minOccurs="0"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}localname"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}namespace" minOccurs="0"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}uniqueRef"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}propertyType"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}cardinality" minOccurs="0"/>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}required" minOccurs="0"/>
- * <sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}valueConstraint" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}annotation" minOccurs="0"/>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}valueConstraint" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}annotation" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
@@ -64,23 +62,17 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement(name = "propertyDefinition")
public class PropertyDefinition {
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
protected String sourceObjectTypeRef;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String localname;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
protected String namespace;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected String uniqueRef;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected PropType propertyType;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
protected BigInteger cardinality;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
protected Boolean required;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
protected List<String> valueConstraint;
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
protected AnnotationType annotation;
/**
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertySemantics.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertySemantics.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertySemantics.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/PropertySemantics.java Wed May 18 23:26:16 2011
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
@@ -18,22 +18,20 @@ import javax.xml.bind.annotation.XmlType
/**
- * <p>Java class for propertySemantics element declaration.
+ * <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
- * <element name="propertySemantics">
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}propertyAnnotation" maxOccurs="unbounded"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </element>
+ * <complexType>
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{web.model.servicesapi.cmsadapter.stanbol.apache.org}propertyAnnotation" maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
* </pre>
*
*
@@ -45,7 +43,7 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement(name = "propertySemantics")
public class PropertySemantics {
- @XmlElement(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", required = true)
+ @XmlElement(required = true)
protected List<PropertyAnnotation> propertyAnnotation;
/**
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/package-info.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/package-info.java?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/package-info.java (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/web/package-info.java Wed May 18 23:26:16 2011
@@ -1,9 +1,9 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0-b52-fcs
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.3-hudson-jaxb-ri-2.2.3-3-
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.04.29 at 11:44:48 AM EEST
+// Generated on: 2011.05.17 at 10:53:39 AM EEST
//
-@javax.xml.bind.annotation.XmlSchema(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org")
+@javax.xml.bind.annotation.XmlSchema(namespace = "web.model.servicesapi.cmsadapter.stanbol.apache.org", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.stanbol.cmsadapter.servicesapi.model.web;
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/resources/model/CMSObjectModel.xsd
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/resources/model/CMSObjectModel.xsd?rev=1124462&r1=1124461&r2=1124462&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/resources/model/CMSObjectModel.xsd (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/resources/model/CMSObjectModel.xsd Wed May 18 23:26:16 2011
@@ -62,7 +62,7 @@
maxOccurs="unbounded" />
</xsd:sequence>
<xsd:sequence>
- <xsd:element ref="iksps:childObjectDefinition"
+ <xsd:element ref="iksps:objectTypeDefinition"
minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
</xsd:sequence>
@@ -86,14 +86,6 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
- <xsd:element name="childObjectDefinition">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="iksps:allowedObjectTypeDefRef" />
- <xsd:element ref="iksps:required" minOccurs="0" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
<xsd:complexType name="CMSObject">
<xsd:sequence>
<xsd:element ref="iksps:uniqueRef" />
@@ -112,6 +104,16 @@
</xsd:sequence>
</xsd:sequence>
</xsd:complexType>
+ <xsd:complexType name="ClassificationObject">
+ <xsd:complexContent>
+ <xsd:extension base="iksps:CMSObject"></xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ <xsd:complexType name="ContentObject">
+ <xsd:complexContent>
+ <xsd:extension base="iksps:CMSObject"></xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
<xsd:element name="property">
<xsd:complexType>
<xsd:sequence>
@@ -121,7 +123,6 @@
<xsd:element ref="iksps:value" maxOccurs="unbounded" />
<xsd:element ref="iksps:propertyDefinition" minOccurs="0" />
</xsd:sequence>
- <xsd:attribute ref="iksps:type" />
</xsd:complexType>
</xsd:element>
@@ -135,7 +136,6 @@
<xsd:element name="propertyAnnotation">
<xsd:complexType>
<xsd:sequence>
- <xsd:element ref="iksps:uniqueRef" />
<xsd:element ref="iksps:annotation" />
</xsd:sequence>
</xsd:complexType>
@@ -149,20 +149,6 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
- <xsd:element name="classificationObjects">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="iksps:classificationObject" maxOccurs="unbounded" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="contentObjects">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="iksps:contentObject" maxOccurs="unbounded" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
<xsd:element name="CMSObjects">
<xsd:annotation>
@@ -173,8 +159,10 @@
</xsd:annotation>
<xsd:complexType>
<xsd:sequence>
- <xsd:element name="CMSObject" type="iksps:CMSObject"
- maxOccurs="unbounded" />
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element ref="iksps:classificationObject" />
+ <xsd:element ref="iksps:contentObject" />
+ </xsd:choice>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -202,10 +190,9 @@
<xsd:element name="path" type="xsd:string" />
<xsd:element name="annotation" type="iksps:annotationType" />
- <xsd:element name="contentObject" type="iksps:CMSObject" />
- <xsd:element name="classificationObject" type="iksps:CMSObject" />
+ <xsd:element name="contentObject" type="iksps:ContentObject" />
+ <xsd:element name="classificationObject" type="iksps:ClassificationObject" />
<xsd:element name="objectTypeRef" type="xsd:string" />
- <xsd:element name="allowedObjectTypeDefRef" type="xsd:string" />
<xsd:element name="containerObjectRef" type="xsd:string" />
<xsd:element name="sourceObjectTypeRef" type="xsd:string" />