From 28c4227d2ced27612fb5ccce7cc548bb74b3356d Mon Sep 17 00:00:00 2001 From: Andreas Romeyke <andreas.romeyke@slub-dresden.de> Date: Wed, 19 Jul 2023 11:14:31 +0200 Subject: [PATCH] - minor --- Makefile | 10 +++++----- ...ml => metadata_XmlFormatValidationPlugin.xml} | 0 .../plugin/TestXmlFormatValidationPlugin.java | 15 +++++++++++++++ .../plugin/Validation/TestValidateDTD.java | 15 +++++++++++++++ .../plugin/Validation/TestValidateRelaxNG.java | 15 +++++++++++++++ .../plugin/Validation/TestValidateSchema.java | 15 +++++++++++++++ .../plugin/Validation/ValidateDTD.java | 15 +++++++++++++++ .../plugin/Validation/ValidateRelaxNG.java | 16 ++++++++++++++++ .../plugin/Validation/ValidateSchema.java | 16 ++++++++++++++++ .../plugin/Validation/ValidateSchematron.java | 15 +++++++++++++++ .../plugin/ValidationCatalogResolver.java | 15 +++++++++++++++ .../dps/repository/plugin/ValidationLevel.java | 15 +++++++++++++++ .../plugin/ValidationResourceResolver.java | 15 +++++++++++++++ .../plugin/ValidationResultHandle.java | 15 +++++++++++++++ .../dps/repository/plugin/ValidationSchema.java | 15 +++++++++++++++ .../repository/plugin/ValidationSchemaType.java | 15 +++++++++++++++ .../dps/repository/plugin/XmlErrorHandler.java | 15 +++++++++++++++ .../plugin/XmlFormatValidationPlugin.java | 4 ++-- .../dps/repository/plugin/XmlInfoRecord.java | 15 +++++++++++++++ 19 files changed, 249 insertions(+), 7 deletions(-) rename PLUGIN-INF/{metadata_SLUBXmlFormatValidationPlugin.xml => metadata_XmlFormatValidationPlugin.xml} (100%) diff --git a/Makefile b/Makefile index d13f239..fb5ebe3 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ ROSETTASDKDEPOSIT:=${ROSETTASDK}/../dps-sdk-projects/dps-sdk-deposit/lib ROSETTASDKPLUGINS:=${ROSETTASDK}/../../bundled_plugins/ ROSETTASDKJARS=$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar") LOCALJARS=$(shell if [ -d lib ]; then find lib -name "*.jar" -print |xargs echo |sed -e "s/ /:/g"; fi) -JAR:=SLUBXmlFormatValidationPlugin.jar +JAR:=XmlFormatValidationPlugin.jar # classpath JUNITCLASSPATH:=./java/:/usr/share/java/junit4.jar:$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar" -print |xargs echo |sed -e "s/ /:/g"):$(JAR) @@ -41,16 +41,16 @@ jarclean: @rm -Rf $(BUILD) test_dtd: $(JAR) - java -Djaxp.debug=1 -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.Validation.TestSLUBValidateDTD; + java -Djaxp.debug=1 -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.Validation.TestValidateDTD; test_schema: $(JAR) - java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.Validation.TestSLUBValidateSchema; + java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.Validation.TestValidateSchema; test_relaxNG: $(JAR) - java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.Validation.TestSLUBValidateRelaxNG; + java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.Validation.TestValidateRelaxNG; test: test_dtd test_schema test_relaxNG - java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.TestSLUBXmlFormatValidationPlugin + java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore org.slub.rosetta.dps.repository.plugin.TestXmlFormatValidationPlugin clean: jarclean @rm -Rf doc/ diff --git a/PLUGIN-INF/metadata_SLUBXmlFormatValidationPlugin.xml b/PLUGIN-INF/metadata_XmlFormatValidationPlugin.xml similarity index 100% rename from PLUGIN-INF/metadata_SLUBXmlFormatValidationPlugin.xml rename to PLUGIN-INF/metadata_XmlFormatValidationPlugin.xml diff --git a/java/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java b/java/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java index da958b4..a2bb705 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java +++ b/java/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin; import org.junit.Before; diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java index 947cc2d..7d293b5 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java +++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin.Validation; import org.junit.Before; diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java index 989ceba..c785241 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java +++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin.Validation; import org.junit.Before; diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java index f0b06d8..28d24e9 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java +++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin.Validation; import org.junit.Before; diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateDTD.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateDTD.java index 0d59286..fdbe0a2 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateDTD.java +++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateDTD.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin.Validation; import org.slub.rosetta.dps.repository.plugin.XmlErrorHandler; diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateRelaxNG.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateRelaxNG.java index 9b7a1e9..2cdc767 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateRelaxNG.java +++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateRelaxNG.java @@ -1,3 +1,19 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + package org.slub.rosetta.dps.repository.plugin.Validation; import com.thaiopensource.util.PropertyMap; diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchema.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchema.java index d32672a..d304183 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchema.java +++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchema.java @@ -1,3 +1,19 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + package org.slub.rosetta.dps.repository.plugin.Validation; import org.apache.xerces.jaxp.validation.XMLSchemaFactory; diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchematron.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchematron.java index e6344a5..94608a2 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchematron.java +++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchematron.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin.Validation; import org.w3c.dom.Document; diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java index 4ead729..03798a5 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java +++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin; import org.apache.xerces.util.XMLCatalogResolver; diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationLevel.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationLevel.java index 4addc3b..0dc77f0 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/ValidationLevel.java +++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationLevel.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin; public enum ValidationLevel { diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationResourceResolver.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationResourceResolver.java index ca111f9..b1c70d3 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/ValidationResourceResolver.java +++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationResourceResolver.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin; import org.apache.xerces.dom.DOMInputImpl; diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java index 6c163a1..eba01a9 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java +++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin; import java.util.ArrayList; diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationSchema.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationSchema.java index 11dd686..30630eb 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/ValidationSchema.java +++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationSchema.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin; import org.xml.sax.SAXException; diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationSchemaType.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationSchemaType.java index 261eb96..d6e2f9b 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/ValidationSchemaType.java +++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationSchemaType.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin; public enum ValidationSchemaType { diff --git a/java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java b/java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java index adf7706..3926cbd 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java +++ b/java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin; import org.xml.sax.ErrorHandler; diff --git a/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java b/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java index 77c89aa..e53b18a 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java +++ b/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java @@ -44,7 +44,7 @@ import java.util.Optional; import java.util.Set; /** - * SLUBXmlFormatValidationPlugin + * XmlFormatValidationPlugin * * @author andreas.romeyke@slub-dresden.de (Andreas Romeyke) * @see com.exlibris.dps.sdk.techmd.FormatValidationPlugin @@ -335,7 +335,7 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin { @Override public String getAgent() { - return "SLUBXmlFormatValidationPlugin"; + return "XmlFormatValidationPlugin"; } @Override diff --git a/java/org/slub/rosetta/dps/repository/plugin/XmlInfoRecord.java b/java/org/slub/rosetta/dps/repository/plugin/XmlInfoRecord.java index 1ed413b..0cd7f48 100644 --- a/java/org/slub/rosetta/dps/repository/plugin/XmlInfoRecord.java +++ b/java/org/slub/rosetta/dps/repository/plugin/XmlInfoRecord.java @@ -1,3 +1,18 @@ +/* +2023 by Andreas Romeyke (SLUB Dresden) + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ package org.slub.rosetta.dps.repository.plugin; class XmlInfoRecord { -- GitLab