Index: acinclude.m4
===================================================================
RCS file: /share/darwin/darwin4/cvs/java/acinclude.m4,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 acinclude.m4
--- acinclude.m4	2005/02/01 01:05:47	1.2
+++ acinclude.m4	2005/02/07 01:45:15
@@ -412,3 +412,17 @@ AC_DEFUN([CLASSPATH_CHECK_ECJ],
     AC_PATH_PROG(ECJ, "ecj")
   fi
 ])
+
+dnl ------------------------------------------------------------
+AC_DEFUN([CASHEWS_WITH_ECLIPSE],
+[
+  AC_ARG_WITH([eclipse],
+	     [AS_HELP_STRING(--with-eclipse,compile the Eclipse plug-in)],
+	[	
+    if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
+      		ECLIPSE="$withval"
+		AC_SUBST(ECLIPSE)
+    fi
+  ])
+])
+
Index: configure.ac
===================================================================
RCS file: /share/darwin/darwin4/cvs/java/configure.ac,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 configure.ac
--- configure.ac	2005/01/31 03:37:40	1.1
+++ configure.ac	2005/02/07 01:45:15
@@ -25,6 +25,9 @@ CLASSPATH_WITH_GLIBJ
 dnl Enable API docs?
 CLASSPATH_WITH_GJDOC
 
+dnl Check for Eclipse path
+CASHEWS_WITH_ECLIPSE
+
 dnl Generate classlist and other output
 AC_CONFIG_FILES([Makefile
 	doc/Makefile
Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /share/darwin/darwin4/cvs/java/lib/gen-classlist.sh.in,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 gen-classlist.sh.in
--- lib/gen-classlist.sh.in	2005/01/31 03:37:40	1.1
+++ lib/gen-classlist.sh.in	2005/02/07 01:45:15
@@ -2,8 +2,14 @@
 # @configure_input@
 
 echo "Adding java source files from srcdir '@top_srcdir@'."
address@hidden@ @top_srcdir@/src/nongnu \
+if test @ECLIPSE@; then
+	@FIND@ @top_srcdir@/src/nongnu \
        -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1
+else
+	@FIND@ @top_srcdir@/src/nongnu \
+       -follow -type f -print | grep '\.java$' \
+	| grep -v 'eclipse' > ${top_builddir}/lib/classes.1
+fi
 
 # Only include generated files once.
 if test ! "${top_builddir}" -ef "@top_srcdir@"; then
Index: src/nongnu/cashews/eclipse/bin/nongnu/cashews/eclipse/servicecomposer/ServiceComposer.class
===================================================================
RCS file: ServiceComposer.class
diff -N ServiceComposer.class
Binary files /tmp/cvsDAAcVaa3E and /dev/null differ
Index: src/nongnu/cashews/eclipse/bin/nongnu/cashews/eclipse/servicecomposer/ServiceComposerPlugin.class
===================================================================
RCS file: ServiceComposerPlugin.class
diff -N ServiceComposerPlugin.class
Binary files /tmp/cvsEAAdVaa3E and /dev/null differ
Index: src/nongnu/cashews/rdf/Literal.java
===================================================================
RCS file: /share/darwin/darwin4/cvs/java/src/nongnu/cashews/rdf/Literal.java,v
retrieving revision 1.1
diff -u -3 -p -u -r1.1 Literal.java
--- src/nongnu/cashews/rdf/Literal.java	2005/02/03 00:34:14	1.1
+++ src/nongnu/cashews/rdf/Literal.java	2005/02/07 01:45:15
@@ -23,13 +23,41 @@ package nongnu.cashews.rdf;
 
 /**
  * <p>
- * This interface represents an RDF literal.
+ * This class represents an RDF literal.  A literal
+ * has at least a lexical form.  Untyped literals
+ * include an optional lower-case language tag,
+ * taken from the values in RFC3066.  Typed literals
+ * instead include a datatype URI, which specifies
+ * the type of the data used in the literal.
  * </p>
  *
  * @author Andrew John Hughes (address@hidden)
+ * @see Type
  */
 public class Literal
   implements RDFObject
 {
+
+  /**
+   * The lexical form of the literal.
+   *
+   * @serial the literal's lexical form.  This may not be null.
+   */
+  private String lexicalForm;
+
+  /**
+   * The optional language tag for this literal.
+   *
+   * @serial a lower-case RFC3066 language tag.  May be null.
+   */
+  private String language;
+
+  /**
+   * The optional type of the literal.
+   *
+   * @see Type
+   * @serial the type of the literal's data.  May be null.
+   */
+  private Type type;
 
 }
Index: src/nongnu/cashews/rdf/Type.java
===================================================================
RCS file: Type.java
diff -N Type.java
--- /dev/null	Mon Feb  7 00:00:05 2005
+++ Type.java	Mon Feb  7 01:45:15 2005
@@ -0,0 +1,48 @@
+/* Type.java -- Representation of a RDF literal type.
+   Copyright (C) 2005  The University of Sheffield.
+
+This file is part of the CASheW-s editor.
+
+The CASheW-s editor is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+The CASheW-s editor is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with The CASheW-s editor; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+*/
+
+package nongnu.cashews.rdf;
+
+/**
+ * <p>
+ * This interface represents the type of an RDF
+ * literal.  Implementing type classes provide the conversion
+ * between the literal and the actual value
+ * represented, by applying a lexical-to-value
+ * mapping.  A literal which does not map to
+ * a value is erroneous, but not synatically invalid.
+ * </p>
+ *
+ * @author Andrew John Hughes (address@hidden)
+ */
+public interface Type
+{
+
+  /**
+   * Retrieves the actual value of this type instance by applying
+   * a lexical to value mapping.
+   *
+   * @param lexical the lexical representation of the literal.
+   * @return an <code>Object</code> representing the value.
+   */
+  Object getValue(String lexical);
+
+}