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 2012/12/18 11:54:33 UTC

svn commit: r1423404 - in /jena/site/trunk/content: documentation/assembler/ documentation/inference/ documentation/io/ documentation/notes/ documentation/ontology/ documentation/tools/ tutorials/

Author: andy
Date: Tue Dec 18 10:54:31 2012
New Revision: 1423404

URL: http://svn.apache.org/viewvc?rev=1423404&view=rev
Log:
Remove references to DAML (no longer supported)

Modified:
    jena/site/trunk/content/documentation/assembler/assembler-howto.mdtext
    jena/site/trunk/content/documentation/inference/index.mdtext
    jena/site/trunk/content/documentation/io/features.mdtext
    jena/site/trunk/content/documentation/io/iohowto.mdtext
    jena/site/trunk/content/documentation/notes/model-factory.mdtext
    jena/site/trunk/content/documentation/notes/typed-literals.mdtext
    jena/site/trunk/content/documentation/ontology/index.mdtext
    jena/site/trunk/content/documentation/tools/eyeball-guide.mdtext
    jena/site/trunk/content/documentation/tools/schemagen.mdtext
    jena/site/trunk/content/tutorials/rdf_api.mdtext

Modified: jena/site/trunk/content/documentation/assembler/assembler-howto.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/assembler/assembler-howto.mdtext?rev=1423404&r1=1423403&r2=1423404&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/assembler/assembler-howto.mdtext (original)
+++ jena/site/trunk/content/documentation/assembler/assembler-howto.mdtext Tue Dec 18 10:54:31 2012
@@ -516,7 +516,6 @@ appropriate properties:
     -   OWL DL: http://www.w3.org/TR/owl-features/\#term_OWLDL
     -   OWL Lite: http://www.w3.org/TR/owl-features/\#term_OWLLite
     -   RDFS: http://www.w3.org/2000/01/rdf-schema\#
-    -   DAML: http://www.daml.org/2001/03/daml+oil\#
 
 Any unspecified properties have default values, normally taken from
 those of `OntModelSpec.OWL_MEM_RDFS_INF`. However, if the

Modified: jena/site/trunk/content/documentation/inference/index.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/inference/index.mdtext?rev=1423404&r1=1423403&r2=1423404&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/inference/index.mdtext (original)
+++ jena/site/trunk/content/documentation/inference/index.mdtext Tue Dec 18 10:54:31 2012
@@ -19,7 +19,6 @@ Title: Reasoners and rule engines: Jena 
   <li><a href="#api">The inference API</a></li>
   <li><a href="#rdfs">The RDFS reasoner</a></li>
   <li><a href="#owl">The OWL reasoner</a></li>
-  <li><a href="#daml">DAML support</a></li>
   <li><a href="#transitive">The transitive reasoner</a></li>
   <li><a href="#rules">The general purpose rule engine</a></li>
   <li><a href="#extensions">Extending the inference support</a></li>
@@ -73,22 +72,20 @@ Title: Reasoners and rule engines: Jena 
 
 ###Available reasoners
 <p>Included in the Jena distribution are a number of predefined reasoners:</p>
-<dl>
-  <dt>Transitive reasoner</dt>
-  <dd>Provides support for storing and traversing class and property lattices.
+<ol>
+  <li>Transitive reasoner: Provides support for storing and traversing class and property lattices.
     This implements just the <i>transitive</i> and <i>reflexive</i> properties
-    of <code>rdfs:subPropertyOf</code> and <code>rdfs:subClassOf</code>.</dd>
-  <dt>RDFS rule reasoner</dt>
-  <dd>Implements a configurable subset of the RDFS entailments.</dd>
-  <dt>OWL, OWL Mini, OWL Micro Reasoners</dt>
-  <dd>A set of useful but incomplete implementation of the OWL/Lite subset of the OWL/Full
-    language. </dd>
-  <dt>DAML micro reasoner</dt>
-  <dd>Used internally to enable the legacy DAML API to provide minimal (RDFS scale) inferencing.</dd>
-  <dt>Generic rule reasoner</dt>
-  <dd>A rule based reasoner that supports user defined rules. Forward chaining,
-    tabled backward chaining and hybrid execution strategies are supported.</dd>
-</dl>
+    of <code>rdfs:subPropertyOf</code> and <code>rdfs:subClassOf</code>.</li>
+
+  <li>RDFS rule reasoner: Implements a configurable subset of the RDFS entailments.</li>
+
+  <li>OWL, OWL Mini, OWL Micro Reasoners: 
+  A set of useful but incomplete implementation of the OWL/Lite subset of the OWL/Full
+    language. </li>
+
+  <li>Generic rule reasoner: A rule based reasoner that supports user defined rules. Forward chaining,
+    tabled backward chaining and hybrid execution strategies are supported.</li>
+</ol>
 
 <p>[<a href="#index">index</a>]</p>
 
