You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/07/14 13:56:24 UTC

[08/10] jena git commit: Revert "Moved W3C vocabs to separate package Signed-off-by:Bart Hanssens "

Revert "Moved W3C vocabs to separate package Signed-off-by:Bart Hanssens <ba...@fedict.be>"

This reverts commit 0f1c9676abf8afff9b8de7ef1c9dd14d01c28425.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/99410940
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/99410940
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/99410940

Branch: refs/heads/master
Commit: 99410940ee7b63eebd69176be5c83c8640007d11
Parents: 0f1c967
Author: Bart.Hanssens <Ba...@AFI-PDEL150164.fed-gov.be>
Authored: Thu Jul 14 09:12:40 2016 +0100
Committer: Bart.Hanssens <Ba...@AFI-PDEL150164.fed-gov.be>
Committed: Thu Jul 14 09:12:40 2016 +0100

----------------------------------------------------------------------
 jena-vocab-w3c/pom.xml                          | 74 ----------------
 .../org/apache/jena/vocabulary/w3c/DCAT.java    | 64 --------------
 .../org/apache/jena/vocabulary/w3c/ORG.java     | 92 --------------------
 .../org/apache/jena/vocabulary/w3c/ROV.java     | 55 ------------
 .../org/apache/jena/vocabulary/w3c/VOID.java    | 79 -----------------
 .../org/apache/jena/vocabulary/w3c/package.html | 29 ------
 6 files changed, 393 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/99410940/jena-vocab-w3c/pom.xml
