Index: TODO =================================================================== RCS file: /share/darwin/darwin4/cvs/java/TODO,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 TODO --- TODO 2005/01/31 03:37:40 1.1 +++ TODO 2005/03/03 11:54:25 @@ -0,0 +1,8 @@ +* RDF + * Parse RDF in XML form +* OWL +* OWL-S +* Eclipse diagram editor + * Serialize/Deserialize + * Extend with all elements for OWL-S + Index: lib/.cvsignore =================================================================== RCS file: /share/darwin/darwin4/cvs/java/lib/.cvsignore,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 .cvsignore --- lib/.cvsignore 2005/01/31 03:37:40 1.1 +++ lib/.cvsignore 2005/03/03 11:54:25 @@ -2,7 +2,8 @@ Makefile Makefile.in nongnu classes -cashews.jar +eclipse.jar +rdf.jar deps.sh gen-classlist.sh mkdep.pl Index: lib/Makefile.am =================================================================== RCS file: /share/darwin/darwin4/cvs/java/lib/Makefile.am,v retrieving revision 1.5 diff -u -3 -p -u -r1.5 Makefile.am --- lib/Makefile.am 2005/03/01 13:29:06 1.5 +++ lib/Makefile.am 2005/03/03 11:54:25 @@ -27,7 +27,7 @@ endif # handling source to bytecode compiler programs like gcj, jikes and kjc if FOUND_ECJ -JAVAC = $(ECJ) -classpath $(compile_classpath) -d . @classes +JAVAC = $(ECJ) -1.5 -classpath $(compile_classpath) -d . @classes else if FOUND_GCJ JAVAC = $(GCJ) --classpath $(compile_classpath) -C -d . @classes Index: src/nongnu/cashews/owls/process/Input.java =================================================================== RCS file: Input.java diff -N Input.java --- /dev/null Thu Mar 3 11:31:32 2005 +++ Input.java Thu Mar 3 11:54:25 2005 @@ -0,0 +1,32 @@ +/* Input.java -- Representation of an OWL-S input. + 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.owls.process; + +/** + * This class represents an input to an OWL-S process. + * + * @author Andrew John Hughes (address@hidden) + */ +public class Input + extends Parameter +{ +} Index: src/nongnu/cashews/owls/process/Local.java =================================================================== RCS file: Local.java diff -N Local.java --- /dev/null Thu Mar 3 11:31:32 2005 +++ Local.java Thu Mar 3 11:54:25 2005 @@ -0,0 +1,37 @@ +/* Local.java -- Representation of locally-defined AtomicProcess parameter. + 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.owls.process; + +/** + * This class represents a local parameter, which is bound + * within the preconditions of an AtomicProcess. + * CompositeProcesses may not include Local + * parameters. + * + * @author Andrew John Hughes (address@hidden) + * @see AtomicProcess + * @see CompositeProcess + */ +public class Local + extends Parameter +{ +} Index: src/nongnu/cashews/owls/process/Output.java =================================================================== RCS file: Output.java diff -N Output.java --- /dev/null Thu Mar 3 11:31:32 2005 +++ Output.java Thu Mar 3 11:54:25 2005 @@ -0,0 +1,32 @@ +/* Output.java -- Representation of an OWL-S output. + 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.owls.process; + +/** + * This class represents an output from an OWL-S process. + * + * @author Andrew John Hughes (address@hidden) + */ +public class Output + extends Parameter +{ +} Index: src/nongnu/cashews/owls/process/Parameter.java =================================================================== RCS file: /share/darwin/darwin4/cvs/java/src/nongnu/cashews/owls/process/Parameter.java,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 Parameter.java --- src/nongnu/cashews/owls/process/Parameter.java 2005/03/01 13:29:06 1.1 +++ src/nongnu/cashews/owls/process/Parameter.java 2005/03/03 11:54:25 @@ -21,7 +21,8 @@ Free Software Foundation, Inc., 59 Templ package nongnu.cashews.owls.process; -import nongnu.cahsews.rdf.RDFURI; +import nongnu.cashews.rdf.RDFURI; +import nongnu.cashews.rdf.XMLLiteral; /** * A Parameter is a generalization of the @@ -29,7 +30,7 @@ import nongnu.cahsews.rdf.RDFURI; * * @author Andrew John Hughes (address@hidden) */ -public class Parameter +public abstract class Parameter { /** @@ -39,5 +40,12 @@ public class Parameter * @see nongnu.cashews.rdf.RDFURI */ private RDFURI type; + + /** + * The value of this parameter, in the form of literal XML. + * + * @see nongnu.cashews.rdf.XMLLiteral + */ + private XMLLiteral value; } Index: src/nongnu/cashews/owls/process/Result.java =================================================================== RCS file: Result.java diff -N Result.java --- /dev/null Thu Mar 3 11:31:32 2005 +++ Result.java Thu Mar 3 11:54:25 2005 @@ -0,0 +1,47 @@ +/* Result.java -- Representation of an OWL-S process result. + 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.owls.process; + +import java.util.List; + +/** + * This class represents the Result of an OWL-S + * process. It bundles the conditional effects and outputs + * of the process, as well as parameters that are used within + * this context. + * + * @author Andrew John Hughes (address@hidden) + */ +public class Result +{ + + /** + * A list of ResultVars used within the scope + * of this Result instance. + * + * @serial the result variables scoped over this instance. + */ + private List variables; + + /* TODO: Add condition and effect lists and output bindings */ + +} Index: src/nongnu/cashews/owls/process/ResultVar.java =================================================================== RCS file: ResultVar.java diff -N ResultVar.java --- /dev/null Thu Mar 3 11:31:32 2005 +++ ResultVar.java Thu Mar 3 11:54:25 2005 @@ -0,0 +1,35 @@ +/* ResultVar.java -- Representation of a local result parameter. + 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.owls.process; + +/** + * This class represents a universally quantified parameter declared in + * the result condition, which is not a process parameter. These parameters + * are scoped over the entire Result object, and may + * be referenced by Outputs and effects. + * + * @author Andrew John Hughes (address@hidden) + */ +public class ResultVar + extends Parameter +{ +}