diff --git a/webapp/lib/arq-2.8.5-tests.jar b/webapp/lib/arq-2.8.5-tests.jar new file mode 100644 index 000000000..d8a6997ca Binary files /dev/null and b/webapp/lib/arq-2.8.5-tests.jar differ diff --git a/webapp/lib/arq-2.8.5.jar b/webapp/lib/arq-2.8.5.jar new file mode 100644 index 000000000..f89b6937e Binary files /dev/null and b/webapp/lib/arq-2.8.5.jar differ diff --git a/webapp/lib/arq-extra.jar b/webapp/lib/arq-extra.jar deleted file mode 100644 index fbf2d7735..000000000 Binary files a/webapp/lib/arq-extra.jar and /dev/null differ diff --git a/webapp/lib/arq.jar b/webapp/lib/arq.jar deleted file mode 100644 index 3196a9f6f..000000000 Binary files a/webapp/lib/arq.jar and /dev/null differ diff --git a/webapp/lib/icu4j-3.4.4.jar b/webapp/lib/icu4j-3.4.4.jar new file mode 100644 index 000000000..f5e8c167e Binary files /dev/null and b/webapp/lib/icu4j-3.4.4.jar differ diff --git a/webapp/lib/icu4j_3_4.jar b/webapp/lib/icu4j_3_4.jar deleted file mode 100644 index d35e3c346..000000000 Binary files a/webapp/lib/icu4j_3_4.jar and /dev/null differ diff --git a/webapp/lib/iri-0.8-sources.jar b/webapp/lib/iri-0.8-sources.jar new file mode 100644 index 000000000..f89aef0fb Binary files /dev/null and b/webapp/lib/iri-0.8-sources.jar differ diff --git a/webapp/lib/iri.jar b/webapp/lib/iri-0.8.jar similarity index 77% rename from webapp/lib/iri.jar rename to webapp/lib/iri-0.8.jar index b2026e455..f096c689c 100644 Binary files a/webapp/lib/iri.jar and b/webapp/lib/iri-0.8.jar differ diff --git a/webapp/lib/jena-2.6.3-sources.jar b/webapp/lib/jena-2.6.3-sources.jar new file mode 100644 index 000000000..ef40629be Binary files /dev/null and b/webapp/lib/jena-2.6.3-sources.jar differ diff --git a/webapp/lib/jena-2.6.3-test-sources.jar b/webapp/lib/jena-2.6.3-test-sources.jar new file mode 100644 index 000000000..235e0815d Binary files /dev/null and b/webapp/lib/jena-2.6.3-test-sources.jar differ diff --git a/webapp/lib/jena-2.6.3-tests.jar b/webapp/lib/jena-2.6.3-tests.jar new file mode 100644 index 000000000..398ef942c Binary files /dev/null and b/webapp/lib/jena-2.6.3-tests.jar differ diff --git a/webapp/lib/jena.jar b/webapp/lib/jena-2.6.3.jar similarity index 66% rename from webapp/lib/jena.jar rename to webapp/lib/jena-2.6.3.jar index 6a532bd43..47a67dca6 100644 Binary files a/webapp/lib/jena.jar and b/webapp/lib/jena-2.6.3.jar differ diff --git a/webapp/lib/jenatest.jar b/webapp/lib/jenatest.jar deleted file mode 100644 index 54b665847..000000000 Binary files a/webapp/lib/jenatest.jar and /dev/null differ diff --git a/webapp/lib/jgrapht-jdk1.5.jar b/webapp/lib/jgrapht-jdk1.5.jar new file mode 100644 index 000000000..e6a3e46d4 Binary files /dev/null and b/webapp/lib/jgrapht-jdk1.5.jar differ diff --git a/webapp/lib/pellet-cli.jar b/webapp/lib/pellet-cli.jar index 71ee447b6..44997f150 100644 Binary files a/webapp/lib/pellet-cli.jar and b/webapp/lib/pellet-cli.jar differ diff --git a/webapp/lib/pellet-core.jar b/webapp/lib/pellet-core.jar index 89b9a06a8..d383d5e61 100644 Binary files a/webapp/lib/pellet-core.jar and b/webapp/lib/pellet-core.jar differ diff --git a/webapp/lib/pellet-datatypes.jar b/webapp/lib/pellet-datatypes.jar index 89444fa8a..320f9ccea 100644 Binary files a/webapp/lib/pellet-datatypes.jar and b/webapp/lib/pellet-datatypes.jar differ diff --git a/webapp/lib/pellet-dig.jar b/webapp/lib/pellet-dig.jar index 02a684ee2..63fe30a43 100644 Binary files a/webapp/lib/pellet-dig.jar and b/webapp/lib/pellet-dig.jar differ diff --git a/webapp/lib/pellet-el.jar b/webapp/lib/pellet-el.jar index 41bd39511..49a9553e0 100644 Binary files a/webapp/lib/pellet-el.jar and b/webapp/lib/pellet-el.jar differ diff --git a/webapp/lib/pellet-explanation.jar b/webapp/lib/pellet-explanation.jar index 8ccf9cb0e..665aca150 100644 Binary files a/webapp/lib/pellet-explanation.jar and b/webapp/lib/pellet-explanation.jar differ diff --git a/webapp/lib/pellet-jena.jar b/webapp/lib/pellet-jena.jar index d712c6aca..e655efb33 100644 Binary files a/webapp/lib/pellet-jena.jar and b/webapp/lib/pellet-jena.jar differ diff --git a/webapp/lib/pellet-modularity.jar b/webapp/lib/pellet-modularity.jar index 112c89888..fda6537fb 100644 Binary files a/webapp/lib/pellet-modularity.jar and b/webapp/lib/pellet-modularity.jar differ diff --git a/webapp/lib/pellet-owlapi.jar b/webapp/lib/pellet-owlapi.jar index f7c20fac4..8c9842b6a 100644 Binary files a/webapp/lib/pellet-owlapi.jar and b/webapp/lib/pellet-owlapi.jar differ diff --git a/webapp/lib/pellet-owlapiv3.jar b/webapp/lib/pellet-owlapiv3.jar new file mode 100644 index 000000000..5534a4a67 Binary files /dev/null and b/webapp/lib/pellet-owlapiv3.jar differ diff --git a/webapp/lib/pellet-pellint.jar b/webapp/lib/pellet-pellint.jar index acdc5f87b..52e012fd2 100644 Binary files a/webapp/lib/pellet-pellint.jar and b/webapp/lib/pellet-pellint.jar differ diff --git a/webapp/lib/pellet-query.jar b/webapp/lib/pellet-query.jar index 6a341d375..f5bbcc650 100644 Binary files a/webapp/lib/pellet-query.jar and b/webapp/lib/pellet-query.jar differ diff --git a/webapp/lib/pellet-rules.jar b/webapp/lib/pellet-rules.jar index 62ade5616..821a4ecd5 100644 Binary files a/webapp/lib/pellet-rules.jar and b/webapp/lib/pellet-rules.jar differ diff --git a/webapp/lib/pellet-test.jar b/webapp/lib/pellet-test.jar index 9d09dc489..ce8a67783 100644 Binary files a/webapp/lib/pellet-test.jar and b/webapp/lib/pellet-test.jar differ diff --git a/webapp/lib/pellet.jar b/webapp/lib/pellet.jar deleted file mode 100644 index 89b9a06a8..000000000 Binary files a/webapp/lib/pellet.jar and /dev/null differ diff --git a/webapp/lib/sdb-1.3.2-tests.jar b/webapp/lib/sdb-1.3.2-tests.jar new file mode 100644 index 000000000..ba4bb4ceb Binary files /dev/null and b/webapp/lib/sdb-1.3.2-tests.jar differ diff --git a/webapp/lib/sdb-1.3.2.jar b/webapp/lib/sdb-1.3.2.jar new file mode 100644 index 000000000..d8e3d3af2 Binary files /dev/null and b/webapp/lib/sdb-1.3.2.jar differ diff --git a/webapp/lib/sdb.jar b/webapp/lib/sdb.jar deleted file mode 100644 index 35f0ab4a2..000000000 Binary files a/webapp/lib/sdb.jar and /dev/null differ diff --git a/webapp/lib/stax-api-1.0.jar b/webapp/lib/stax-api-1.0.jar deleted file mode 100644 index 2d03f2ce3..000000000 Binary files a/webapp/lib/stax-api-1.0.jar and /dev/null differ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingModel.java index f0167cece..aa66bed50 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingModel.java @@ -2986,4 +2986,13 @@ public class RegeneratingModel implements OntModel { } } + public Resource wrapAsResource(Node arg0) { + try { + return model.wrapAsResource(arg0); + } catch (Exception e) { + regenerate(); + return model.wrapAsResource(arg0); + } + } + } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java index 20c1922a5..c7d2c383e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java @@ -132,7 +132,7 @@ public class EditLiteral implements Literal { throw new UnsupportedOperationException(); } - public RDFNode inModel(Model model) { + public Literal inModel(Model model) { throw new UnsupportedOperationException(); } @@ -191,9 +191,9 @@ public class EditLiteral implements Literal { } @Deprecated - public Object getObject(ObjectF arg0) { - throw new UnsupportedOperationException(); - } + //public Object getObject(ObjectF arg0) { + // throw new UnsupportedOperationException(); + //} public T as(Class arg0) { throw new UnsupportedOperationException(); @@ -202,4 +202,16 @@ public class EditLiteral implements Literal { public boolean canAs(Class arg0) { throw new UnsupportedOperationException(); } + + public Literal asLiteral() { + throw new UnsupportedOperationException(); + } + + public Resource asResource() { + throw new UnsupportedOperationException(); + } + + public Model getModel() { + throw new UnsupportedOperationException(); + } }