Author: suat
Date: Wed May 18 23:00:01 2011
New Revision: 1124460
URL: http://svn.apache.org/viewvc?rev=1124460&view=rev
Log:
STANBOL-206:
-It is not allowed to define a standalone property bridge, so XSD schema was
updated accordingly and model was regenerated.
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/MappingModelParser.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/AnnotationType.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/BridgeDefinitions.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/ConceptBridge.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/InstanceBridge.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/NameType.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/ObjectFactory.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/PropertyAnnotation.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/PropertyBridge.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/SubsumptionBridge.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/package-info.java
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/resources/model/CR2OntologyMap.xsd
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/MappingModelParser.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/MappingModelParser.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/MappingModelParser.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/MappingModelParser.java
Wed May 18 23:00:01 2011
@@ -14,99 +14,100 @@ import org.apache.stanbol.cmsadapter.ser
import org.apache.stanbol.cmsadapter.servicesapi.model.mapping.ConceptBridge;
import org.apache.stanbol.cmsadapter.servicesapi.model.mapping.InstanceBridge;
import org.apache.stanbol.cmsadapter.servicesapi.model.mapping.ObjectFactory;
-import org.apache.stanbol.cmsadapter.servicesapi.model.mapping.PropertyBridge;
import
org.apache.stanbol.cmsadapter.servicesapi.model.mapping.SubsumptionBridge;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * Helper class for serializing and deserializing bridge definitions
+ *
+ */
public class MappingModelParser {
- private static final Logger logger = LoggerFactory
- .getLogger(MappingModelParser.class);
+ private static final Logger logger =
LoggerFactory.getLogger(MappingModelParser.class);
- public static BridgeDefinitions deserializeObject(String xmlContent) {
- BridgeDefinitions bridgeDefinitions = null;
+ public static BridgeDefinitions deserializeObject(String xmlContent) {
+ BridgeDefinitions bridgeDefinitions = null;
- try {
- ClassLoader cl = ObjectFactory.class.getClassLoader();
- JAXBContext jc =
JAXBContext.newInstance(ObjectFactory.class
- .getPackage().getName(), cl);
- Unmarshaller um = jc.createUnmarshaller();
- StringReader stringReader = new
StringReader(xmlContent);
- bridgeDefinitions = (BridgeDefinitions)
um.unmarshal(stringReader);
-
- } catch (JAXBException e) {
- logger.error("JAXB Exception when parsing serialized
BridgeDefinitions");
- }
- return bridgeDefinitions;
- }
-
- public static String serializeObject(Object object) {
- String bridgeDefinitions = null;
-
- try {
- ClassLoader cl = ObjectFactory.class.getClassLoader();
- JAXBContext jc = JAXBContext.newInstance(ObjectFactory.class
- .getPackage().getName(), cl);
- Marshaller m = jc.createMarshaller();
- StringWriter stringWriter = new StringWriter();
- m.marshal(object, stringWriter);
- bridgeDefinitions = stringWriter.toString();
-
- } catch (JAXBException e) {
- logger.error("JAXB Exception when parsing serialized
BridgeDefinitions");
- }
- return bridgeDefinitions;
- }
-
-
- public static List<ConceptBridge> getConceptBridges(
- BridgeDefinitions bridgeDefinitions) {
- List<ConceptBridge> cList = new ArrayList<ConceptBridge>();
- List<Object> aList =
bridgeDefinitions.getConceptBridgeOrSubsumptionBridgeOrPropertyBridge();
- for (Object bridge : aList) {
- if (bridge instanceof ConceptBridge) {
- cList.add((ConceptBridge) bridge);
- }
- }
- return cList;
- }
-
- public static List<SubsumptionBridge> getSubsumptionBridges(
- BridgeDefinitions bridgeDefinitions) {
-
- List<SubsumptionBridge> sList = new
ArrayList<SubsumptionBridge>();
- List<Object> aList =
bridgeDefinitions.getConceptBridgeOrSubsumptionBridgeOrPropertyBridge();
- for (Object bridge : aList) {
- if (bridge instanceof SubsumptionBridge) {
- sList.add((SubsumptionBridge) bridge);
- }
- }
- return sList;
- }
-
- public static List<PropertyBridge> getPropertyBridges(
- BridgeDefinitions bridgeDefinitions) {
-
- List<PropertyBridge> pList = new ArrayList<PropertyBridge>();
- List<Object> aList =
bridgeDefinitions.getConceptBridgeOrSubsumptionBridgeOrPropertyBridge();
- for (Object bridge : aList) {
- if (bridge instanceof PropertyBridge) {
- pList.add((PropertyBridge) bridge);
- }
- }
- return pList;
- }
-
- public static List<InstanceBridge> getInstanceBridges(
- BridgeDefinitions bridgeDefinitions) {
-
- List<InstanceBridge> sList = new ArrayList<InstanceBridge>();
- List<Object> aList =
bridgeDefinitions.getConceptBridgeOrSubsumptionBridgeOrPropertyBridge();
- for (Object bridge : aList) {
- if (bridge instanceof InstanceBridge) {
- sList.add((InstanceBridge) bridge);
- }
- }
- return sList;
- }
+ try {
+ ClassLoader cl = ObjectFactory.class.getClassLoader();
+ JAXBContext jc =
JAXBContext.newInstance(ObjectFactory.class.getPackage().getName(), cl);
+ Unmarshaller um = jc.createUnmarshaller();
+ StringReader stringReader = new StringReader(xmlContent);
+ bridgeDefinitions = (BridgeDefinitions) um.unmarshal(stringReader);
+
+ } catch (JAXBException e) {
+ logger.error("JAXB Exception when parsing serialized
BridgeDefinitions");
+ }
+ return bridgeDefinitions;
+ }
+
+ public static String serializeObject(Object object) {
+ String bridgeDefinitions = null;
+
+ try {
+ ClassLoader cl = ObjectFactory.class.getClassLoader();
+ JAXBContext jc =
JAXBContext.newInstance(ObjectFactory.class.getPackage().getName(), cl);
+ Marshaller m = jc.createMarshaller();
+ StringWriter stringWriter = new StringWriter();
+ m.marshal(object, stringWriter);
+ bridgeDefinitions = stringWriter.toString();
+
+ } catch (JAXBException e) {
+ logger.error("JAXB Exception when parsing serialized
BridgeDefinitions");
+ }
+ return bridgeDefinitions;
+ }
+
+ /**
+ * Gets {@link ConceptBridge}s from inside the given {@link
BridgeDefinitions} object.
+ *
+ * @param bridgeDefinitions
+ * @return
+ */
+ public static List<ConceptBridge> getConceptBridges(BridgeDefinitions
bridgeDefinitions) {
+ List<ConceptBridge> cList = new ArrayList<ConceptBridge>();
+ List<Object> aList =
bridgeDefinitions.getConceptBridgeOrSubsumptionBridgeOrInstanceBridge();
+ for (Object bridge : aList) {
+ if (bridge instanceof ConceptBridge) {
+ cList.add((ConceptBridge) bridge);
+ }
+ }
+ return cList;
+ }
+
+ /**
+ * Gets {@link SubsumptionBridge}s from inside the given {@link
BridgeDefinitions} object.
+ *
+ * @param bridgeDefinitions
+ * @return
+ */
+ public static List<SubsumptionBridge>
getSubsumptionBridges(BridgeDefinitions bridgeDefinitions) {
+
+ List<SubsumptionBridge> sList = new ArrayList<SubsumptionBridge>();
+ List<Object> aList =
bridgeDefinitions.getConceptBridgeOrSubsumptionBridgeOrInstanceBridge();
+ for (Object bridge : aList) {
+ if (bridge instanceof SubsumptionBridge) {
+ sList.add((SubsumptionBridge) bridge);
+ }
+ }
+ return sList;
+ }
+
+ /**
+ * Gets {@link InstanceBridge}s from inside the given {@link
BridgeDefinitions} object.
+ *
+ * @param bridgeDefinitions
+ * @return
+ */
+ public static List<InstanceBridge> getInstanceBridges(BridgeDefinitions
bridgeDefinitions) {
+
+ List<InstanceBridge> sList = new ArrayList<InstanceBridge>();
+ List<Object> aList =
bridgeDefinitions.getConceptBridgeOrSubsumptionBridgeOrInstanceBridge();
+ for (Object bridge : aList) {
+ if (bridge instanceof InstanceBridge) {
+ sList.add((InstanceBridge) bridge);
+ }
+ }
+ return sList;
+ }
}
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/AnnotationType.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/AnnotationType.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/AnnotationType.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/AnnotationType.java
Wed May 18 23:00:01 2011
@@ -2,7 +2,7 @@
// 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.14 at 03:06:41 PM EEST
+// Generated on: 2011.05.09 at 02:52:53 PM EEST
//
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/BridgeDefinitions.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/BridgeDefinitions.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/BridgeDefinitions.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/BridgeDefinitions.java
Wed May 18 23:00:01 2011
@@ -2,7 +2,7 @@
// 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.14 at 03:06:41 PM EEST
+// Generated on: 2011.05.09 at 02:52:53 PM EEST
//
@@ -30,7 +30,6 @@ import javax.xml.bind.annotation.XmlType
* <choice maxOccurs="unbounded">
* <element
ref="{mapping.model.servicesapi.cmsadapter.stanbol.apache.org}ConceptBridge"/>
* <element
ref="{mapping.model.servicesapi.cmsadapter.stanbol.apache.org}SubsumptionBridge"/>
- * <element
ref="{mapping.model.servicesapi.cmsadapter.stanbol.apache.org}PropertyBridge"/>
* <element
ref="{mapping.model.servicesapi.cmsadapter.stanbol.apache.org}InstanceBridge"/>
* </choice>
* </restriction>
@@ -42,49 +41,47 @@ import javax.xml.bind.annotation.XmlType
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "conceptBridgeOrSubsumptionBridgeOrPropertyBridge"
+ "conceptBridgeOrSubsumptionBridgeOrInstanceBridge"
})
@XmlRootElement(name = "BridgeDefinitions")
public class BridgeDefinitions {
@XmlElements({
@XmlElement(name = "SubsumptionBridge", type =
SubsumptionBridge.class),
- @XmlElement(name = "ConceptBridge", type = ConceptBridge.class),
- @XmlElement(name = "PropertyBridge", type = PropertyBridge.class),
- @XmlElement(name = "InstanceBridge", type = InstanceBridge.class)
+ @XmlElement(name = "InstanceBridge", type = InstanceBridge.class),
+ @XmlElement(name = "ConceptBridge", type = ConceptBridge.class)
})
- protected List<Object> conceptBridgeOrSubsumptionBridgeOrPropertyBridge;
+ protected List<Object> conceptBridgeOrSubsumptionBridgeOrInstanceBridge;
/**
- * Gets the value of the conceptBridgeOrSubsumptionBridgeOrPropertyBridge
property.
+ * Gets the value of the conceptBridgeOrSubsumptionBridgeOrInstanceBridge
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
conceptBridgeOrSubsumptionBridgeOrPropertyBridge property.
+ * This is why there is not a <CODE>set</CODE> method for the
conceptBridgeOrSubsumptionBridgeOrInstanceBridge property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
- * getConceptBridgeOrSubsumptionBridgeOrPropertyBridge().add(newItem);
+ * getConceptBridgeOrSubsumptionBridgeOrInstanceBridge().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link SubsumptionBridge }
- * {@link ConceptBridge }
- * {@link PropertyBridge }
* {@link InstanceBridge }
+ * {@link ConceptBridge }
*
*
*/
- public List<Object> getConceptBridgeOrSubsumptionBridgeOrPropertyBridge() {
- if (conceptBridgeOrSubsumptionBridgeOrPropertyBridge == null) {
- conceptBridgeOrSubsumptionBridgeOrPropertyBridge = new
ArrayList<Object>();
+ public List<Object> getConceptBridgeOrSubsumptionBridgeOrInstanceBridge() {
+ if (conceptBridgeOrSubsumptionBridgeOrInstanceBridge == null) {
+ conceptBridgeOrSubsumptionBridgeOrInstanceBridge = new
ArrayList<Object>();
}
- return this.conceptBridgeOrSubsumptionBridgeOrPropertyBridge;
+ return this.conceptBridgeOrSubsumptionBridgeOrInstanceBridge;
}
}
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/ConceptBridge.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/ConceptBridge.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/ConceptBridge.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/ConceptBridge.java
Wed May 18 23:00:01 2011
@@ -2,7 +2,7 @@
// 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.14 at 03:06:41 PM EEST
+// Generated on: 2011.05.09 at 02:52:53 PM EEST
//
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/InstanceBridge.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/InstanceBridge.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/InstanceBridge.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/InstanceBridge.java
Wed May 18 23:00:01 2011
@@ -2,7 +2,7 @@
// 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.14 at 03:06:41 PM EEST
+// Generated on: 2011.05.09 at 02:52:53 PM EEST
//
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/NameType.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/NameType.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/NameType.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/NameType.java
Wed May 18 23:00:01 2011
@@ -2,7 +2,7 @@
// 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.14 at 03:06:41 PM EEST
+// Generated on: 2011.05.09 at 02:52:53 PM EEST
//
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/ObjectFactory.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/ObjectFactory.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/ObjectFactory.java
Wed May 18 23:00:01 2011
@@ -2,7 +2,7 @@
// 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.14 at 03:06:41 PM EEST
+// Generated on: 2011.05.09 at 02:52:53 PM EEST
//
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/PropertyAnnotation.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/PropertyAnnotation.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/PropertyAnnotation.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/PropertyAnnotation.java
Wed May 18 23:00:01 2011
@@ -2,7 +2,7 @@
// 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.14 at 03:06:41 PM EEST
+// Generated on: 2011.05.09 at 02:52:53 PM EEST
//
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/PropertyBridge.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/PropertyBridge.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/PropertyBridge.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/PropertyBridge.java
Wed May 18 23:00:01 2011
@@ -2,7 +2,7 @@
// 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.14 at 03:06:41 PM EEST
+// Generated on: 2011.05.09 at 02:52:53 PM EEST
//
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/SubsumptionBridge.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/SubsumptionBridge.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/SubsumptionBridge.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/SubsumptionBridge.java
Wed May 18 23:00:01 2011
@@ -2,7 +2,7 @@
// 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.14 at 03:06:41 PM EEST
+// Generated on: 2011.05.09 at 02:52:53 PM EEST
//
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/package-info.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/package-info.java?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/package-info.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/model/mapping/package-info.java
Wed May 18 23:00:01 2011
@@ -2,7 +2,7 @@
// 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.14 at 03:06:41 PM EEST
+// Generated on: 2011.05.09 at 02:52:53 PM EEST
//
@javax.xml.bind.annotation.XmlSchema(namespace =
"mapping.model.servicesapi.cmsadapter.stanbol.apache.org", elementFormDefault =
javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/resources/model/CR2OntologyMap.xsd
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/resources/model/CR2OntologyMap.xsd?rev=1124460&r1=1124459&r2=1124460&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/resources/model/CR2OntologyMap.xsd
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/resources/model/CR2OntologyMap.xsd
Wed May 18 23:00:01 2011
@@ -1,17 +1,13 @@
-<xsd:schema
-
targetNamespace="mapping.model.servicesapi.cmsadapter.stanbol.apache.org"
- attributeFormDefault="unqualified"
- elementFormDefault="qualified"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:tns="mapping.model.servicesapi.cmsadapter.stanbol.apache.org">
+<xsd:schema
targetNamespace="mapping.model.servicesapi.cmsadapter.stanbol.apache.org"
+ attributeFormDefault="unqualified" elementFormDefault="qualified"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:tns="mapping.model.servicesapi.cmsadapter.stanbol.apache.org">
<xsd:element name="BridgeDefinitions">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
- <xsd:element ref="tns:ConceptBridge" />
- <xsd:element
ref="tns:SubsumptionBridge" />
- <xsd:element ref="tns:PropertyBridge" />
- <xsd:element ref="tns:InstanceBridge" />
+ <xsd:element ref="tns:ConceptBridge" />
+ <xsd:element ref="tns:SubsumptionBridge" />
+ <xsd:element ref="tns:InstanceBridge" />
</xsd:choice>
</xsd:complexType>
</xsd:element>
@@ -20,40 +16,45 @@
<xsd:complexType>
<xsd:sequence>
<xsd:element name="Query" type="tns:QueryType"
/>
- <xsd:element ref="tns:SubsumptionBridge"
minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element ref="tns:PropertyBridge"
minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element ref="tns:SubsumptionBridge"
minOccurs="0"
+ maxOccurs="unbounded" />
+ <xsd:element ref="tns:PropertyBridge"
minOccurs="0"
+ maxOccurs="unbounded" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name="SubsumptionBridge">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="PredicateName"
type="tns:QueryType" />
- <xsd:element name="SubjectQuery"
type="tns:QueryType" minOccurs="0" />
+ <xsd:element name="SubjectQuery"
type="tns:QueryType"
+ minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name="PropertyBridge">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="PredicateName"
type="tns:QueryType" />
- <xsd:element name="SubjectQuery"
type="tns:QueryType" minOccurs="0" />
+ <xsd:element name="SubjectQuery"
type="tns:QueryType"
+ minOccurs="0" />
<xsd:element ref="tns:PropertyAnnotation"
minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name="InstanceBridge">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="Query" type="tns:QueryType"
/>
- <xsd:element ref="tns:PropertyBridge"
minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element ref="tns:PropertyBridge"
minOccurs="0"
+ maxOccurs="unbounded" />
</xsd:sequence>
- </xsd:complexType>
+ </xsd:complexType>
</xsd:element>
-
+
<xsd:element name="PropertyAnnotation">
<xsd:complexType>
<xsd:sequence>
@@ -67,23 +68,23 @@
<xsd:element name="PropertyName" type="xsd:string" />
</xsd:choice>
</xsd:complexType>
-
+
<xsd:simpleType name="QueryType">
<xsd:restriction base="xsd:string">
<xsd:minLength value="1" />
</xsd:restriction>
</xsd:simpleType>
-
- <xsd:simpleType name = "AnnotationType">
- <xsd:restriction base = "xsd:NMTOKEN">
- <xsd:enumeration value = "subsumption" />
- <xsd:enumeration value = "transitive" />
- <xsd:enumeration value = "inverseFunctional" />
- <xsd:enumeration value = "instanceOf" />
- <xsd:enumeration value = "equivalentClass" />
- <xsd:enumeration value = "disjointWith" />
- <xsd:enumeration value = "functional" />
- <xsd:enumeration value = "symmetric" />
+
+ <xsd:simpleType name="AnnotationType">
+ <xsd:restriction base="xsd:NMTOKEN">
+ <xsd:enumeration value="subsumption" />
+ <xsd:enumeration value="transitive" />
+ <xsd:enumeration value="inverseFunctional" />
+ <xsd:enumeration value="instanceOf" />
+ <xsd:enumeration value="equivalentClass" />
+ <xsd:enumeration value="disjointWith" />
+ <xsd:enumeration value="functional" />
+ <xsd:enumeration value="symmetric" />
</xsd:restriction>
</xsd:simpleType>
</xsd:schema>