----------------------------------------------------------------------
diff --git a/jena-vocab-w3c/pom.xml b/jena-vocab-w3c/pom.xml
deleted file mode 100644
index 8071cff..0000000
--- a/jena-vocab-w3c/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>jena-vocab-w3c</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Jena - Vocabularies W3C</name>
-    <description>Additional vocabularies (W3C)</description>
-    
-    <parent>
-        <groupId>org.apache.jena</groupId>
-        <artifactId>jena-parent</artifactId>
-        <version>17-SNAPSHOT</version>
-        <relativePath>../jena-parent</relativePath>
-    </parent>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.jena</groupId>
-            <artifactId>jena-core</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
-        </dependency>
-    </dependencies> 
-
-    <properties>
-        <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
-        <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
-    </properties>
-    <build>
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-      
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <author>true</author>
-                    <version>true</version>
-                    <show>public</show>
-                    <quiet>true</quiet>
-                    <encoding>UTF-8</encoding>
-                    <windowtitle>Apache Jena</windowtitle>
-                    <doctitle>Apache Jena Vocabularies W3C ${project.version}</doctitle>
-                    <bottom>Licenced under the Apache License, Version 2.0</bottom>
-                    <groups>
-                        <group>
-                            <title>W3C Vocabularies</title>
-                            <packages>org.apache.jena.vocabulary.w3c</packages>
-                        </group>
-                    </groups>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/99410940/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/DCAT.java
----------------------------------------------------------------------
diff --git a/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/DCAT.java b/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/DCAT.java
deleted file mode 100644
index f0bf7bf..0000000
--- a/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/DCAT.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.vocabulary.w3c;
-
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
- 
-/**
- * Constants for the W3C Data Catalog Vocabulary.
- *
- * @see <a href="https://www.w3.org/TR/vocab-dcat/">Data Catalog Vocabulary</a>
- */
-public class DCAT {
-	private static final Model m = ModelFactory.createDefaultModel();
-
-	public static final String NS = "http://www.w3.org/ns/dcat#";
-	public static final Resource NAMESPACE = m.createResource(NS);
-	
-	/**
-	 * Returns the URI for this schema
-	 * @return URI
-	 */
-	public static String getURI() {
-		return NS;
-	}
-	
-	// Classes
-	public static final Resource Catalog = m.createResource(NS + "Catalog");
-	public static final Resource CatalogRecord = m.createResource(NS + "CatalogRecord");
-	public static final Resource Dataset = m.createResource(NS + "Dataset");
-	public static final Resource Distribution = m.createResource(NS + "Distribution");
-	
-	// Properties
-	public static final Property accessURL = m.createProperty(NS + "accessURL");
-	public static final Property byteSize = m.createProperty(NS + "byteSize");
-	public static final Property contactPoint = m.createProperty(NS + "contactPoint");
-	public static final Property dataset = m.createProperty(NS + "dataset");
-	public static final Property distribution = m.createProperty(NS + "distribution");
-	public static final Property downloadURL = m.createProperty(NS + "downloadURL");
-	public static final Property keyword = m.createProperty(NS + "keyword");	
-	public static final Property landingPage = m.createProperty(NS + "landingPage");
-	public static final Property mediaType = m.createProperty(NS + "mediaType");
-	public static final Property record = m.createProperty(NS + "record");
-	public static final Property theme = m.createProperty(NS + "theme");
-	public static final Property themeTaxonomy = m.createProperty(NS + "themeTaxonomy");
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/99410940/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/ORG.java
----------------------------------------------------------------------
diff --git a/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/ORG.java b/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/ORG.java
deleted file mode 100644
index df613f6..0000000
--- a/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/ORG.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.vocabulary.w3c;
-
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
- 
-/**
- * Constants for the W3C Organization Ontology.
- * 
- * @see <a href="https://www.w3.org/TR/vocab-org/">Organization Ontology</a>
- */
-public class ORG {
-	private static final Model m = ModelFactory.createDefaultModel();
-
-	public static final String NS = "http://www.w3.org/ns/org#";
-	public static final Resource NAMESPACE = m.createResource(NS);
-	
-	/**
-	 * Returns the URI for this schema
-	 * @return URI
-	 */
-	public static String getURI() {
-		return NS;
-	}
-	
-	// Classes
-	public static final Resource ChangeEvent = m.createResource(NS + "ChangeEvent");
-	public static final Resource FormalOrganization = m.createResource(NS + "FormalOrganization");
-	public static final Resource Membership = m.createResource(NS + "Membership");
-	public static final Resource OrganizationalCollaboration = m.createResource(NS + "OrganizationalCollaboration");
-	public static final Resource OrganizationalUnit = m.createResource(NS + "OrganizationalUnit");
-	public static final Resource Organization = m.createResource(NS + "Organization");
-	public static final Resource Post = m.createResource(NS + "Post");
-	public static final Resource Role = m.createResource(NS + "Role");
-	public static final Resource Site = m.createResource(NS + "Site");
-
-	// Properties
-	public static final Property basedAt = m.createProperty(NS + "basedAt");
-	public static final Property changedBy = m.createProperty(NS + "changedBy");
-	public static final Property classification = m.createProperty(NS + "classification");
-	public static final Property hasMember = m.createProperty(NS + "hasMember");
-	public static final Property hasMembership = m.createProperty(NS + "hasMembership");
-	public static final Property hasPost = m.createProperty(NS + "hasPost");
-	public static final Property hasPrimarySite = m.createProperty(NS + "hasPrimarySite");
-	public static final Property hasRegisteredSite = m.createProperty(NS + "hasRegisteredSite");
-	public static final Property hasSite = m.createProperty(NS + "hasSite");
-	public static final Property hasSubOrganization = m.createProperty(NS + "hasSubOrganization");
-	public static final Property hasUnit = m.createProperty(NS + "hasUnit");
-	public static final Property headOf = m.createProperty(NS + "headOf");
-	public static final Property heldBy = m.createProperty(NS + "heldBy");
-	public static final Property holds = m.createProperty(NS + "holds");
-	public static final Property identifier = m.createProperty(NS + "identifier");
-	public static final Property linkedTo = m.createProperty(NS + "linkedTo");
-	public static final Property location = m.createProperty(NS + "location");
-	public static final Property memberDuring = m.createProperty(NS + "memberDuring");
-	public static final Property memberOf = m.createProperty(NS + "memberOf");
-	public static final Property member = m.createProperty(NS + "member");
-	public static final Property organization = m.createProperty(NS + "organization");
-	public static final Property originalOrganization = m.createProperty(NS + "originalOrganization");
-	public static final Property postIn = m.createProperty(NS + "postIn");
-	public static final Property purpose = m.createProperty(NS + "purpose");
-	public static final Property remuneration = m.createProperty(NS + "remuneration");
-	public static final Property reportsTo = m.createProperty(NS + "reportsTo");
-	public static final Property resultedFrom = m.createProperty(NS + "resultedFrom");
-	public static final Property resultingOrganization = m.createProperty(NS + "resultingOrganization");
-	public static final Property role = m.createProperty(NS + "role");
-	public static final Property roleProperty = m.createProperty(NS + "roleProperty");
-	public static final Property siteAddress = m.createProperty(NS + "siteAddress");
-	public static final Property siteOf = m.createProperty(NS + "siteOf");
-	public static final Property subOrganizationOf = m.createProperty(NS + "subOrganizationOf");
-	public static final Property transitiveSubOrganizationOf = m.createProperty(NS + "transitiveSubOrganizationOf");
-	public static final Property unitOf = m.createProperty(NS + "unitOf");
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/99410940/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/ROV.java
----------------------------------------------------------------------
diff --git a/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/ROV.java b/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/ROV.java
deleted file mode 100644
index 425c02c..0000000
--- a/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/ROV.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.vocabulary.w3c;
-
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
- 
-/**
- * Constants for the W3C Registered Organization Vocabulary.
- *
- * @see <a href="https://www.w3.org/TR/vocab-regorg/">Registered Organization Vocabulary</a>
- */
-public class ROV {
-	private static final Model m = ModelFactory.createDefaultModel();
-
-	public static final String NS = "http://www.w3.org/ns/regorg#";
-	public static final Resource NAMESPACE = m.createResource(NS);
-	
-	/**
-	 * Returns the URI for this schema
-	 * @return URI
-	 */
-	public static String getURI() {
-		return NS;
-	}
-	
-	// Classes
-	public static final Resource RegisteredOrganization = m.createResource(NS + "RegisteredOrganization");
-
-	// Properties
-	public static final Property hasRegisteredOrganization = m.createProperty(NS + "hasRegisteredOrganization");
-	public static final Property legalName = m.createProperty(NS + "legalName");
-	public static final Property orgActivity = m.createProperty(NS + "orgActivity");
-	public static final Property orgStatus = m.createProperty(NS + "orgStatus");
-	public static final Property orgType = m.createProperty(NS + "orgType");
-	public static final Property registration = m.createProperty(NS + "registration");
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/99410940/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/VOID.java
----------------------------------------------------------------------
diff --git a/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/VOID.java b/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/VOID.java
deleted file mode 100644
index 230187b..0000000
--- a/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/VOID.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.vocabulary.w3c;
-
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
- 
-/**
- * Constants for the W3C Vocabulary of Interlinked Datasets.
- *
- * @see <a href="https://www.w3.org/TR/void/">Vocabulary of Interlinked Datasets</a>
- */
-public class VOID {
-	private static final Model m = ModelFactory.createDefaultModel();
-
-	public static final String NS = "http://rdfs.org/ns/void#";
-	public static final Resource NAMESPACE = m.createResource(NS);
-	
-	/**
-	 * Returns the URI for this schema
-	 * @return URI
-	 */
-	public static String getURI() {
-		return NS;
-	}
-	
-	// Classes
-	public static final Resource Dataset = m.createResource(NS + "Dataset");
-	public static final Resource DatasetDescription = m.createResource(NS + "DatasetDescription");
-	public static final Resource Linkset = m.createResource(NS + "Linkset");
-	public static final Resource TechnicalFeature = m.createResource(NS + "TechnicalFeature");
-
-	// Properties
-	public static final Property _class = m.createProperty(NS + "class");
-	public static final Property classPartition = m.createProperty(NS + "classPartition");
-	public static final Property classes = m.createProperty(NS + "classes");
-	public static final Property dataDump = m.createProperty(NS + "dataDump");
-	public static final Property distinctObjects = m.createProperty(NS + "distinctObjects");
-	public static final Property distinctSubjects = m.createProperty(NS + "distinctSubjects");
-	public static final Property documents = m.createProperty(NS + "documents");
-	public static final Property entities = m.createProperty(NS + "entities");
-	public static final Property exampleResource = m.createProperty(NS + "exampleResource");
-	public static final Property feature = m.createProperty(NS + "feature");
-	public static final Property inDataset = m.createProperty(NS + "inDataset");
-	public static final Property linkPredicate = m.createProperty(NS + "linkPredicate");
-	public static final Property objectsTarget = m.createProperty(NS + "objectsTarget");
-	public static final Property openSearchDescription = m.createProperty(NS + "openSearchDescription");
-	public static final Property properties = m.createProperty(NS + "properties");
-	public static final Property property = m.createProperty(NS + "property");
-	public static final Property propertyPartition = m.createProperty(NS + "propertyPartition");
-	public static final Property rootResource = m.createProperty(NS + "rootResource");
-	public static final Property sparqlEndpoint = m.createProperty(NS + "sparqlEndpoint");
-	public static final Property subjectsTarget = m.createProperty(NS + "subjectsTarget");
-	public static final Property subset = m.createProperty(NS + "subset");
-	public static final Property target = m.createProperty(NS + "target");
-	public static final Property triples = m.createProperty(NS + "triples");
-	public static final Property uriLookupEndpoint = m.createProperty(NS + "uriLookupEndpoint");
-	public static final Property uriRegexPattern = m.createProperty(NS + "uriRegexPattern");
-	public static final Property uriSpace = m.createProperty(NS + "uriSpace");
-	public static final Property vocabulary = m.createProperty(NS + "vocabulary");
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/99410940/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/package.html
----------------------------------------------------------------------
diff --git a/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/package.html b/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/package.html
deleted file mode 100644
index 9959a00..0000000
--- a/jena-vocab-w3c/src/main/java/org/apache/jena/vocabulary/w3c/package.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-    <title>W3C Vocabularies</title>
-</head>
- <body>
-<p>A package containing constant classes with predefined constant objects
-for classes and properties defined in well known W3C vocabularies.
-</p>
-</body>
-</html>