From a3c378bb250ea22f47e6329a5c6086b09d017930 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Fri, 2 Sep 2016 19:59:10 +0100 Subject: [PATCH] [VIVO-1270] Initial commit of Jena 3 --- .../webapp/application/ApplicationImpl.java | 2 +- .../webapp/application/ApplicationSetup.java | 4 +- .../auth/identifier/common/IsBlacklisted.java | 16 +- .../webapp/auth/policy/PolicyHelper.java | 20 +- .../bean/PropertyRestrictionBeanImpl.java | 4 +- .../RelationshipChecker.java | 16 +- .../AbstractDataPropertyStatementAction.java | 2 +- ...AbstractObjectPropertyStatementAction.java | 2 +- .../AbstractPropertyStatementAction.java | 2 +- .../propstmt/AddDataPropertyStatement.java | 2 +- .../propstmt/AddObjectPropertyStatement.java | 2 +- .../propstmt/DropDataPropertyStatement.java | 2 +- .../propstmt/DropObjectPropertyStatement.java | 2 +- .../propstmt/EditDataPropertyStatement.java | 2 +- .../propstmt/EditObjectPropertyStatement.java | 2 +- .../publish/PublishDataPropertyStatement.java | 2 +- .../PublishObjectPropertyStatement.java | 2 +- .../vitro/webapp/beans/BaseResourceBean.java | 4 +- .../webapp/beans/DataPropertyComparator.java | 2 +- .../webapp/beans/DataPropertyStatement.java | 2 +- .../vitro/webapp/beans/FauxProperty.java | 2 +- .../vitro/webapp/beans/ObjectProperty.java | 2 +- .../mannlib/vitro/webapp/beans/Property.java | 2 +- .../controller/AbstractPageHandler.java | 2 +- .../FedoraDatastreamController.java | 18 +- .../IndividualListRdfController.java | 6 +- .../webapp/controller/OntologyController.java | 18 +- .../controller/SparqlQueryBuilderServlet.java | 6 +- .../vitro/webapp/controller/VitroRequest.java | 4 +- .../accounts/UserAccountsSelector.java | 10 +- .../admin/ajax/ProfileAutoCompleter.java | 18 +- .../ProxyRelationshipSelector.java | 6 +- .../ajax/BasicProxiesGetter.java | 4 +- .../admin/ShowSourcesController.java | 6 +- .../admin/SparqlQueryController.java | 4 +- .../ajax/AbstractAjaxResponder.java | 4 +- .../ajax/SparqlQueryAjaxController.java | 4 +- .../webapp/controller/ajax/SparqlUtils.java | 20 +- .../api/SparqlQueryApiController.java | 2 +- .../api/SparqlUpdateApiController.java | 14 +- .../sparqlquery/SparqlQueryApiExecutor.java | 4 +- .../SparqlQueryApiRdfProducer.java | 2 +- .../SparqlQueryApiResultSetProducer.java | 8 +- .../datatools/dumprestore/DumpNode.java | 3 +- .../dumprestore/RestoreModelsAction.java | 2 +- .../webapp/controller/edit/Authenticate.java | 2 +- .../controller/edit/DeletePageController.java | 18 +- .../controller/edit/MenuManagementEdit.java | 14 +- .../NamespacePrefixOperationController.java | 14 +- .../controller/edit/PrimitiveRdfEdit.java | 10 +- .../edit/RefactorOperationController.java | 52 +-- .../controller/edit/ReorderController.java | 20 +- .../edit/RestrictionOperationController.java | 24 +- .../edit/RestrictionRetryController.java | 4 +- .../controller/edit/VclassEditController.java | 2 +- .../jena/NamespacesListingController.java | 14 +- .../jena/RestrictionsListingController.java | 28 +- .../ManageLabelsForIndividualController.java | 6 +- .../ShowClassHierarchyController.java | 2 +- .../freemarker/ViewLabelsServlet.java | 8 +- .../responsevalues/BaseResponseValues.java | 2 +- .../responsevalues/RdfResponseValues.java | 2 +- .../responsevalues/ResponseValues.java | 2 +- .../grefine/GrefineMqlreadServlet.java | 2 +- .../grefine/GrefinePropertyListServlet.java | 2 +- .../individual/ExtendedRdfAssembler.java | 30 +- .../individual/IndividualRdfAssembler.java | 26 +- .../individual/IndividualResponseBuilder.java | 6 +- .../controller/jena/JenaAdminActions.java | 42 +-- .../jena/JenaCsv2RdfController.java | 4 +- .../controller/jena/JenaExportController.java | 12 +- .../controller/jena/JenaIngestController.java | 42 +-- .../controller/jena/JenaXMLFileUpload.java | 10 +- .../controller/jena/RDFUploadController.java | 14 +- .../webapp/dao/DataPropertyStatementDao.java | 2 +- .../vitro/webapp/dao/DisplayVocabulary.java | 14 +- .../mannlib/vitro/webapp/dao/PropertyDao.java | 2 +- .../DataPropertyStatementDaoFiltering.java | 2 +- .../filtering/PropertyGroupDaoFiltering.java | 2 +- .../filters/EntityPropertyListFilter.java | 16 +- .../webapp/dao/jena/ApplicationDaoJena.java | 16 +- .../dao/jena/BlankNodeFilteringGraph.java | 43 +-- .../jena/BlankNodeFilteringModelMaker.java | 12 +- .../dao/jena/BlankNodeStatementListener.java | 6 +- .../dao/jena/CumulativeDeltaModeler.java | 10 +- .../webapp/dao/jena/DataPropertyDaoJena.java | 60 +-- .../jena/DataPropertyStatementDaoJena.java | 50 +-- .../dao/jena/DataPropertyStatementDaoSDB.java | 28 +- .../vitro/webapp/dao/jena/DatasetWrapper.java | 4 +- .../dao/jena/DependentResourceDeleteJena.java | 14 +- .../webapp/dao/jena/DifferenceGraph.java | 46 +-- .../webapp/dao/jena/DisplayModelDaoJena.java | 14 +- .../webapp/dao/jena/FauxPropertyDaoJena.java | 24 +- .../vitro/webapp/dao/jena/GraphGenerator.java | 2 +- .../webapp/dao/jena/IndividualDaoJena.java | 54 +-- .../webapp/dao/jena/IndividualDaoSDB.java | 42 +-- .../vitro/webapp/dao/jena/IndividualJena.java | 22 +- .../vitro/webapp/dao/jena/IndividualSDB.java | 48 +-- .../vitro/webapp/dao/jena/JenaBaseDao.java | 58 +-- .../vitro/webapp/dao/jena/JenaBaseDaoCon.java | 16 +- .../vitro/webapp/dao/jena/JenaModelUtils.java | 40 +- .../vitro/webapp/dao/jena/MenuDaoJena.java | 20 +- .../vitro/webapp/dao/jena/ModelContext.java | 2 +- .../dao/jena/ObjectPropertyDaoJena.java | 68 ++-- .../jena/ObjectPropertyStatementDaoJena.java | 44 +-- .../jena/ObjectPropertyStatementDaoSDB.java | 10 +- .../webapp/dao/jena/OntModelSelector.java | 2 +- .../webapp/dao/jena/OntModelSelectorImpl.java | 2 +- .../webapp/dao/jena/OntologyDaoJena.java | 20 +- .../vitro/webapp/dao/jena/PageDaoJena.java | 26 +- .../webapp/dao/jena/PropertyDaoJena.java | 44 +-- .../webapp/dao/jena/PropertyGroupDaoJena.java | 28 +- .../dao/jena/PropertyInstanceDaoJena.java | 20 +- .../vitro/webapp/dao/jena/QueryUtils.java | 12 +- .../webapp/dao/jena/RDFServiceDataset.java | 53 +-- .../dao/jena/RDFServiceDatasetGraph.java | 97 ++++- .../webapp/dao/jena/RDFServiceGraph.java | 72 ++-- .../dao/jena/RDFServiceGraphBulkUpdater.java | 342 ------------------ .../webapp/dao/jena/RDFServiceModelMaker.java | 18 +- .../webapp/dao/jena/RegeneratingGraph.java | 65 ++-- .../webapp/dao/jena/SDBGraphGenerator.java | 8 +- .../dao/jena/SimpleOntModelSelector.java | 8 +- .../jena/SingleContentOntModelSelector.java | 2 +- .../vitro/webapp/dao/jena/SparqlGraph.java | 75 ++-- .../dao/jena/SparqlGraphBulkUpdater.java | 252 ------------- .../dao/jena/SparqlGraphMultilingual.java | 22 +- .../webapp/dao/jena/StaticDatasetFactory.java | 2 +- .../webapp/dao/jena/UserAccountsDaoJena.java | 22 +- .../vitro/webapp/dao/jena/VClassDaoJena.java | 78 ++-- .../vitro/webapp/dao/jena/VClassDaoSDB.java | 38 +- .../webapp/dao/jena/VClassGroupCache.java | 18 +- .../webapp/dao/jena/VClassGroupDaoJena.java | 18 +- .../vitro/webapp/dao/jena/VClassJena.java | 14 +- .../webapp/dao/jena/VitroModelSource.java | 6 +- .../webapp/dao/jena/WebappDaoFactoryJena.java | 26 +- .../webapp/dao/jena/WebappDaoFactorySDB.java | 10 +- .../webapp/dao/jena/event/EditEvent.java | 4 +- .../jena/event/IndividualCreationEvent.java | 6 +- .../jena/event/IndividualDeletionEvent.java | 6 +- .../dao/jena/event/IndividualEditEvent.java | 6 +- .../dao/jena/event/IndividualUpdateEvent.java | 6 +- .../dao/vclassgroup/ProhibitedFromSearch.java | 28 +- .../vitro/webapp/edit/EditLiteral.java | 6 +- .../VTwo/AdditionsAndRetractions.java | 4 +- .../n3editing/VTwo/BasicValidationVTwo.java | 10 +- .../VTwo/DateTimeIntervalValidationVTwo.java | 4 +- .../VTwo/DateTimeWithPrecisionVTwo.java | 6 +- .../VTwo/EditConfigurationUtils.java | 4 +- .../n3editing/VTwo/EditConfigurationVTwo.java | 8 +- .../edit/n3editing/VTwo/EditElementVTwo.java | 2 +- .../n3editing/VTwo/EditN3GeneratorVTwo.java | 12 +- .../VTwo/MultiValueEditSubmission.java | 10 +- .../edit/n3editing/VTwo/N3EditUtils.java | 18 +- .../edit/n3editing/VTwo/ProcessRdfForm.java | 10 +- .../edit/n3editing/VTwo/RdfLiteralHash.java | 31 +- .../n3editing/VTwo/SparqlEvaluateVTwo.java | 8 +- .../VTwo/fields/ChildVClassesOptions.java | 2 +- .../VTwo/fields/ChildVClassesWithParent.java | 2 +- ...vidualsViaObjectPropertyByRankOptions.java | 22 +- .../configuration/IdModelSelector.java | 4 +- .../configuration/ModelSelector.java | 2 +- .../configuration/StandardModelSelector.java | 2 +- .../BaseEditConfigurationGenerator.java | 2 +- .../DateTimeIntervalFormGenerator.java | 4 +- .../generators/DateTimePropertyGenerator.java | 4 +- .../DateTimeValueFormGenerator.java | 4 +- ...aultAddMissingIndividualFormGenerator.java | 4 +- .../DefaultDataPropertyFormGenerator.java | 2 +- .../DefaultObjectPropertyFormGenerator.java | 4 +- .../ManageLabelsForIndividualGenerator.java | 8 +- .../generators/ManagePageGenerator.java | 24 +- .../NewIndividualFormGenerator.java | 8 +- .../generators/RDFSLabelGenerator.java | 6 +- .../generators/RdfTypeGenerator.java | 4 +- ...issingIndividualFormModelPreprocessor.java | 4 +- .../DefaultDataPropEmptyField.java | 4 +- .../FoafNameToRdfsLabelPreprocessor.java | 34 +- ...ManageLabelsForIndividualPreprocessor.java | 14 +- .../preprocessors/ManagePagePreprocessor.java | 2 +- .../ModelChangePreprocessor.java | 2 +- .../utils/ProcessClassGroupDataGetterN3.java | 16 +- .../utils/ProcessDataGetterAbstract.java | 2 +- .../utils/ProcessDataGetterN3.java | 4 +- .../utils/ProcessFixedHTMLN3.java | 16 +- ...cessIndividualsForClassesDataGetterN3.java | 18 +- .../ProcessSearchIndividualsDataGetterN3.java | 18 +- .../utils/ProcessSparqlDataGetterN3.java | 18 +- .../validators/AntiXssValidation.java | 2 +- .../DefaultDataPropertyFormValidator.java | 2 +- .../EditRequestDispatchController.java | 2 +- .../controller/ProcessRdfFormController.java | 10 +- .../vitro/webapp/filters/ModelSwitcher.java | 8 +- .../rel17/RemoveObsoletePermissions.java | 14 +- .../rel18/FauxPropertiesUpdater.java | 12 +- .../modelaccess/ContextModelAccess.java | 6 +- .../modelaccess/RequestModelAccess.java | 4 +- .../adapters/AbstractModelMakerDecorator.java | 10 +- .../adapters/ListCachingModelMaker.java | 10 +- .../adapters/MemoryMappingModelMaker.java | 8 +- .../ModelMakerWithPersistentEmptyModels.java | 10 +- .../adapters/NamedDefaultModelMaker.java | 8 +- .../impl/ContextModelAccessImpl.java | 6 +- .../impl/RequestModelAccessImpl.java | 4 +- .../ontmodels/JoinedOntModelCache.java | 2 +- .../ontmodels/MaskingOntModelCache.java | 2 +- .../ontmodels/ModelMakerOntModelCache.java | 6 +- .../modelaccess/ontmodels/OntModelCache.java | 2 +- .../ontmodels/UnionModelsOntModelsCache.java | 2 +- .../modules/searchIndexer/SearchIndexer.java | 2 +- .../tboxreasoner/TBoxReasonerModule.java | 2 +- .../ConfigurationTripleSource.java | 2 +- .../tripleSource/ContentTripleSource.java | 2 +- .../modules/tripleSource/TripleSource.java | 4 +- .../webapp/ontology/update/ABoxUpdater.java | 34 +- .../webapp/ontology/update/ChangeRecord.java | 2 +- .../ontology/update/KnowledgeBaseUpdater.java | 14 +- .../ontology/update/SimpleChangeRecord.java | 4 +- .../webapp/ontology/update/TBoxUpdater.java | 40 +- .../ontology/update/UpdateSettings.java | 2 +- .../vitro/webapp/rdfservice/RDFService.java | 4 +- .../webapp/rdfservice/RDFServiceFactory.java | 2 +- .../webapp/rdfservice/ResultSetConsumer.java | 4 +- .../adapters/AbstractModelDecorator.java | 106 +++--- .../adapters/AbstractOntModelDecorator.java | 193 +++++----- .../adapters/BulkUpdatingModel.java | 106 +++--- .../adapters/BulkUpdatingOntModel.java | 128 +++---- .../adapters/MemoryMappedModel.java | 13 +- .../adapters/VitroModelFactory.java | 31 +- .../rdfservice/filter/FilteredResultSet.java | 8 +- .../filter/LanguageFilteringRDFService.java | 20 +- .../filter/LanguageFilteringUtils.java | 6 +- .../SameAsFilteringRDFServiceFactory.java | 32 +- .../impl/RDFServiceFactorySingle.java | 4 +- .../rdfservice/impl/RDFServiceImpl.java | 28 +- .../rdfservice/impl/RDFServiceUtils.java | 10 +- .../rdfservice/impl/jena/RDFServiceJena.java | 38 +- .../impl/jena/model/RDFServiceModel.java | 6 +- .../impl/jena/sdb/RDFServiceFactorySDB.java | 4 +- .../impl/jena/sdb/RDFServiceSDB.java | 16 +- .../impl/jena/tdb/RDFServiceTDB.java | 8 +- .../impl/logging/LoggingRDFService.java | 4 +- .../logging/LoggingRDFServiceFactory.java | 2 +- .../impl/sparql/RDFServiceSparql.java | 48 +-- .../impl/sparql/RDFServiceSparqlHttp.java | 14 +- .../impl/virtuoso/RDFServiceVirtuoso.java | 16 +- .../vitro/webapp/reasoner/ABoxRecomputer.java | 42 +-- .../vitro/webapp/reasoner/ModelUpdate.java | 2 +- .../vitro/webapp/reasoner/ReasonerPlugin.java | 6 +- .../vitro/webapp/reasoner/SimpleReasoner.java | 48 +-- .../reasoner/SimpleReasonerTBoxListener.java | 4 +- .../webapp/reasoner/plugin/DisableSameAs.java | 6 +- .../reasoner/plugin/SimpleBridgingRule.java | 26 +- .../plugin/SimplePropertyAndTypeRule.java | 20 +- .../DataAutocompleteController.java | 18 +- .../controller/SearchHelpController.java | 10 +- .../searchindex/IndexingChangeListener.java | 13 +- .../webapp/searchindex/SearchIndexerImpl.java | 2 +- .../documentBuilding/ThumbnailImageURL.java | 6 +- .../exclusions/SyncingExcludeBasedOnType.java | 32 +- .../AdditionalURIsForClassGroupChanges.java | 10 +- .../AdditionalURIsForDataProperties.java | 2 +- .../AdditionalURIsForObjectProperties.java | 16 +- .../AdditionalURIsForTypeStatements.java | 4 +- .../indexing/IndexingUriFinder.java | 2 +- .../indexing/IndexingUriFinderList.java | 2 +- .../indexing/IndexingUriFinderListBasic.java | 2 +- .../IndexingUriFinderListDeveloper.java | 2 +- .../indexing/SelectQueryUriFinder.java | 4 +- .../indexing/URIsForClassGroupChange.java | 2 +- .../tasks/FindUrisForStatementWorkUnit.java | 2 +- .../tasks/UpdateDocumentWorkUnit.java | 4 +- .../tasks/UpdateStatementsTask.java | 2 +- .../FakeApplicationOntologyService.java | 18 +- .../setup/ConfigurationModelsSetup.java | 2 +- .../servlet/setup/ContentModelSetup.java | 16 +- .../webapp/servlet/setup/FileGraphSetup.java | 12 +- .../servlet/setup/PropertyMaskingSetup.java | 2 +- .../webapp/servlet/setup/RDFFilesLoader.java | 8 +- .../servlet/setup/RunSparqlConstructs.java | 20 +- .../servlet/setup/SimpleReasonerSetup.java | 8 +- .../webapp/servlet/setup/ThemeInfoSetup.java | 12 +- .../servlet/setup/UpdateKnowledgeBase.java | 32 +- .../vitro/webapp/sparql/GetAllPrefix.java | 8 +- .../ConfiguredReasonerListener.java | 14 +- .../tboxreasoner/InferenceModelUpdater.java | 6 +- .../tboxreasoner/PatternListBuilder.java | 6 +- .../tboxreasoner/ReasonerConfiguration.java | 6 +- .../ReasonerStatementPattern.java | 10 +- .../webapp/tboxreasoner/TBoxChanges.java | 4 +- .../webapp/tboxreasoner/TBoxReasoner.java | 8 +- .../impl/BasicTBoxReasonerDriver.java | 8 +- .../impl/TBoxInferencesAccumulator.java | 12 +- .../impl/jfact/JFactTBoxReasoner.java | 26 +- .../impl/jfact/JFactTBoxReasonerModule.java | 2 +- .../triplesource/CombinedTripleSource.java | 4 +- .../impl/BasicCombinedTripleSource.java | 4 +- .../impl/sdb/ContentTripleSourceSDB.java | 20 +- .../sparql/ContentTripleSourceSPARQL.java | 4 +- .../tdb/ConfigurationTripleSourceTDB.java | 6 +- .../impl/tdb/ContentTripleSourceTDB.java | 6 +- ...ApplicationConfigurationOntologyUtils.java | 24 +- .../mannlib/vitro/webapp/utils/Csv2Rdf.java | 20 +- .../webapp/utils/FedoraConfiguration.java | 4 +- .../webapp/utils/FrontEndEditingUtils.java | 12 +- .../vitro/webapp/utils/NamespaceMapper.java | 2 +- .../vitro/webapp/utils/SparqlQueryRunner.java | 22 +- .../vitro/webapp/utils/SparqlQueryUtils.java | 8 +- .../ConfigurationBeanLoader.java | 8 +- .../configuration/ConfigurationRdfParser.java | 16 +- .../utils/configuration/PropertyType.java | 14 +- .../utils/dataGetter/BrowseDataGetter.java | 2 +- .../utils/dataGetter/ClassGroupPageData.java | 2 +- .../utils/dataGetter/DataGetterBase.java | 2 +- .../utils/dataGetter/DataGetterUtils.java | 28 +- .../dataGetter/ExecuteDataRetrieval.java | 2 +- .../utils/dataGetter/FixedHTMLDataGetter.java | 26 +- .../IndividualsForClassesDataGetter.java | 16 +- .../SearchIndividualsDataGetter.java | 24 +- .../dataGetter/SparqlQueryDataGetter.java | 26 +- .../DeveloperDisabledChangeListener.java | 8 +- .../DeveloperDisabledModelChangeListener.java | 8 +- .../developer/loggers/StackTraceUtility.java | 2 +- .../webapp/utils/jena/DedupAndExtract.java | 14 +- .../utils/jena/ExtendedLinkedDataUtils.java | 16 +- .../webapp/utils/jena/JenaIngestUtils.java | 40 +- .../jena/JenaIngestWorkflowProcessor.java | 36 +- .../webapp/utils/jena/JenaOutputUtils.java | 2 +- .../utils/jena/NamespaceMapperJena.java | 20 +- .../vitro/webapp/utils/jena/URIUtils.java | 20 +- .../webapp/utils/jena/WorkflowOntology.java | 4 +- .../jena/criticalsection/LockableModel.java | 4 +- .../criticalsection/LockableOntModel.java | 4 +- .../jena/criticalsection/LockedModel.java | 6 +- .../jena/criticalsection/LockedOntModel.java | 2 +- .../vitro/webapp/utils/logging/ToString.java | 8 +- .../menuManagement/ProcessClassGroup.java | 10 +- .../menuManagement/ProcessDataGetter.java | 4 +- .../ProcessIndividualsForClasses.java | 10 +- .../utils/sparql/RdfServiceQueryContext.java | 6 +- .../utils/sparql/ResultSetIterators.java | 20 +- .../vitro/webapp/web/MiscWebUtils.java | 4 +- .../webapp/web/jsptags/ListSparqlTag.java | 93 ----- .../edit/EditConfigurationTemplateModel.java | 2 +- ...MultiValueEditSubmissionTemplateModel.java | 2 +- .../DataPropertyStatementTemplateModel.java | 2 +- .../individual/DataPropertyTemplateModel.java | 2 +- .../individual/FauxObjectPropertyWrapper.java | 2 +- .../individual/GroupedPropertyList.java | 2 +- .../NameStatementTemplateModel.java | 2 +- .../vitro/testing/AbstractTestClass.java | 8 +- .../testing/ModelUtilitiesTestHelper.java | 22 +- .../auth/policy/PolicyHelper_ModelsTest.java | 18 +- .../policy/PolicyHelper_StatementsTest.java | 12 +- .../auth/policy/SelfEditingPolicyTest.java | 6 +- .../auth/policy/SelfEditingPolicy_2_Test.java | 6 +- .../accounts/UserAccountsSelectorTest.java | 8 +- .../ProxyRelationshipSelectorTest.java | 8 +- .../controller/api/SparqlUpdateApiTest.java | 18 +- .../SparqlQueryApiExecutorTest.java | 8 +- .../controller/edit/PrimitiveRdfEditTest.java | 6 +- .../IndividualRdfAssemblerTest.java | 16 +- .../webapp/dao/NewURIMakerVitroTest.java | 10 +- .../dao/jena/DataPropertyDaoJenaTest.java | 18 +- .../jena/DependentResourceDeleteJenaTest.java | 12 +- .../webapp/dao/jena/JenaBaseDaoTest.java | 22 +- .../webapp/dao/jena/JenaBaseDao_2_Test.java | 14 +- .../webapp/dao/jena/MenuDaoJenaTest.java | 10 +- .../dao/jena/ObjectPropertyDaoJenaTest.java | 14 +- .../ObjectPropertyStatementDaoJenaTest.java | 4 +- .../dao/jena/PropertyInstanceDaoJenaTest.java | 10 +- .../vitro/webapp/dao/jena/QueryUtilsTest.java | 8 +- .../dao/jena/UserAccountsDaoJenaTest.java | 14 +- .../vitro/webapp/dao/jena/VClassDaoTest.java | 14 +- .../webapp/dao/jena/VClassGroupCacheTest.java | 10 +- .../vitro/webapp/dao/jena/VClassJenaTest.java | 52 +-- .../vclassgroup/ProhibitedFromSearchTest.java | 14 +- .../vitro/webapp/edit/EditLiteralTest.java | 2 +- .../edit/n3editing/EditN3UtilsTest.java | 6 +- .../VTwo/EditN3GeneratorVTwoTest.java | 8 +- .../n3editing/VTwo/ProcessRdfFormTest.java | 10 +- .../processEdit/RdfLiteralHashTest.java | 6 +- .../URLRewritingHttpServletResponseTest.java | 6 +- .../adapters/ListCachingModelMakerTest.java | 16 +- .../adapters/MemoryMappingModelMakerTest.java | 18 +- ...delMakerWithPersistentEmptyModelsTest.java | 16 +- .../adapters/VitroModelFactoryTest.java | 123 +++---- .../LanguageFilteringRDFServiceTest.java | 4 +- .../SimpleReasonerInversePropertyTest.java | 14 +- .../reasoner/SimpleReasonerPluginTest.java | 22 +- .../reasoner/SimpleReasonerSameAsTest.java | 24 +- .../reasoner/SimpleReasonerTBoxHelper.java | 12 +- .../webapp/reasoner/SimpleReasonerTest.java | 22 +- .../ThumbnailImageURLTest.java | 6 +- ...dditionalURIsForClassGroupChangesTest.java | 6 +- ...AdditionalURIsForObjectPropertiesTest.java | 10 +- .../AdditionalURIsForTypeStatementsTest.java | 4 +- .../indexing/SelectQueryUriFinderTest.java | 18 +- .../setup/UpdateKnowledgeBaseTest.java | 4 +- .../vitro/webapp/test/JenaOntologyLoader.java | 8 +- .../ConfigurationBeanLoaderTest.java | 8 +- .../utils/dataGetter/DataGetterUtilsTest.java | 10 +- .../dataGetter/SparqlQueryDataGetterTest.java | 14 +- .../utils/ingest/JenaIngestUtilsTest.java | 12 +- .../utils/jena/JenaIngestUtilsTest.java | 12 +- ...yTemplateModel_PropertyListConfigTest.java | 6 +- .../hp/hpl/jena/rdf/model/LiteralStub.java | 16 +- .../rdf/model/ModelMaker/ModelMakerStub.java | 22 +- .../bean/PropertyRestrictionBeanStub.java | 4 +- .../vitro/webapp/beans/IndividualStub.java | 4 +- .../modelaccess/ContextModelAccessStub.java | 6 +- .../modelaccess/RequestModelAccessStub.java | 4 +- .../searchIndexer/SearchIndexerStub.java | 2 +- dependencies/pom.xml | 13 +- .../WEB-INF/classes/log4j.properties | 4 +- .../utilities/rdbmigration/RdbMigrator.java | 12 +- .../vitro/utilities/sdb2tdb/Sdb2Tdb.java | 34 +- legacy/webapp/config/log4j.properties | 4 +- .../webapp/WEB-INF/tlds/ListSparqlTag.tld | 51 --- .../main/webapp/WEB-INF/tlds/sparqltag.tld | 279 -------------- webapp/src/main/webapp/WEB-INF/web.xml | 5 - .../src/main/webapp/admin/conceptRepair.jsp | 24 +- .../webapp/admin/removeBadRestrictions.jsp | 28 +- .../admin/removeResourceDescription.jsp | 24 +- webapp/src/main/webapp/admin/sparql.jsp | 4 +- webapp/src/main/webapp/jenaIngest/csv2rdf.jsp | 8 +- .../webapp/jenaIngest/csv2rdfSelectUri.jsp | 8 +- .../webapp/jenaIngest/executeWorkflow.jsp | 8 +- .../main/webapp/jenaIngest/generateTBox.jsp | 8 +- .../src/main/webapp/jenaIngest/listModels.jsp | 2 +- .../main/webapp/jenaIngest/mergeResources.jsp | 4 +- .../main/webapp/jenaIngest/merge_result.jsp | 2 +- .../src/main/webapp/jenaIngest/notfound.jsp | 2 +- .../main/webapp/jenaIngest/permanentURI.jsp | 4 +- .../main/webapp/jenaIngest/processStrings.jsp | 8 +- .../main/webapp/jenaIngest/renameBNodes.jsp | 8 +- .../jenaIngest/renameBNodesURISelect.jsp | 8 +- .../main/webapp/jenaIngest/renameResource.jsp | 4 +- .../webapp/jenaIngest/smushSingleModel.jsp | 8 +- .../webapp/jenaIngest/sparqlConstruct.jsp | 8 +- .../webapp/jenaIngest/splitPropertyValues.jsp | 8 +- .../main/webapp/jenaIngest/subtractModels.jsp | 8 +- .../main/webapp/jenaIngest/workflowStep.jsp | 8 +- .../main/webapp/jenaIngest/xmlFileUpload.jsp | 2 +- .../jenaIngest/xmlFileUploadSuccess.jsp | 2 +- 444 files changed, 2965 insertions(+), 4074 deletions(-) delete mode 100644 api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraphBulkUpdater.java delete mode 100644 api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphBulkUpdater.java delete mode 100644 api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/ListSparqlTag.java delete mode 100644 webapp/src/main/webapp/WEB-INF/tlds/ListSparqlTag.tld delete mode 100644 webapp/src/main/webapp/WEB-INF/tlds/sparqltag.tld diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java index 36e230466..9fbcfa6ad 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java @@ -8,7 +8,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import com.hp.hpl.jena.ontology.OntDocumentManager; +import org.apache.jena.ontology.OntDocumentManager; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.modules.Application; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/ApplicationSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/ApplicationSetup.java index a6404e49c..005d8a361 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/ApplicationSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/ApplicationSetup.java @@ -11,8 +11,8 @@ import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; import edu.cornell.mannlib.vitro.webapp.utils.configuration.ConfigurationBeanLoader; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java index d5a880cf7..8cb3f7e19 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java @@ -16,14 +16,14 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.RDFNode; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java index 14277612f..b60a1f118 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java @@ -9,14 +9,14 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; @@ -134,7 +134,7 @@ public class PolicyHelper { } Resource subject = stmt.getSubject(); - com.hp.hpl.jena.rdf.model.Property predicate = stmt.getPredicate(); + org.apache.jena.rdf.model.Property predicate = stmt.getPredicate(); RDFNode objectNode = stmt.getObject(); if ((subject == null) || (predicate == null) || (objectNode == null)) { return false; @@ -169,7 +169,7 @@ public class PolicyHelper { } Resource subject = stmt.getSubject(); - com.hp.hpl.jena.rdf.model.Property predicate = stmt.getPredicate(); + org.apache.jena.rdf.model.Property predicate = stmt.getPredicate(); RDFNode objectNode = stmt.getObject(); if ((subject == null) || (predicate == null) || (objectNode == null)) { return false; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java index 4681de664..e0c4bcf02 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java @@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.impl.Util; +import org.apache.jena.rdf.model.impl.Util; import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels.Which; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel; @@ -225,7 +225,7 @@ public class PropertyRestrictionBeanImpl extends PropertyRestrictionBean { } private String namespace(String uri) { - return uri.substring(0, Util.splitNamespace(uri)); + return uri.substring(0, Util.splitNamespaceXML(uri)); } @Override diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/RelationshipChecker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/RelationshipChecker.java index c696efe05..f306d051c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/RelationshipChecker.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/RelationshipChecker.java @@ -8,14 +8,14 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Selector; -import com.hp.hpl.jena.rdf.model.SimpleSelector; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Selector; +import org.apache.jena.rdf.model.SimpleSelector; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.auth.policy.BasicPolicyDecision; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java index 98fec8b2a..e20c3267a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Property; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java index 8ebab565b..1ad4dc679 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.beans.Property; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java index 3d50a00d3..3892b24aa 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; import edu.cornell.mannlib.vitro.webapp.beans.Property; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddDataPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddDataPropertyStatement.java index 39c1e20ab..02051450e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddDataPropertyStatement.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddDataPropertyStatement.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropertyStatement.java index 4af37509e..7b9241fe6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropertyStatement.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropertyStatement.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.beans.Property; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropDataPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropDataPropertyStatement.java index b1f84cb2a..bb4d1f39e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropDataPropertyStatement.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropDataPropertyStatement.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropObjectPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropObjectPropertyStatement.java index ef374102b..e50da8e41 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropObjectPropertyStatement.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropObjectPropertyStatement.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.beans.Property; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditDataPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditDataPropertyStatement.java index 8243a2031..538102c7f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditDataPropertyStatement.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditDataPropertyStatement.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditObjectPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditObjectPropertyStatement.java index 0f74cf3ee..07d2fb7aa 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditObjectPropertyStatement.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditObjectPropertyStatement.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.beans.Property; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishDataPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishDataPropertyStatement.java index e69a3b618..e73517ecb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishDataPropertyStatement.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishDataPropertyStatement.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.publish; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractDataPropertyStatementAction; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishObjectPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishObjectPropertyStatement.java index bdd2973d3..1fe1a5eb3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishObjectPropertyStatement.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/publish/PublishObjectPropertyStatement.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.publish; import static edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction.SOME_URI; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractObjectPropertyStatementAction; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java index e782aab44..d893a17ed 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java @@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSets; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java index 796edaeb1..491ca68ea 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java @@ -7,7 +7,7 @@ import java.util.Comparator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.vocabulary.XSD; /* This class is used to order authorships on the add author form. It should be removed in favor of using whatever * method is used to order authorships on the publication profile page instead. I've implemented this due to diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java index ea518b5d9..5fa6a2358 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.beans; import java.util.Date; -import com.hp.hpl.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Property; /** * a class representing a particular instance of a data property diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java index a48d9265d..b7556b06f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.beans; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; +import static org.apache.jena.rdf.model.ResourceFactory.createResource; import java.util.Objects; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java index c3568bc6c..2db1be3ea 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java @@ -15,7 +15,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.datatypes.xsd.XSDDatatype; import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Property.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Property.java index 1f2e8dea7..ef796e326 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Property.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Property.java @@ -7,7 +7,7 @@ import java.util.Comparator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.ResourceFactory; public class Property extends BaseResourceBean implements ResourceBean { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java index ad51979ec..6102de1b5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java @@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java index 21a61724f..0be39a34c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java @@ -24,14 +24,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.XSD; import com.ibm.icu.util.Calendar; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; @@ -531,7 +531,7 @@ public class FedoraDatastreamController extends VitroHttpServlet implements Cons //Individual event Resource eventIndividual = sessionOntModel.createResource(individualPrefix + deleteEventName); //Event is of type DeleteEvent - Statement rType = sessionOntModel.createStatement(eventIndividual, com.hp.hpl.jena.vocabulary.RDF.type, deleteEventType); + Statement rType = sessionOntModel.createStatement(eventIndividual, org.apache.jena.vocabulary.RDF.type, deleteEventType); sessionOntModel.add(rType); //Add properties to individual - deleteDateTime, deletedBy, forDataSet, forFile DatatypeProperty dateTimeProp = sessionOntModel.createDatatypeProperty(deleteNs + "deleteDateTime"); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java index 0dbbe0b60..aeaa60f8c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/IndividualListRdfController.java @@ -18,9 +18,9 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.QueryParseException; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java index bb89a55c2..ccac5da24 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java @@ -15,15 +15,15 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java index c5b98bf3c..aefbe136a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java @@ -14,9 +14,9 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.sparql.resultset.ResultsFormat; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.sparql.resultset.ResultsFormat; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java index 41fb48ab0..8b5f843e3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java @@ -25,8 +25,8 @@ import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java index f1f206c25..0c684134c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java @@ -11,11 +11,11 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java index 3a55ab72b..5be1b3270 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java @@ -22,15 +22,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONException; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelector.java index c3d4ecfa3..22ba17d6c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelector.java @@ -9,9 +9,9 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; import edu.cornell.mannlib.vitro.webapp.controller.accounts.manageproxies.ProxyRelationshipSelectionBuilder.ItemInfo; import edu.cornell.mannlib.vitro.webapp.controller.accounts.manageproxies.ProxyRelationshipSelectionBuilder.Relationship; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProxiesGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProxiesGetter.java index 60e3df457..85db98834 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProxiesGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProxiesGetter.java @@ -16,8 +16,8 @@ import org.apache.commons.logging.LogFactory; import org.json.JSONArray; import org.json.JSONException; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.QuerySolution; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.QuerySolution; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.ajax.AbstractAjaxResponder; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java index 20bd7fb69..50c8a898a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java @@ -19,9 +19,9 @@ import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.graph.Graph; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java index 64d828763..da4fc589f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java @@ -20,8 +20,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryParseException; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryParseException; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/AbstractAjaxResponder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/AbstractAjaxResponder.java index c9c8d3f71..3c80b8070 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/AbstractAjaxResponder.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/AbstractAjaxResponder.java @@ -18,8 +18,8 @@ import org.apache.commons.logging.LogFactory; import org.json.JSONArray; import org.json.JSONException; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java index d93a8dcf5..a012716ae 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java @@ -14,8 +14,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.query.Query; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java index 9e5413bf7..9ebf5a940 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java @@ -12,16 +12,16 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Model; /** * Handle an AJAX request for a SPARQL query. On entry, the "query" parameter diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java index cd6e92c6d..b7ed960c9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java @@ -13,7 +13,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.hp.hpl.jena.query.QueryParseException; +import org.apache.jena.query.QueryParseException; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java index 0be8b50f5..7feecbc1e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java @@ -18,13 +18,13 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.ReadWrite; -import com.hp.hpl.jena.update.GraphStore; -import com.hp.hpl.jena.update.GraphStoreFactory; -import com.hp.hpl.jena.update.UpdateAction; -import com.hp.hpl.jena.update.UpdateFactory; -import com.hp.hpl.jena.update.UpdateRequest; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.ReadWrite; +import org.apache.jena.update.GraphStore; +import org.apache.jena.update.GraphStoreFactory; +import org.apache.jena.update.UpdateAction; +import org.apache.jena.update.UpdateFactory; +import org.apache.jena.update.UpdateRequest; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutor.java index 77a01c1c1..13a274d36 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutor.java @@ -5,8 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.api.sparqlquery; import java.io.IOException; import java.io.OutputStream; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryParseException; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryParseException; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiRdfProducer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiRdfProducer.java index 57b9a2b9a..5e5044d3f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiRdfProducer.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiRdfProducer.java @@ -14,7 +14,7 @@ import com.github.jsonldjava.core.JSONLD; import com.github.jsonldjava.core.JSONLDProcessingError; import com.github.jsonldjava.impl.JenaRDFParser; import com.github.jsonldjava.utils.JSONUtils; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiResultSetProducer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiResultSetProducer.java index d9b238a2d..2e0f770b8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiResultSetProducer.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiResultSetProducer.java @@ -11,10 +11,10 @@ import java.util.Collection; import org.apache.commons.io.IOUtils; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.sparql.resultset.ResultsFormat; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.sparql.resultset.ResultsFormat; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java index 0060b2a13..f02abb359 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpNode.java @@ -8,7 +8,8 @@ import java.util.regex.Pattern; import javax.json.JsonObject; import javax.json.JsonString; -import org.apache.jena.riot.out.EscapeStr; +import org.apache.jena.atlas.lib.EscapeStr; + /** * A representation of an RDF Node, read from one format of a result set, and diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java index 6789a6a5e..47157752c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java @@ -27,7 +27,7 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.datatools.dumprestore.DumpRestoreController.BadRequestException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java index 3e2cd801f..18efc6835 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java index dec1b8df1..5c1839a36 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java @@ -13,15 +13,15 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java index 8735b79f7..f5508a5ba 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java @@ -15,13 +15,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONObject; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java index 7e8fd1647..5b80881a6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java @@ -12,13 +12,13 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java index 6a4a71f8a..2e75d4bc6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java @@ -17,9 +17,9 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; @@ -138,7 +138,7 @@ public class PrimitiveRdfEdit extends VitroAjaxController { for( String param : parameters){ try{ StringReader reader = new StringReader(param); - Model model = com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel(); + Model model = org.apache.jena.rdf.model.ModelFactory.createDefaultModel(); model.read(reader, null, format); models.add(model); }catch(Error ex){ @@ -155,7 +155,7 @@ public class PrimitiveRdfEdit extends VitroAjaxController { /** Package access to allow for unit testing. */ Model mergeModels(Set additions) { - Model a = com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel(); + Model a = org.apache.jena.rdf.model.ModelFactory.createDefaultModel(); for (Model m : additions) { a.add(m); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java index 3c40c35cf..f722f5a09 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java @@ -20,32 +20,32 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.InvalidPropertyURIException; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.ResourceUtils; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.InvalidPropertyURIException; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.ResourceUtils; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java index a277ef2e2..160a65cd4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java @@ -12,16 +12,16 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.TypeMapper; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java index f4a6d98a3..0a96dbdc8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java @@ -13,18 +13,18 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.datatypes.TypeMapper; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java index 9093a698e..5e96d6f82 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java @@ -13,8 +13,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java index 97381b513..fc84e79a8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.beans.FormObject; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java index afdedab53..286b41015 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java @@ -10,13 +10,13 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java index e6b851b4f..ba386facf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java @@ -9,20 +9,20 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.hp.hpl.jena.ontology.AllValuesFromRestriction; -import com.hp.hpl.jena.ontology.CardinalityRestriction; -import com.hp.hpl.jena.ontology.HasValueRestriction; -import com.hp.hpl.jena.ontology.MaxCardinalityRestriction; -import com.hp.hpl.jena.ontology.MinCardinalityRestriction; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.ontology.SomeValuesFromRestriction; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; +import org.apache.jena.ontology.AllValuesFromRestriction; +import org.apache.jena.ontology.CardinalityRestriction; +import org.apache.jena.ontology.HasValueRestriction; +import org.apache.jena.ontology.MaxCardinalityRestriction; +import org.apache.jena.ontology.MinCardinalityRestriction; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.ontology.SomeValuesFromRestriction; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vedit.beans.EditProcessObject; import edu.cornell.mannlib.vedit.controller.BaseEditController; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java index 33316862b..51f24e857 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java @@ -8,9 +8,9 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java index c6228ec78..1ee31817b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java @@ -15,7 +15,7 @@ import net.sf.json.util.JSONUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java index 5f624dd6a..afd68ff47 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java @@ -19,10 +19,10 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Property; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java index c4c6b5f4b..cf88cb559 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues; import java.util.Map; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.web.ContentType; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java index 4a3107857..2a2fc192a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.web.ContentType; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java index 6ebdef627..77a9e1427 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues; import java.util.Map; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.web.ContentType; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java index 03b4dcc31..a9c466d42 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java @@ -24,7 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; /** * This servlet is for servicing Google Refine's diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java index 303d98bde..504076f4f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory; import org.json.JSONArray; import org.json.JSONObject; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.VClass; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/ExtendedRdfAssembler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/ExtendedRdfAssembler.java index 96326945f..933a56a08 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/ExtendedRdfAssembler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/ExtendedRdfAssembler.java @@ -13,21 +13,21 @@ import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.TypeMapper; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssembler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssembler.java index 4e060dbd6..b2df86aa5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssembler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssembler.java @@ -14,19 +14,19 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java index 332ba4baf..3ac23858d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java @@ -8,14 +8,14 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import com.hp.hpl.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONException; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java index 5a9de5389..c2cdf8112 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java @@ -21,27 +21,27 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.iri.IRI; import org.apache.jena.iri.IRIFactory; -import com.hp.hpl.jena.ontology.AllValuesFromRestriction; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.AllValuesFromRestriction; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java index c5c5da47d..e9756c6df 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java @@ -19,8 +19,8 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java index 9a5f8ca18..9a79a7fa3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java @@ -22,12 +22,12 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.shared.JenaException; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.shared.JenaException; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java index 56069871a..df80be7b0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java @@ -38,26 +38,26 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.semanticweb.owlapi.reasoner.InconsistentOntologyException; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecException; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryParseException; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecException; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; @@ -299,7 +299,7 @@ public class JenaIngestController extends BaseEditController { model.write(out, "TTL"); out.flush(); out.close(); - } catch (com.hp.hpl.jena.shared.CannotEncodeCharacterException cece) { + } catch (org.apache.jena.shared.CannotEncodeCharacterException cece) { // there's got to be a better way to do this byte[] badCharBytes = String.valueOf(cece.getBadChar()).getBytes(); String errorMsg = "Cannot encode character with byte values: (decimal) "; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java index c3ca7af2c..24a0ff9df 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java @@ -27,11 +27,11 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.controller.Controllers; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java index bcdc408b2..ab1a37b4b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java @@ -24,13 +24,13 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.shared.JenaException; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.shared.JenaException; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyStatementDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyStatementDao.java index 3801f9a67..013388794 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyStatementDao.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyStatementDao.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java index 49ac44097..2d8aaf6e7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java @@ -2,13 +2,13 @@ package edu.cornell.mannlib.vitro.webapp.dao; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; public class DisplayVocabulary { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java index 1e325cac9..937a4aa81 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.dao; import java.util.List; import java.util.Objects; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty; import edu.cornell.mannlib.vitro.webapp.beans.Property; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementDaoFiltering.java index d0936e2fd..b981a6c53 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementDaoFiltering.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementDaoFiltering.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java index 73a021400..6e6844b55 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java @@ -8,7 +8,7 @@ import java.util.List; import net.sf.jga.algorithms.Filter; -import com.hp.hpl.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.DatatypeProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java index 940b23b4e..3063b4796 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java @@ -13,13 +13,13 @@ import java.util.Set; import net.sf.jga.fn.UnaryFunctor; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; @@ -30,7 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; public class EntityPropertyListFilter extends UnaryFunctor, List> { - private static final com.hp.hpl.jena.rdf.model.Property MASKS_PROPERTY = ResourceFactory.createProperty(VitroVocabulary.MASKS_PROPERTY); + private static final org.apache.jena.rdf.model.Property MASKS_PROPERTY = ResourceFactory.createProperty(VitroVocabulary.MASKS_PROPERTY); private Map> propertyMaskMap; public EntityPropertyListFilter(OntModel ontModel) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java index e5e884339..98f1860ae 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java @@ -5,14 +5,14 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.util.ArrayList; import java.util.List; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.dao.ApplicationDao; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringGraph.java index a1c663ba5..eed0b6471 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringGraph.java @@ -5,20 +5,18 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.util.ArrayList; import java.util.List; -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.Capabilities; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.GraphEventManager; -import com.hp.hpl.jena.graph.GraphStatisticsHandler; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.TransactionHandler; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.graph.TripleMatch; -import com.hp.hpl.jena.shared.AddDeniedException; -import com.hp.hpl.jena.shared.DeleteDeniedException; -import com.hp.hpl.jena.shared.PrefixMapping; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.graph.Capabilities; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.GraphEventManager; +import org.apache.jena.graph.GraphStatisticsHandler; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.TransactionHandler; +import org.apache.jena.graph.Triple; +import org.apache.jena.shared.AddDeniedException; +import org.apache.jena.shared.DeleteDeniedException; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.WrappedIterator; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; @@ -55,6 +53,11 @@ public class BlankNodeFilteringGraph implements Graph { graph.delete(t); } + @Override + public ExtendedIterator find(Triple triple) { + return find(triple.getSubject(), triple.getPredicate(), triple.getObject()); + } + @Override public boolean dependsOn(Graph arg0) { return graph.dependsOn(arg0); @@ -77,18 +80,6 @@ public class BlankNodeFilteringGraph implements Graph { return WrappedIterator.create(nbTripList.iterator()); } - @Override - public ExtendedIterator find(TripleMatch tripleMatch) { - Triple t = tripleMatch.asTriple(); - return find(t.getSubject(), t.getPredicate(), t.getObject()); - } - - @Override - @Deprecated - public BulkUpdateHandler getBulkUpdateHandler() { - return graph.getBulkUpdateHandler(); - } - @Override public Capabilities getCapabilities() { return graph.getCapabilities(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringModelMaker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringModelMaker.java index 4d87cad5e..9395e7240 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringModelMaker.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringModelMaker.java @@ -5,12 +5,12 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.shared.CannotCreateException; +import org.apache.jena.graph.Graph; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.shared.CannotCreateException; import edu.cornell.mannlib.vitro.webapp.modelaccess.adapters.AbstractModelMakerDecorator; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeStatementListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeStatementListener.java index b37a5bc9e..951057a63 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeStatementListener.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeStatementListener.java @@ -5,9 +5,9 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Statement; public class BlankNodeStatementListener extends StatementListener { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/CumulativeDeltaModeler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/CumulativeDeltaModeler.java index fff2a81bc..279907dcb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/CumulativeDeltaModeler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/CumulativeDeltaModeler.java @@ -2,11 +2,11 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; /** * This ModelChangedListener will accumulate all statements added to diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java index 955662ef6..ddf1396a7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java @@ -17,30 +17,30 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.AllValuesFromRestriction; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.ontology.ProfileException; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.AllValuesFromRestriction; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.ontology.ProfileException; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean; @@ -90,7 +90,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements OntModel ontModel = getOntModelSelector().getTBoxModel(); ontModel.enterCriticalSection(Lock.WRITE); try { - com.hp.hpl.jena.ontology.OntResource ind = ontModel.getOntResource(dataPropertyURI); + org.apache.jena.ontology.OntResource ind = ontModel.getOntResource(dataPropertyURI); if( ind != null ){ ontModel.add(ind, DATAPROPERTY_ISEXTERNALID, "TRUE"); return true; @@ -277,7 +277,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements ClosableIterator dataprops = ontModel.listDatatypeProperties(); try { while (dataprops.hasNext()) { - com.hp.hpl.jena.ontology.DatatypeProperty jDataprop = (com.hp.hpl.jena.ontology.DatatypeProperty) dataprops.next(); + org.apache.jena.ontology.DatatypeProperty jDataprop = (org.apache.jena.ontology.DatatypeProperty) dataprops.next(); DataProperty dataprop = datapropFromOntProperty(jDataprop); if (dataprop != null && !(NONUSER_NAMESPACES.contains(dataprop.getNamespace()))) allDataprops.add(dataprop); @@ -303,7 +303,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements ClosableIterator dataprops = ontModel.listDatatypeProperties(); try { while (dataprops.hasNext()) { - com.hp.hpl.jena.ontology.DatatypeProperty jDataprop = (com.hp.hpl.jena.ontology.DatatypeProperty) dataprops.next(); + org.apache.jena.ontology.DatatypeProperty jDataprop = (org.apache.jena.ontology.DatatypeProperty) dataprops.next(); DataProperty dataprop = datapropFromOntProperty(jDataprop); if (dataprop != null && ontModel.contains(jDataprop, DATAPROPERTY_ISEXTERNALID, ResourceFactory.createTypedLiteral(true))) allDataprops.add(dataprop); @@ -492,7 +492,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements if (errMsgStr != null) { throw new InsertException(errMsgStr); } - com.hp.hpl.jena.ontology.DatatypeProperty jDataprop = ontModel.createDatatypeProperty(dtp.getURI()); + org.apache.jena.ontology.DatatypeProperty jDataprop = ontModel.createDatatypeProperty(dtp.getURI()); if (dtp.getPublicName() != null && dtp.getPublicName().length() > 0) { jDataprop.setLabel(dtp.getPublicName(), getDefaultLanguage()); } else { @@ -563,7 +563,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements ontModel.enterCriticalSection(Lock.WRITE); try { getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),true)); - com.hp.hpl.jena.ontology.DatatypeProperty jDataprop = ontModel.getDatatypeProperty(dtp.getURI()); + org.apache.jena.ontology.DatatypeProperty jDataprop = ontModel.getDatatypeProperty(dtp.getURI()); updateRDFSLabel(jDataprop, dtp.getPublicName()); @@ -617,7 +617,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements ClosableIterator propIt = ontModel.listDatatypeProperties(); try { while (propIt.hasNext()) { - com.hp.hpl.jena.ontology.DatatypeProperty op = (com.hp.hpl.jena.ontology.DatatypeProperty) propIt.next(); + org.apache.jena.ontology.DatatypeProperty op = (org.apache.jena.ontology.DatatypeProperty) propIt.next(); boolean isRoot = false; Iterator parentIt = op.listSuperProperties(); if (parentIt != null) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java index f6a11c787..fda9af263 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java @@ -13,30 +13,30 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.TypeMapper; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.AnonId; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.AnonId; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; @@ -70,7 +70,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro getWebappDaoFactory().getUserURI(), true, dataPropertyStatement.getIndividualURI())); - com.hp.hpl.jena.ontology.Individual ind = ontModel.getIndividual( + org.apache.jena.ontology.Individual ind = ontModel.getIndividual( dataPropertyStatement.getIndividualURI()); OntModel tboxModel = getOntModelSelector().getTBoxModel(); tboxModel.enterCriticalSection(Lock.READ); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java index 64f39301c..0f87844ef 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java @@ -5,20 +5,20 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.util.ArrayList; import java.util.List; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapper.java index 897cef7d2..a0c7ce79c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapper.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapper.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.sdb.sql.SDBConnection; +import org.apache.jena.query.Dataset; +import org.apache.jena.sdb.sql.SDBConnection; public class DatasetWrapper { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java index 8583ebe93..65b3b3f0e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java @@ -9,13 +9,13 @@ import java.util.List; import java.util.ListIterator; import java.util.Set; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DifferenceGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DifferenceGraph.java index ee5c8e55b..254b99e86 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DifferenceGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DifferenceGraph.java @@ -4,20 +4,18 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.util.Set; -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.Capabilities; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.GraphEventManager; -import com.hp.hpl.jena.graph.GraphStatisticsHandler; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.TransactionHandler; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.graph.TripleMatch; -import com.hp.hpl.jena.shared.AddDeniedException; -import com.hp.hpl.jena.shared.DeleteDeniedException; -import com.hp.hpl.jena.shared.PrefixMapping; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.graph.Capabilities; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.GraphEventManager; +import org.apache.jena.graph.GraphStatisticsHandler; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.TransactionHandler; +import org.apache.jena.graph.Triple; +import org.apache.jena.shared.AddDeniedException; +import org.apache.jena.shared.DeleteDeniedException; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.WrappedIterator; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; @@ -51,7 +49,12 @@ public class DifferenceGraph implements Graph { g.delete(arg0); } - @Override + @Override + public ExtendedIterator find(Triple triple) { + return find(triple.getSubject(), triple.getPredicate(), triple.getObject()); + } + + @Override public void remove(Node arg0, Node arg1, Node arg2) { g.remove(arg0, arg1, arg2); } @@ -61,13 +64,6 @@ public class DifferenceGraph implements Graph { return g.dependsOn(arg0); } - @Override - public ExtendedIterator find(TripleMatch arg0) { - Set tripSet = g.find(arg0).toSet(); - tripSet.removeAll(subtract.find(arg0).toSet()); - return WrappedIterator.create(tripSet.iterator()); - } - @Override public ExtendedIterator find(Node arg0, Node arg1, Node arg2) { Set tripSet = g.find(arg0, arg1, arg2).toSet(); @@ -75,12 +71,6 @@ public class DifferenceGraph implements Graph { return WrappedIterator.create(tripSet.iterator()); } - @Override - @Deprecated - public BulkUpdateHandler getBulkUpdateHandler() { - return g.getBulkUpdateHandler(); - } - @Override public Capabilities getCapabilities() { return g.getCapabilities(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java index 59af49fa8..1bb748c93 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java @@ -13,13 +13,13 @@ import java.nio.channels.FileChannel; import javax.servlet.ServletContext; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.dao.DisplayModelDao; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java index 083fd013c..61a3ac6db 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/FauxPropertyDaoJena.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; +import static org.apache.jena.rdf.model.ResourceFactory.createResource; import static edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.bindValues; import static edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.uriValue; @@ -17,17 +17,17 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty; import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/GraphGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/GraphGenerator.java index 14ce6caf3..636c1f26b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/GraphGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/GraphGenerator.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import com.hp.hpl.jena.graph.Graph; +import org.apache.jena.graph.Graph; public interface GraphGenerator { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java index ef6357e82..9651f308f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java @@ -17,25 +17,25 @@ import org.apache.commons.lang.NotImplementedException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.ontology.UnionClass; -import com.hp.hpl.jena.rdf.model.AnonId; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.ontology.UnionClass; +import org.apache.jena.rdf.model.AnonId; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -220,7 +220,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { try { entURI = new String(preferredURI); - com.hp.hpl.jena.ontology.Individual test = ontModel.getIndividual(entURI); + org.apache.jena.ontology.Individual test = ontModel.getIndividual(entURI); int count = 0; while (test != null) { ++count; @@ -230,7 +230,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { try { ontModel.getBaseModel().notifyEvent(new IndividualCreationEvent(getWebappDaoFactory().getUserURI(),true,entURI)); - com.hp.hpl.jena.ontology.Individual ind = ontModel.createIndividual(entURI,cls); + org.apache.jena.ontology.Individual ind = ontModel.createIndividual(entURI,cls); if (ent.getName() != null) { ind.setLabel(ent.getName(), getDefaultLanguage()); } @@ -287,7 +287,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { ontModel.enterCriticalSection(Lock.WRITE); try { ontModel.getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),true,ent.getURI())); - com.hp.hpl.jena.ontology.Individual ind = ontModel.getIndividual(ent.getURI()); + org.apache.jena.ontology.Individual ind = ontModel.getIndividual(ent.getURI()); if (ind != null) { if (ent.getName() != null && ( (ind.getLabel(getDefaultLanguage())==null) || (ind.getLabel(getDefaultLanguage())!=null && ent.getName()!=null && !ent.getName().equals(ind.getLabel(getDefaultLanguage())) ) ) ) { @@ -360,7 +360,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { public void markModified(Individual ind, OntModel ontModel) { ontModel.enterCriticalSection(Lock.WRITE); try { - com.hp.hpl.jena.ontology.Individual jind = ontModel.getIndividual(ind.getURI()); + org.apache.jena.ontology.Individual jind = ontModel.getIndividual(ind.getURI()); if (jind != null) { updatePropertyDateTimeValue(jind,MODTIME,Calendar.getInstance().getTime(),ontModel); } @@ -493,7 +493,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { String subUri = ((Resource)sub).getURI(); if( ! individualsMap.containsKey(subUri)){ - com.hp.hpl.jena.ontology.Individual ind = getOntModel().getIndividual(subUri); + org.apache.jena.ontology.Individual ind = getOntModel().getIndividual(subUri); individualsMap.put(subUri,new IndividualJena(ind, getWebappDaoFactory())); } } @@ -518,7 +518,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { String subUri = ((Resource)sub).getURI(); if( ! individualsMap.containsKey(subUri)){ - com.hp.hpl.jena.ontology.Individual ind = getOntModel().getIndividual(subUri); + org.apache.jena.ontology.Individual ind = getOntModel().getIndividual(subUri); individualsMap.put(subUri,new IndividualJena(ind, getWebappDaoFactory())); } } @@ -543,7 +543,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { String subUri = ((Resource)sub).getURI(); if( ! individualsMap.containsKey(subUri)){ - com.hp.hpl.jena.ontology.Individual ind = getOntModel().getIndividual(subUri); + org.apache.jena.ontology.Individual ind = getOntModel().getIndividual(subUri); individualsMap.put(subUri,new IndividualJena(ind, getWebappDaoFactory())); } } @@ -593,7 +593,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao { if ( st.getURI() == null ) { // check to make sure this node isn't null continue; } - com.hp.hpl.jena.ontology.Individual ind = getOntModel().getIndividual(st.getURI()); + org.apache.jena.ontology.Individual ind = getOntModel().getIndividual(st.getURI()); inds.add(new IndividualJena(ind, getWebappDaoFactory())); } } finally { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java index b4512c3a4..0abe07421 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java @@ -18,27 +18,27 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.UnionClass; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.rdf.model.AnonId; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.UnionClass; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.rdf.model.AnonId; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java index ba490899e..efdcfec63 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java @@ -17,17 +17,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java index f4ebc4270..1a37c9ac4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java @@ -17,35 +17,35 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hp.hpl.jena.graph.NodeFactory; +import org.apache.jena.graph.NodeFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java index a9e9b2f92..74a224829 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java @@ -19,33 +19,33 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.iri.IRI; import org.apache.jena.iri.IRIFactory; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.NodeFactory; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.AnonId; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.NodeFactory; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.AnonId; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; @@ -948,7 +948,7 @@ public class JenaBaseDao extends JenaBaseDaoCon { if (vitroURIStr.indexOf(PSEUDO_BNODE_NS)==0) { String idStr = vitroURIStr.split("#")[1]; log.debug("Trying to get bnode " + idStr); - RDFNode rdfNode = ontModel.getRDFNode(NodeFactory.createAnon(AnonId.create(idStr))); + RDFNode rdfNode = ontModel.getRDFNode(NodeFactory.createAnon(idStr)); if ( (rdfNode != null) && (rdfNode.canAs(OntClass.class)) ) { log.debug("found it"); cls = rdfNode.as(OntClass.class); @@ -976,7 +976,7 @@ public class JenaBaseDao extends JenaBaseDaoCon { protected Node makeNodeForURI(String vitroURIStr) { if (vitroURIStr.indexOf(PSEUDO_BNODE_NS)==0) { - return NodeFactory.createAnon(AnonId.create(vitroURIStr.split("#")[1])); + return NodeFactory.createAnon(vitroURIStr.split("#")[1]); } else { return NodeFactory.createURI(vitroURIStr); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java index ebcd76551..04bc6f0cc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java @@ -2,14 +2,14 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import com.hp.hpl.jena.ontology.AnnotationProperty; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.Ontology; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.AnnotationProperty; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.Ontology; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java index fa370031e..ca1aac69a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java @@ -11,26 +11,26 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java index 2d1f8269e..b0af14e6d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java @@ -8,16 +8,16 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.dao.MenuDao; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java index d83aa3438..ef515f9be 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java @@ -7,7 +7,7 @@ import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.ModelChangedListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java index 03b4efda8..97b68557f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java @@ -15,33 +15,33 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.ontology.ConversionException; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.ontology.ProfileException; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.ontology.ConversionException; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.ontology.ProfileException; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean; @@ -257,7 +257,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp ClosableIterator opIt = getOntModel().listObjectProperties(); try { while (opIt.hasNext()) { - com.hp.hpl.jena.ontology.ObjectProperty op = (com.hp.hpl.jena.ontology.ObjectProperty) opIt.next(); + org.apache.jena.ontology.ObjectProperty op = (org.apache.jena.ontology.ObjectProperty) opIt.next(); if (!NONUSER_NAMESPACES.contains(op.getNameSpace())) props.add(propertyFromOntProperty(op)); } @@ -539,8 +539,8 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp if (errMsgStr != null) { throw new InsertException(errMsgStr); } - com.hp.hpl.jena.ontology.ObjectProperty p = ontModel.createObjectProperty(prop.getURI()); - com.hp.hpl.jena.ontology.ObjectProperty inv = null; + org.apache.jena.ontology.ObjectProperty p = ontModel.createObjectProperty(prop.getURI()); + org.apache.jena.ontology.ObjectProperty inv = null; if (hasInverse(prop)) { log.debug("non-null inverse URI: " +prop.getURIInverse()); errMsgStr = getWebappDaoFactory().checkURIForEditableEntity(prop.getURIInverse()); @@ -571,11 +571,11 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp ontModel.enterCriticalSection(Lock.WRITE); try { getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),true)); - com.hp.hpl.jena.ontology.ObjectProperty p = ontModel.getObjectProperty(prop.getURI()); + org.apache.jena.ontology.ObjectProperty p = ontModel.getObjectProperty(prop.getURI()); if (p == null) { return; } - com.hp.hpl.jena.ontology.ObjectProperty inv = null; + org.apache.jena.ontology.ObjectProperty inv = null; if (hasInverse(prop)) { try { inv = ontModel.getObjectProperty(prop.getURIInverse()); @@ -613,7 +613,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp try { String parentURI = prop.getParentURI(); if (parentURI != null) { - com.hp.hpl.jena.ontology.ObjectProperty parent = ontModel.getObjectProperty(prop.getParentURI()); + org.apache.jena.ontology.ObjectProperty parent = ontModel.getObjectProperty(prop.getParentURI()); if (parent != null) { if (!p.hasSuperProperty(parent, true)) { @@ -850,7 +850,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp while (propIt.hasNext()) { Resource res = (Resource) propIt.next(); if (res.canAs(OntProperty.class)) { - com.hp.hpl.jena.ontology.OntProperty op = res.as(OntProperty.class); + org.apache.jena.ontology.OntProperty op = res.as(OntProperty.class); boolean isRoot = false; Iterator parentIt = op.listSuperProperties(); if (parentIt != null) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java index 58a9b3182..43c43699c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java @@ -16,26 +16,26 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty; import edu.cornell.mannlib.vitro.webapp.beans.Individual; @@ -74,7 +74,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),true,objPropertyStmt.getSubjectURI())); try { Resource s = ontModel.getResource(objPropertyStmt.getSubjectURI()); - com.hp.hpl.jena.rdf.model.Property p = ontModel.getProperty(objPropertyStmt.getPropertyURI()); + org.apache.jena.rdf.model.Property p = ontModel.getProperty(objPropertyStmt.getPropertyURI()); Resource o = ontModel.getResource(objPropertyStmt.getObjectURI()); if ((s != null) && (p != null) && (o != null)) { ontModel.remove(s,p,o); @@ -252,7 +252,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),true,objPropertyStmt.getSubjectURI())); try { Resource s = ontModel.getResource(objPropertyStmt.getSubjectURI()); - com.hp.hpl.jena.rdf.model.Property p = ontModel.getProperty(objPropertyStmt.getPropertyURI()); + org.apache.jena.rdf.model.Property p = ontModel.getProperty(objPropertyStmt.getPropertyURI()); Resource o = ontModel.getResource(objPropertyStmt.getObjectURI()); if ((s != null) && (p != null) && (o != null)) { ontModel.add(s,p,o); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoSDB.java index 30cf15db9..1eebf58c7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoSDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoSDB.java @@ -12,11 +12,11 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java index 63d4d1446..89b61e714 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; /** * Interface for retrieving RDF (Ont)models containing certain types of data. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java index bd7dcc73a..726e44873 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; public class OntModelSelectorImpl implements OntModelSelector { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java index 88107e076..9879524af 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java @@ -8,11 +8,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.ontology.ProfileException; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.ontology.ProfileException; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao; @@ -39,7 +39,7 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao { } } - private com.hp.hpl.jena.ontology.Ontology getOntology(String ontologyURI, + private org.apache.jena.ontology.Ontology getOntology(String ontologyURI, OntModel ontModel) { // Something non-ideal happens here. There are places in the code that @@ -55,7 +55,7 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao { // mark if an ontology resource is not found at the specified URI. try { ontModel.enterCriticalSection(Lock.READ); - com.hp.hpl.jena.ontology.Ontology o = ontModel.getOntology( + org.apache.jena.ontology.Ontology o = ontModel.getOntology( ontologyURI); if (o != null) { return o; @@ -75,7 +75,7 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao { public void deleteOntology(Ontology ontology, OntModel ontModel) { ontModel.enterCriticalSection(Lock.WRITE); try { - com.hp.hpl.jena.ontology.Ontology o = getOntology(ontology.getURI(),ontModel); + org.apache.jena.ontology.Ontology o = getOntology(ontology.getURI(),ontModel); if (o == null) { o = ontModel.getOntology(adjustOntologyURI(ontology.getURI())); } @@ -135,7 +135,7 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao { String ontologyURI = adjustAndValidateOntologyURI(ontology.getURI()); ontModel.enterCriticalSection(Lock.WRITE); try { - com.hp.hpl.jena.ontology.Ontology o = ontModel.createOntology(ontologyURI); + org.apache.jena.ontology.Ontology o = ontModel.createOntology(ontologyURI); if (ontology.getName() != null && ontology.getName().length()>0) { o.setLabel(ontology.getName(), getDefaultLanguage()); } @@ -168,7 +168,7 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao { ontModel.enterCriticalSection(Lock.WRITE); if (ontology != null && ontology.getURI() != null && ontology.getURI().length()>0) { try { - com.hp.hpl.jena.ontology.Ontology o = getOntology(ontology.getURI(),ontModel); + org.apache.jena.ontology.Ontology o = getOntology(ontology.getURI(),ontModel); if (o == null) { log.error("OntologyDaoJena.updateOntology() could not find ontology "+ontology.getURI()+" in Jena model"); } else { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java index 612266e0f..f6fe21fcc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java @@ -13,19 +13,19 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.PageDao; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java index 56676c2d7..d05dd5ab3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java @@ -17,27 +17,27 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.IntersectionClass; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.IntersectionClass; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; @@ -641,7 +641,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao { } private List relatedClasses(OntClass ontClass, - com.hp.hpl.jena.rdf.model.Property property) { + org.apache.jena.rdf.model.Property property) { List classes = new ArrayList(); StmtIterator closeIt = ontClass.listProperties(property); try { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java index 2d713d3f3..fe1d1311a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java @@ -11,17 +11,17 @@ import java.util.ListIterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl; import edu.cornell.mannlib.vitro.webapp.beans.Property; @@ -115,9 +115,9 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa for (Iterator stmtIt = closeIt; stmtIt.hasNext(); ) { Statement stmt = (Statement) stmtIt.next(); Resource subjRes = stmt.getSubject(); - if (subjRes.canAs(com.hp.hpl.jena.ontology.ObjectProperty.class)) { + if (subjRes.canAs(org.apache.jena.ontology.ObjectProperty.class)) { properties.add(opDao.getObjectPropertyByURI(subjRes.getURI())); - } else if (subjRes.canAs(com.hp.hpl.jena.ontology.DatatypeProperty.class)) { + } else if (subjRes.canAs(org.apache.jena.ontology.DatatypeProperty.class)) { properties.add(dpDao.getDataPropertyByURI(subjRes.getURI())); } } @@ -170,7 +170,7 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa if (groupURI != null) { getOntModel().enterCriticalSection(Lock.WRITE); try { - com.hp.hpl.jena.ontology.Individual groupJenaInd = + org.apache.jena.ontology.Individual groupJenaInd = getOntModel().getIndividual(groupURI); try { groupJenaInd.addProperty(DISPLAY_RANK, Integer.toString( diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java index e03ed48c5..650419267 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java @@ -10,16 +10,16 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java index 1c80ec087..a047f3a8b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java @@ -14,12 +14,12 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java index b4f84cc18..49c04f4b3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java @@ -8,17 +8,17 @@ import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.NodeFactory; -import com.hp.hpl.jena.graph.TransactionHandler; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.LabelExistsException; -import com.hp.hpl.jena.query.ReadWrite; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.sparql.core.DatasetGraph; -import com.hp.hpl.jena.sparql.util.Context; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.NodeFactory; +import org.apache.jena.graph.TransactionHandler; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.LabelExistsException; +import org.apache.jena.query.ReadWrite; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.shared.Lock; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.util.Context; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; @@ -118,11 +118,12 @@ public class RDFServiceDataset implements Dataset { @Override public boolean supportsTransactions() { - if (g.getDefaultGraph().getTransactionHandler() == null) { - return false; - } else { - return g.getDefaultGraph().getTransactionHandler().transactionsSupported(); - } + return g.supportsTransactions(); + } + + @Override + public boolean supportsTransactionAbort() { + return g.supportsTransactionAbort(); } @Override @@ -139,32 +140,16 @@ public class RDFServiceDataset implements Dataset { public void begin(ReadWrite arg0) { this.transactionMode = arg0; g.begin(arg0); - for(String graphURI : g.getGraphCache().keySet()) { - Graph graph = g.getGraphCache().get(graphURI); - if (supportsTransactions(graph)) { - graph.getTransactionHandler().begin(); - } - } } @Override public void commit() { - for(String graphURI : g.getGraphCache().keySet()) { - Graph graph = g.getGraphCache().get(graphURI); - if(supportsTransactions(graph)) { - graph.getTransactionHandler().commit(); - } - } + g.commit(); } @Override public void abort() { - for(String graphURI : g.getGraphCache().keySet()) { - Graph graph = g.getGraphCache().get(graphURI); - if(supportsTransactions(graph)) { - graph.getTransactionHandler().abort(); - } - } + g.abort(); } @Override diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java index 5553a55aa..175ce0bd2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java @@ -9,19 +9,19 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.NodeFactory; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ReadWrite; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.shared.LockMRSW; -import com.hp.hpl.jena.sparql.core.DatasetGraph; -import com.hp.hpl.jena.sparql.core.Quad; -import com.hp.hpl.jena.sparql.util.Context; -import com.hp.hpl.jena.util.iterator.SingletonIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.NodeFactory; +import org.apache.jena.graph.Triple; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ReadWrite; +import org.apache.jena.shared.Lock; +import org.apache.jena.shared.LockMRSW; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.core.Quad; +import org.apache.jena.sparql.util.Context; +import org.apache.jena.util.iterator.SingletonIterator; +import org.apache.jena.util.iterator.WrappedIterator; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; @@ -31,6 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; public class RDFServiceDatasetGraph implements DatasetGraph { private RDFService rdfService; + private RDFServiceGraph defaultGraph; private Lock lock = new LockMRSW(); private Context context = new Context() ; private Map graphCache = new ConcurrentHashMap(); @@ -38,16 +39,58 @@ public class RDFServiceDatasetGraph implements DatasetGraph { public RDFServiceDatasetGraph(RDFService rdfService) { this.rdfService = rdfService; + this.defaultGraph = new RDFServiceGraph(rdfService); } public Map getGraphCache() { return graphCache; } - - public void begin(ReadWrite mode) { + + @Override + public synchronized void begin(ReadWrite mode) { this.transactionMode = mode; + graphCache.clear(); } - + + @Override + public synchronized void commit() { + this.transactionMode = null; + if (supportsTransactions(defaultGraph)) { + defaultGraph.getTransactionHandler().commit(); + } + + for (RDFServiceGraph graph : graphCache.values()) { + if (supportsTransactions(graph)) { + graph.getTransactionHandler().commit(); + } + + } + + graphCache.clear(); + } + + @Override + public synchronized void abort() { + this.transactionMode = null; + if (supportsTransactions(defaultGraph)) { + defaultGraph.getTransactionHandler().abort(); + } + + for (RDFServiceGraph graph : graphCache.values()) { + if (supportsTransactions(graph)) { + graph.getTransactionHandler().abort(); + } + + } + + graphCache.clear(); + } + + @Override + public boolean isInTransaction() { + return false; + } + public void end() { this.transactionMode = null; } @@ -58,7 +101,7 @@ public class RDFServiceDatasetGraph implements DatasetGraph { private Graph getGraphFor(Node g) { return (g == Node.ANY) - ? new RDFServiceGraph(rdfService) + ? defaultGraph : getGraph(g); } @@ -82,11 +125,26 @@ public class RDFServiceDatasetGraph implements DatasetGraph { // TODO Auto-generated method stub } + @Override + public boolean supportsTransactions() { + return true; + } + + @Override + public boolean supportsTransactionAbort() { + return true; + } + @Override public boolean contains(Quad arg0) { return getGraphFor(arg0).contains(new Triple(arg0.getSubject(), arg0.getPredicate(), arg0.getObject())); } + @Override + public void clear() { + + } + @Override public boolean contains(Node arg0, Node arg1, Node arg2, Node arg3) { return getGraphFor(arg0).contains(arg1, arg2, arg3); @@ -94,8 +152,7 @@ public class RDFServiceDatasetGraph implements DatasetGraph { @Override public boolean containsGraph(Node arg0) { - // TODO Auto-generated method stub - return true; + return getGraphFor(arg0) != null; } @Override @@ -185,7 +242,7 @@ public class RDFServiceDatasetGraph implements DatasetGraph { @Override public RDFServiceGraph getDefaultGraph() { - return new RDFServiceGraph(rdfService); + return defaultGraph; } @Override diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java index 4bea5bb45..651a4e368 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java @@ -11,30 +11,28 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.Capabilities; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.GraphEventManager; -import com.hp.hpl.jena.graph.GraphStatisticsHandler; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.TransactionHandler; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.graph.TripleMatch; -import com.hp.hpl.jena.graph.impl.GraphWithPerform; -import com.hp.hpl.jena.graph.impl.SimpleEventManager; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.AddDeniedException; -import com.hp.hpl.jena.shared.Command; -import com.hp.hpl.jena.shared.DeleteDeniedException; -import com.hp.hpl.jena.shared.PrefixMapping; -import com.hp.hpl.jena.shared.impl.PrefixMappingImpl; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.SingletonIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.graph.Capabilities; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.GraphEventManager; +import org.apache.jena.graph.GraphStatisticsHandler; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.TransactionHandler; +import org.apache.jena.graph.Triple; +import org.apache.jena.graph.impl.GraphWithPerform; +import org.apache.jena.graph.impl.SimpleEventManager; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.AddDeniedException; +import org.apache.jena.shared.Command; +import org.apache.jena.shared.DeleteDeniedException; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.shared.impl.PrefixMappingImpl; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.SingletonIterator; +import org.apache.jena.util.iterator.WrappedIterator; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; @@ -50,7 +48,6 @@ public class RDFServiceGraph implements GraphWithPerform { private String graphURI; private static final Log log = LogFactory.getLog(RDFServiceGraph.class); - private BulkUpdateHandler bulkUpdateHandler; private PrefixMapping prefixMapping = new PrefixMappingImpl(); private GraphEventManager eventManager; @@ -262,7 +259,12 @@ public class RDFServiceGraph implements GraphWithPerform { performDelete(arg0); } - @Override + @Override + public ExtendedIterator find(Triple triple) { + return find(triple.getSubject(), triple.getPredicate(), triple.getObject()); + } + + @Override public void remove(Node subject, Node predicate, Node object) { for (Triple t : find(subject, predicate, object).toList()) { delete(t); @@ -274,13 +276,6 @@ public class RDFServiceGraph implements GraphWithPerform { return false; // who knows? } - @Override - public ExtendedIterator find(TripleMatch arg0) { - //log.info("find(TripleMatch) " + arg0); - Triple t = arg0.asTriple(); - return find(t.getSubject(), t.getPredicate(), t.getObject()); - } - public static String sparqlNode(Node node, String varName) { if (node == null || node.isVariable()) { return varName; @@ -400,15 +395,6 @@ public class RDFServiceGraph implements GraphWithPerform { return (node == null || node.isVariable() || node == Node.ANY); } - @Override - @Deprecated - public BulkUpdateHandler getBulkUpdateHandler() { - if (this.bulkUpdateHandler == null) { - this.bulkUpdateHandler = new RDFServiceGraphBulkUpdater(this); - } - return this.bulkUpdateHandler; - } - @Override public Capabilities getCapabilities() { return capabilities; @@ -555,7 +541,7 @@ public class RDFServiceGraph implements GraphWithPerform { /* * * see http://www.python.org/doc/2.5.2/ref/strings.html - * or see jena's n3 grammar jena/src/com/hp/hpl/jena/n3/n3.g + * or see jena's n3 grammar jena/src/org.apache/jena/n3/n3.g */ protected static void pyString(StringBuffer sbuff, String s) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraphBulkUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraphBulkUpdater.java deleted file mode 100644 index acb56c612..000000000 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraphBulkUpdater.java +++ /dev/null @@ -1,342 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.dao.jena; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.Iterator; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.GraphEventManager; -import com.hp.hpl.jena.graph.GraphEvents; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.sparql.graph.GraphFactory; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; - -import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; -import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; -import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; -import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; -import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; - -public class RDFServiceGraphBulkUpdater implements BulkUpdateHandler { - private static final Log log = LogFactory.getLog(RDFServiceGraphBulkUpdater.class); - - private final RDFServiceGraph graph; - private final GraphEventManager manager; - - public RDFServiceGraphBulkUpdater(RDFServiceGraph graph) { - this.graph = graph; - this.manager = graph.getEventManager(); - } - - @Override - @Deprecated - public void add(Triple[] arg0) { - Graph g = GraphFactory.createPlainGraph(); - for (int i = 0 ; i < arg0.length ; i++) { - g.add(arg0[i]); - } - add(g); - } - - @Override - @Deprecated - public void add(List arg0) { - Graph g = GraphFactory.createPlainGraph(); - for (Triple t : arg0) { - g.add(t); - } - add(g); - } - - @Override - @Deprecated - public void add(Iterator arg0) { - Graph g = GraphFactory.createPlainGraph(); - while (arg0.hasNext()) { - Triple t = arg0.next(); - g.add(t); - } - add(g); - } - - @Override - @Deprecated - public void add(Graph arg0) { - add(arg0, false); - } - - @Override - @Deprecated - public void add(Graph g, boolean arg1) { - Model[] model = separateStatementsWithBlankNodes(g); - addModel(model[1] /* nonBlankNodeModel */); - // replace following call with different method - addModel(model[0] /*blankNodeModel*/); - } - - /** - * Returns a pair of models. The first contains any statement containing at - * least one blank node. The second contains all remaining statements. - * @param g Graph - */ - - private Model[] separateStatementsWithBlankNodes(Graph g) { - Model gm = ModelFactory.createModelForGraph(g); - Model blankNodeModel = ModelFactory.createDefaultModel(); - Model nonBlankNodeModel = ModelFactory.createDefaultModel(); - StmtIterator sit = gm.listStatements(); - while (sit.hasNext()) { - Statement stmt = sit.nextStatement(); - if (!stmt.getSubject().isAnon() && !stmt.getObject().isAnon()) { - nonBlankNodeModel.add(stmt); - } else { - blankNodeModel.add(stmt); - } - } - Model[] result = new Model[2]; - result[0] = blankNodeModel; - result[1] = nonBlankNodeModel; - return result; - } - - - @Override - @Deprecated - public void delete(Triple[] arg0) { - Graph g = GraphFactory.createPlainGraph(); - for (int i = 0 ; i < arg0.length ; i++) { - g.add(arg0[i]); - } - delete(g); - } - - @Override - @Deprecated - public void delete(List arg0) { - Graph g = GraphFactory.createPlainGraph(); - for (Triple t : arg0) { - g.add(t); - } - delete(g); - } - - @Override - @Deprecated - public void delete(Iterator arg0) { - Graph g = GraphFactory.createPlainGraph(); - while (arg0.hasNext()) { - Triple t = arg0.next(); - g.add(t); - } - delete(g); - } - - @Override - @Deprecated - public void delete(Graph g, boolean withReifications) { - delete(g); - } - - @Override - @Deprecated - public void delete(Graph g) { - deleteModel(ModelFactory.createModelForGraph(g)); - } - - public void addModel(Model model) { - ChangeSet changeSet = graph.getRDFService().manufactureChangeSet(); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - model.write(out, "N-TRIPLE"); - changeSet.addAddition(new ByteArrayInputStream( - out.toByteArray()), RDFService.ModelSerializationFormat.N3, - graph.getGraphURI()); - try { - graph.getRDFService().changeSetUpdate(changeSet); - } catch (RDFServiceException rdfse) { - throw new RuntimeException(rdfse); - } - } - - public void deleteModel(Model model) { - ChangeSet changeSet = graph.getRDFService().manufactureChangeSet(); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - model.write(out, "N-TRIPLE"); - changeSet.addRemoval(new ByteArrayInputStream( - out.toByteArray()), RDFService.ModelSerializationFormat.N3, - graph.getGraphURI()); - try { - graph.getRDFService().changeSetUpdate(changeSet); - } catch (RDFServiceException rdfse) { - throw new RuntimeException(rdfse); - } - } - - @Override - @Deprecated - public void removeAll() { - removeAll(graph, null, null, null); - notifyRemoveAll(); - } - - protected void notifyRemoveAll() { - manager.notifyEvent(graph, GraphEvents.removeAll); - } - - @Override - @Deprecated - public void remove(Node s, Node p, Node o) { - removeAll(graph, s, p, o); - manager.notifyEvent(graph, GraphEvents.remove(s, p, o)); - } - - private static void removeAll(Graph g, Node s, Node p, Node o) - { - log.debug("removeAll: g=" + ToString.graphToString(g) + ", s=" + s - + ", p=" + p + ", o=" + o); - if (!(g instanceof RDFServiceGraph)) { - removeAllTripleByTriple(g, s, p, o); - return; - } - - RDFServiceGraph graph = (RDFServiceGraph) g; - String graphURI = graph.getGraphURI(); - - StringBuffer findPattern = new StringBuffer() - .append(sparqlNode(s, "?s")) - .append(" ") - .append(sparqlNode(p, "?p")) - .append(" ") - .append(sparqlNode(o, "?o")); - - StringBuffer findQuery = new StringBuffer("CONSTRUCT { ") - .append(findPattern) - .append(" } WHERE { \n"); - if (graphURI != null) { - findQuery.append(" GRAPH <" + graphURI + "> { "); - } - findQuery.append(findPattern); - if (graphURI != null) { - findQuery.append(" } "); - } - findQuery.append("\n}"); - - String queryString = findQuery.toString(); - - int chunkSize = 50000; - boolean done = false; - - while (!done) { - String chunkQueryString = queryString + " LIMIT " + chunkSize; - - try { - Model chunkToRemove = RDFServiceUtils.parseModel( - graph.getRDFService().sparqlConstructQuery( - chunkQueryString, RDFService.ModelSerializationFormat.N3), - RDFService.ModelSerializationFormat.N3); - if (chunkToRemove.size() > 0) { - ChangeSet cs = graph.getRDFService().manufactureChangeSet(); - ByteArrayOutputStream out = new ByteArrayOutputStream(); - chunkToRemove.write(out, "N-TRIPLE"); - cs.addRemoval(new ByteArrayInputStream(out.toByteArray()), - RDFService.ModelSerializationFormat.N3, graphURI); - graph.getRDFService().changeSetUpdate(cs); - } else { - done = true; - } - } catch (RDFServiceException e) { - throw new RuntimeException(e); - } - } - - } - - private static String sparqlNode(Node node, String varName) { - if (node == null || node.isVariable() || node.isBlank()) { - return varName; - } else if (node.isURI()) { - StringBuffer uriBuff = new StringBuffer(); - return uriBuff.append("<").append(node.getURI()).append(">").toString(); - } else if (node.isLiteral()) { - StringBuffer literalBuff = new StringBuffer(); - literalBuff.append("\""); - pyString(literalBuff, node.getLiteralLexicalForm()); - literalBuff.append("\""); - if (node.getLiteralDatatypeURI() != null) { - literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">"); - } else if (node.getLiteralLanguage() != null && node.getLiteralLanguage() != "") { - literalBuff.append("@").append(node.getLiteralLanguage()); - } - return literalBuff.toString(); - } else { - return varName; - } - } - - /* - * - * see http://www.python.org/doc/2.5.2/ref/strings.html - * or see jena's n3 grammar jena/src/com/hp/hpl/jena/n3/n3.g - */ - private static void pyString(StringBuffer sbuff, String s) - { - for (int i = 0; i < s.length(); i++) { - char c = s.charAt(i); - - // Escape escapes and quotes - if (c == '\\' || c == '"' ) - { - sbuff.append('\\') ; - sbuff.append(c) ; - continue ; - } - - // Whitespace - if (c == '\n'){ sbuff.append("\\n");continue; } - if (c == '\t'){ sbuff.append("\\t");continue; } - if (c == '\r'){ sbuff.append("\\r");continue; } - if (c == '\f'){ sbuff.append("\\f");continue; } - if (c == '\b'){ sbuff.append("\\b");continue; } - if( c == 7 ) { sbuff.append("\\a");continue; } - - // Output as is (subject to UTF-8 encoding on output that is) - sbuff.append(c) ; - -// // Unicode escapes -// // c < 32, c >= 127, not whitespace or other specials -// String hexstr = Integer.toHexString(c).toUpperCase(); -// int pad = 4 - hexstr.length(); -// sbuff.append("\\u"); -// for (; pad > 0; pad--) -// sbuff.append("0"); -// sbuff.append(hexstr); - } - } - - private static void removeAllTripleByTriple(Graph g, Node s, Node p, Node o) - { - ExtendedIterator it = g.find( s, p, o ); - try { - while (it.hasNext()) { - Triple t = it.next(); - g.delete(t); - it.remove(); - } - } - finally { - it.close(); - } - } - -} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java index 2ae6886c0..57500e91c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceModelMaker.java @@ -8,15 +8,15 @@ import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.GraphMaker; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.shared.AlreadyExistsException; -import com.hp.hpl.jena.shared.CannotCreateException; -import com.hp.hpl.jena.shared.DoesNotExistException; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.graph.GraphMaker; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.shared.AlreadyExistsException; +import org.apache.jena.shared.CannotCreateException; +import org.apache.jena.shared.DoesNotExistException; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.WrappedIterator; import com.ibm.icu.text.Collator; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingGraph.java index da205d408..d21d257fc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingGraph.java @@ -5,21 +5,19 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.Capabilities; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.GraphEventManager; -import com.hp.hpl.jena.graph.GraphStatisticsHandler; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.TransactionHandler; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.graph.TripleMatch; -import com.hp.hpl.jena.shared.AddDeniedException; -import com.hp.hpl.jena.shared.DeleteDeniedException; -import com.hp.hpl.jena.shared.PrefixMapping; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.vocabulary.DCTerms; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.graph.Capabilities; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.GraphEventManager; +import org.apache.jena.graph.GraphStatisticsHandler; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.TransactionHandler; +import org.apache.jena.graph.Triple; +import org.apache.jena.shared.AddDeniedException; +import org.apache.jena.shared.DeleteDeniedException; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.vocabulary.DCTerms; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; @@ -100,7 +98,18 @@ public class RegeneratingGraph implements Graph, Regenerable { g.delete(arg0); } } - + + @Override + public ExtendedIterator find(Triple triple) { + try { + regenerateIfClosed(); + return g.find(triple); + } catch (Exception e) { + regenerate(); + return g.find(triple); + } + } + @Override public boolean dependsOn(Graph arg0) { try { @@ -112,17 +121,6 @@ public class RegeneratingGraph implements Graph, Regenerable { } } - @Override - public ExtendedIterator find(TripleMatch arg0) { - try { - regenerateIfClosed(); - return g.find(arg0); - } catch (Exception e) { - regenerate(); - return g.find(arg0); - } - } - @Override public ExtendedIterator find(Node arg0, Node arg1, Node arg2) { try { @@ -133,19 +131,6 @@ public class RegeneratingGraph implements Graph, Regenerable { return g.find(arg0,arg1,arg2); } } - - @Override - @Deprecated - public BulkUpdateHandler getBulkUpdateHandler() { - try { - regenerateIfClosed(); - sendTestQuery(); - return g.getBulkUpdateHandler(); - } catch (Exception e) { - regenerate(); - return g.getBulkUpdateHandler(); - } - } @Override public Capabilities getCapabilities() { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java index f96ada96b..e8c9732ba 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java @@ -10,10 +10,10 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.sdb.SDBFactory; -import com.hp.hpl.jena.sdb.Store; -import com.hp.hpl.jena.sdb.StoreDesc; +import org.apache.jena.graph.Graph; +import org.apache.jena.sdb.SDBFactory; +import org.apache.jena.sdb.Store; +import org.apache.jena.sdb.StoreDesc; public class SDBGraphGenerator implements SQLGraphGenerator { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java index 562b45f2b..bc1317cdf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java @@ -2,10 +2,10 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.shared.Lock; /** * An OntModelSelector that does not support model-per-ontology separation diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SingleContentOntModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SingleContentOntModelSelector.java index 58b411ff4..7e8f09a00 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SingleContentOntModelSelector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SingleContentOntModelSelector.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; public class SingleContentOntModelSelector extends SimpleOntModelSelector { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java index 1ef031594..6fc8e3052 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java @@ -18,31 +18,29 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.conn.PoolingClientConnectionManager; import org.apache.http.message.BasicNameValuePair; -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.Capabilities; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.GraphEventManager; -import com.hp.hpl.jena.graph.GraphStatisticsHandler; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.TransactionHandler; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.graph.TripleMatch; -import com.hp.hpl.jena.graph.impl.GraphWithPerform; -import com.hp.hpl.jena.graph.impl.SimpleEventManager; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.shared.AddDeniedException; -import com.hp.hpl.jena.shared.DeleteDeniedException; -import com.hp.hpl.jena.shared.PrefixMapping; -import com.hp.hpl.jena.shared.impl.PrefixMappingImpl; -import com.hp.hpl.jena.sparql.resultset.ResultSetMem; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.SingletonIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.graph.Capabilities; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.GraphEventManager; +import org.apache.jena.graph.GraphStatisticsHandler; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.TransactionHandler; +import org.apache.jena.graph.Triple; +import org.apache.jena.graph.impl.GraphWithPerform; +import org.apache.jena.graph.impl.SimpleEventManager; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.shared.AddDeniedException; +import org.apache.jena.shared.DeleteDeniedException; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.shared.impl.PrefixMappingImpl; +import org.apache.jena.sparql.resultset.ResultSetMem; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.SingletonIterator; +import org.apache.jena.util.iterator.WrappedIterator; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; import org.apache.http.protocol.BasicHttpContext; @@ -55,7 +53,6 @@ public class SparqlGraph implements GraphWithPerform { private HttpClient httpClient; private static final Log log = LogFactory.getLog(SparqlGraph.class); - private BulkUpdateHandler bulkUpdateHandler; private PrefixMapping prefixMapping = new PrefixMappingImpl(); private GraphEventManager eventManager; @@ -200,7 +197,13 @@ public class SparqlGraph implements GraphWithPerform { performDelete(arg0); } - @Override + @Override + public ExtendedIterator find(Triple triple) { + //log.info("find(TripleMatch) " + arg0); + return find(triple.getSubject(), triple.getPredicate(), triple.getObject()); + } + + @Override public void clear() { removeAll(); } @@ -217,13 +220,6 @@ public class SparqlGraph implements GraphWithPerform { return false; // who knows? } - @Override - public ExtendedIterator find(TripleMatch arg0) { - //log.info("find(TripleMatch) " + arg0); - Triple t = arg0.asTriple(); - return find(t.getSubject(), t.getPredicate(), t.getObject()); - } - public static String sparqlNode(Node node, String varName) { if (node == null || node.isVariable()) { return varName; @@ -316,15 +312,6 @@ public class SparqlGraph implements GraphWithPerform { return (node == null || node.isVariable() || node == Node.ANY); } - @Override - @Deprecated - public BulkUpdateHandler getBulkUpdateHandler() { - if (this.bulkUpdateHandler == null) { - this.bulkUpdateHandler = new SparqlGraphBulkUpdater(this); - } - return this.bulkUpdateHandler; - } - @Override public Capabilities getCapabilities() { return capabilities; @@ -468,7 +455,7 @@ public class SparqlGraph implements GraphWithPerform { /* * * see http://www.python.org/doc/2.5.2/ref/strings.html - * or see jena's n3 grammar jena/src/com/hp/hpl/jena/n3/n3.g + * or see jena's n3 grammar jena/src/org.apache/jena/n3/n3.g */ protected static void pyString(StringBuffer sbuff, String s) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphBulkUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphBulkUpdater.java deleted file mode 100644 index 3a481096d..000000000 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphBulkUpdater.java +++ /dev/null @@ -1,252 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.dao.jena; - -import java.io.StringWriter; -import java.util.Iterator; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.GraphEvents; -import com.hp.hpl.jena.graph.GraphUtil; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.graph.impl.SimpleBulkUpdateHandler; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.sparql.graph.GraphFactory; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; - -public class SparqlGraphBulkUpdater extends SimpleBulkUpdateHandler { - - private static final Log log = LogFactory.getLog(SparqlGraphBulkUpdater.class); - private SparqlGraph graph; - - public SparqlGraphBulkUpdater(SparqlGraph graph) { - super(graph); - this.graph = graph; - } - - @Override - @Deprecated - public void add(Triple[] arg0) { - Graph g = GraphFactory.createPlainGraph(); - for (int i = 0 ; i < arg0.length ; i++) { - g.add(arg0[i]); - } - add(g); - } - - @Override - @Deprecated - public void add(List arg0) { - Graph g = GraphFactory.createPlainGraph(); - for (Triple t : arg0) { - g.add(t); - } - add(g); - } - - @Override - @Deprecated - public void add(Iterator arg0) { - Graph g = GraphFactory.createPlainGraph(); - while (arg0.hasNext()) { - Triple t = arg0.next(); - g.add(t); - } - add(g); - } - - @Override - @Deprecated - public void add(Graph arg0) { - add(arg0, false); - } - - @Override - @Deprecated - public void add(Graph g, boolean arg1) { - log.info("adding graph"); - Model[] model = separateStatementsWithBlankNodes(g); - addModel(model[1] /* nonBlankNodeModel */); - // replace following call with different method - addModel(model[0] /*blankNodeModel*/); - } - - /** - * Returns a pair of models. The first contains any statement containing at - * least one blank node. The second contains all remaining statements. - * @param g Jena Graph - */ - - private Model[] separateStatementsWithBlankNodes(Graph g) { - Model gm = ModelFactory.createModelForGraph(g); - Model blankNodeModel = ModelFactory.createDefaultModel(); - Model nonBlankNodeModel = ModelFactory.createDefaultModel(); - StmtIterator sit = gm.listStatements(); - while (sit.hasNext()) { - Statement stmt = sit.nextStatement(); - if (!stmt.getSubject().isAnon() && !stmt.getObject().isAnon()) { - nonBlankNodeModel.add(stmt); - } else { - blankNodeModel.add(stmt); - } - } - Model[] result = new Model[2]; - result[0] = blankNodeModel; - result[1] = nonBlankNodeModel; - return result; - } - - - @Override - @Deprecated - public void delete(Graph g, boolean withReifications) { - delete(g); - } - - @Override - @Deprecated - public void delete(Graph g) { - Model[] model = separateStatementsWithBlankNodes(g); - deleteModel(model[1] /*statements without blank nodes*/); - // replace blank nodes in remaining statements with variables - - StringBuffer patternBuff = new StringBuffer(); - Iterator tripIt = g.find(null, null, null); - while(tripIt.hasNext()) { - Triple t = tripIt.next(); - patternBuff.append(SparqlGraph.sparqlNodeDelete(t.getSubject(), null)); - patternBuff.append(" "); - patternBuff.append(SparqlGraph.sparqlNodeDelete(t.getPredicate(), null)); - patternBuff.append(" "); - patternBuff.append(SparqlGraph.sparqlNodeDelete(t.getObject(), null)); - patternBuff.append(" .\n"); - } - - StringBuffer queryBuff = new StringBuffer(); - String graphURI = graph.getGraphURI(); - queryBuff.append("DELETE { " + ((graphURI != null) ? "GRAPH <" + graphURI + "> { " : "" ) + " \n"); - queryBuff.append(patternBuff); - if (graphURI != null) { - queryBuff.append(" } \n"); - } - queryBuff.append("} WHERE { \n"); - if (graphURI != null) { - queryBuff.append(" GRAPH <" + graphURI + "> { \n"); - } - queryBuff.append(patternBuff); - if (graphURI != null) { - queryBuff.append(" } \n"); - } - queryBuff.append("} \n"); - - log.debug(queryBuff.toString()); - - graph.executeUpdate(queryBuff.toString()); - - } - - public void addModel(Model model) { - verbModel(model, "INSERT"); - } - - public void deleteModel(Model model) { - verbModel(model, "DELETE"); - } - - private void verbModel(Model model, String verb) { - Model m = ModelFactory.createDefaultModel(); - int testLimit = 1000; - StmtIterator stmtIt = model.listStatements(); - int count = 0; - try { - while (stmtIt.hasNext()) { - count++; - m.add(stmtIt.nextStatement()); - if (count % testLimit == 0 || !stmtIt.hasNext()) { - StringWriter sw = new StringWriter(); - m.write(sw, "N-TRIPLE"); - StringBuffer updateStringBuff = new StringBuffer(); - String graphURI = graph.getGraphURI(); - updateStringBuff.append(verb + " DATA { " + ((graphURI != null) ? "GRAPH <" + graphURI + "> { " : "" )); - updateStringBuff.append(sw); - updateStringBuff.append(((graphURI != null) ? " } " : "") + " }"); - - String updateString = updateStringBuff.toString(); - - //log.info(updateString); - - graph.executeUpdate(updateString); - - m.removeAll(); - } - } - } finally { - stmtIt.close(); - } - } - - - @Override - @Deprecated - public void removeAll() { - removeAll(graph); - notifyRemoveAll(); - } - - @Override - @Deprecated - protected void notifyRemoveAll() { - manager.notifyEvent(graph, GraphEvents.removeAll); - } - - @Override - @Deprecated - public void remove(Node s, Node p, Node o) { - removeAll(graph, s, p, o); - manager.notifyEvent(graph, GraphEvents.remove(s, p, o)); - } - - public static void removeAll(Graph g, Node s, Node p, Node o) - { - ExtendedIterator it = g.find( s, p, o ); - try { - while (it.hasNext()) { - Triple t = it.next(); - g.delete(t); - it.remove(); - } - } - finally { - it.close(); - } - } - - public static void removeAll( Graph g ) - { - ExtendedIterator it = GraphUtil.findAll(g); - try { - while (it.hasNext()) { - Triple t = it.next(); - g.delete(t); - it.remove(); - } - } finally { - it.close(); - } - - // get rid of remaining blank nodes using a SPARQL DELETE - if (g instanceof SparqlGraph) { - ((SparqlGraph) g).removeAll(); - } - - } - -} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphMultilingual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphMultilingual.java index 74a93d7a2..ac1a8c71b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphMultilingual.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphMultilingual.java @@ -12,14 +12,13 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.NodeFactory; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.graph.TripleMatch; -import com.hp.hpl.jena.graph.impl.GraphWithPerform; -import com.hp.hpl.jena.shared.AddDeniedException; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.NodeFactory; +import org.apache.jena.graph.Triple; +import org.apache.jena.graph.impl.GraphWithPerform; +import org.apache.jena.shared.AddDeniedException; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.WrappedIterator; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; @@ -61,13 +60,6 @@ public class SparqlGraphMultilingual extends SparqlGraph implements GraphWithPer } } - @Override - public ExtendedIterator find(TripleMatch arg0) { - //log.info("find(TripleMatch) " + arg0); - Triple t = arg0.asTriple(); - return find(t.getSubject(), t.getPredicate(), t.getObject()); - } - @Override public ExtendedIterator find(Node subject, Node predicate, Node object) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java index 0ed683a2c..661ca7f1f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import com.hp.hpl.jena.query.Dataset; +import org.apache.jena.query.Dataset; public class StaticDatasetFactory implements DatasetWrapperFactory { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java index 409b65842..75767041f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java @@ -9,17 +9,17 @@ import java.util.Comparator; import java.util.List; import java.util.Random; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java index 1ebf320d3..827f908ce 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java @@ -11,45 +11,45 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.AllValuesFromRestriction; -import com.hp.hpl.jena.ontology.AnnotationProperty; -import com.hp.hpl.jena.ontology.CardinalityRestriction; -import com.hp.hpl.jena.ontology.ComplementClass; -import com.hp.hpl.jena.ontology.HasValueRestriction; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.IntersectionClass; -import com.hp.hpl.jena.ontology.MaxCardinalityRestriction; -import com.hp.hpl.jena.ontology.MinCardinalityRestriction; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.ontology.ProfileException; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.ontology.SomeValuesFromRestriction; -import com.hp.hpl.jena.ontology.UnionClass; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.AllValuesFromRestriction; +import org.apache.jena.ontology.AnnotationProperty; +import org.apache.jena.ontology.CardinalityRestriction; +import org.apache.jena.ontology.ComplementClass; +import org.apache.jena.ontology.HasValueRestriction; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.IntersectionClass; +import org.apache.jena.ontology.MaxCardinalityRestriction; +import org.apache.jena.ontology.MinCardinalityRestriction; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.ontology.ProfileException; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.ontology.SomeValuesFromRestriction; +import org.apache.jena.ontology.UnionClass; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java index 0e97bd923..b22fb887c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java @@ -3,25 +3,25 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; -import com.hp.hpl.jena.ontology.AnnotationProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.AnnotationProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java index baff88223..8a6c70727 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java @@ -14,15 +14,15 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.beans.VClass; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java index 254bf36ec..8e0e7d5d2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java @@ -13,15 +13,15 @@ import java.util.ListIterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl; import edu.cornell.mannlib.vitro.webapp.beans.VClass; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java index 0a51d7c78..46e56acc2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java @@ -9,13 +9,13 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.UnionClass; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.UnionClass; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean; import edu.cornell.mannlib.vitro.webapp.beans.VClass; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java index bddf240db..cd333df4e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java @@ -5,9 +5,9 @@ import javax.servlet.ServletContext; import org.apache.commons.lang.StringUtils; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.rdf.model.ModelSource; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.rdf.model.ModelSource; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java index 0b83478d1..3064f0094 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java @@ -14,19 +14,19 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.iri.IRI; import org.apache.jena.iri.IRIFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.beans.ResourceBean; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java index eeba74a12..d5c80eff3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java @@ -7,11 +7,11 @@ import java.sql.SQLException; import org.apache.commons.dbcp.BasicDataSource; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.sdb.SDBFactory; -import com.hp.hpl.jena.sdb.Store; -import com.hp.hpl.jena.sdb.StoreDesc; -import com.hp.hpl.jena.sdb.sql.SDBConnection; +import org.apache.jena.query.Dataset; +import org.apache.jena.sdb.SDBFactory; +import org.apache.jena.sdb.Store; +import org.apache.jena.sdb.StoreDesc; +import org.apache.jena.sdb.sql.SDBConnection; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/EditEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/EditEvent.java index 9fea7de9b..74800e1f0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/EditEvent.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/EditEvent.java @@ -7,8 +7,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualCreationEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualCreationEvent.java index 729dca82e..a1cb22b84 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualCreationEvent.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualCreationEvent.java @@ -7,9 +7,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.RDF; public class IndividualCreationEvent extends IndividualEditEvent { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualDeletionEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualDeletionEvent.java index c1f2e0356..2e8d89f9e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualDeletionEvent.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualDeletionEvent.java @@ -6,9 +6,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualEditEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualEditEvent.java index d8a0012f4..415ac58e8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualEditEvent.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualEditEvent.java @@ -6,9 +6,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualUpdateEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualUpdateEvent.java index a4f51f89d..766b24fb3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualUpdateEvent.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualUpdateEvent.java @@ -6,9 +6,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearch.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearch.java index 01d2d3c9e..c014e62ba 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearch.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearch.java @@ -8,20 +8,20 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java index 3e2dc324f..c18d4f7eb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteral.java @@ -2,9 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.edit; -import com.hp.hpl.jena.rdf.model.*; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.graph.Node;/** +import org.apache.jena.rdf.model.*; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.graph.Node;/** * bdc34: I needed to have a representation of a RDF literal for * editing. Jena seems to have a Model associated with the literals and * has depreciated the creation of simple Literals as if they were data diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java index 5fe092a9a..1d5b2a3b8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java @@ -5,8 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo; import java.io.StringWriter; import java.util.List; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; /** * This is a data structure to allow a method to return diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java index 78b9e5e62..86a8e5944 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java @@ -14,11 +14,11 @@ import org.apache.commons.fileupload.FileItem; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.datatypes.TypeMapper; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.datatypes.TypeMapper; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.beans.Datatype; import edu.cornell.mannlib.vitro.webapp.dao.jena.DatatypeDaoJena; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java index ae87a397c..f39c1d058 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java @@ -10,8 +10,8 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.datatypes.xsd.XSDDateTime; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.datatypes.xsd.XSDDateTime; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.Precision; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java index 5e6b65c65..aa92c7ed3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java @@ -15,9 +15,9 @@ import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; import org.joda.time.format.ISODateTimeFormat; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java index 2227eec5d..3cdad33d7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java @@ -14,8 +14,8 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java index 7eb33bc0e..536b531c0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java @@ -22,10 +22,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java index c3ced4abb..b12117856 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo; import java.util.Map; import java.util.List; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java index 3c4fa9fd7..370268905 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java @@ -15,9 +15,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.vocabulary.XSD; /** * Builds the N3 strings for the given EditConfiguration, model @@ -184,7 +184,7 @@ public class EditN3GeneratorVTwo { try{ if( literal.getValue() == null ) log.debug("value of literal for " + var + " was null"); - }catch(com.hp.hpl.jena.datatypes.DatatypeFormatException ex){ + }catch(org.apache.jena.datatypes.DatatypeFormatException ex){ log.debug("value for " + var + " " + ex.getMessage()); } @@ -274,7 +274,7 @@ public class EditN3GeneratorVTwo { * * The following methods are from * HP's Jena project ver 2.5.5 - * Found in file Jena-2.5.5/src/com/hp/hpl/jena/n3/N3JenaWriterCommon.java + * Found in file Jena-2.5.5/src/org.apache/jena/n3/N3JenaWriterCommon.java * * The following copyright statement applies to these methods. */ @@ -384,7 +384,7 @@ public class EditN3GeneratorVTwo { /* * * see http://www.python.org/doc/2.5.2/ref/strings.html - * or see jena's n3 grammar jena/src/com/hp/hpl/jena/n3/n3.g + * or see jena's n3 grammar jena/src/org.apache/jena/n3/n3.g */ protected static void pyString(StringBuffer sbuff, String s) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java index cf154f679..4c313bc46 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java @@ -19,11 +19,11 @@ import org.apache.commons.logging.LogFactory; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java index 99f9675f9..0226bb36d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java @@ -13,15 +13,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.xerces.util.XMLChar; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java index 08f5d2d84..b66ce944a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java @@ -15,11 +15,11 @@ import java.util.Random; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.InsertException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/RdfLiteralHash.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/RdfLiteralHash.java index 415bbfab7..db9e06c9b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/RdfLiteralHash.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/RdfLiteralHash.java @@ -5,11 +5,11 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl; @@ -43,28 +43,23 @@ public class RdfLiteralHash { * @return a value between MIN_INTEGER and MAX_INTEGER */ public static int makeRdfLiteralHash( DataPropertyStatement stmt ){ - if( (stmt.getLanguage() != null && stmt.getLanguage().trim().length() > 0) - && - (stmt.getDatatypeURI() != null && stmt.getDatatypeURI().trim().length() > 0 ) ) - throw new Error("DataPropertyStatement should not have both a language " + - "and a datatype; lang: '" + stmt.getLanguage() + "' datatype: '"+ stmt.getDatatypeURI() + "'"); - if( stmt.getIndividualURI() == null || stmt.getIndividualURI().trim().length() == 0 ) throw new Error("Cannot make a hash for a statement with no subject URI"); if( stmt.getDatapropURI() == null || stmt.getDatapropURI().trim().length() == 0) throw new Error("Cannot make a hash for a statement with no predicate URI"); - String langOrDatatype = "9876NONE"; + String language = "9876NONE"; if( stmt.getLanguage() != null && stmt.getLanguage().trim().length() > 0){ - langOrDatatype = stmt.getLanguage(); - }else{ - if( stmt.getDatatypeURI() != null && stmt.getDatatypeURI().trim().length() > 0){ - langOrDatatype = stmt.getDatatypeURI(); - } + language = stmt.getLanguage(); } - String hashMe = langOrDatatype + "_" + stmt.getIndividualURI() + "_" + stmt.getDatapropURI() + "_" + stmt.getData(); + String datatype = "9876NONE"; + if( stmt.getDatatypeURI() != null && stmt.getDatatypeURI().trim().length() > 0){ + datatype = stmt.getDatatypeURI(); + } + + String hashMe = language + "_" + datatype + "_" + stmt.getIndividualURI() + "_" + stmt.getDatapropURI() + "_" + stmt.getData(); if( log.isDebugEnabled() ) log.debug("got hash " + hashMe.hashCode() + " for String '" + hashMe + "'"); return hashMe.hashCode(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java index 9525a8c4d..be2b7a7df 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java @@ -1,10 +1,10 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo; -import com.hp.hpl.jena.query.*; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.query.*; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java index c6c2472f9..b8a1ac1d2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java @@ -10,7 +10,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java index 39e816128..f19eb0b09 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java @@ -9,7 +9,7 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java index 97ecc2e71..afcb25982 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java @@ -7,17 +7,17 @@ import java.util.Comparator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/IdModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/IdModelSelector.java index 7051e61d9..6912394bf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/IdModelSelector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/IdModelSelector.java @@ -6,8 +6,8 @@ import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichServ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroModelSource; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/ModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/ModelSelector.java index 3b06bd38e..39ad15d01 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/ModelSelector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/ModelSelector.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; /** * Interface that is intended to be used with N3 Editing to diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java index ce6a4f7da..fb039571c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java index dac6eb3df..9f0d691b1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java index 9cb4033f9..8c8e170ca 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java @@ -9,8 +9,8 @@ import java.util.List; import javax.servlet.http.HttpSession; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java index 24ed50d68..e88565389 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java @@ -10,8 +10,8 @@ import java.util.List; import javax.servlet.http.HttpSession; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java index 360d47cb6..861ef5e3f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java @@ -9,8 +9,8 @@ import java.util.List; import javax.servlet.http.HttpSession; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java index 9404ce6e4..1218ee7a6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java @@ -15,8 +15,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java index ab909445b..0ea5a0e0d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java @@ -9,7 +9,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java index 60fd889d8..a6574ad59 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java @@ -16,8 +16,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.JspToGeneratorMappin import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.beans.Individual; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java index 14a4e9865..7c10795bc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java @@ -21,10 +21,10 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java index 10caf6d02..31fa167a8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java @@ -18,18 +18,18 @@ import net.sf.json.JSONObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java index 98440ba14..9946c8be8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java @@ -10,10 +10,10 @@ import java.util.Map; import javax.servlet.http.HttpSession; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java index 9953a85c1..0b15a2de6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java @@ -13,9 +13,9 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RdfTypeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RdfTypeGenerator.java index 095ed5974..3b28f59be 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RdfTypeGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RdfTypeGenerator.java @@ -9,8 +9,8 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultAddMissingIndividualFormModelPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultAddMissingIndividualFormModelPreprocessor.java index 06fbcf9e4..36a7a271c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultAddMissingIndividualFormModelPreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultAddMissingIndividualFormModelPreprocessor.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ResourceFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java index 15a2ac216..d45e4823e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java @@ -6,8 +6,8 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java index 460e15db5..caf878741 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java @@ -7,23 +7,23 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java index 03a60f97b..31ff7a058 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java @@ -9,13 +9,13 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java index 4bf598ad8..15f1e13c6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java @@ -15,7 +15,7 @@ import net.sf.json.JSONSerializer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ModelChangePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ModelChangePreprocessor.java index 89e03c517..7774494ec 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ModelChangePreprocessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ModelChangePreprocessor.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import javax.servlet.http.HttpServletRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java index 58fac7806..af7522406 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java @@ -14,14 +14,14 @@ import net.sf.json.JSONObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java index cfb279efc..003fd067d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; //Returns the appropriate n3 based on data getter public abstract class ProcessDataGetterAbstract implements ProcessDataGetterN3 { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java index 70185d540..41747af06 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java @@ -9,8 +9,8 @@ import java.util.Map; import net.sf.json.JSONObject; import javax.servlet.ServletContext; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java index 260942cf8..96328d0d9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java @@ -12,14 +12,14 @@ import net.sf.json.JSONObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; //Returns the appropriate n3 based on data getter diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java index dd24195ff..53d951b80 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java @@ -12,15 +12,15 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Resource; import javax.servlet.ServletContext; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSearchIndividualsDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSearchIndividualsDataGetterN3.java index 096c0ed67..0c31a951f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSearchIndividualsDataGetterN3.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSearchIndividualsDataGetterN3.java @@ -12,15 +12,15 @@ import net.sf.json.JSONObject; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; //Returns the appropriate n3 based on data getter diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java index d4feb86d6..b1765594d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java @@ -11,15 +11,15 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Resource; import javax.servlet.ServletContext; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java index 37d499db3..854235984 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java @@ -13,7 +13,7 @@ import org.owasp.validator.html.CleanResults; import org.owasp.validator.html.PolicyException; import org.owasp.validator.html.ScanException; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java index a2eb46a5f..665426cdc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java @@ -10,7 +10,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java index 28476e99c..5965c1905 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java @@ -13,7 +13,7 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java index 797c3c152..7ba226297 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java @@ -12,10 +12,10 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; @@ -273,7 +273,7 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{ Property prop = ResourceFactory.createProperty(predicateUri); predicateLocalName = prop.getLocalName(); - }catch (com.hp.hpl.jena.shared.InvalidPropertyURIException e){ + }catch (org.apache.jena.shared.InvalidPropertyURIException e){ log.debug("could not convert predicateUri into a valid URI",e); } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java index 4240e8e96..a8638e2e1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java @@ -19,10 +19,10 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel17/RemoveObsoletePermissions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel17/RemoveObsoletePermissions.java index 55b359fae..456153bba 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel17/RemoveObsoletePermissions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel17/RemoveObsoletePermissions.java @@ -12,13 +12,13 @@ import javax.servlet.ServletContextListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.update.GraphStore; -import com.hp.hpl.jena.update.GraphStoreFactory; -import com.hp.hpl.jena.update.UpdateAction; -import com.hp.hpl.jena.update.UpdateFactory; -import com.hp.hpl.jena.update.UpdateRequest; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.update.GraphStore; +import org.apache.jena.update.GraphStoreFactory; +import org.apache.jena.update.UpdateAction; +import org.apache.jena.update.UpdateFactory; +import org.apache.jena.update.UpdateRequest; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/FauxPropertiesUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/FauxPropertiesUpdater.java index 130344156..33762de78 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/FauxPropertiesUpdater.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/FauxPropertiesUpdater.java @@ -2,9 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.migration.rel18; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createPlainLiteral; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; +import static org.apache.jena.rdf.model.ResourceFactory.createPlainLiteral; +import static org.apache.jena.rdf.model.ResourceFactory.createProperty; +import static org.apache.jena.rdf.model.ResourceFactory.createResource; import static edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.vitroURI; import java.io.FileInputStream; @@ -15,9 +15,9 @@ import java.nio.file.Paths; import javax.servlet.ServletContext; import javax.servlet.ServletContextListener; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccess.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccess.java index b4525ea03..e28af4a4c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccess.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccess.java @@ -2,9 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.modelaccess; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccess.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccess.java index 14e3eff3c..7783452ce 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccess.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccess.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.modelaccess; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/AbstractModelMakerDecorator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/AbstractModelMakerDecorator.java index 092ca328b..95e5f7d43 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/AbstractModelMakerDecorator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/AbstractModelMakerDecorator.java @@ -2,11 +2,11 @@ package edu.cornell.mannlib.vitro.webapp.modelaccess.adapters; -import com.hp.hpl.jena.graph.GraphMaker; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import org.apache.jena.graph.GraphMaker; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.util.iterator.ExtendedIterator; /** * Extend this to add decorator functionality to a ModelMaker. The sub-class can diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMaker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMaker.java index 2e4d50c81..85eaf7c78 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMaker.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMaker.java @@ -5,11 +5,11 @@ package edu.cornell.mannlib.vitro.webapp.modelaccess.adapters; import java.util.Set; import java.util.TreeSet; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.WrappedIterator; /** * This ModelMaker keeps a cached list of the available models. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMaker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMaker.java index 359e7b276..914d43be3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMaker.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMaker.java @@ -5,10 +5,10 @@ package edu.cornell.mannlib.vitro.webapp.modelaccess.adapters; import java.util.HashMap; import java.util.Map; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.shared.AlreadyExistsException; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.shared.AlreadyExistsException; import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.MemoryMappedModel; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModels.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModels.java index 22a1ee0e6..a067f03ce 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModels.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModels.java @@ -6,11 +6,11 @@ import java.util.HashSet; import java.util.Set; import java.util.TreeSet; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.WrappedIterator; /** * This ModelMaker will remember the URIs of models you create, even if you diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/NamedDefaultModelMaker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/NamedDefaultModelMaker.java index 7ae63450a..6b71f4ec1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/NamedDefaultModelMaker.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/NamedDefaultModelMaker.java @@ -7,10 +7,10 @@ import java.util.Collections; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.util.iterator.ExtendedIterator; /** * This model maker allows you to refer to the default model by a name. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/ContextModelAccessImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/ContextModelAccessImpl.java index da05f7997..1b2b70a15 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/ContextModelAccessImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/ContextModelAccessImpl.java @@ -29,9 +29,9 @@ import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/RequestModelAccessImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/RequestModelAccessImpl.java index be10ff5a8..920f5a1f8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/RequestModelAccessImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/RequestModelAccessImpl.java @@ -19,8 +19,8 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers; import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/JoinedOntModelCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/JoinedOntModelCache.java index 3207196bf..a8f6812f4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/JoinedOntModelCache.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/JoinedOntModelCache.java @@ -10,7 +10,7 @@ import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/MaskingOntModelCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/MaskingOntModelCache.java index 9ae5a5d1b..8d45824d3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/MaskingOntModelCache.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/MaskingOntModelCache.java @@ -11,7 +11,7 @@ import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/ModelMakerOntModelCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/ModelMakerOntModelCache.java index 94106433c..caee36481 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/ModelMakerOntModelCache.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/ModelMakerOntModelCache.java @@ -7,9 +7,9 @@ import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.VitroModelFactory; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/OntModelCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/OntModelCache.java index 865f07fd6..4c8f9213c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/OntModelCache.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/OntModelCache.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.modelaccess.ontmodels; import java.util.SortedSet; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; /** * A source for OntModels from the triple-store. The contract is this: diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/UnionModelsOntModelsCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/UnionModelsOntModelsCache.java index 2ce5af5cc..af521b1cf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/UnionModelsOntModelsCache.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/UnionModelsOntModelsCache.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.VitroModelFactory; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexer.java index fa40b384a..40a6f4851 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexer.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexer.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.modules.searchIndexer; import java.util.Collection; import java.util.List; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.modules.Application; import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerModule.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerModule.java index 3110d9960..b06d439f0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerModule.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerModule.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner; import java.util.List; -import com.hp.hpl.jena.ontology.Restriction; +import org.apache.jena.ontology.Restriction; import edu.cornell.mannlib.vitro.webapp.modules.Application; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ConfigurationTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ConfigurationTripleSource.java index 4a0d35a6b..9d0c819ca 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ConfigurationTripleSource.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ConfigurationTripleSource.java @@ -7,7 +7,7 @@ import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_DI import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_TBOX; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.USER_ACCOUNTS; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelMaker; /** * A triple source for configuration models. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ContentTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ContentTripleSource.java index 6eb44bc77..0999b3627 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ContentTripleSource.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ContentTripleSource.java @@ -7,7 +7,7 @@ import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.FULL_UNION import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_INFERENCES; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.modelaccess.adapters.NamedDefaultModelMaker; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/TripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/TripleSource.java index d799a1bd7..92c6f5428 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/TripleSource.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/TripleSource.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.modules.tripleSource; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.modelaccess.ontmodels.OntModelCache; import edu.cornell.mannlib.vitro.webapp.modules.Application; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java index c8d38c158..cfed08bf6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java @@ -10,23 +10,23 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; import edu.cornell.mannlib.vitro.webapp.ontology.update.AtomicOntologyChange.AtomicChangeType; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeRecord.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeRecord.java index 3c9029839..d87e39981 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeRecord.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeRecord.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.ontology.update; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; public interface ChangeRecord { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java index 78545cf06..7ce3779f7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java @@ -22,13 +22,13 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.iri.IRI; import org.apache.jena.iri.IRIFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeRecord.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeRecord.java index 78a5c6ba7..2f3844ca0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeRecord.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeRecord.java @@ -11,8 +11,8 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; public class SimpleChangeRecord implements ChangeRecord { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java index 7585fc7eb..c57305e82 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java @@ -11,26 +11,26 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/UpdateSettings.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/UpdateSettings.java index 1e37ded8f..19548e185 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/UpdateSettings.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/UpdateSettings.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.ontology.update; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java index 509ab0c7b..c2394035e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java @@ -6,8 +6,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.List; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; /** * Interface for API to write, read, and update Vitro's RDF store, with support diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceFactory.java index 5497cbfc6..c1ecb2b1c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceFactory.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceFactory.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.ModelChangedListener; public interface RDFServiceFactory { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ResultSetConsumer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ResultSetConsumer.java index 74d215a6e..efb156d40 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ResultSetConsumer.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ResultSetConsumer.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; import java.util.List; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java index 1c607398f..e9c19a486 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java @@ -11,34 +11,34 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.rdf.model.Alt; -import com.hp.hpl.jena.rdf.model.AnonId; -import com.hp.hpl.jena.rdf.model.Bag; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.NsIterator; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFList; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.RDFReader; -import com.hp.hpl.jena.rdf.model.RDFWriter; -import com.hp.hpl.jena.rdf.model.RSIterator; -import com.hp.hpl.jena.rdf.model.ReifiedStatement; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Selector; -import com.hp.hpl.jena.rdf.model.Seq; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Command; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.shared.PrefixMapping; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.rdf.model.Alt; +import org.apache.jena.rdf.model.AnonId; +import org.apache.jena.rdf.model.Bag; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.NsIterator; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFList; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.RDFReader; +import org.apache.jena.rdf.model.RDFWriter; +import org.apache.jena.rdf.model.RSIterator; +import org.apache.jena.rdf.model.ReifiedStatement; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Selector; +import org.apache.jena.rdf.model.Seq; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Command; +import org.apache.jena.shared.Lock; +import org.apache.jena.shared.PrefixMapping; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; @@ -66,7 +66,7 @@ public abstract class AbstractModelDecorator implements Model { @Override @Deprecated - public Resource getResource(String uri, com.hp.hpl.jena.rdf.model.ResourceF f) { + public Resource getResource(String uri, org.apache.jena.rdf.model.ResourceF f) { return inner.getResource(uri, f); } @@ -122,13 +122,13 @@ public abstract class AbstractModelDecorator implements Model { @Override @Deprecated - public Resource createResource(com.hp.hpl.jena.rdf.model.ResourceF f) { + public Resource createResource(org.apache.jena.rdf.model.ResourceF f) { return inner.createResource(f); } @Override @Deprecated - public Resource createResource(String uri, com.hp.hpl.jena.rdf.model.ResourceF f) { + public Resource createResource(String uri, org.apache.jena.rdf.model.ResourceF f) { return inner.createResource(uri, f); } @@ -364,6 +364,16 @@ public abstract class AbstractModelDecorator implements Model { return inner.setReaderClassName(lang, className); } + @Override + public void resetRDFReaderF() { + inner.resetRDFReaderF(); + } + + @Override + public String removeReader(String s) throws IllegalArgumentException { + return inner.removeReader(s); + } + @Override public RDFWriter getWriter() { return inner.getWriter(); @@ -379,6 +389,16 @@ public abstract class AbstractModelDecorator implements Model { return inner.setWriterClassName(lang, className); } + @Override + public void resetRDFWriterF() { + inner.resetRDFWriterF(); + } + + @Override + public String removeWriter(String s) throws IllegalArgumentException { + return inner.removeWriter(s); + } + @Override public Alt createAlt(String uri) { return inner.createAlt(uri); @@ -475,12 +495,6 @@ public abstract class AbstractModelDecorator implements Model { return inner.remove(m); } - @Override - @Deprecated - public Model remove(Model m, boolean suppressReifications) { - return inner.remove(m, suppressReifications); - } - @Override public StmtIterator listLiteralStatements(Resource subject, Property predicate, boolean object) { @@ -493,6 +507,12 @@ public abstract class AbstractModelDecorator implements Model { return inner.listLiteralStatements(subject, predicate, object); } + @Override + public StmtIterator listLiteralStatements(Resource subject, + Property predicate, int object) { + return inner.listLiteralStatements(subject, predicate, object); + } + @Override public StmtIterator listLiteralStatements(Resource subject, Property predicate, long object) { @@ -748,12 +768,6 @@ public abstract class AbstractModelDecorator implements Model { return inner.add(m); } - @Override - @Deprecated - public Model add(Model m, boolean suppressReifications) { - return inner.add(m, suppressReifications); - } - @Override public Model read(String url) { return inner.read(url); @@ -964,12 +978,6 @@ public abstract class AbstractModelDecorator implements Model { return inner.listReifiedStatements(st); } - @Override - @Deprecated - public com.hp.hpl.jena.shared.ReificationStyle getReificationStyle() { - return inner.getReificationStyle(); - } - @Override public Model query(Selector s) { return inner.query(s); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java index dc6d2b7eb..653f5372b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java @@ -12,72 +12,72 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.ontology.AllDifferent; -import com.hp.hpl.jena.ontology.AllValuesFromRestriction; -import com.hp.hpl.jena.ontology.AnnotationProperty; -import com.hp.hpl.jena.ontology.CardinalityQRestriction; -import com.hp.hpl.jena.ontology.CardinalityRestriction; -import com.hp.hpl.jena.ontology.ComplementClass; -import com.hp.hpl.jena.ontology.DataRange; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.EnumeratedClass; -import com.hp.hpl.jena.ontology.FunctionalProperty; -import com.hp.hpl.jena.ontology.HasValueRestriction; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.IntersectionClass; -import com.hp.hpl.jena.ontology.InverseFunctionalProperty; -import com.hp.hpl.jena.ontology.MaxCardinalityQRestriction; -import com.hp.hpl.jena.ontology.MaxCardinalityRestriction; -import com.hp.hpl.jena.ontology.MinCardinalityQRestriction; -import com.hp.hpl.jena.ontology.MinCardinalityRestriction; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntDocumentManager; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.ontology.Ontology; -import com.hp.hpl.jena.ontology.Profile; -import com.hp.hpl.jena.ontology.QualifiedRestriction; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.ontology.SomeValuesFromRestriction; -import com.hp.hpl.jena.ontology.SymmetricProperty; -import com.hp.hpl.jena.ontology.TransitiveProperty; -import com.hp.hpl.jena.ontology.UnionClass; -import com.hp.hpl.jena.rdf.model.Alt; -import com.hp.hpl.jena.rdf.model.AnonId; -import com.hp.hpl.jena.rdf.model.Bag; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.NsIterator; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFList; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.RDFReader; -import com.hp.hpl.jena.rdf.model.RDFWriter; -import com.hp.hpl.jena.rdf.model.RSIterator; -import com.hp.hpl.jena.rdf.model.ReifiedStatement; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Selector; -import com.hp.hpl.jena.rdf.model.Seq; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.reasoner.Derivation; -import com.hp.hpl.jena.reasoner.Reasoner; -import com.hp.hpl.jena.reasoner.ValidityReport; -import com.hp.hpl.jena.shared.Command; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.shared.PrefixMapping; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.ontology.AllDifferent; +import org.apache.jena.ontology.AllValuesFromRestriction; +import org.apache.jena.ontology.AnnotationProperty; +import org.apache.jena.ontology.CardinalityQRestriction; +import org.apache.jena.ontology.CardinalityRestriction; +import org.apache.jena.ontology.ComplementClass; +import org.apache.jena.ontology.DataRange; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.EnumeratedClass; +import org.apache.jena.ontology.FunctionalProperty; +import org.apache.jena.ontology.HasValueRestriction; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.IntersectionClass; +import org.apache.jena.ontology.InverseFunctionalProperty; +import org.apache.jena.ontology.MaxCardinalityQRestriction; +import org.apache.jena.ontology.MaxCardinalityRestriction; +import org.apache.jena.ontology.MinCardinalityQRestriction; +import org.apache.jena.ontology.MinCardinalityRestriction; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntDocumentManager; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.ontology.Ontology; +import org.apache.jena.ontology.Profile; +import org.apache.jena.ontology.QualifiedRestriction; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.ontology.SomeValuesFromRestriction; +import org.apache.jena.ontology.SymmetricProperty; +import org.apache.jena.ontology.TransitiveProperty; +import org.apache.jena.ontology.UnionClass; +import org.apache.jena.rdf.model.Alt; +import org.apache.jena.rdf.model.AnonId; +import org.apache.jena.rdf.model.Bag; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.NsIterator; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFList; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.RDFReader; +import org.apache.jena.rdf.model.RDFWriter; +import org.apache.jena.rdf.model.RSIterator; +import org.apache.jena.rdf.model.ReifiedStatement; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Selector; +import org.apache.jena.rdf.model.Seq; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.reasoner.Derivation; +import org.apache.jena.reasoner.Reasoner; +import org.apache.jena.reasoner.ValidityReport; +import org.apache.jena.shared.Command; +import org.apache.jena.shared.Lock; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.util.iterator.ExtendedIterator; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; @@ -105,7 +105,7 @@ public abstract class AbstractOntModelDecorator implements OntModel { @Override @Deprecated - public Resource getResource(String uri, com.hp.hpl.jena.rdf.model.ResourceF f) { + public Resource getResource(String uri, org.apache.jena.rdf.model.ResourceF f) { return inner.getResource(uri, f); } @@ -161,13 +161,13 @@ public abstract class AbstractOntModelDecorator implements OntModel { @Override @Deprecated - public Resource createResource(com.hp.hpl.jena.rdf.model.ResourceF f) { + public Resource createResource(org.apache.jena.rdf.model.ResourceF f) { return inner.createResource(f); } @Override @Deprecated - public Resource createResource(String uri, com.hp.hpl.jena.rdf.model.ResourceF f) { + public Resource createResource(String uri, org.apache.jena.rdf.model.ResourceF f) { return inner.createResource(uri, f); } @@ -403,6 +403,16 @@ public abstract class AbstractOntModelDecorator implements OntModel { return inner.setReaderClassName(lang, className); } + @Override + public void resetRDFReaderF() { + inner.resetRDFReaderF(); + } + + @Override + public String removeReader(String s) throws IllegalArgumentException { + return inner.removeReader(s); + } + @Override public RDFWriter getWriter() { return inner.getWriter(); @@ -418,6 +428,16 @@ public abstract class AbstractOntModelDecorator implements OntModel { return inner.setWriterClassName(lang, className); } + @Override + public void resetRDFWriterF() { + inner.resetRDFWriterF(); + } + + @Override + public String removeWriter(String s) throws IllegalArgumentException { + return inner.removeWriter(s); + } + @Override public Alt createAlt(String uri) { return inner.createAlt(uri); @@ -514,12 +534,6 @@ public abstract class AbstractOntModelDecorator implements OntModel { return inner.remove(m); } - @Override - @Deprecated - public Model remove(Model m, boolean suppressReifications) { - return inner.remove(m, suppressReifications); - } - @Override public StmtIterator listLiteralStatements(Resource subject, Property predicate, boolean object) { @@ -532,6 +546,12 @@ public abstract class AbstractOntModelDecorator implements OntModel { return inner.listLiteralStatements(subject, predicate, object); } + @Override + public StmtIterator listLiteralStatements(Resource resource, Property property, int object) { + return inner.listLiteralStatements(resource, property, object); + } + + @Override public StmtIterator listLiteralStatements(Resource subject, Property predicate, long object) { @@ -787,12 +807,6 @@ public abstract class AbstractOntModelDecorator implements OntModel { return inner.add(m); } - @Override - @Deprecated - public Model add(Model m, boolean suppressReifications) { - return inner.add(m, suppressReifications); - } - @Override public Model read(String url) { return inner.read(url); @@ -1003,12 +1017,6 @@ public abstract class AbstractOntModelDecorator implements OntModel { return inner.listReifiedStatements(st); } - @Override - @Deprecated - public com.hp.hpl.jena.shared.ReificationStyle getReificationStyle() { - return inner.getReificationStyle(); - } - @Override public Model query(Selector s) { return inner.query(s); @@ -1748,6 +1756,16 @@ public abstract class AbstractOntModelDecorator implements OntModel { return inner.getSpecification(); } + @Override + public Model writeAll(Writer writer, String s) { + return inner.writeAll(writer, s); + } + + @Override + public Model writeAll(OutputStream outputStream, String s) { + return inner.writeAll(outputStream, s); + } + @Override public Model writeAll(Writer writer, String lang, String base) { return inner.writeAll(writer, lang, base); @@ -1757,5 +1775,4 @@ public abstract class AbstractOntModelDecorator implements OntModel { public Model writeAll(OutputStream out, String lang, String base) { return inner.writeAll(out, lang, base); } - } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingModel.java index 0ad31d3cb..b89dcb5df 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingModel.java @@ -9,17 +9,19 @@ import java.net.URL; import java.util.Iterator; import java.util.List; -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFReaderF; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.rdf.model.impl.RDFReaderFImpl; -import com.hp.hpl.jena.rdf.model.impl.StatementImpl; -import com.hp.hpl.jena.shared.WrappedIOException; -import com.hp.hpl.jena.util.iterator.Map1; +import org.apache.jena.graph.GraphUtil; +import org.apache.jena.graph.Triple; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFReaderF; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.impl.RDFReaderFImpl; +import org.apache.jena.rdf.model.impl.StatementImpl; +import org.apache.jena.shared.WrappedIOException; +import org.apache.jena.util.iterator.Map1; /** * A model that still handles bulk updates in the old-fashioned way: with a @@ -28,43 +30,31 @@ import com.hp.hpl.jena.util.iterator.Map1; public class BulkUpdatingModel extends AbstractModelDecorator { private static final RDFReaderF readerFactory = new RDFReaderFImpl(); - private final BulkUpdateHandler buh; - - public BulkUpdatingModel(Model inner, BulkUpdateHandler buh) { + public BulkUpdatingModel(Model inner) { super(inner); - this.buh = buh; } @SuppressWarnings("deprecation") @Override public Model add(StmtIterator iter) { try { - buh.add(asTriples(iter)); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.add(this.getGraph(), asTriples(iter)); + this.getGraph().getTransactionHandler().commit(); } finally { iter.close(); } return this; } - @Override - public Model add(Model m) { - return add(m, false); - } - - @Deprecated - @Override - public Model add(Model m, boolean suppressReifications) { - // suppressReifications is a no-op. - buh.add(m.getGraph()); - return this; - } - @SuppressWarnings("deprecation") @Override public Model read(String url) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader().read(m, url); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -73,7 +63,9 @@ public class BulkUpdatingModel extends AbstractModelDecorator { public Model read(Reader reader, String base) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader().read(m, reader, base); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -82,7 +74,9 @@ public class BulkUpdatingModel extends AbstractModelDecorator { public Model read(InputStream reader, String base) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader().read(m, reader, base); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -91,7 +85,9 @@ public class BulkUpdatingModel extends AbstractModelDecorator { public Model read(String url, String lang) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader(lang).read(m, url); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -117,7 +113,9 @@ public class BulkUpdatingModel extends AbstractModelDecorator { public Model read(Reader reader, String base, String lang) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader(lang).read(m, reader, base); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -126,40 +124,27 @@ public class BulkUpdatingModel extends AbstractModelDecorator { public Model read(InputStream reader, String base, String lang) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader(lang).read(m, reader, base); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @SuppressWarnings("deprecation") @Override public Model remove(StmtIterator iter) { - buh.delete(asTriples(iter)); - return this; - } - - @Override - public Model remove(Model m) { - return remove(m, false); - } - - @Override - @Deprecated - public Model remove(Model m, boolean suppressReifications) { - buh.delete(m.getGraph()); - return this; - } - - @SuppressWarnings("deprecation") - @Override - public Model removeAll() { - buh.removeAll(); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.delete(this.getGraph(), asTriples(iter)); + this.getGraph().getTransactionHandler().commit(); return this; } @SuppressWarnings("deprecation") @Override public Model add(Statement[] statements) { - buh.add(StatementImpl.asTriples(statements)); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.add(this.getGraph(), StatementImpl.asTriples(statements)); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -172,7 +157,9 @@ public class BulkUpdatingModel extends AbstractModelDecorator { @SuppressWarnings("deprecation") @Override public Model remove(Statement[] statements) { - buh.delete(StatementImpl.asTriples(statements)); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.delete(this.getGraph(), StatementImpl.asTriples(statements)); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -188,9 +175,8 @@ public class BulkUpdatingModel extends AbstractModelDecorator { private Map1 mapAsTriple = new Map1() { @Override - public Triple map1(Statement s) { - return s.asTriple(); + public Triple apply(Statement statement) { + return statement.asTriple(); } }; - } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java index 083085235..7c28f34b3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/BulkUpdatingOntModel.java @@ -4,7 +4,9 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.io.Reader; +import java.io.Writer; import java.net.URL; import java.util.Iterator; import java.util.List; @@ -12,21 +14,22 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.graph.impl.GraphWithPerform; -import com.hp.hpl.jena.graph.impl.WrappedBulkUpdateHandler; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFReaderF; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.rdf.model.impl.RDFReaderFImpl; -import com.hp.hpl.jena.rdf.model.impl.StatementImpl; -import com.hp.hpl.jena.shared.WrappedIOException; -import com.hp.hpl.jena.util.iterator.Map1; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.GraphUtil; +import org.apache.jena.graph.Triple; +import org.apache.jena.graph.impl.GraphWithPerform; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFReaderF; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.impl.RDFReaderFImpl; +import org.apache.jena.rdf.model.impl.StatementImpl; +import org.apache.jena.shared.WrappedIOException; +import org.apache.jena.util.iterator.Map1; /** * A model that still handles bulk updates in the old-fashioned way: with a @@ -38,58 +41,31 @@ public class BulkUpdatingOntModel extends AbstractOntModelDecorator { private static final RDFReaderF readerFactory = new RDFReaderFImpl(); - private final BulkUpdateHandler buh; - public BulkUpdatingOntModel(OntModel inner) { super(inner); - this.buh = inner.getGraph().getBulkUpdateHandler(); - } - - @SuppressWarnings("deprecation") - private static BulkUpdateHandler getWrappedBulkUpdateHandler(Graph graph) { - if (graph instanceof GraphWithPerform) { - return new WrappedBulkUpdateHandler((GraphWithPerform) graph, - graph.getBulkUpdateHandler()); - } else { - try { - throw new IllegalStateException(); - } catch (IllegalStateException e) { - log.warn("Graph is not an instance of GraphWithPerform", e); - } - return graph.getBulkUpdateHandler(); - } } @SuppressWarnings("deprecation") @Override public Model add(StmtIterator iter) { try { - buh.add(asTriples(iter)); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.add(this.getGraph(), asTriples(iter)); + this.getGraph().getTransactionHandler().commit(); } finally { iter.close(); } return this; } - @Override - public Model add(Model m) { - return add(m, false); - } - - @Deprecated - @Override - public Model add(Model m, boolean suppressReifications) { - // suppressReifications is a no-op. - buh.add(m.getGraph()); - return this; - } - @SuppressWarnings("deprecation") @Override public Model read(String url) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader().read(m, url); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -98,7 +74,9 @@ public class BulkUpdatingOntModel extends AbstractOntModelDecorator { public Model read(Reader reader, String base) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader().read(m, reader, base); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -107,7 +85,9 @@ public class BulkUpdatingOntModel extends AbstractOntModelDecorator { public Model read(InputStream reader, String base) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader().read(m, reader, base); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -116,7 +96,9 @@ public class BulkUpdatingOntModel extends AbstractOntModelDecorator { public Model read(String url, String lang) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader(lang).read(m, url); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -142,7 +124,9 @@ public class BulkUpdatingOntModel extends AbstractOntModelDecorator { public Model read(Reader reader, String base, String lang) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader(lang).read(m, reader, base); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -151,40 +135,27 @@ public class BulkUpdatingOntModel extends AbstractOntModelDecorator { public Model read(InputStream reader, String base, String lang) { Model m = ModelFactory.createDefaultModel(); readerFactory.getReader(lang).read(m, reader, base); - buh.add(m.getGraph()); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.addInto(this.getGraph(), m.getGraph()); + this.getGraph().getTransactionHandler().commit(); return this; } @SuppressWarnings("deprecation") @Override public Model remove(StmtIterator iter) { - buh.delete(asTriples(iter)); - return this; - } - - @Override - public Model remove(Model m) { - return remove(m, false); - } - - @Override - @Deprecated - public Model remove(Model m, boolean suppressReifications) { - buh.delete(m.getGraph()); - return this; - } - - @SuppressWarnings("deprecation") - @Override - public Model removeAll() { - buh.removeAll(); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.delete(this.getGraph(), asTriples(iter)); + this.getGraph().getTransactionHandler().commit(); return this; } @SuppressWarnings("deprecation") @Override public Model add(Statement[] statements) { - buh.add(StatementImpl.asTriples(statements)); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.add(this.getGraph(), StatementImpl.asTriples(statements)); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -197,7 +168,9 @@ public class BulkUpdatingOntModel extends AbstractOntModelDecorator { @SuppressWarnings("deprecation") @Override public Model remove(Statement[] statements) { - buh.delete(StatementImpl.asTriples(statements)); + this.getGraph().getTransactionHandler().begin(); + GraphUtil.delete(this.getGraph(), StatementImpl.asTriples(statements)); + this.getGraph().getTransactionHandler().commit(); return this; } @@ -213,9 +186,8 @@ public class BulkUpdatingOntModel extends AbstractOntModelDecorator { private Map1 mapAsTriple = new Map1() { @Override - public Triple map1(Statement s) { - return s.asTriple(); + public Triple apply(Statement statement) { + return statement.asTriple(); } }; - } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/MemoryMappedModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/MemoryMappedModel.java index 8eff342d6..1dda50776 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/MemoryMappedModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/MemoryMappedModel.java @@ -5,14 +5,17 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters; import java.util.List; import java.util.Set; +import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroModelSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.rdf.model.impl.StmtIteratorImpl; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.impl.StmtIteratorImpl; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.CloseEvent; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactory.java index 3de5327ce..6d41628f8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactory.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactory.java @@ -2,20 +2,18 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters; -import static com.hp.hpl.jena.ontology.OntModelSpec.OWL_MEM; +import static org.apache.jena.ontology.OntModelSpec.OWL_MEM; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.compose.Union; -import com.hp.hpl.jena.graph.impl.WrappedBulkUpdateHandler; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.impl.OntModelImpl; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.impl.ModelCom; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.compose.Union; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.impl.OntModelImpl; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.impl.ModelCom; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; @@ -46,9 +44,8 @@ public class VitroModelFactory { BulkUpdatingUnion unionGraph = new BulkUpdatingUnion(baseGraph, plusGraph); - BulkUpdateHandler buh = getBulkUpdateHandler(unionGraph); Model unionModel = ModelFactory.createModelForGraph(unionGraph); - return new BulkUpdatingModel(unionModel, buh); + return new BulkUpdatingModel(unionModel); } public static OntModel createUnion(OntModel baseModel, OntModel plusModel) { @@ -64,16 +61,13 @@ public class VitroModelFactory { } public static Model createModelForGraph(Graph g) { - BulkUpdateHandler buh = getBulkUpdateHandler(g); - return new BulkUpdatingModel(ModelFactory.createModelForGraph(g), buh); + return new BulkUpdatingModel(ModelFactory.createModelForGraph(g)); } private static class BulkUpdatingUnion extends Union { @SuppressWarnings("deprecation") public BulkUpdatingUnion(Graph L, Graph R) { super(L, R); - this.bulkHandler = new WrappedBulkUpdateHandler(this, - L.getBulkUpdateHandler()); } @Override @@ -85,9 +79,4 @@ public class VitroModelFactory { } - - @SuppressWarnings("deprecation") - private static BulkUpdateHandler getBulkUpdateHandler(Graph graph) { - return graph.getBulkUpdateHandler(); - } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/FilteredResultSet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/FilteredResultSet.java index 3bbdf8a8b..7a9f151e2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/FilteredResultSet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/FilteredResultSet.java @@ -5,10 +5,10 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice.filter; import java.util.Iterator; import java.util.List; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.sparql.engine.binding.Binding; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.sparql.engine.binding.Binding; public class FilteredResultSet implements ResultSet { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java index d58643e8f..aa3846068 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java @@ -15,16 +15,16 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java index a1e2e879d..54380ef9e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java @@ -9,9 +9,9 @@ import java.util.Locale; import javax.servlet.ServletRequest; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceGraph; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/SameAsFilteringRDFServiceFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/SameAsFilteringRDFServiceFactory.java index 40b9e4666..a92f53a37 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/SameAsFilteringRDFServiceFactory.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/SameAsFilteringRDFServiceFactory.java @@ -13,22 +13,22 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java index 8c940163f..72ae3e208 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java @@ -6,8 +6,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.List; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java index 61bab8e73..c02cd555d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java @@ -12,19 +12,19 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.NodeFactory; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QueryParseException; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.NodeFactory; +import org.apache.jena.graph.Triple; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; @@ -266,7 +266,7 @@ public abstract class RDFServiceImpl implements RDFService { } // see http://www.python.org/doc/2.5.2/ref/strings.html - // or see jena's n3 grammar jena/src/com/hp/hpl/jena/n3/n3.g + // or see jena's n3 grammar jena/src/org.apache/jena/n3/n3.g protected static void pyString(StringBuffer sbuff, String s) { for (int i = 0; i < s.length(); i++) { char c = s.charAt(i); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceUtils.java index 15c67689a..fa19df460 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceUtils.java @@ -11,11 +11,11 @@ import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.sparql.resultset.ResultsFormat; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.sparql.resultset.ResultsFormat; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java index f7ec6797a..9323652ef 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java @@ -19,25 +19,25 @@ import org.apache.commons.logging.LogFactory; import org.apache.jena.riot.RDFDataMgr; import org.apache.log4j.lf5.util.StreamUtils; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.sdb.SDB; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.sparql.core.Quad; +import org.apache.jena.graph.Triple; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.sdb.SDB; +import org.apache.jena.shared.Lock; +import org.apache.jena.sparql.core.Quad; import edu.cornell.mannlib.vitro.webapp.dao.jena.DatasetWrapper; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java index 0f9eb5421..9d8fe4540 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java @@ -9,9 +9,9 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.dao.jena.DatasetWrapper; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceFactorySDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceFactorySDB.java index d6a7e761a..6ba786db4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceFactorySDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceFactorySDB.java @@ -7,8 +7,8 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.sdb.StoreDesc; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.sdb.StoreDesc; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java index 82fd2a55a..58d4faf7a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java @@ -11,14 +11,14 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.sdb.SDBFactory; -import com.hp.hpl.jena.sdb.Store; -import com.hp.hpl.jena.sdb.StoreDesc; -import com.hp.hpl.jena.sdb.sql.SDBConnection; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.sdb.SDBFactory; +import org.apache.jena.sdb.Store; +import org.apache.jena.sdb.StoreDesc; +import org.apache.jena.sdb.sql.SDBConnection; import edu.cornell.mannlib.vitro.webapp.dao.jena.DatasetWrapper; import edu.cornell.mannlib.vitro.webapp.dao.jena.StaticDatasetFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java index 1df088264..fc11813d9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java @@ -12,15 +12,15 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.ReadWrite; -import com.hp.hpl.jena.tdb.TDBFactory; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.ReadWrite; +import org.apache.jena.tdb.TDBFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.DatasetWrapper; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java index 4d4859571..19006cfd4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java @@ -6,8 +6,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.List; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java index 0e84a447d..8c7908e6e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice.impl.logging; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.ModelChangedListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java index d3ce2e941..c28c0cdcc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java @@ -39,22 +39,22 @@ import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; import org.apache.jena.riot.RDFDataMgr; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.sparql.core.Quad; +import org.apache.jena.graph.Triple; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.sparql.core.Quad; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; import edu.cornell.mannlib.vitro.webapp.dao.jena.SparqlGraph; @@ -701,7 +701,7 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService { ResultSet rs = qe.execSelect(); while (rs.hasNext()) { QuerySolution qs = rs.next(); - com.hp.hpl.jena.rdf.model.Resource s = qs.getResource("s"); + org.apache.jena.rdf.model.Resource s = qs.getResource("s"); String treeFinder = makeDescribe(s); Query treeFinderQuery = QueryFactory.create(treeFinder); QueryExecution qee = QueryExecutionFactory.create(treeFinderQuery, blankNodeModel); @@ -720,8 +720,8 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService { RDFNode n = stmt.getObject(); Model m2 = ModelFactory.createDefaultModel(); if (n.isResource()) { - com.hp.hpl.jena.rdf.model.Resource s2 = - (com.hp.hpl.jena.rdf.model.Resource) n; + org.apache.jena.rdf.model.Resource s2 = + (org.apache.jena.rdf.model.Resource) n; // now run yet another describe query String smallerTree = makeDescribe(s2); Query smallerTreeQuery = QueryFactory.create(smallerTree); @@ -787,8 +787,8 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService { if (originalSize == 1) return stmts; List remaining = stmts; - ConcurrentLinkedQueue subjQueue = - new ConcurrentLinkedQueue(); + ConcurrentLinkedQueue subjQueue = + new ConcurrentLinkedQueue(); for(Statement stmt : remaining) { if(stmt.getSubject().isURIResource()) { subjQueue.add(stmt.getSubject()); @@ -803,13 +803,13 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService { subjQueue.add(remaining.get(0).getSubject()); } while(!subjQueue.isEmpty()) { - com.hp.hpl.jena.rdf.model.Resource subj = subjQueue.poll(); + org.apache.jena.rdf.model.Resource subj = subjQueue.poll(); List temp = new ArrayList(); for (Statement stmt : remaining) { if(stmt.getSubject().equals(subj)) { output.add(stmt); if (stmt.getObject().isResource()) { - subjQueue.add((com.hp.hpl.jena.rdf.model.Resource) stmt.getObject()); + subjQueue.add((org.apache.jena.rdf.model.Resource) stmt.getObject()); } } else { temp.add(stmt); @@ -847,7 +847,7 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService { } } - private String makeDescribe(com.hp.hpl.jena.rdf.model.Resource s) { + private String makeDescribe(org.apache.jena.rdf.model.Resource s) { StringBuffer query = new StringBuffer("DESCRIBE <") ; if (s.isAnon()) { query.append("_:" + s.getId().toString()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java index 6319bdd9d..06e556c0e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java @@ -6,13 +6,13 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFormatter; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFormatter; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.sparql.engine.http.QueryEngineHTTP; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java index e7b19f325..1c7ff10a0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java @@ -10,14 +10,14 @@ import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Selector; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Selector; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import org.apache.commons.io.IOUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java index d00692fb4..51c090da6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java @@ -18,27 +18,27 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.ResultSetFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.ResultSetFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ModelUpdate.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ModelUpdate.java index abd7be02d..1cb085142 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ModelUpdate.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ModelUpdate.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.reasoner; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; public class ModelUpdate { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ReasonerPlugin.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ReasonerPlugin.java index 5b38ef81e..8cf00127f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ReasonerPlugin.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ReasonerPlugin.java @@ -2,9 +2,9 @@ package edu.cornell.mannlib.vitro.webapp.reasoner; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Statement; public interface ReasonerPlugin { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java index bdcc274b5..26790589e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java @@ -13,30 +13,30 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.AnnotationProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.NodeIterator; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.AnnotationProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.NodeIterator; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.dao.jena.DifferenceGraph; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceGraph; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxListener.java index 8db489c51..62eb3ce7e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxListener.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxListener.java @@ -7,8 +7,8 @@ import java.util.concurrent.ConcurrentLinkedQueue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames; import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java index 1452f55cf..23fdd69f6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java @@ -5,9 +5,9 @@ package edu.cornell.mannlib.vitro.webapp.reasoner.plugin; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.reasoner.ReasonerPlugin; import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java index 2246f0f5a..a911d4e71 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java @@ -7,19 +7,19 @@ import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QueryParseException; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.reasoner.ReasonerPlugin; import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimplePropertyAndTypeRule.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimplePropertyAndTypeRule.java index 56e1cccf5..c6edbfbd6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimplePropertyAndTypeRule.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimplePropertyAndTypeRule.java @@ -2,16 +2,16 @@ package edu.cornell.mannlib.vitro.webapp.reasoner.plugin; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.reasoner.ReasonerPlugin; import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java index 66b823b2c..21f0cba38 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java @@ -15,15 +15,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONArray; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java index 451676e81..076c23b08 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java @@ -15,11 +15,11 @@ import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.datatypes.RDFDatatype ; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.datatypes.RDFDatatype ; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java index 091aebb0a..8e284632a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java @@ -14,16 +14,15 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.jena.riot.RiotReader; import org.apache.jena.riot.tokens.Tokenizer; import org.apache.jena.riot.tokens.TokenizerFactory; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.graph.Triple; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java index e9a6a9a81..3e29bdab0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java @@ -32,7 +32,7 @@ import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java index 4638476c8..03f5afec6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java @@ -10,9 +10,9 @@ import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.RDFNode; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.java index 0caf64025..5ffe61cd8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.java @@ -11,22 +11,22 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java index 83c94c06c..781886ca6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java @@ -8,11 +8,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForDataProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForDataProperties.java index 0e3c14820..a18740c9c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForDataProperties.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForDataProperties.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.util.Collections; import java.util.List; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.IndexingUriFinder; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.java index 1ed7d7a37..4ee04399e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.java @@ -10,14 +10,14 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java index b1261a1f9..ed63071db 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java @@ -5,8 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.util.Collections; import java.util.List; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.IndexingUriFinder; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinder.java index c622de01c..1f6520b96 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinder.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinder.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.util.List; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; /** * Interface to use with IndexBuilder to find more URIs to index given a changed diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderList.java index a1a4169c7..f879c0916 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderList.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderList.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.util.Set; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; /** * An ordered list of IndexingUriFinder objects, in a handy package. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListBasic.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListBasic.java index 21c41bd31..b807429f6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListBasic.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListBasic.java @@ -12,7 +12,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; /** * The basic implementation. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java index 563935dc3..f713bd639 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java @@ -14,7 +14,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; /** * An implementation that accumulates timing figures for each finder and writes diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinder.java index a0e50797a..c82e5fb9c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinder.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinder.java @@ -15,8 +15,8 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.java index e79395dcd..4f734fb9e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/FindUrisForStatementWorkUnit.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/FindUrisForStatementWorkUnit.java index 739a3604a..12240217d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/FindUrisForStatementWorkUnit.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/FindUrisForStatementWorkUnit.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.searchindex.tasks; import java.util.HashSet; import java.util.Set; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.IndexingUriFinderList; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateDocumentWorkUnit.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateDocumentWorkUnit.java index beca68c87..cbab202e2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateDocumentWorkUnit.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateDocumentWorkUnit.java @@ -24,8 +24,8 @@ import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; import org.jsoup.Jsoup; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java index 550d9ab0e..228daf277 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java @@ -17,7 +17,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer.Event; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java index a650620cc..d86678052 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java @@ -19,15 +19,15 @@ import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java index e728fb7c2..eb880f263 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java @@ -11,7 +11,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java index 5b9b45579..db9efe608 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java @@ -15,14 +15,14 @@ import javax.servlet.ServletContextEvent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.ResourceUtils; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.ResourceUtils; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java index 0a42817f2..946551efb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java @@ -28,12 +28,12 @@ import javax.servlet.ServletContextListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntDocumentManager; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntDocumentManager; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java index 0338109eb..f0bd212f9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java @@ -10,7 +10,7 @@ import javax.servlet.ServletContextListener; import net.sf.jga.fn.UnaryFunctor; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.beans.Property; import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.EntityPropertyListFilter; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java index c24f43382..ed63c9303 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java @@ -16,10 +16,10 @@ import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java index 0a381cb16..c034bd80c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java @@ -20,16 +20,16 @@ import javax.servlet.ServletContextListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.util.ResourceUtils; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.util.ResourceUtils; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java index 533df0efa..2e7739a32 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java @@ -18,10 +18,10 @@ import javax.servlet.ServletContextListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java index 8fb5a968a..a15c2384f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java @@ -16,12 +16,12 @@ import javax.servlet.ServletContextListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean.ThemeInfo; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java index 8710e50f9..b5aaffbc2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java @@ -26,22 +26,22 @@ import javax.servlet.ServletContextListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java index 12e37bcb1..2edcf9b9f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java @@ -16,10 +16,10 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vedit.controller.BaseEditController; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java index 017994afe..cca7e9454 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java @@ -12,13 +12,13 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java index 04fda0a6e..a2a387e7b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java @@ -7,9 +7,9 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ConfiguredReasonerListener; import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ConfiguredReasonerListener.Suspension; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java index 97574caaf..9f28580be 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java @@ -2,13 +2,13 @@ package edu.cornell.mannlib.vitro.webapp.tboxreasoner; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty; +import static org.apache.jena.rdf.model.ResourceFactory.createProperty; import java.util.LinkedList; import java.util.Set; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.ObjectProperty; import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerConfiguration; import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerStatementPattern; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java index ed7f33341..1c77bd308 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java @@ -5,9 +5,9 @@ package edu.cornell.mannlib.vitro.webapp.tboxreasoner; import java.util.HashSet; import java.util.Set; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; public class ReasonerConfiguration { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java index e1c1c627e..f9e6796cc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java @@ -4,11 +4,11 @@ package edu.cornell.mannlib.vitro.webapp.tboxreasoner; import java.util.List; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.shared.Lock; /** * For now, this only models Object Properties. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxChanges.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxChanges.java index 4ec7ae0f6..8e768ad09 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxChanges.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxChanges.java @@ -6,8 +6,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; /** * Accumulate changes to the TBox as they arrive. Then make them available to diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java index 5839193ca..287c042a9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java @@ -4,10 +4,10 @@ package edu.cornell.mannlib.vitro.webapp.tboxreasoner; import java.util.List; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.rdf.model.Statement; /** * The functionality of a TBox reasoner. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java index 9ffe21cb5..db6f5f675 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java @@ -16,10 +16,10 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerStatus; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/TBoxInferencesAccumulator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/TBoxInferencesAccumulator.java index d2009280e..d4305de7d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/TBoxInferencesAccumulator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/TBoxInferencesAccumulator.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.tboxreasoner.impl; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; +import static org.apache.jena.rdf.model.ResourceFactory.createProperty; +import static org.apache.jena.rdf.model.ResourceFactory.createResource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -14,10 +14,10 @@ import org.semanticweb.owlapi.model.OWLObjectProperty; import org.semanticweb.owlapi.model.OWLObjectPropertyExpression; import org.semanticweb.owlapi.reasoner.OWLReasoner; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; /** * Build a model of inferred statements by walking through the ontology as diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java index 5987710b1..9bbccfc43 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java @@ -21,19 +21,19 @@ import org.semarglproject.vocab.OWL; import uk.ac.manchester.cs.jfact.JFactFactory; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.tboxreasoner.ReasonerStatementPattern; import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxChanges; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasonerModule.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasonerModule.java index b69ca0095..42708bf99 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasonerModule.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasonerModule.java @@ -13,7 +13,7 @@ import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.Restriction; +import org.apache.jena.ontology.Restriction; import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/CombinedTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/CombinedTripleSource.java index c5189a4b4..525b0b229 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/CombinedTripleSource.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/CombinedTripleSource.java @@ -4,8 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.triplesource; import javax.servlet.http.HttpServletRequest; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService; import edu.cornell.mannlib.vitro.webapp.modelaccess.ontmodels.OntModelCache; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicCombinedTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicCombinedTripleSource.java index 612f47b56..a1144250c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicCombinedTripleSource.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicCombinedTripleSource.java @@ -18,8 +18,8 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService; import edu.cornell.mannlib.vitro.webapp.modelaccess.ontmodels.JoinedOntModelCache; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/ContentTripleSourceSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/ContentTripleSourceSDB.java index 68247c61e..f90d87c57 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/ContentTripleSourceSDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/ContentTripleSourceSDB.java @@ -16,16 +16,16 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.sdb.SDB; -import com.hp.hpl.jena.sdb.SDBFactory; -import com.hp.hpl.jena.sdb.Store; -import com.hp.hpl.jena.sdb.StoreDesc; -import com.hp.hpl.jena.sdb.sql.SDBConnection; -import com.hp.hpl.jena.sdb.store.DatabaseType; -import com.hp.hpl.jena.sdb.store.LayoutType; -import com.hp.hpl.jena.sdb.util.StoreUtils; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.sdb.SDB; +import org.apache.jena.sdb.SDBFactory; +import org.apache.jena.sdb.Store; +import org.apache.jena.sdb.StoreDesc; +import org.apache.jena.sdb.sql.SDBConnection; +import org.apache.jena.sdb.store.DatabaseType; +import org.apache.jena.sdb.store.LayoutType; +import org.apache.jena.sdb.util.StoreUtils; import com.mchange.v2.c3p0.ComboPooledDataSource; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sparql/ContentTripleSourceSPARQL.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sparql/ContentTripleSourceSPARQL.java index cc19fac1e..da90f2eda 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sparql/ContentTripleSourceSPARQL.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sparql/ContentTripleSourceSPARQL.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.triplesource.impl.sparql; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceModelMaker; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ConfigurationTripleSourceTDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ConfigurationTripleSourceTDB.java index a497c9af5..7c787595f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ConfigurationTripleSourceTDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ConfigurationTripleSourceTDB.java @@ -5,9 +5,9 @@ package edu.cornell.mannlib.vitro.webapp.triplesource.impl.tdb; import java.io.IOException; import java.nio.file.Path; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.tdb.TDB; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.tdb.TDB; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java index 4591559b0..43656a7ec 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java @@ -4,9 +4,9 @@ package edu.cornell.mannlib.vitro.webapp.triplesource.impl.tdb; import java.io.IOException; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.tdb.TDB; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.tdb.TDB; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceModelMaker; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java index 2d5471ab7..8a31363f9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java @@ -8,18 +8,18 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java index 769e53b0c..0f9d90cc7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java @@ -12,16 +12,16 @@ import javax.servlet.http.HttpServletRequest; import org.skife.csv.CSVReader; import org.skife.csv.SimpleReader; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FedoraConfiguration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FedoraConfiguration.java index 59c4e39ef..d014e0688 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FedoraConfiguration.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FedoraConfiguration.java @@ -15,8 +15,8 @@ import org.apache.commons.logging.LogFactory; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import fedora.client.FedoraClient; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java index a9107d049..1088ef106 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java @@ -10,12 +10,12 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapper.java index 1ca5f58dc..c312ad90d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapper.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapper.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.utils; import java.util.List; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.ModelChangedListener; public interface NamespaceMapper extends ModelChangedListener { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java index f2fda46dc..4032207be 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java @@ -5,17 +5,17 @@ package edu.cornell.mannlib.vitro.webapp.utils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; /** * Execute SPARQL queries against a model. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryUtils.java index fcbe1cea1..651932223 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryUtils.java @@ -6,10 +6,10 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QueryParseException; -import com.hp.hpl.jena.query.Syntax; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.query.Syntax; /** * Some utility methods that help when dealing with SPARQL queries. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java index fa7249297..4a9ce2361 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.utils.configuration; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; +import static org.apache.jena.rdf.model.ResourceFactory.createResource; import java.util.HashSet; import java.util.List; @@ -12,9 +12,9 @@ import java.util.Set; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockableModel; import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockedModel; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java index 72dc8223a..abf9288a0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.utils.configuration; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createStatement; +import static org.apache.jena.rdf.model.ResourceFactory.createResource; +import static org.apache.jena.rdf.model.ResourceFactory.createStatement; import static edu.cornell.mannlib.vitro.webapp.utils.configuration.ConfigurationBeanLoader.fromJavaUri; import static edu.cornell.mannlib.vitro.webapp.utils.configuration.ConfigurationBeanLoader.isJavaUri; import static edu.cornell.mannlib.vitro.webapp.utils.configuration.ConfigurationBeanLoader.toJavaUri; @@ -14,12 +14,12 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Selector; -import com.hp.hpl.jena.rdf.model.SimpleSelector; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Selector; +import org.apache.jena.rdf.model.SimpleSelector; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.utils.configuration.PropertyType.PropertyStatement; import edu.cornell.mannlib.vitro.webapp.utils.configuration.PropertyType.PropertyTypeException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java index 397008548..58f1cacb8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java @@ -2,17 +2,17 @@ package edu.cornell.mannlib.vitro.webapp.utils.configuration; -import static com.hp.hpl.jena.datatypes.xsd.XSDDatatype.XSDfloat; -import static com.hp.hpl.jena.datatypes.xsd.XSDDatatype.XSDstring; +import static org.apache.jena.datatypes.xsd.XSDDatatype.XSDfloat; +import static org.apache.jena.datatypes.xsd.XSDDatatype.XSDstring; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Statement; /** * An enumeration of the types of properties that the ConfigurationBeanLoader diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/BrowseDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/BrowseDataGetter.java index 83c2d518e..66d061eb2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/BrowseDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/BrowseDataGetter.java @@ -17,7 +17,7 @@ import org.apache.commons.logging.LogFactory; import org.json.JSONArray; import org.json.JSONObject; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java index 5560d259d..9fe92e671 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java @@ -12,7 +12,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONObject; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java index f42384c9c..5545534ac 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java @@ -7,7 +7,7 @@ import javax.servlet.ServletContext; import org.apache.commons.lang.StringUtils; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.jena.JenaIngestController; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java index ad37993a9..b83c366fc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java @@ -15,20 +15,20 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONObject; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java index d9bdcebcb..8402d4bac 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java @@ -9,7 +9,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java index 2a30c62f0..4e6f64bee 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java @@ -13,19 +13,19 @@ import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java index 47a17976e..782e928db 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java @@ -16,14 +16,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONObject; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SearchIndividualsDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SearchIndividualsDataGetter.java index 6b731d147..739b9f309 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SearchIndividualsDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SearchIndividualsDataGetter.java @@ -13,18 +13,18 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.Listed import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.VClass; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java index 6bb296d1e..dd04c322a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java @@ -13,19 +13,19 @@ import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledChangeListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledChangeListener.java index 1bb0cbe7e..690487200 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledChangeListener.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledChangeListener.java @@ -2,10 +2,10 @@ package edu.cornell.mannlib.vitro.webapp.utils.developer.listeners; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings; import edu.cornell.mannlib.vitro.webapp.utils.developer.Key; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledModelChangeListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledModelChangeListener.java index 280666a8c..86b1186ec 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledModelChangeListener.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledModelChangeListener.java @@ -4,10 +4,10 @@ package edu.cornell.mannlib.vitro.webapp.utils.developer.listeners; import java.util.List; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings; import edu.cornell.mannlib.vitro.webapp.utils.developer.Key; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/loggers/StackTraceUtility.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/loggers/StackTraceUtility.java index 747cbf772..ac63f22df 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/loggers/StackTraceUtility.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/loggers/StackTraceUtility.java @@ -82,7 +82,7 @@ public class StackTraceUtility { ListIterator iter = list.listIterator(); while (iter.hasNext()) { StackTraceElement ste = iter.next(); - if (ste.getClassName().startsWith("com.hp.hpl.jena.")) { + if (ste.getClassName().startsWith("org.apache.jena.")) { iter.remove(); } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/DedupAndExtract.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/DedupAndExtract.java index 1fdd84523..1cb2b3f48 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/DedupAndExtract.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/DedupAndExtract.java @@ -6,13 +6,13 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.OWL; public class DedupAndExtract { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java index 143653972..4846c1f4c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java @@ -13,14 +13,14 @@ import javax.servlet.ServletContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; public class ExtendedLinkedDataUtils { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java index b40f3b7f7..54b8b68c1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java @@ -18,26 +18,26 @@ import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.FunctionalProperty; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.ResIterator; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.ResourceUtils; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.FunctionalProperty; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.ResIterator; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.ResourceUtils; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.InsertException; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestWorkflowProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestWorkflowProcessor.java index 05b1e4ff3..a14b4ac58 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestWorkflowProcessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestWorkflowProcessor.java @@ -10,24 +10,24 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.Syntax; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.Syntax; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.shared.Lock; public class JenaIngestWorkflowProcessor { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java index 82ec60b2a..1c087cc4a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java @@ -10,7 +10,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/NamespaceMapperJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/NamespaceMapperJena.java index 8cb5c702e..5da89ba75 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/NamespaceMapperJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/NamespaceMapperJena.java @@ -12,16 +12,16 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.ontology.Individual; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; +import org.apache.jena.ontology.Individual; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.utils.NamespaceMapper; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/URIUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/URIUtils.java index 4c890a64e..c756381cb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/URIUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/URIUtils.java @@ -2,17 +2,17 @@ package edu.cornell.mannlib.vitro.webapp.utils.jena; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; +import static org.apache.jena.rdf.model.ResourceFactory.createProperty; +import static org.apache.jena.rdf.model.ResourceFactory.createResource; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; public class URIUtils { public static boolean hasExistingURI(String uriStr, OntModel ontModel) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/WorkflowOntology.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/WorkflowOntology.java index 435986285..5b8e36325 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/WorkflowOntology.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/WorkflowOntology.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.utils.jena; -import com.hp.hpl.jena.rdf.model.*; -import com.hp.hpl.jena.ontology.*; +import org.apache.jena.rdf.model.*; +import org.apache.jena.ontology.*; /** * Vocabulary definitions from workflowOntology.rdf * @author Auto-generated by schemagen on 12 Aug 2008 11:27 diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableModel.java index e66f65578..347654158 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableModel.java @@ -4,8 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection; import java.util.Objects; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.shared.Lock; /** * Makes it easy to use a Jena Model in a try-with-resources block. At the end diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModel.java index 75a05c82d..6906c498c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModel.java @@ -4,8 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection; import java.util.Objects; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.shared.Lock; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.shared.Lock; /** * Makes it easy to use a Jena OntModel in a try-with-resources block. At the diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java index 7d9cdec98..1ad8016a4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java @@ -2,9 +2,12 @@ package edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractModelDecorator; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.StmtIterator; /** * A model that is easy to use in a try-with-resources code block. It can only @@ -21,7 +24,6 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractModelDecorat */ public class LockedModel extends AbstractModelDecorator implements AutoCloseable { - /** * Should only be created by LockableModel. */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedOntModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedOntModel.java index 5f310d84a..440ce6492 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedOntModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedOntModel.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection; -import com.hp.hpl.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModel; import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractOntModelDecorator; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java index c5f0620bb..223206ad8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java @@ -12,10 +12,10 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.compose.Polyadic; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.compose.Polyadic; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java index 489a2801f..072071d2b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java @@ -9,11 +9,11 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java index 1e36e3796..951d73c76 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java @@ -6,8 +6,8 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java index 7f8f22172..e211fba2b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java @@ -11,11 +11,11 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/RdfServiceQueryContext.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/RdfServiceQueryContext.java index 148acda48..e27f3ca9f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/RdfServiceQueryContext.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/RdfServiceQueryContext.java @@ -13,9 +13,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.RDFNode; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/ResultSetIterators.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/ResultSetIterators.java index 1f935a83a..de7c8ec76 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/ResultSetIterators.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/ResultSetIterators.java @@ -4,15 +4,15 @@ package edu.cornell.mannlib.vitro.webapp.utils.sparql; import java.util.Iterator; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.NodeFactory; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.sparql.core.Quad; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.NodeFactory; +import org.apache.jena.graph.Triple; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.sparql.core.Quad; /** * Helper classes for producing N-Triples or N-Quads from ResultSets @@ -83,7 +83,7 @@ public class ResultSetIterators { public static Node toNode(RDFNode rdfNode) { if (rdfNode.isAnon()) { Resource a = rdfNode.asResource(); - return NodeFactory.createAnon(a.getId()); + return NodeFactory.createAnon(); } if (rdfNode.isLiteral()) { Literal l = rdfNode.asLiteral(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java index 51147adaf..743193c1e 100755 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java @@ -16,8 +16,8 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.impl.ModelCom; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.impl.ModelCom; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/ListSparqlTag.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/ListSparqlTag.java deleted file mode 100644 index 9df204428..000000000 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/ListSparqlTag.java +++ /dev/null @@ -1,93 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.web.jsptags; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.SimpleTagSupport; - -import net.djpowell.sparqltag.SelectTag; -import net.djpowell.sparqltag.SparqlTag; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.shared.Lock; - -import edu.cornell.mannlib.vitro.webapp.utils.IterableAdaptor; - -/** - * sparql:listselect - wraps a SPARQL select query, and copies the resultset into - * a variable. - * - * var resultset (list of rows in the "rows" property) - * model model - * - * based on SelectTag.java from David Powell. - */ - -public class ListSparqlTag extends SelectTag { - private static final Log log = LogFactory.getLog(ListSparqlTag.class); - -/** - * - * The query get executed, the result set copied into a Collection and - * the queryExecution gets closed. - */ - public void doTag() throws JspException { - log.debug("CollectionSparqlTag.doTag()"); - - SparqlTag container = ((SparqlTag)SimpleTagSupport.findAncestorWithClass(this, SparqlTag.class)); - if (container == null) { - throw new RuntimeException("Ancestor must be sparql container"); - } - //we copy the resultset into a collection so dispose can be called immediately - //container.addInnerTag((SelectTag)this); - - Query query = parseQuery(); - QueryExecution qex = QueryExecutionFactory.create(query, model, qparams); - log.debug("query executed"); - - ResultSet results; - model.enterCriticalSection(Lock.READ); - try { - results = qex.execSelect(); - List> resultList = new LinkedList>(); - - for( QuerySolution qs : IterableAdaptor.adapt( (Iterator)results ) ){ - log.debug("found solution"); - HashMap map1 = new HashMap(); - for( String name : IterableAdaptor.adapt((Iterator)qs.varNames())){ - RDFNode value = qs.get(name); - if( log.isDebugEnabled() ){log.debug(name + ": " + value.toString() );} - map1.put(name, value); - } - resultList.add(map1); - } - log.debug("setting " + var + " to a list of size " + resultList.size() ); - getJspContext().setAttribute(var, resultList); - } finally { - model.leaveCriticalSection(); - synchronized (this) { - if (qex != null) { - qex.close(); - } - model = null; - var = null; - qparams = null; - qex = null; - } - } - } -} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java index 471f527f4..4990cdf03 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java @@ -19,7 +19,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java index 763fb1f95..bfd56b2db 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java @@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit; import java.util.Map; import java.util.List; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java index 47ec82162..e0e23bf78 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java index bf22a5dac..c49d17f47 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java @@ -12,7 +12,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/FauxObjectPropertyWrapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/FauxObjectPropertyWrapper.java index e01ce0f09..cdb1de7b3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/FauxObjectPropertyWrapper.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/FauxObjectPropertyWrapper.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; import java.util.List; import java.util.Objects; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java index 2eb752d37..dff1472fd 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java @@ -17,7 +17,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.FauxProperty; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/NameStatementTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/NameStatementTemplateModel.java index 93eb997dd..183752f52 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/NameStatementTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/NameStatementTemplateModel.java @@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java b/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java index 168b9144b..b380419e8 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java @@ -52,10 +52,10 @@ import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; /** * A collection of useful routines to help when testing. diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/testing/ModelUtilitiesTestHelper.java b/api/src/test/java/edu/cornell/mannlib/vitro/testing/ModelUtilitiesTestHelper.java index 69c29537f..92db82b56 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/testing/ModelUtilitiesTestHelper.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/testing/ModelUtilitiesTestHelper.java @@ -2,21 +2,21 @@ package edu.cornell.mannlib.vitro.testing; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createLangLiteral; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createPlainLiteral; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createStatement; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createTypedLiteral; +import static org.apache.jena.rdf.model.ResourceFactory.createLangLiteral; +import static org.apache.jena.rdf.model.ResourceFactory.createPlainLiteral; +import static org.apache.jena.rdf.model.ResourceFactory.createProperty; +import static org.apache.jena.rdf.model.ResourceFactory.createResource; +import static org.apache.jena.rdf.model.ResourceFactory.createStatement; +import static org.apache.jena.rdf.model.ResourceFactory.createTypedLiteral; import java.util.SortedSet; import java.util.TreeSet; -import com.hp.hpl.jena.datatypes.xsd.XSDDatatype; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.RDF; /** * Just some helper methods for Test classes that work with models. diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java index 74ab2419b..ec7aa88ac 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java @@ -21,15 +21,15 @@ import stubs.javax.servlet.ServletContextStub; import stubs.javax.servlet.http.HttpServletRequestStub; import stubs.javax.servlet.http.HttpSessionStub; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.util.iterator.NiceIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.util.iterator.NiceIterator; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java index c04b328f3..465d3675b 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java @@ -12,12 +12,12 @@ import stubs.javax.servlet.ServletContextStub; import stubs.javax.servlet.http.HttpServletRequestStub; import stubs.javax.servlet.http.HttpSessionStub; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java index cfaff087f..9e13ef71c 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java @@ -15,9 +15,9 @@ import org.junit.Test; import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBeanStub; import stubs.javax.servlet.ServletContextStub; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java index 34267371a..24e0f33cc 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java @@ -13,9 +13,9 @@ import org.junit.Test; import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBeanStub; import stubs.javax.servlet.ServletContextStub; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java index 9fba64f01..a192a4693 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java @@ -15,10 +15,10 @@ import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest.java index 9656859a1..703d48a9f 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest.java @@ -21,10 +21,10 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.controller.accounts.manageproxies.ProxyRelationshipSelectionCriteria.ProxyRelationshipView; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java index 130c28373..96e3073c1 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java @@ -11,15 +11,15 @@ import junit.framework.Assert; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.DatasetFactory; -import com.hp.hpl.jena.query.ReadWrite; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.update.GraphStore; -import com.hp.hpl.jena.update.GraphStoreFactory; -import com.hp.hpl.jena.update.UpdateAction; -import com.hp.hpl.jena.update.UpdateFactory; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.DatasetFactory; +import org.apache.jena.query.ReadWrite; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.update.GraphStore; +import org.apache.jena.update.GraphStoreFactory; +import org.apache.jena.update.UpdateAction; +import org.apache.jena.update.UpdateFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java index d1838bfd0..06d622597 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutorTest.java @@ -18,10 +18,10 @@ import org.apache.commons.lang.StringUtils; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.query.QueryParseException; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEditTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEditTest.java index e1608f18d..997a9bcde 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEditTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEditTest.java @@ -9,9 +9,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.java index 638e00cfc..d56ff838e 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.individual; -import static com.hp.hpl.jena.ontology.OntModelSpec.OWL_MEM; +import static org.apache.jena.ontology.OntModelSpec.OWL_MEM; import static edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.LABEL; import static edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.RDF_TYPE; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.LanguageOption.LANGUAGE_NEUTRAL; @@ -28,13 +28,13 @@ import stubs.javax.servlet.ServletContextStub; import stubs.javax.servlet.http.HttpServletRequestStub; import stubs.javax.servlet.http.HttpSessionStub; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java index e5bae17fe..cc7332f71 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java @@ -12,11 +12,11 @@ import java.util.Set; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java index a4a854bd2..146232fa7 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java @@ -8,15 +8,15 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.DatatypeProperty; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.DatatypeProperty; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java index c1e9adc53..76a6be12b 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java @@ -7,12 +7,12 @@ import java.util.List; import org.junit.Assert; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java index 26a9db88e..c55c2718c 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java @@ -10,17 +10,17 @@ import org.junit.Assert; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java index 4b00a1028..84a841877 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java @@ -12,13 +12,13 @@ import org.apache.log4j.Level; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java index 9e892f1ab..703e3526d 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java @@ -10,11 +10,11 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java index 365c3defb..889346bd2 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java @@ -7,12 +7,12 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty; @@ -128,7 +128,7 @@ public class ObjectPropertyDaoJenaTest extends AbstractTestClass { String lang = "en-US"; // populate sub-model - com.hp.hpl.jena.ontology.ObjectProperty property1 = subModel.createObjectProperty(propertyURI); + org.apache.jena.ontology.ObjectProperty property1 = subModel.createObjectProperty(propertyURI); property1.setLabel(rdfsLabel,lang); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java index fe79e90f0..516e82aa9 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java @@ -6,8 +6,8 @@ import static org.junit.Assert.*; import org.junit.Test; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; public class ObjectPropertyStatementDaoJenaTest { diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java index 0016c4d2c..2bd6e1fc1 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java @@ -10,11 +10,11 @@ import java.util.Map; import org.junit.Assert; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtilsTest.java index aa8e24020..1940273a4 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtilsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtilsTest.java @@ -15,10 +15,10 @@ import java.util.Map; import org.junit.Ignore; import org.junit.Test; -import com.hp.hpl.jena.query.QuerySolutionMap; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.query.QuerySolutionMap; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java index 9fb85e73b..2f29c3dd3 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java @@ -20,13 +20,13 @@ import org.apache.log4j.Level; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java index b4effd9df..18b5d243b 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java @@ -8,13 +8,13 @@ import java.util.List; import static org.junit.Assert.*; import org.junit.Test; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java index 782461ce2..5cf085638 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java @@ -8,11 +8,11 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.RDFS; public class VClassGroupCacheTest { diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java index 21e6880cd..9819d8b49 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java @@ -10,32 +10,32 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import com.hp.hpl.jena.ontology.AllValuesFromRestriction; -import com.hp.hpl.jena.ontology.AnnotationProperty; -import com.hp.hpl.jena.ontology.CardinalityRestriction; -import com.hp.hpl.jena.ontology.ComplementClass; -import com.hp.hpl.jena.ontology.HasValueRestriction; -import com.hp.hpl.jena.ontology.IntersectionClass; -import com.hp.hpl.jena.ontology.MaxCardinalityRestriction; -import com.hp.hpl.jena.ontology.MinCardinalityRestriction; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.ontology.OntResource; -import com.hp.hpl.jena.ontology.Restriction; -import com.hp.hpl.jena.ontology.SomeValuesFromRestriction; -import com.hp.hpl.jena.ontology.UnionClass; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.shared.Lock; -import com.hp.hpl.jena.util.iterator.ClosableIterator; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.AllValuesFromRestriction; +import org.apache.jena.ontology.AnnotationProperty; +import org.apache.jena.ontology.CardinalityRestriction; +import org.apache.jena.ontology.ComplementClass; +import org.apache.jena.ontology.HasValueRestriction; +import org.apache.jena.ontology.IntersectionClass; +import org.apache.jena.ontology.MaxCardinalityRestriction; +import org.apache.jena.ontology.MinCardinalityRestriction; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.ontology.OntResource; +import org.apache.jena.ontology.Restriction; +import org.apache.jena.ontology.SomeValuesFromRestriction; +import org.apache.jena.ontology.UnionClass; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.shared.Lock; +import org.apache.jena.util.iterator.ClosableIterator; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean; import edu.cornell.mannlib.vitro.webapp.beans.Ontology; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearchTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearchTest.java index 7cd3216d6..0eda46f6e 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearchTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearchTest.java @@ -7,13 +7,13 @@ import java.io.StringReader; import org.junit.Assert; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java index a6b35fe05..358c5cce7 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java @@ -6,7 +6,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; public class EditLiteralTest { diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3UtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3UtilsTest.java index 95632c345..cdee87e24 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3UtilsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3UtilsTest.java @@ -7,9 +7,9 @@ import org.junit.Assert; import org.apache.commons.io.output.NullOutputStream; import org.junit.Test; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java index ce2a700c5..6af51709b 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java @@ -12,10 +12,10 @@ import java.util.Map; import org.junit.Assert; import org.junit.Test; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java index bf5587b3d..c0d6aa4a8 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java @@ -12,11 +12,11 @@ import java.util.Map; import org.junit.Test; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.dao.InsertException; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java index 6ca614ff3..ad78373af 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java @@ -12,9 +12,9 @@ import org.junit.Assert; import org.junit.Test; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.vocabulary.XSD; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement; import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java index 4fb93e3e6..416b26c0a 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java @@ -11,9 +11,9 @@ import org.junit.Assert; import org.junit.Test; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.utils.NamespaceMapper; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMakerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMakerTest.java index 7d087227f..188a6461c 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMakerTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMakerTest.java @@ -15,15 +15,15 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; -import stubs.com.hp.hpl.jena.rdf.model.ModelMaker.ModelMakerStub; +import stubs.org.apache.jena.rdf.model.ModelMaker.ModelMakerStub; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.shared.AlreadyExistsException; -import com.hp.hpl.jena.shared.CannotCreateException; -import com.hp.hpl.jena.shared.DoesNotExistException; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.shared.AlreadyExistsException; +import org.apache.jena.shared.CannotCreateException; +import org.apache.jena.shared.DoesNotExistException; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMakerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMakerTest.java index 78b2cf164..a9b725bcc 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMakerTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMakerTest.java @@ -17,16 +17,16 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; -import stubs.com.hp.hpl.jena.rdf.model.ModelMaker.ModelMakerStub; +import stubs.org.apache.jena.rdf.model.ModelMaker.ModelMakerStub; -import com.hp.hpl.jena.graph.Graph; -import com.hp.hpl.jena.graph.impl.CollectionGraph; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.impl.CollectionGraph; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModelsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModelsTest.java index 4d4c530d6..baeae7234 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModelsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModelsTest.java @@ -14,15 +14,15 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; -import stubs.com.hp.hpl.jena.rdf.model.ModelMaker.ModelMakerStub; +import stubs.org.apache.jena.rdf.model.ModelMaker.ModelMakerStub; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.shared.AlreadyExistsException; -import com.hp.hpl.jena.shared.CannotCreateException; -import com.hp.hpl.jena.shared.DoesNotExistException; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.shared.AlreadyExistsException; +import org.apache.jena.shared.CannotCreateException; +import org.apache.jena.shared.DoesNotExistException; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java index 3b4edc231..b585817a2 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java @@ -2,7 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters; -import static com.hp.hpl.jena.ontology.OntModelSpec.OWL_MEM; +import static org.apache.jena.ontology.OntModelSpec.OWL_MEM; import static org.junit.Assert.*; import java.io.IOException; @@ -14,21 +14,19 @@ import java.util.List; import org.junit.Test; -import com.hp.hpl.jena.graph.BulkUpdateHandler; -import com.hp.hpl.jena.graph.impl.GraphWithPerform; -import com.hp.hpl.jena.graph.impl.SimpleBulkUpdateHandler; -import com.hp.hpl.jena.mem.GraphMem; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.listeners.StatementListener; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelChangedListener; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.graph.impl.GraphWithPerform; +import org.apache.jena.mem.GraphMem; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.listeners.StatementListener; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelChangedListener; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.testing.RecordingProxy; @@ -91,21 +89,18 @@ public class VitroModelFactoryTest extends AbstractTestClass { */ private static abstract class ModelGroup extends TestObjectGrouping { final GraphWithPerform g; - final BulkUpdateHandler bu; final ModelChangedListener l; final Model m; protected ModelGroup() { - MyGraphMem rawGraph = new MyGraphMem(); + GraphMem rawGraph = new GraphMem(); this.g = wrapGraph(rawGraph); - this.bu = makeBulkUpdater(this.g, rawGraph); this.l = makeListener(); this.m = wrapModel(makeModel(this.g)); this.m.register(this.l); reset(g); - reset(bu); reset(l); reset(m); } @@ -135,24 +130,21 @@ public class VitroModelFactoryTest extends AbstractTestClass { public void addOneToModel() { mg = new DefaultModelGroup(); mg.m.add(SINGLE_STATEMENT); - new MethodCalls().add(mg.g, "add").add(mg.bu) - .add(mg.l, "addedStatement").test(); + new MethodCalls().add(mg.g, "add").add(mg.l, "addedStatement").test(); } @Test public void addOneToVitroModel() { mg = new VitroModelGroup(); mg.m.add(SINGLE_STATEMENT); - new MethodCalls().add(mg.g, "add").add(mg.bu) - .add(mg.l, "addedStatement").test(); + new MethodCalls().add(mg.g, "add").add(mg.l, "addedStatement").test(); } @Test public void addMultipleToModel() { mg = new DefaultModelGroup(); mg.m.add(MULTIPLE_STATEMENTS); - new MethodCalls().add(mg.g, "performAdd", "performAdd").add(mg.bu) - .add(mg.l, "addedStatements").test(); + new MethodCalls().add(mg.g, "performAdd", "performAdd").add(mg.l, "addedStatements").test(); } @Test @@ -160,7 +152,7 @@ public class VitroModelFactoryTest extends AbstractTestClass { mg = new VitroModelGroup(); mg.m.add(MULTIPLE_STATEMENTS); new MethodCalls().add(mg.g, "performAdd", "performAdd") - .add(mg.bu, "add").add(mg.l, "addedStatements").test(); + .add(mg.l, "addedStatements").test(); } // ---------------------------------------------------------------------- @@ -225,7 +217,7 @@ public class VitroModelFactoryTest extends AbstractTestClass { public void addOneToOntModel() { omg = new DefaultOntModelGroup(); omg.om.add(SINGLE_STATEMENT); - new MethodCalls().add(omg.g, "add").add(omg.bu) + new MethodCalls().add(omg.g, "add") .add(omg.l, "addedStatement").add(omg.ol, "addedStatement") .test(); } @@ -234,7 +226,7 @@ public class VitroModelFactoryTest extends AbstractTestClass { public void addOneToVitroOntModel() { omg = new VitroOntModelGroup(); omg.om.add(SINGLE_STATEMENT); - new MethodCalls().add(omg.g, "add").add(omg.bu) + new MethodCalls().add(omg.g, "add") .add(omg.l, "addedStatement").add(omg.ol, "addedStatement") .test(); } @@ -243,7 +235,7 @@ public class VitroModelFactoryTest extends AbstractTestClass { public void addMultipleToOntModel() { omg = new DefaultOntModelGroup(); omg.om.add(MULTIPLE_STATEMENTS); - new MethodCalls().add(omg.g, "add", "add").add(omg.bu) + new MethodCalls().add(omg.g, "add", "add") .add(omg.l, "addedStatement", "addedStatement") .add(omg.ol, "addedStatements").test(); } @@ -253,7 +245,7 @@ public class VitroModelFactoryTest extends AbstractTestClass { omg = new VitroOntModelGroup(); omg.om.add(MULTIPLE_STATEMENTS); new MethodCalls().add(omg.g, "performAdd", "performAdd") - .add(omg.bu, "add").add(omg.l, "addedStatements") + .add(omg.l, "addedStatements") .add(omg.ol, "addedStatements").test(); } @@ -324,9 +316,9 @@ public class VitroModelFactoryTest extends AbstractTestClass { public void addOneToUnion() { umg = new DefaultUnionModelGroup(); umg.m.add(SINGLE_STATEMENT); - new MethodCalls().add(umg.base.g, "add").add(umg.base.bu) + new MethodCalls().add(umg.base.g, "add") .add(umg.base.l, "addedStatement").add(umg.plus.g) - .add(umg.plus.bu).add(umg.plus.l).add(umg.l, "addedStatement") + .add(umg.plus.l).add(umg.l, "addedStatement") .test(); } @@ -334,9 +326,9 @@ public class VitroModelFactoryTest extends AbstractTestClass { public void addOneToVitroUnion() { umg = new VitroUnionModelGroup(); umg.m.add(SINGLE_STATEMENT); - new MethodCalls().add(umg.base.g, "add").add(umg.base.bu) + new MethodCalls().add(umg.base.g, "add") .add(umg.base.l, "addedStatement").add(umg.plus.g) - .add(umg.plus.bu).add(umg.plus.l).add(umg.l, "addedStatement") + .add(umg.plus.l).add(umg.l, "addedStatement") .test(); } @@ -344,9 +336,9 @@ public class VitroModelFactoryTest extends AbstractTestClass { public void addMultipleToUnion() { umg = new DefaultUnionModelGroup(); umg.m.add(MULTIPLE_STATEMENTS); - new MethodCalls().add(umg.base.g, "add", "add").add(umg.base.bu) + new MethodCalls().add(umg.base.g, "add", "add") .add(umg.base.l, "addedStatement", "addedStatement") - .add(umg.plus.g).add(umg.plus.bu).add(umg.plus.l) + .add(umg.plus.g).add(umg.plus.l) .add(umg.l, "addedStatements").test(); } @@ -355,8 +347,8 @@ public class VitroModelFactoryTest extends AbstractTestClass { umg = new VitroUnionModelGroup(); umg.m.add(MULTIPLE_STATEMENTS); new MethodCalls().add(umg.base.g, "performAdd", "performAdd") - .add(umg.base.bu, "add").add(umg.base.l, "addedStatements") - .add(umg.plus.g).add(umg.plus.bu).add(umg.plus.l) + .add(umg.base.l, "addedStatements") + .add(umg.plus.g).add(umg.plus.l) .add(umg.l, "addedStatements").test(); } @@ -430,9 +422,9 @@ public class VitroModelFactoryTest extends AbstractTestClass { public void addOneToOntUnion() { uomg = new DefaultUnionOntModelGroup(); uomg.om.add(SINGLE_STATEMENT); - new MethodCalls().add(uomg.base.g, "add").add(uomg.base.bu) + new MethodCalls().add(uomg.base.g, "add") .add(uomg.base.l, "addedStatement").add(uomg.plus.g) - .add(uomg.plus.bu).add(uomg.plus.l) + .add(uomg.plus.l) .add(uomg.l, "addedStatement").test(); } @@ -440,9 +432,9 @@ public class VitroModelFactoryTest extends AbstractTestClass { public void addOneToVitroOntUnion() { uomg = new VitroUnionOntModelGroup(); uomg.om.add(SINGLE_STATEMENT); - new MethodCalls().add(uomg.base.g, "add").add(uomg.base.bu) + new MethodCalls().add(uomg.base.g, "add") .add(uomg.base.l, "addedStatement").add(uomg.plus.g) - .add(uomg.plus.bu).add(uomg.plus.l) + .add(uomg.plus.l) .add(uomg.l, "addedStatement").test(); } @@ -450,9 +442,9 @@ public class VitroModelFactoryTest extends AbstractTestClass { public void addMultipleToOntUnion() { uomg = new DefaultUnionOntModelGroup(); uomg.om.add(MULTIPLE_STATEMENTS); - new MethodCalls().add(uomg.base.g, "add", "add").add(uomg.base.bu) + new MethodCalls().add(uomg.base.g, "add", "add") .add(uomg.base.l, "addedStatement", "addedStatement") - .add(uomg.plus.g).add(uomg.plus.bu).add(uomg.plus.l) + .add(uomg.plus.g).add(uomg.plus.l) .add(uomg.l, "addedStatements").test(); } @@ -461,8 +453,8 @@ public class VitroModelFactoryTest extends AbstractTestClass { uomg = new VitroUnionOntModelGroup(); uomg.om.add(MULTIPLE_STATEMENTS); new MethodCalls().add(uomg.base.g, "performAdd", "performAdd") - .add(uomg.base.bu, "add").add(uomg.base.l, "addedStatements") - .add(uomg.plus.g).add(uomg.plus.bu).add(uomg.plus.l) + .add(uomg.base.l, "addedStatements") + .add(uomg.plus.g).add(uomg.plus.l) .add(uomg.l, "addedStatements").test(); } @@ -539,10 +531,10 @@ public class VitroModelFactoryTest extends AbstractTestClass { omumg = new DefaultOntModelUnionModelGroup(); omumg.om.add(SINGLE_STATEMENT); new MethodCalls().add(omumg.om, "add").add(omumg.ol, "addedStatement") - .add(omumg.union.base.g, "add").add(omumg.union.base.bu) + .add(omumg.union.base.g, "add") .add(omumg.union.base.m) .add(omumg.union.base.l, "addedStatement") - .add(omumg.union.plus.g).add(omumg.union.plus.bu) + .add(omumg.union.plus.g) .add(omumg.union.plus.m).add(omumg.union.plus.l).test(); } @@ -551,10 +543,10 @@ public class VitroModelFactoryTest extends AbstractTestClass { omumg = new VitroOntModelUnionModelGroup(); omumg.om.add(SINGLE_STATEMENT); new MethodCalls().add(omumg.om, "add").add(omumg.ol, "addedStatement") - .add(omumg.union.base.g, "add").add(omumg.union.base.bu) + .add(omumg.union.base.g, "add") .add(omumg.union.base.m) .add(omumg.union.base.l, "addedStatement") - .add(omumg.union.plus.g).add(omumg.union.plus.bu) + .add(omumg.union.plus.g) .add(omumg.union.plus.m).add(omumg.union.plus.l).test(); } @@ -563,10 +555,10 @@ public class VitroModelFactoryTest extends AbstractTestClass { omumg = new DefaultOntModelUnionModelGroup(); omumg.om.add(MULTIPLE_STATEMENTS); new MethodCalls().add(omumg.om, "add").add(omumg.ol, "addedStatements") - .add(omumg.union.base.g, "add", "add").add(omumg.union.base.bu) + .add(omumg.union.base.g, "add", "add") .add(omumg.union.base.m) .add(omumg.union.base.l, "addedStatement", "addedStatement") - .add(omumg.union.plus.g).add(omumg.union.plus.bu) + .add(omumg.union.plus.g) .add(omumg.union.plus.m).add(omumg.union.plus.l).test(); } @@ -576,9 +568,9 @@ public class VitroModelFactoryTest extends AbstractTestClass { omumg.om.add(MULTIPLE_STATEMENTS); new MethodCalls().add(omumg.om, "add").add(omumg.ol, "addedStatements") .add(omumg.union.base.g, "performAdd", "performAdd") - .add(omumg.union.base.bu, "add").add(omumg.union.base.m) + .add(omumg.union.base.m) .add(omumg.union.base.l, "addedStatements") - .add(omumg.union.plus.g).add(omumg.union.plus.bu) + .add(omumg.union.plus.g) .add(omumg.union.plus.m).add(omumg.union.plus.l).test(); } @@ -620,16 +612,6 @@ public class VitroModelFactoryTest extends AbstractTestClass { // Helper classes // ---------------------------------------------------------------------- - /** - * The latest Graph classes allow you to get their BulkUpdateHandler, but - * won't allow you to set it. - */ - private static class MyGraphMem extends GraphMem { - public void setBulkUpdateHandler(BulkUpdateHandler bulkHandler) { - this.bulkHandler = bulkHandler; - } - } - /** * A collection of "CallNames", each of which holds a list of expected * calls, a recording proxy from which we can get the actual calls, and a @@ -687,19 +669,10 @@ public class VitroModelFactoryTest extends AbstractTestClass { * Some utility methods for creating a group of test objects. */ private static abstract class TestObjectGrouping { - protected GraphWithPerform wrapGraph(MyGraphMem raw) { + protected GraphWithPerform wrapGraph(GraphMem raw) { return RecordingProxy.create(raw, GraphWithPerform.class); } - protected BulkUpdateHandler makeBulkUpdater(GraphWithPerform g, - MyGraphMem raw) { - SimpleBulkUpdateHandler rawBu = new SimpleBulkUpdateHandler(g); - BulkUpdateHandler bu = RecordingProxy.create(rawBu, - BulkUpdateHandler.class); - raw.setBulkUpdateHandler(bu); - return bu; - } - protected static ModelChangedListener makeListener() { return RecordingProxy.create(new StatementListener(), ModelChangedListener.class); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java index a3da1bd26..cf5afb377 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java @@ -20,9 +20,9 @@ import org.apache.log4j.Level; import org.junit.Before; import org.junit.Test; -import stubs.com.hp.hpl.jena.rdf.model.LiteralStub; +import stubs.org.apache.jena.rdf.model.LiteralStub; -import com.hp.hpl.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Literal; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerInversePropertyTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerInversePropertyTest.java index 5201f8eca..80035fece 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerInversePropertyTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerInversePropertyTest.java @@ -11,13 +11,13 @@ import stubs.edu.cornell.mannlib.vitro.webapp.modules.ApplicationStub; import stubs.edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngineStub; import stubs.javax.servlet.ServletContextStub; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.vocabulary.OWL; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerPluginTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerPluginTest.java index 5d5509e94..04108b14d 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerPluginTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerPluginTest.java @@ -10,17 +10,17 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDFS; public class SimpleReasonerPluginTest extends SimpleReasonerTBoxHelper { long delay = 50; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerSameAsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerSameAsTest.java index 72089696b..015968db7 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerSameAsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerSameAsTest.java @@ -7,18 +7,18 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.ontology.AnnotationProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.AnnotationProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxHelper.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxHelper.java index 0c4b05cfb..ffd40cd7b 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxHelper.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxHelper.java @@ -5,12 +5,12 @@ package edu.cornell.mannlib.vitro.webapp.reasoner; import java.util.HashSet; import java.util.Set; -import com.hp.hpl.jena.ontology.ObjectProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.ontology.OntProperty; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.ObjectProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.ontology.OntProperty; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java index 237c18622..ea1c8d402 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java @@ -8,17 +8,17 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import com.hp.hpl.jena.ontology.AnnotationProperty; -import com.hp.hpl.jena.ontology.OntClass; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.AnnotationProperty; +import org.apache.jena.ontology.OntClass; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java index 10b6ab66f..2813911f4 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java @@ -16,9 +16,9 @@ import stubs.edu.cornell.mannlib.vitro.webapp.modules.ApplicationStub; import stubs.edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngineStub; import stubs.javax.servlet.ServletContextStub; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java index 755cf1b18..ef93cff32 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java @@ -11,9 +11,9 @@ import org.junit.Test; import stubs.edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccessStub; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.java index e74942dbb..20a182501 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.java @@ -13,11 +13,11 @@ import org.junit.Test; import stubs.edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccessStub; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDFS; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java index 30db6ddb0..522093b42 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java @@ -8,8 +8,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; /** * @author bdc34 diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinderTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinderTest.java index 59bed0f75..0ee8b2398 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinderTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinderTest.java @@ -2,10 +2,10 @@ package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createPlainLiteral; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource; -import static com.hp.hpl.jena.rdf.model.ResourceFactory.createStatement; +import static org.apache.jena.rdf.model.ResourceFactory.createPlainLiteral; +import static org.apache.jena.rdf.model.ResourceFactory.createProperty; +import static org.apache.jena.rdf.model.ResourceFactory.createResource; +import static org.apache.jena.rdf.model.ResourceFactory.createStatement; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService.CONTENT; import static org.junit.Assert.assertEquals; @@ -21,11 +21,11 @@ import org.junit.Test; import stubs.edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccessStub; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Property; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java index 88dbe2ce9..e089fcfd9 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java @@ -6,8 +6,8 @@ import java.io.StringReader; import org.junit.Assert; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/test/JenaOntologyLoader.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/test/JenaOntologyLoader.java index 8e9146df4..c6d0a2f1c 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/test/JenaOntologyLoader.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/test/JenaOntologyLoader.java @@ -5,10 +5,10 @@ package edu.cornell.mannlib.vitro.webapp.test; import java.io.IOException; import java.io.InputStream; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; /** * this is a class to load owl files for testing. diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java index da924567a..32c3c3c71 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java @@ -2,8 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.utils.configuration; -import static com.hp.hpl.jena.datatypes.xsd.XSDDatatype.XSDfloat; -import static com.hp.hpl.jena.datatypes.xsd.XSDDatatype.XSDstring; +import static org.apache.jena.datatypes.xsd.XSDDatatype.XSDfloat; +import static org.apache.jena.datatypes.xsd.XSDDatatype.XSDstring; import static edu.cornell.mannlib.vitro.testing.ModelUtilitiesTestHelper.dataProperty; import static edu.cornell.mannlib.vitro.testing.ModelUtilitiesTestHelper.model; import static edu.cornell.mannlib.vitro.testing.ModelUtilitiesTestHelper.objectProperty; @@ -29,8 +29,8 @@ import stubs.javax.servlet.ServletContextStub; import stubs.javax.servlet.http.HttpServletRequestStub; import stubs.javax.servlet.http.HttpSessionStub; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java index a788e179e..2f556b6a0 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java @@ -13,11 +13,11 @@ import org.junit.Test; import stubs.javax.servlet.http.HttpServletRequestStub; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java index 8e7faafb7..5f6c1efbd 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java @@ -14,13 +14,13 @@ import org.junit.Test; import stubs.javax.servlet.http.HttpServletRequestStub; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/ingest/JenaIngestUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/ingest/JenaIngestUtilsTest.java index 5118cc6a0..d6c90226c 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/ingest/JenaIngestUtilsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/ingest/JenaIngestUtilsTest.java @@ -10,12 +10,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceGraph; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtilsTest.java index a7ada216f..e8f2ece19 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtilsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtilsTest.java @@ -6,12 +6,12 @@ import org.junit.Assert; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import org.junit.Test; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Statement; -import com.hp.hpl.jena.rdf.model.StmtIterator; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.vocabulary.OWL; +import org.apache.jena.vocabulary.RDF; public class JenaIngestUtilsTest extends AbstractTestClass { diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java index 882d6297c..09589899d 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java @@ -37,9 +37,9 @@ import stubs.javax.servlet.ServletContextStub; import stubs.javax.servlet.http.HttpServletRequestStub; import stubs.javax.servlet.http.HttpSessionStub; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.ontology.OntModelSpec; -import com.hp.hpl.jena.rdf.model.ModelFactory; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.ontology.OntModelSpec; +import org.apache.jena.rdf.model.ModelFactory; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.beans.Individual; diff --git a/api/src/test/java/stubs/com/hp/hpl/jena/rdf/model/LiteralStub.java b/api/src/test/java/stubs/com/hp/hpl/jena/rdf/model/LiteralStub.java index ff7cf9c4e..4a65fb76c 100644 --- a/api/src/test/java/stubs/com/hp/hpl/jena/rdf/model/LiteralStub.java +++ b/api/src/test/java/stubs/com/hp/hpl/jena/rdf/model/LiteralStub.java @@ -1,14 +1,14 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package stubs.com.hp.hpl.jena.rdf.model; +package stubs.org.apache.jena.rdf.model; -import com.hp.hpl.jena.datatypes.RDFDatatype; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.rdf.model.Literal; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.RDFVisitor; -import com.hp.hpl.jena.rdf.model.Resource; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.graph.Node; +import org.apache.jena.rdf.model.Literal; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.RDFVisitor; +import org.apache.jena.rdf.model.Resource; /** * Only implemented what I needed so far. The rest is left as an exercise for diff --git a/api/src/test/java/stubs/com/hp/hpl/jena/rdf/model/ModelMaker/ModelMakerStub.java b/api/src/test/java/stubs/com/hp/hpl/jena/rdf/model/ModelMaker/ModelMakerStub.java index cbcd80f72..f769c6750 100644 --- a/api/src/test/java/stubs/com/hp/hpl/jena/rdf/model/ModelMaker/ModelMakerStub.java +++ b/api/src/test/java/stubs/com/hp/hpl/jena/rdf/model/ModelMaker/ModelMakerStub.java @@ -1,20 +1,20 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package stubs.com.hp.hpl.jena.rdf.model.ModelMaker; +package stubs.org.apache.jena.rdf.model.ModelMaker; import java.util.HashMap; import java.util.Map; -import com.hp.hpl.jena.graph.GraphMaker; -import com.hp.hpl.jena.graph.impl.SimpleGraphMaker; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelMaker; -import com.hp.hpl.jena.rdf.model.ModelReader; -import com.hp.hpl.jena.shared.AlreadyExistsException; -import com.hp.hpl.jena.shared.CannotCreateException; -import com.hp.hpl.jena.shared.DoesNotExistException; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.util.iterator.WrappedIterator; +import org.apache.jena.graph.GraphMaker; +import org.apache.jena.graph.impl.SimpleGraphMaker; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelMaker; +import org.apache.jena.rdf.model.ModelReader; +import org.apache.jena.shared.AlreadyExistsException; +import org.apache.jena.shared.CannotCreateException; +import org.apache.jena.shared.DoesNotExistException; +import org.apache.jena.util.iterator.ExtendedIterator; +import org.apache.jena.util.iterator.WrappedIterator; /** * A ModelMaker stub, but is it strict or relaxed? Choose one of the diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java index 033056cd5..dab72a8dd 100644 --- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java +++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import com.hp.hpl.jena.rdf.model.impl.Util; +import org.apache.jena.rdf.model.impl.Util; import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionBean; import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionLevels; @@ -66,7 +66,7 @@ public class PropertyRestrictionBeanStub extends PropertyRestrictionBean { } private String namespace(String uri) { - return uri.substring(0, Util.splitNamespace(uri)); + return uri.substring(0, Util.splitNamespaceXML(uri)); } private boolean isPermittedProperty(String uri) { diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java index c4801ad69..bab681682 100644 --- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java +++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java @@ -12,8 +12,8 @@ import java.util.Set; import org.json.JSONException; import org.json.JSONObject; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java index 5cd0d77c9..6b1f3ebca 100644 --- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java +++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java @@ -10,9 +10,9 @@ import java.util.EnumMap; import java.util.HashMap; import java.util.Map; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.ModelMaker; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; +import org.apache.jena.rdf.model.ModelMaker; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccessStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccessStub.java index 00ac671c7..e60ad773e 100644 --- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccessStub.java +++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccessStub.java @@ -5,8 +5,8 @@ package stubs.edu.cornell.mannlib.vitro.webapp.modelaccess; import java.util.HashMap; import java.util.Map; -import com.hp.hpl.jena.ontology.OntModel; -import com.hp.hpl.jena.query.Dataset; +import org.apache.jena.ontology.OntModel; +import org.apache.jena.query.Dataset; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStub.java index a138f8438..460c1c235 100644 --- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStub.java +++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStub.java @@ -5,7 +5,7 @@ package stubs.edu.cornell.mannlib.vitro.webapp.modules.searchIndexer; import java.util.Collection; import java.util.List; -import com.hp.hpl.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.modules.Application; import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus; diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 638e8dbfc..cc4937a7e 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -188,22 +188,22 @@ org.apache.jena jena-arq - 2.10.1 + 3.1.0 org.apache.jena jena-core - 2.10.1 + 3.1.0 org.apache.jena jena-sdb - 1.3.6 + 3.1.0 org.apache.jena jena-tdb - 0.10.0 + 3.1.0 org.apache.solr @@ -273,11 +273,6 @@ jai_core 1.1.3 - - org.vivoweb.dependencies - sparqltag - 1.0 - javax.json diff --git a/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties index f9d04c7a5..eef3874ee 100644 --- a/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties +++ b/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties @@ -42,8 +42,8 @@ log4j.logger.org.semanticweb.owlapi.rdf.rdfxml.parser=WARN log4j.logger.org.springframework=WARN # suppress odd warnings from libraries -log4j.logger.com.hp.hpl.jena.sdb.layout2.LoaderTuplesNodes=FATAL -log4j.logger.com.hp.hpl.jena.sdb.sql.SDBConnection=ERROR +log4j.logger.org.apache.jena.sdb.layout2.LoaderTuplesNodes=FATAL +log4j.logger.org.apache.jena.sdb.sql.SDBConnection=ERROR log4j.logger.org.openjena.riot=FATAL log4j.logger.org.apache.jena.riot=FATAL log4j.logger.org.directwebremoting=FATAL diff --git a/legacy/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java b/legacy/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java index d453db2c4..2381f16dd 100644 --- a/legacy/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java +++ b/legacy/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java @@ -21,12 +21,12 @@ import java.util.Properties; import org.apache.commons.lang.StringUtils; -import com.hp.hpl.jena.db.DBConnection; -import com.hp.hpl.jena.db.GraphRDB; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.sparql.core.DatasetGraph; -import com.hp.hpl.jena.tdb.TDBFactory; +import org.apache.jena.db.DBConnection; +import org.apache.jena.db.GraphRDB; +import org.apache.jena.graph.Node; +import org.apache.jena.query.Dataset; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.tdb.TDBFactory; /** * A free-standing application that walks the user through the process of diff --git a/legacy/utilities/sdb_to_tdb/src/edu/cornell/mannlib/vitro/utilities/sdb2tdb/Sdb2Tdb.java b/legacy/utilities/sdb_to_tdb/src/edu/cornell/mannlib/vitro/utilities/sdb2tdb/Sdb2Tdb.java index 1ab4866a0..1c2cb5260 100644 --- a/legacy/utilities/sdb_to_tdb/src/edu/cornell/mannlib/vitro/utilities/sdb2tdb/Sdb2Tdb.java +++ b/legacy/utilities/sdb_to_tdb/src/edu/cornell/mannlib/vitro/utilities/sdb2tdb/Sdb2Tdb.java @@ -19,23 +19,23 @@ import java.util.List; import org.apache.jena.riot.RDFDataMgr; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.Triple; -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.query.Query; -import com.hp.hpl.jena.query.QueryExecution; -import com.hp.hpl.jena.query.QueryExecutionFactory; -import com.hp.hpl.jena.query.QueryFactory; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.query.ResultSet; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.sdb.SDB; -import com.hp.hpl.jena.sdb.SDBFactory; -import com.hp.hpl.jena.sdb.Store; -import com.hp.hpl.jena.sdb.StoreDesc; -import com.hp.hpl.jena.sdb.store.DatabaseType; -import com.hp.hpl.jena.sdb.store.LayoutType; -import com.hp.hpl.jena.tdb.TDBFactory; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.query.Dataset; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryExecution; +import org.apache.jena.query.QueryExecutionFactory; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.QuerySolution; +import org.apache.jena.query.ResultSet; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.sdb.SDB; +import org.apache.jena.sdb.SDBFactory; +import org.apache.jena.sdb.Store; +import org.apache.jena.sdb.StoreDesc; +import org.apache.jena.sdb.store.DatabaseType; +import org.apache.jena.sdb.store.LayoutType; +import org.apache.jena.tdb.TDBFactory; /** * Copy all of the data from an SDB triple-store to a TDB triple-store. See diff --git a/legacy/webapp/config/log4j.properties b/legacy/webapp/config/log4j.properties index afb5b3a11..1be93b80c 100644 --- a/legacy/webapp/config/log4j.properties +++ b/legacy/webapp/config/log4j.properties @@ -42,8 +42,8 @@ log4j.logger.org.semanticweb.owlapi.rdf.rdfxml.parser=WARN log4j.logger.org.springframework=WARN # suppress odd warnings from libraries -log4j.logger.com.hp.hpl.jena.sdb.layout2.LoaderTuplesNodes=FATAL -log4j.logger.com.hp.hpl.jena.sdb.sql.SDBConnection=ERROR +log4j.logger.org.apache.jena.sdb.layout2.LoaderTuplesNodes=FATAL +log4j.logger.org.apache.jena.sdb.sql.SDBConnection=ERROR log4j.logger.org.openjena.riot=FATAL log4j.logger.org.apache.jena.riot=FATAL log4j.logger.org.directwebremoting=FATAL diff --git a/webapp/src/main/webapp/WEB-INF/tlds/ListSparqlTag.tld b/webapp/src/main/webapp/WEB-INF/tlds/ListSparqlTag.tld deleted file mode 100644 index d9cdcf6e5..000000000 --- a/webapp/src/main/webapp/WEB-INF/tlds/ListSparqlTag.tld +++ /dev/null @@ -1,51 +0,0 @@ - - - - - List SPARQL JSP taglib - 1.0 - sparql - http://mannlib.cornell.edu/vitro/ListSparqlTag/0.1/ - - - SPARQL select tag. (Must be nested inside sparql:sparql) - SPARQL select tag - select - edu.cornell.mannlib.vitro.webapp.web.jsptags.ListSparqlTag - tagdependent - - - var - java.util.List - AT_BEGIN - - - - - model - true - true - com.hp.hpl.jena.rdf.model.Model - - - - - var - true - true - java.lang.String - - - true - - - - - - - - \ No newline at end of file diff --git a/webapp/src/main/webapp/WEB-INF/tlds/sparqltag.tld b/webapp/src/main/webapp/WEB-INF/tlds/sparqltag.tld deleted file mode 100644 index 3016f37ab..000000000 --- a/webapp/src/main/webapp/WEB-INF/tlds/sparqltag.tld +++ /dev/null @@ -1,279 +0,0 @@ - - - - - - - SPARQL JSP taglib - 1.0 - sparql - http://djpowell.net/tmp/sparql-tag/0.1/ - - - - - - SPARQL container tag.

-

This tag must be placed around sparql:select tags to - ensure that the live ResultSet's gets closed, - when this tag goes out of scope. - ]]> - - SPARQL container tag - sparql - net.djpowell.sparqltag.SparqlTag - scriptless - - - - - - - Obtains a lock or transaction on a model until the tag is closed. - - SPARQL lock tag - lock - net.djpowell.sparqltag.LockTag - net.djpowell.sparqltag.LockTagInfo - scriptless - - - The model to lock, or execute in a transaction - model - true - true - com.hp.hpl.jena.rdf.model.Model - - - - - Indicates whether transactions should be used instead of - critical sections. - - transactions - - false - true - java.lang.String - - - - - If critical sections are being used, indicates whether a - read lock is sufficient, or whether a write-lock is required. - The default is true, meaning a read-lock. - - readonly - - false - true - java.lang.String - - - - - - - - SPARQL load tag. Convenience tag for creating a new model from an RDF/XML URI. - SPARQL load tag - load - net.djpowell.sparqltag.LoadTag - net.djpowell.sparqltag.LoadTagInfo - empty - - - var - com.hp.hpl.jena.rdf.model.Model - AT_END - - - - - var - true - true - java.lang.String - - - - - uri - true - true - java.lang.String - - - - - - - - SPARQL ask tag. (Must be nested inside sparql:sparql) - SPARQL ask tag - ask - net.djpowell.sparqltag.AskTag - tagdependent - - - - var - java.lang.Boolean - AT_END - - - - - model - true - true - com.hp.hpl.jena.rdf.model.Model - - - - - var - true - false - java.lang.String - - - true - - - - - - - - - - - - SPARQL construct tag. (Must be nested inside sparql:sparql) - SPARQL construct tag - construct - net.djpowell.sparqltag.ConstructTag - tagdependent - - - var - com.hp.hpl.jena.rdf.model.Model - AT_END - - - - - model - true - false - com.hp.hpl.jena.rdf.model.Model - - - - - var - true - true - java.lang.String - - - true - - - - - - - - - - - SPARQL describe tag. (Must be nested inside sparql:sparql) - SPARQL describe tag - describe - net.djpowell.sparqltag.DescribeTag - tagdependent - - - var - com.hp.hpl.jena.rdf.model.Model - AT_END - - - - - model - true - true - com.hp.hpl.jena.rdf.model.Model - - - - - var - true - false - java.lang.String - - - true - - - - - - - - - - - - SPARQL select tag. (Must be nested inside sparql:sparql) - SPARQL select tag - select - net.djpowell.sparqltag.SelectTag - tagdependent - - - var - net.djpowell.sparqltag.SelectTag.RSWrapper - - AT_END - - - - - model - true - true - com.hp.hpl.jena.rdf.model.Model - - - - - var - true - true - java.lang.String - - - true - - - - - - - - - - diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index 11f8dd3dd..04ee7bc23 100644 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -1326,11 +1326,6 @@ /WEB-INF/tlds/vitroForm.tld - - http://mannlib.cornell.edu/vitro/ListSparqlTag/0.1/ - /WEB-INF/tlds/ListSparqlTag.tld - - http://jakarta.apache.org/taglibs/string-1.1 /WEB-INF/tlds/taglibs-string.tld diff --git a/webapp/src/main/webapp/admin/conceptRepair.jsp b/webapp/src/main/webapp/admin/conceptRepair.jsp index 1d18a48fd..548daa5c1 100644 --- a/webapp/src/main/webapp/admin/conceptRepair.jsp +++ b/webapp/src/main/webapp/admin/conceptRepair.jsp @@ -60,21 +60,21 @@ %> -<%@page import="com.hp.hpl.jena.ontology.OntModel"%> -<%@page import="com.hp.hpl.jena.shared.Lock"%> -<%@page import="com.hp.hpl.jena.query.Syntax"%> -<%@page import="com.hp.hpl.jena.query.Query"%> -<%@page import="com.hp.hpl.jena.query.QueryFactory"%> -<%@page import="com.hp.hpl.jena.query.QueryExecutionFactory"%> -<%@page import="com.hp.hpl.jena.rdf.model.ModelFactory"%> -<%@page import="com.hp.hpl.jena.rdf.model.Model"%> -<%@page import="com.hp.hpl.jena.query.QueryExecution"%> +<%@page import="org.apache.jena.ontology.OntModel"%> +<%@page import="org.apache.jena.shared.Lock"%> +<%@page import="org.apache.jena.query.Syntax"%> +<%@page import="org.apache.jena.query.Query"%> +<%@page import="org.apache.jena.query.QueryFactory"%> +<%@page import="org.apache.jena.query.QueryExecutionFactory"%> +<%@page import="org.apache.jena.rdf.model.ModelFactory"%> +<%@page import="org.apache.jena.rdf.model.Model"%> +<%@page import="org.apache.jena.query.QueryExecution"%> <%@page import="java.util.Arrays"%> <%@page import="java.util.List"%> <%@page import="java.util.ArrayList"%> -<%@page import="com.hp.hpl.jena.rdf.model.Resource"%> -<%@page import="com.hp.hpl.jena.rdf.model.Property"%> -<%@page import="com.hp.hpl.jena.rdf.model.AnonId"%> +<%@page import="org.apache.jena.rdf.model.Resource"%> +<%@page import="org.apache.jena.rdf.model.Property"%> +<%@page import="org.apache.jena.rdf.model.AnonId"%> Anonymous Concept Repair Tools diff --git a/webapp/src/main/webapp/admin/removeBadRestrictions.jsp b/webapp/src/main/webapp/admin/removeBadRestrictions.jsp index af3a03bcf..e0a9a8fe8 100644 --- a/webapp/src/main/webapp/admin/removeBadRestrictions.jsp +++ b/webapp/src/main/webapp/admin/removeBadRestrictions.jsp @@ -87,25 +87,25 @@ %> -<%@page import="com.hp.hpl.jena.ontology.OntModel"%> -<%@page import="com.hp.hpl.jena.shared.Lock"%> -<%@page import="com.hp.hpl.jena.query.Syntax"%> -<%@page import="com.hp.hpl.jena.query.Query"%> -<%@page import="com.hp.hpl.jena.query.QueryFactory"%> -<%@page import="com.hp.hpl.jena.query.QueryExecutionFactory"%> -<%@page import="com.hp.hpl.jena.rdf.model.ModelFactory"%> -<%@page import="com.hp.hpl.jena.rdf.model.Model"%> -<%@page import="com.hp.hpl.jena.query.QueryExecution"%> +<%@page import="org.apache.jena.ontology.OntModel"%> +<%@page import="org.apache.jena.shared.Lock"%> +<%@page import="org.apache.jena.query.Syntax"%> +<%@page import="org.apache.jena.query.Query"%> +<%@page import="org.apache.jena.query.QueryFactory"%> +<%@page import="org.apache.jena.query.QueryExecutionFactory"%> +<%@page import="org.apache.jena.rdf.model.ModelFactory"%> +<%@page import="org.apache.jena.rdf.model.Model"%> +<%@page import="org.apache.jena.query.QueryExecution"%> <%@page import="java.util.Arrays"%> <%@page import="java.util.List"%> <%@page import="java.util.ArrayList"%> -<%@page import="com.hp.hpl.jena.rdf.model.Resource"%> -<%@page import="com.hp.hpl.jena.rdf.model.Property"%> -<%@page import="com.hp.hpl.jena.rdf.model.AnonId"%> +<%@page import="org.apache.jena.rdf.model.Resource"%> +<%@page import="org.apache.jena.rdf.model.Property"%> +<%@page import="org.apache.jena.rdf.model.AnonId"%> <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDao"%> <%@page import="java.util.Iterator"%> -<%@page import="com.hp.hpl.jena.ontology.Restriction"%> -<%@page import="com.hp.hpl.jena.vocabulary.OWL"%> +<%@page import="org.apache.jena.ontology.Restriction"%> +<%@page import="org.apache.jena.vocabulary.OWL"%> Remove Bad Restrictions diff --git a/webapp/src/main/webapp/admin/removeResourceDescription.jsp b/webapp/src/main/webapp/admin/removeResourceDescription.jsp index 276eb713e..fca234829 100644 --- a/webapp/src/main/webapp/admin/removeResourceDescription.jsp +++ b/webapp/src/main/webapp/admin/removeResourceDescription.jsp @@ -55,21 +55,21 @@ %> -<%@page import="com.hp.hpl.jena.ontology.OntModel"%> -<%@page import="com.hp.hpl.jena.shared.Lock"%> -<%@page import="com.hp.hpl.jena.query.Syntax"%> -<%@page import="com.hp.hpl.jena.query.Query"%> -<%@page import="com.hp.hpl.jena.query.QueryFactory"%> -<%@page import="com.hp.hpl.jena.query.QueryExecutionFactory"%> -<%@page import="com.hp.hpl.jena.rdf.model.ModelFactory"%> -<%@page import="com.hp.hpl.jena.rdf.model.Model"%> -<%@page import="com.hp.hpl.jena.query.QueryExecution"%> +<%@page import="org.apache.jena.ontology.OntModel"%> +<%@page import="org.apache.jena.shared.Lock"%> +<%@page import="org.apache.jena.query.Syntax"%> +<%@page import="org.apache.jena.query.Query"%> +<%@page import="org.apache.jena.query.QueryFactory"%> +<%@page import="org.apache.jena.query.QueryExecutionFactory"%> +<%@page import="org.apache.jena.rdf.model.ModelFactory"%> +<%@page import="org.apache.jena.rdf.model.Model"%> +<%@page import="org.apache.jena.query.QueryExecution"%> <%@page import="java.util.Arrays"%> <%@page import="java.util.List"%> <%@page import="java.util.ArrayList"%> -<%@page import="com.hp.hpl.jena.rdf.model.Resource"%> -<%@page import="com.hp.hpl.jena.rdf.model.Property"%> -<%@page import="com.hp.hpl.jena.rdf.model.AnonId"%> +<%@page import="org.apache.jena.rdf.model.Resource"%> +<%@page import="org.apache.jena.rdf.model.Property"%> +<%@page import="org.apache.jena.rdf.model.AnonId"%> Anonymous Concept Repair Tools diff --git a/webapp/src/main/webapp/admin/sparql.jsp b/webapp/src/main/webapp/admin/sparql.jsp index 2ecc3f58d..54fec2601 100644 --- a/webapp/src/main/webapp/admin/sparql.jsp +++ b/webapp/src/main/webapp/admin/sparql.jsp @@ -1,6 +1,6 @@ -<%@page import="com.hp.hpl.jena.vocabulary.OWL"%> -<%@page import="com.hp.hpl.jena.rdf.model.ModelMaker"%> +<%@page import="org.apache.jena.vocabulary.OWL"%> +<%@page import="org.apache.jena.rdf.model.ModelMaker"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService"%> <%@page import="java.util.Iterator"%> diff --git a/webapp/src/main/webapp/jenaIngest/csv2rdf.jsp b/webapp/src/main/webapp/jenaIngest/csv2rdf.jsp index 130adc920..98c3d4d6d 100644 --- a/webapp/src/main/webapp/jenaIngest/csv2rdf.jsp +++ b/webapp/src/main/webapp/jenaIngest/csv2rdf.jsp @@ -1,9 +1,9 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp b/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp index f7bb72afe..4671bc343 100644 --- a/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp +++ b/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp @@ -3,10 +3,10 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@ taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp b/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp index c1483e621..c4ff1ea4f 100644 --- a/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp +++ b/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp @@ -1,10 +1,10 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess"%> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/generateTBox.jsp b/webapp/src/main/webapp/jenaIngest/generateTBox.jsp index d262debb1..77bab1a41 100644 --- a/webapp/src/main/webapp/jenaIngest/generateTBox.jsp +++ b/webapp/src/main/webapp/jenaIngest/generateTBox.jsp @@ -1,9 +1,9 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/listModels.jsp b/webapp/src/main/webapp/jenaIngest/listModels.jsp index a4b9d7de7..3cb752932 100644 --- a/webapp/src/main/webapp/jenaIngest/listModels.jsp +++ b/webapp/src/main/webapp/jenaIngest/listModels.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.net.URLEncoder" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/webapp/src/main/webapp/jenaIngest/mergeResources.jsp b/webapp/src/main/webapp/jenaIngest/mergeResources.jsp index 5fe31a8eb..65eea4920 100644 --- a/webapp/src/main/webapp/jenaIngest/mergeResources.jsp +++ b/webapp/src/main/webapp/jenaIngest/mergeResources.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker"%> -<%@ page import="com.hp.hpl.jena.rdf.model.Model"%> +<%@ page import="org.apache.jena.rdf.model.ModelMaker"%> +<%@ page import="org.apache.jena.rdf.model.Model"%> <%@ page import="java.util.Iterator"%> <%@ page import="java.net.URLEncoder"%> <%@ page import="java.util.List"%> diff --git a/webapp/src/main/webapp/jenaIngest/merge_result.jsp b/webapp/src/main/webapp/jenaIngest/merge_result.jsp index 264ef8a56..9cda24238 100644 --- a/webapp/src/main/webapp/jenaIngest/merge_result.jsp +++ b/webapp/src/main/webapp/jenaIngest/merge_result.jsp @@ -8,7 +8,7 @@ <% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %> -<%@ page import="com.hp.hpl.jena.rdf.model.Model"%> +<%@ page import="org.apache.jena.rdf.model.Model"%>

Ingest Menu > Merge Individuals

diff --git a/webapp/src/main/webapp/jenaIngest/notfound.jsp b/webapp/src/main/webapp/jenaIngest/notfound.jsp index cbbd0e58d..3e209bb7c 100644 --- a/webapp/src/main/webapp/jenaIngest/notfound.jsp +++ b/webapp/src/main/webapp/jenaIngest/notfound.jsp @@ -2,7 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ page import="com.hp.hpl.jena.rdf.model.Model"%> +<%@ page import="org.apache.jena.rdf.model.Model"%>

Individual Not Found

diff --git a/webapp/src/main/webapp/jenaIngest/permanentURI.jsp b/webapp/src/main/webapp/jenaIngest/permanentURI.jsp index 242088415..feab9ada7 100644 --- a/webapp/src/main/webapp/jenaIngest/permanentURI.jsp +++ b/webapp/src/main/webapp/jenaIngest/permanentURI.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker"%> -<%@ page import="com.hp.hpl.jena.rdf.model.Model"%> +<%@ page import="org.apache.jena.rdf.model.ModelMaker"%> +<%@ page import="org.apache.jena.rdf.model.Model"%> <%@ page import="java.util.Iterator"%> <%@ page import="java.net.URLEncoder"%> <%@ page import="java.util.List"%> diff --git a/webapp/src/main/webapp/jenaIngest/processStrings.jsp b/webapp/src/main/webapp/jenaIngest/processStrings.jsp index 836d39fbb..8959b51c8 100644 --- a/webapp/src/main/webapp/jenaIngest/processStrings.jsp +++ b/webapp/src/main/webapp/jenaIngest/processStrings.jsp @@ -1,9 +1,9 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/renameBNodes.jsp b/webapp/src/main/webapp/jenaIngest/renameBNodes.jsp index 98440ca06..77a89a778 100644 --- a/webapp/src/main/webapp/jenaIngest/renameBNodes.jsp +++ b/webapp/src/main/webapp/jenaIngest/renameBNodes.jsp @@ -1,9 +1,9 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp b/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp index 644238679..1f9fd31e6 100644 --- a/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp +++ b/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp @@ -1,9 +1,9 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/renameResource.jsp b/webapp/src/main/webapp/jenaIngest/renameResource.jsp index 3237fff4f..1a7331109 100644 --- a/webapp/src/main/webapp/jenaIngest/renameResource.jsp +++ b/webapp/src/main/webapp/jenaIngest/renameResource.jsp @@ -1,7 +1,7 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker"%> -<%@ page import="com.hp.hpl.jena.rdf.model.Model"%> +<%@ page import="org.apache.jena.rdf.model.ModelMaker"%> +<%@ page import="org.apache.jena.rdf.model.Model"%> <%@ page import="java.util.Iterator"%> <%@ page import="java.net.URLEncoder"%> <%@ page import="java.util.List"%> diff --git a/webapp/src/main/webapp/jenaIngest/smushSingleModel.jsp b/webapp/src/main/webapp/jenaIngest/smushSingleModel.jsp index 9c8e852be..4a7299ab4 100644 --- a/webapp/src/main/webapp/jenaIngest/smushSingleModel.jsp +++ b/webapp/src/main/webapp/jenaIngest/smushSingleModel.jsp @@ -1,9 +1,9 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp b/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp index 06aba09c6..c978e30a8 100644 --- a/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp +++ b/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp @@ -1,11 +1,11 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual"%> -<%@ page import="com.hp.hpl.jena.ontology.OntModel"%> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker"%> +<%@ page import="org.apache.jena.ontology.Individual"%> +<%@ page import="org.apache.jena.ontology.OntModel"%> +<%@ page import="org.apache.jena.rdf.model.ModelMaker"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess"%> <%@ page import="edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService"%> -<%@ page import="com.hp.hpl.jena.shared.Lock"%> +<%@ page import="org.apache.jena.shared.Lock"%> <%@ page import="java.util.Iterator"%> <%@ page import="java.util.List"%> <%@ page import="java.net.URLEncoder"%> diff --git a/webapp/src/main/webapp/jenaIngest/splitPropertyValues.jsp b/webapp/src/main/webapp/jenaIngest/splitPropertyValues.jsp index ebc48f56c..3ba872989 100644 --- a/webapp/src/main/webapp/jenaIngest/splitPropertyValues.jsp +++ b/webapp/src/main/webapp/jenaIngest/splitPropertyValues.jsp @@ -1,9 +1,9 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/subtractModels.jsp b/webapp/src/main/webapp/jenaIngest/subtractModels.jsp index 8f19c1b0d..ae8ffd3be 100644 --- a/webapp/src/main/webapp/jenaIngest/subtractModels.jsp +++ b/webapp/src/main/webapp/jenaIngest/subtractModels.jsp @@ -1,9 +1,9 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/workflowStep.jsp b/webapp/src/main/webapp/jenaIngest/workflowStep.jsp index 7ba852dda..0800c19d1 100644 --- a/webapp/src/main/webapp/jenaIngest/workflowStep.jsp +++ b/webapp/src/main/webapp/jenaIngest/workflowStep.jsp @@ -1,10 +1,10 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.ontology.Individual" %> -<%@ page import="com.hp.hpl.jena.ontology.OntModel" %> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.ontology.Individual" %> +<%@ page import="org.apache.jena.ontology.OntModel" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess"%> -<%@ page import="com.hp.hpl.jena.shared.Lock" %> +<%@ page import="org.apache.jena.shared.Lock" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> <%@ page import="java.net.URLEncoder" %> diff --git a/webapp/src/main/webapp/jenaIngest/xmlFileUpload.jsp b/webapp/src/main/webapp/jenaIngest/xmlFileUpload.jsp index 903e4e8d1..7fb7f395c 100644 --- a/webapp/src/main/webapp/jenaIngest/xmlFileUpload.jsp +++ b/webapp/src/main/webapp/jenaIngest/xmlFileUpload.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.net.URLEncoder" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> diff --git a/webapp/src/main/webapp/jenaIngest/xmlFileUploadSuccess.jsp b/webapp/src/main/webapp/jenaIngest/xmlFileUploadSuccess.jsp index 64fcbbae5..fe27f3c17 100644 --- a/webapp/src/main/webapp/jenaIngest/xmlFileUploadSuccess.jsp +++ b/webapp/src/main/webapp/jenaIngest/xmlFileUploadSuccess.jsp @@ -1,6 +1,6 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> -<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %> +<%@ page import="org.apache.jena.rdf.model.ModelMaker" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.net.URLEncoder" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>