litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-773 Update the JENA libraries and adjust to the changes

Browse source 
Replace the JAR files with more current ones.
Add a one-line change to BaseInfGraph (from the Jena source), so it will work with Pellet 2.3.1
Adjust all implementations of Graph to include new methods and remove old ones.
Add annotations and generics to reduce compiler warnings.
Remove all dependencies on RDB, which is no longer supported.
   This requires considerable refactoring of JenaIngestController, RDFUploadController, listModels.jsp
Refactor the ModelMaker uses
   Remove VitroJenaModelMaker,
   Revise VitroInterceptingModelMaker to be configurable for Config or Content models
Add debug logging code to ModelChangeImpl ChangeSetImpl, RDFServiceJena.
Add TDB support: RDFServiceFactoryTDB, RDFServiceTDB
   Refactor RDFServiceJena and RDFServiceSDB so much of the code can be reused by RDFServiceTDB
Accomodate two RDFService instances - one for Configuration models and one for Content models.
   Changes to RDFServiceUtils, RDFServiceSetup
   Configuration models use TDB directory in Vitro home directory
Handle bulk updating:
   Jena has deprecated bulk operations, and their models classes no longer use the bulk updaters
   Create a VitroModelFactory to use instead of the ModelFactory, when bulk updating is required.
   Create adapter classes: BulkUpdatingModel, BulkUpdatingOntModel, AbstractModelDecorator
Make the configuration model setup algorithms uniform
   Combine ApplicationModelSetup and UserModelSetup into ConfigurationModelsSetup
This commit is contained in:
Jim Blake 2014-06-01 18:23:21 -04:00
parent 03c87f49a4
commit 3a2930cdc6
81 changed files with 6293 additions and 1628 deletions
Download patch file Download diff file Expand all files Collapse all files

23
webapp/web/jenaIngest/listModels.jsp
View file

@ -12,12 +12,12 @@
<script type="text/javascript">
function init(){
var infoLine = document.information.info.value;
if(infoLine == "RDB models"){
document.rdbform.submit.disabled="true";
var modelType = document.ingesting.modelType.value;
if(modelType == "CONFIGURATION"){
document.showConfigurationModelsForm.submit.disabled="true";
}
else{
document.sdbform.submit.disabled="true";
document.showContentModelsForm.submit.disabled="true";
}
}
</script>
@ -27,26 +27,23 @@ function init(){
<table>
<tr>
<td>
<form name="sdbform" action="ingest" method="get">
<input type="hidden" name="action" value="sdbModels"/>
<form name="showContentModelsForm" action="ingest" method="get">
<input type="hidden" name="action" value="contentModels"/>
<input type="submit" name="submit" value="Main Store Models"/>
</form>
</td>
<td>
<form name="rdbform" action="ingest" method="get">
<input type="hidden" name="action" value="rdbModels"/>
<input type="submit" name="submit" value="RDB Models"/>
<form name="showConfigurationModelsForm" action="ingest" method="get">
<input type="hidden" name="action" value="configModels"/>
<input type="submit" name="submit" value="Configuration Models"/>
</form>
</td>
</tr>
</table>
<form action="ingest" method="get">
<form name="ingesting" action="ingest" method="get">
<input type="hidden" name="action" value="createModel"/>
<input type="hidden" name="modelType" value="${modelType}"/>
<input type="submit" name="submit" value="Create Model"/>
</form>
<form name="information">
<input type="hidden" name="info" value="${infoLine}"/>
</form>
Currently showing <font color="red">${infoLine}</font>