@@ -1185,16 +1182,6 @@ class B = cardinality(P,1)</pre>
 
 <p>[<a href="#owl">OWL index</a>] [<a href="#index">main index</a>]</p>
 
-##<a name="daml"></a>DAML support
-<p>This is minimal legacy support. The DAMLMicroReasoner is
-  essentially the RDFS reasoner augmented by axioms declaring the equivalence
-  between the DAML constructs and their RDFS aliases. It is invoked using the
-  prebuilt <a href="/documentation/javadoc/jena/com/hp/hpl/jena/ontology/OntModelSpec.html"><code>OntModelSpec</code></a>
-  <code>DAML_MEM_RULE_INF.</code></p>
-<p>There are <u><b>no</b></u> plans to go beyond this and offer more complete
-  DAML inference support.</p>
-<p>[<a href="#index">index</a>]</p>
-
 ##<a name="transitive"></a>The transitive reasoner
 <p>The TransitiveReasoner provides support for storing and traversing class and
   property lattices. This implements just the <i>transitive</i> and <i>symmetric</i>
@@ -1295,7 +1282,7 @@ term</i>      :=   (<i>node</i>, <i>node
   place.</p>
 <p>To keep rules readable qname syntax is supported for URI refs. The set of known
   prefixes is those registered with the <code><a href="/documentation/javadoc/jena/com/hp/hpl/jena/util/PrintUtil.html">PrintUtil</a></code>
-  object. This initially knows about rdf, rdfs, owl, daml, xsd and a test namespace
+  object. This initially knows about rdf, rdfs, owl, xsd and a test namespace
   eg, but more mappings can be registered in java code. In addition it is possible to
   define additional prefix mappings in the rule file, see below. </p>
 <p>Here are some example rules which illustrate most of these constructs:</p>

Modified: jena/site/trunk/content/documentation/io/features.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/io/features.mdtext?rev=1423404&r1=1423403&r2=1423404&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/io/features.mdtext (original)
+++ jena/site/trunk/content/documentation/io/features.mdtext Tue Dec 18 10:54:31 2012
@@ -6,9 +6,6 @@ Title: ARP Features
     [RDF Test Cases](http://www.w3.org/TR/rdf-testcases)
     Recommendations.
 -   Compliant with following standards and recommendations:
-    - **daml:collection**<br />
-      [rdf:parseType='daml:collection'](http://www.daml.org/2001/03/reference.html#collection)
-        is supported.
     - **xml:lang**<br />
       [xml:lang](http://www.w3.org/TR/REC-xml#sec-lang-tag) is fully
         supported, both in RDF/XML and any document embedding RDF/XML.

Modified: jena/site/trunk/content/documentation/io/iohowto.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/io/iohowto.mdtext?rev=1423404&r1=1423403&r2=1423404&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/io/iohowto.mdtext (original)
+++ jena/site/trunk/content/documentation/io/iohowto.mdtext Tue Dec 18 10:54:31 2012
@@ -403,23 +403,21 @@ of "rdf:about", then the following code 
     in.close();
 
 As a second example, suppose you wish to work in strict mode, but
-allow `"daml:collection"`, the following works:
+ingore some specific warning or error, the following works:
 
      …
      arp.setProperty("error-mode", "strict" );
-     arp.setProperty("IGN_DAML_COLLECTION","EM_IGNORE");
+     arp.setProperty("WARN_UNQUALIFIED_ATTRIBUTE", "EM_IGNORE");
      …
 
 The other way round does not work.
 
      …
-     arp.setProperty("IGN_DAML_COLLECTION","EM_IGNORE");
+     arp.setProperty("WARN_UNQUALIFIED_ATTRIBUTE", "EM_IGNORE");
      arp.setProperty("error-mode", "strict" );
      …
 
-This is because in strict mode
-[`IGN_DAML_COLLECTION`](/documentation/javadoc/jena/com/hp/hpl/jena/rdf/arp/ARPErrorNumbers.html#IGN_DAML_COLLECTION)
-is treated as an error, and so the second call to `setProperty`
+This is because in strict mode it is treated as an error, and so the second call to `setProperty`
 overwrites the effect of the first.
 
 The IRI rules and resolver can be set on a per-reader basis:
@@ -594,18 +592,6 @@ indicating grammar rules that will not b
 - [propertyAttr](http://www.w3.org/TR/rdf-syntax-grammar#propertyAttr)
  ([`RDFSyntax.propertyAttr`](/documentation/javadoc/jena/com/hp/hpl/jena/vocabulary/RDFSyntax.html#propertyAttr))
 
-In addition `"daml:collection"`
-([`DAML_OIL.collection`](/documentation/javadoc/jena/com/hp/hpl/jena/vocabulary/DAML_OIL.html#collection))
-can be blocked. Blocking
-[idAttr](http://www.w3.org/TR/rdf-syntax-grammar#idAttr) also
-blocks
-[section-Reification](http://www.w3.org/TR/rdf-syntax-grammar#section-Reification).
-By default, rule
-[propertyAttr](http://www.w3.org/TR/rdf-syntax-grammar#propertyAttr)
-is blocked. For the basic writer (RDF/XML) only
-[parseTypeLiteralPropertyElt](http://www.w3.org/TR/rdf-syntax-grammar#parseTypeLiteralPropertyElt)
-has any effect, since none of the other rules are implemented by
-that writer.
 </td>
 <td>`Resource[]` or `String`</td>
 <td></td>
@@ -617,19 +603,22 @@ Only for the RDF/XML-ABBREV writer. This
 the principal objects in the model. The writer will tend to create
 RDF/XML with resources of these types at the top level.
 
-Example usage showing the a value suitable for DAML+OIL output:
+Example usage showing the default settings:
 
     w.setProperty("prettyTypes",
              new Resource[]{
-                  DAML_OIL.Ontology,
-                  DAML_OIL.Class,
-                  DAML_OIL.Datatype,
-                  DAML_OIL.Property,
-                  DAML_OIL.ObjectProperty,
-                  DAML_OIL.DatatypeProperty,
-                  DAML_OIL.TransitiveProperty,
-                  DAML_OIL.UnambigousProperty,
-                  DAML_OIL.UniqueProperty,
+			OWL.Ontology,
+			OWL.Datatype,
+			RDFS.Datatype,
+			RDFS.Class,
+			OWL.Class,
+			OWL.ObjectProperty,
+			RDF.Property,
+			OWL.DatatypeProperty,
+			OWL.TransitiveProperty,
+			OWL.SymmetricProperty,
+			OWL.FunctionalProperty,
+			OWL.InverseFunctionalProperty
                   });
 </td>
 <td>
@@ -646,8 +635,7 @@ As an example,
     w.setProperty("showXMLDeclaration","true");
     w.setProperty("tab","1");
     w.setProperty("blockRules",
-      "daml:collection,parseTypeLiteralPropertyElt,"
-      +"parseTypeResourcePropertyElt,parseTypeCollectionPropertyElt");
+      "parseTypeResourcePropertyElt,parseTypeCollectionPropertyElt");
 
 creates a writer that does not use rdf:parseType (preferring
 rdf:datatype for rdf:XMLLiteral), indents only a little, and
@@ -693,17 +681,11 @@ Notes:
 The RDF/XML I/O endeavours to conform with the
 [RDF Syntax Recommendation](http://www.w3.org/TR/rdf-syntax-grammar/).
 
-The parser must be set to strict mode. (Note that, the conformant
-behaviour for `rdf:parseType="daml:collection"` is to silently turn
-`"daml:collection"` into `"Literal"`).
+The parser must be set to strict mode.
 
 The RDF/XML writer is conformant, but does not exercise much of the
-grammar.
-
-The RDF/XML-ABBREV writer exercises all of the grammar and is
-conformant except that it uses the `daml:collection` construct for
-DAML ontologies. This non-conformant behaviour can be switched off
-using the `blockRules` property.
+grammar.  The RDF/XML-ABBREV writer exercises all of the grammar and is
+conformant.
 
 
 ## Faster RDF/XML I/O

Modified: jena/site/trunk/content/documentation/notes/model-factory.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/notes/model-factory.mdtext?rev=1423404&r1=1423403&r2=1423404&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/notes/model-factory.mdtext (original)
+++ jena/site/trunk/content/documentation/notes/model-factory.mdtext Tue Dec 18 10:54:31 2012
@@ -112,7 +112,7 @@ please see the relevant reference sectio
 ## Inference model creation
 
 An important feature of Jena is support for different kinds of
-inference over RDF-based models (used for RDFS, OWL, and DAML).
+inference over RDF-based models (used for RDFS and OWL).
 Inference models are constructed by applying *reasoners* to
 *base models* and optionally *schema*. The statements deduced by
 the reasoner from the base model then appear in the inferred model
@@ -158,7 +158,7 @@ sub-property closure.
 
 An *ontology model* is one that presents RDF as an ontology -
 classes, individuals, different kinds of properties, and so forth.
-Jena supports RDFS, OWL, and DAML ontologies through *profiles*.
+Jena supports RDFS and OWL ontologies through *profiles*.
 There is extensive documentation on
 [Jena's ontology support](../ontology/index.html), so all we'll do
 here is summarise the creation methods.

Modified: jena/site/trunk/content/documentation/notes/typed-literals.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/notes/typed-literals.mdtext?rev=1423404&r1=1423403&r2=1423404&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/notes/typed-literals.mdtext (original)
+++ jena/site/trunk/content/documentation/notes/typed-literals.mdtext Tue Dec 18 10:54:31 2012
@@ -229,35 +229,10 @@ serialize, test instances of that dataty
 
 There is one difficult issue in here, what URI to give to the user
 defined datatype? This is not defined by XML Schema, nor RDF nor
-OWL. Jena2 adopts the position taken by DAML that the defined
+OWL. Jena2 adopts the position that the defined
 datatype should have the base URI of the schema file with a
 fragment identifier given by the datatype name.
 
-Thus the DAML example
-file`http://www.daml.org/2001/03/daml+oil-ex-dt` (a corrected copy
-of which is stored in `$JENA/testing/xsd/daml+oil-ex-dt.xsd`, where
-`$JENA` is your Jena install directory) defines several types such
-as "over12". The following code fragment will load this file and
-register the newly defined types:
-
-    String uri = "http://www.daml.org/2001/03/daml+oil-ex-DT";
-    String filename = "../jena2/testing/xsd/daml+oil-ex-dt.xsd";
-    TypeMapper tm = TypeMapper.getInstance();
-    List typenames = XSDDatatype.loadUserDefined(uri, new FileReader(filename), null, TM);
-    System.out.println("Defined types are:");
-    for (Iterator i = typenames.iterator(); i.hasNext(); ) {
-        System.out.println(" - " + i.next());
-    }
-
-it produces the following output:
-
-    Defined types are:
-     - http://www.daml.org/2001/03/daml+oil-ex-DT#XSDEnumerationHeight
-     - http://www.daml.org/2001/03/daml+oil-ex-DT#over12
-     - http://www.daml.org/2001/03/daml+oil-ex-DT#over17
-     - http://www.daml.org/2001/03/daml+oil-ex-DT#over59
-     - http://www.daml.org/2001/03/daml+oil-ex-DT#clothingsize
-
 To illustrate working with the defined types, the following code
 then tries to create and use two instances of the over 12 type:
 

Modified: jena/site/trunk/content/documentation/ontology/index.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/ontology/index.mdtext?rev=1423404&r1=1423403&r2=1423404&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/ontology/index.mdtext (original)
+++ jena/site/trunk/content/documentation/ontology/index.mdtext Tue Dec 18 10:54:31 2012
@@ -101,9 +101,8 @@ Since Jena is fundamentally an RDF platf
 support is limited to ontology formalisms built on top of RDF.
 Specifically this means [RDFS](http://en.wikipedia.org/wiki/RDFS),
 the varieties of
-[OWL](http://en.wikipedia.org/wiki/Web_Ontology_Language), and the
-now-obsolete [DAML+OIL](http://en.wikipedia.org/wiki/DAML+OIL). We
-will provide a very brief introduction to these languages here,
+[OWL](http://en.wikipedia.org/wiki/Web_Ontology_Language).
+We will provide a very brief introduction to these languages here,
 but please refer to the extensive on-line documentation for these
 formalisms for complete and authoritative details.
 
@@ -225,20 +224,6 @@ the RDF-centric view treats RDF triples 
 formalism. While both views are valid, in Jena we take the
 RDF-centric view.
 
-### DAML+OIL
-
-DAML+OIL is very similar to OWL Full. This is not surprising, since
-the W3C's Web Ontology Working Group, who designed OWL, took
-DAML+OIL as their starting point. Some constructions in OWL have
-been added to the capabilities of DAML+OIL, and one or two have
-been removed. For the purposes of this brief overview, however, the
-expressiveness of DAML+OIL is comparable to that of OWL.
-
-**Note:** DAML+OIL is effectively now obsolete. While it is still
-possible to
-find some DAML ontologies on the web, our recommendation is that
-Jena developers stick to OWL and RDFS as ontology languages.
-
 ### Ontology languages and the Jena Ontology API
 
 As we outlined above, there are various different ontology languages
@@ -251,14 +236,12 @@ in your programs.
 
 The Jena Ontology API is language-neutral: the Java class names are not
 specific to the underlying language. For example, the `OntClass`
-Java class can represent an OWL class, RDFS class, or DAML class.
+Java class can represent an OWL class or RDFS class.
 To represent the differences between the various representations,
 each of the ontology languages has a *profile*, which lists the
 permitted constructs and the names of the classes and properties.
-Thus in the DAML profile, the URI for object property is
-`daml:ObjectProperty` (short for
-`http://www.daml.org/2001/03/daml+oil#ObjectProperty`), in the OWL
-profile is it `owl:ObjectProperty` (short for
+
+Thus in the OWL profile is it `owl:ObjectProperty` (short for
 `http://www.w3.org/2002/07/owl#ObjectProperty`) and in the RDFS
 profile it is `null` since RDFS does not define object properties.
 
@@ -468,7 +451,6 @@ various language profiles are:
 Ontology language | URI
 ----------------- | ---
 RDFS | `http://www.w3.org/2000/01/rdf-schema#`
-DAML+OIL | `http://www.daml.org/2001/03/daml+oil#`
 OWL Full | `http://www.w3.org/2002/07/owl#`
 OWL DL | `http://www.w3.org/TR/owl-features/#term_OWLDL`
 OWL Lite | `http://www.w3.org/TR/owl-features/#term_OWLLite`
@@ -480,12 +462,6 @@ that you do not have to remember these U
 URI's denoting OWL Lite and OWL DL are not officially sanctioned by
 the OWL standard.
 
-To create an ontology model for handling DAML ontologies, use
-either of:
-
-    OntModel m = ModelFactory.createOntologyModel( OntModelSpec.DAML_MEM );
-    OntModel m = ModelFactory.createOntologyModel( ProfileRegistry.DAML_LANG );
-
 Beyond these basic choices, the complexities of configuring an
 ontology model are wrapped up in a recipe object called
 [`OntModelSpec`](/documentation/javadoc/jena/com/hp/hpl/jena/ontology/OntModelSpec.html).
@@ -510,10 +486,6 @@ OWL\_LITE\_MEM | OWL Lite | in-memory | 
 OWL\_LITE\_MEM\_TRANS\_INF | OWL Lite | in-memory | transitive class-hierarchy inference
 OWL\_LITE\_MEM\_RDFS\_INF | OWL Lite | in-memory | rule reasoner with RDFS-level entailment-rules
 OWL\_LITE\_MEM\_RULES\_INF | OWL Lite | in-memory | rule-based reasoner with OWL rules
-DAML\_MEM | DAML+OIL | in-memory | none
-DAML\_MEM\_TRANS\_INF | DAML+OIL | in-memory | transitive class-hierarchy inference
-DAML\_MEM\_RDFS\_INF | DAML+OIL | in-memory | rule reasoner with RDFS-level entailment-rules
-DAML\_MEM\_RULE\_INF | DAML+OIL | in-memory | rule-based reasoner with DAML rules
 RDFS\_MEM | RDFS | in-memory | none
 RDFS\_MEM\_TRANS\_INF | RDFS | in-memory | transitive class-hierarchy inference
 RDFS\_MEM\_RDFS\_INF | RDFS | in-memory | rule reasoner with RDFS-level entailment-rules
@@ -526,9 +498,7 @@ See also further discussion [below](#inf
 
 **Note:** it is primarily the choice of reasoner, rather than the
 choice of language profile, which determines which entailments are
-seen by the ontology model. However, using an OWL reasoner with
-DAML source data will result in few additional entailments being
-seen by the ontology model.
+seen by the ontology model. 
 
 To create a model with a given specification, you should invoke the
 `ModelFactory` as follows:
@@ -551,7 +521,7 @@ and then update the copy as necessary:
 
 ## Compound ontology documents and imports processing
 
-The OWL and DAML ontology languages include some facilities for
+The OWL ontology language includes some facilities for
 creating modular ontologies that can be re-used in a similar manner
 to software modules. In particular, one ontology can *import*
 another. Jena helps ontology developers to work with modular
@@ -597,7 +567,7 @@ internationalised character sets, since 
 encoding by the Reader and by XML parsers is not compatible.
 
 By default, when an ontology model reads an ontology document, it
-will also locate and load the document's imports. An OWL or DAML
+will also locate and load the document's imports. An OWL
 document may contain an individual of class `Ontology`, which
 contains meta-data about that document itself. For example:
 
@@ -1014,7 +984,7 @@ resource if possible, or create a new cl
 
 You can use the create class method to create an anonymous class &ndash;
 a class description with no associated URI. Anonymous classes are
-often used when building more complex ontologies in OWL or DAML.
+often used when building more complex ontologies in OWL.
 They are less useful in RDFS.
 
     OntClass anonClass = m.createClass();
@@ -1285,7 +1255,7 @@ min cardinality | The property has at le
 max cardinality | The property has at most *n* values, for some positive integer n.
 
 Note that, at present, the Jena
-ontology API has only limited support for OWL2 and DAML's qualified
+ontology API has only limited support for OWL2's qualified
 cardinality restrictions (i.e. `cardinalityQ`, `minCardinalityQ`
 and `maxCardinalityQ`). Qualified cardinality restrictions are
 encapsulated in the interfaces `CardinalityQRestriction`,
@@ -1425,9 +1395,8 @@ Boolean class expressions, let's briefly
 
 RDF originally had three container types: `Seq`, `Alt` and `Bag`.
 While useful, these are all open forms: it is not possible to say
-that a given container has a fixed number of values. The DAML+OIL
-standard introduced a fourth container type - lists - in order to
-have a closed collection. Lists have subsequently been added to the
+that a given container has a fixed number of values. 
+Lists have subsequently been added to the
 core RDF specification, and are used extensively in OWL. A list
 follows the well-known *cons cell* pattern from Lisp, Prolog and
 other list-handling languages. Each cell of a list is either the

Modified: jena/site/trunk/content/documentation/tools/eyeball-guide.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/tools/eyeball-guide.mdtext?rev=1423404&r1=1423403&r2=1423404&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/tools/eyeball-guide.mdtext (original)
+++ jena/site/trunk/content/documentation/tools/eyeball-guide.mdtext Tue Dec 18 10:54:31 2012
@@ -156,7 +156,7 @@ This arises when a "standard" prefix has
 URI which isn't its usual one. The "standard" prefixes are taken
 from Jena's `PrefixMapping.Extended` and are currently:
 
-    **rdf, rdfs, daml, owl, xsd, rss, vcard**
+    **rdf, rdfs, owl, xsd, rss, vcard**
 
 And the second:
 

Modified: jena/site/trunk/content/documentation/tools/schemagen.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/documentation/tools/schemagen.mdtext?rev=1423404&r1=1423403&r2=1423404&view=diff
==============================================================================
--- jena/site/trunk/content/documentation/tools/schemagen.mdtext (original)
+++ jena/site/trunk/content/documentation/tools/schemagen.mdtext Tue Dec 18 10:54:31 2012
@@ -1,7 +1,6 @@
 Title: Jena schemagen HOWTO
 
-The `schemagen` provided with Jena is used to convert an OWL, DAML
-or RDFS vocabulary into a Java class file that contains static
+The `schemagen` provided with Jena is used to convert an OWL or RDFS vocabulary into a Java class file that contains static
 constants for the terms in the vocabulary. This documents outlines
 the use of schemagen, and the various options and templates that
 may be used to control the output.
@@ -33,7 +32,6 @@ Command line option | RDF config file pr
 `--classnamesuffix <string\>` | `sgen:classnamesuffix` | Option for adding a suffix to the generated class name, e.g. "Vocab".
 `--classSection <string\>` |  `sgen:classSection` | Section declaration comment for class section.
 `--classTemplate <string\>`  | `sgen:classTemplate` | Template for writing out declarations of class resources.
-`--daml` | `sgen:daml` | Specify that the language of the source ontology is DAML+OIL.
 `--declarations <string\>` | `sgen:declarations` | Additional declarations to add at the top of the class.
 `--dos` | `sgen:dos` | Use MSDOS-style line endings (i.e. \\r\\n). Default is Unix-style line endings.
 `-e <string\>` | `sgen:encoding` | The surface syntax of the input file (e.g. RDF/XML, N3). Defaults to RDF/XML.
@@ -66,7 +64,7 @@ Command line option | RDF config file pr
 
 ## What does schemagen do?
 
-RDFS, OWL and DAML+OIL provide a very convenient means to define a
+RDFS and OWL provide a very convenient means to define a
 controlled vocabulary or ontology. For general ontology processing,
 Jena provides various API's to allow the source files to be read in
 and manipulated. However, when developing an application, it is
@@ -196,8 +194,8 @@ to get:
 
 ## General principles
 
-In essence, schemagen will load a single vocabulary file (imports
-processing is switched off in DAML and OWL), and generate a Java
+In essence, schemagen will load a single vocabulary file,
+and generate a Java
 class that contains static constants for the named classes,
 properties and instances of the vocabulary. Most of the generated
 components of the output Java file can be controlled by option
@@ -440,8 +438,8 @@ definitions of other terms. Schemagen as
 primary namespace for each document, and it is names from that
 namespace that will appear in the generated Java file.
 
-In an OWL or DAML+OIL ontology, this namespace is computed by
-finding the owl:Ontology or daml:Ontology element, and using its
+In an OWL ontology, this namespace is computed by
+finding the owl:Ontology element, and using its
 namespace as the primary namespace of the ontology. This may not be
 available (it is not, for example, a part of RDFS) or correct, so
 the namespace may be specified directly with the `-a` option or in
@@ -501,13 +499,13 @@ the encoding configuration option.
 
 By default, the Java class generated by schemagen will generate
 constants that are plain RDF Resource, Property or Literal
-constants. When working with OWL, DAML, or RDFS ontologies, it may
+constants. When working with OWL or RDFS ontologies, it may
 be more convenient to have constants that are OntClass,
 ObjectProperty, DatatypeProperty and Individual Java objects. To
 generate these ontology constants, rather than plain RDF constants,
 set the ontology configuration option.
 
-Furthermore, since Jena can handle input ontologies in DAML+OIL,
+Furthermore, since Jena can handle input ontologies in
 OWL (the default), and RDFS, it is necessary to be able to specify
 which language is being processed. This will affect both the
 parsing of the input documents, and the language profile selected
@@ -515,11 +513,6 @@ for the constants in the generated Java 
 
  |
 --- | ---
-**Command line** | `--daml`
-**Config file** | `<sgen:daml rdf:datatype="&xsd;boolean"\>true</sgen:daml\>`
-
- |
---- | ---
 **Command line** | `--owl`
 **Config file** | `<sgen:owl rdf:datatype="&xsd;boolean"\>true</sgen:owl\>`
 
@@ -537,10 +530,7 @@ the generated Java class, even if that f
 asserted in the input model. From Jena 2.2 onwards, this option is
 now **off by default**. If correct handling of an input document by
 schemagen requires the use of inference rules, this must be
-specified by the `inference` option. In particular, some DAML+OIL
-input files may require the use of this option, to ensure that
-synonyms such as `daml:Class` and `rdfs:Class` are recognised
-correctly.
+specified by the `inference` option. 
 
  |
 --- | ---

Modified: jena/site/trunk/content/tutorials/rdf_api.mdtext
URL: http://svn.apache.org/viewvc/jena/site/trunk/content/tutorials/rdf_api.mdtext?rev=1423404&r1=1423403&r2=1423404&view=diff
==============================================================================
--- jena/site/trunk/content/tutorials/rdf_api.mdtext (original)
+++ jena/site/trunk/content/tutorials/rdf_api.mdtext Tue Dec 18 10:54:31 2012
@@ -127,7 +127,7 @@ types of Model are also available from M
 The property is provided by a "constant" class VCARD which holds objects
 representing all the definitions in the VCARD schema.  Jena provides constant
 classes for other well known schemas, such as RDF and RDF schema themselves,
-Dublin Core and DAML.</p>
+Dublin Core and OWL.</p>
 
 <p>The code to create the resource and add the property, can be more
 compactly written in a cascading style:</p>