diff --git a/build.gradle b/build.gradle index 4ca44a0..9675ec2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.spotbugs" version "1.6.2" + id "com.github.spotbugs" version "1.6.9" id "org.sonarqube" version '2.6.1' id "io.codearte.nexus-staging" version "0.11.0" } @@ -18,22 +18,14 @@ printf "Host: %s\nOS: %s %s %s\nJVM: %s %s %s %s\nGradle: %s Groovy: %s Java: %s GroovySystem.getVersion(), JavaVersion.current() - -apply plugin: 'java' -apply plugin: 'maven' -apply plugin: 'checkstyle' -apply plugin: 'pmd' -apply plugin: 'jacoco' -apply plugin: "com.github.spotbugs" - - -apply from: "${rootProject.projectDir}/gradle/ext.gradle" -apply from: "${rootProject.projectDir}/gradle/sonarqube.gradle" - subprojects { apply plugin: 'java' apply plugin: 'maven' apply plugin: 'signing' + apply plugin: 'checkstyle' + apply plugin: 'pmd' + apply plugin: "com.github.spotbugs" + configurations { wagon @@ -63,8 +55,9 @@ subprojects { } test { + systemProperty 'java.util.logging.config.file', project.file('src/test/resources/logging.properties') testLogging { - showStandardStreams = false + showStandardStreams = true exceptionFormat = 'full' } } @@ -87,6 +80,16 @@ subprojects { sign configurations.archives } } + ext { + user = 'xbib' + projectName = 'z3950' + projectDescription = 'Z39.50 for Java' + scmUrl = 'https://github.com/xbib/z3950' + scmConnection = 'scm:git:git://github.com/xbib/z3950.git' + scmDeveloperConnection = 'scm:git:git://github.com/xbib/z3950.git' + } + apply from: "${rootProject.projectDir}/gradle/publish.gradle" + apply from: "${rootProject.projectDir}/gradle/sonarqube.gradle" } diff --git a/gradle.properties b/gradle.properties index bf534e6..0fa82b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ group = org.xbib name = z3950 -version = 1.2.1 +version = 1.3.0 xbib-cql.version = 1.2.0 -netty.version = 4.1.29.Final +netty.version = 4.1.34.Final junit.version = 4.12 wagon.version = 3.0.0 diff --git a/gradle/ext.gradle b/gradle/ext.gradle index 23349ac..e69de29 100644 --- a/gradle/ext.gradle +++ b/gradle/ext.gradle @@ -1,8 +0,0 @@ -ext { - user = 'xbib' - projectName = 'z3950' - projectDescription = 'Z39.50 for Java' - scmUrl = 'https://github.com/xbib/z3950' - scmConnection = 'scm:git:git://github.com/xbib/z3950.git' - scmDeveloperConnection = 'scm:git:git://github.com/xbib/z3950.git' -} diff --git a/gradle/sonarqube.gradle b/gradle/sonarqube.gradle index 84b3414..f28846b 100644 --- a/gradle/sonarqube.gradle +++ b/gradle/sonarqube.gradle @@ -1,5 +1,4 @@ - spotbugs { toolVersion = '3.1.3' sourceSets = [sourceSets.main] @@ -7,14 +6,17 @@ spotbugs { effort = "max" reportLevel = "high" } + spotbugsMain.reports { xml.enabled = false html.enabled = true } + spotbugsTest.reports { xml.enabled = false html.enabled = true } + tasks.withType(Pmd) { ignoreFailures = true reports { @@ -31,20 +33,12 @@ tasks.withType(Checkstyle) { } } -jacocoTestReport { - reports { - xml.enabled = true - csv.enabled = false - } -} - sonarqube { properties { property "sonar.projectName", "${project.group} ${project.name}" property "sonar.sourceEncoding", "UTF-8" property "sonar.tests", "src/test/java" property "sonar.scm.provider", "git" - property "sonar.java.coveragePlugin", "jacoco" property "sonar.junit.reportsPath", "build/test-results/test/" } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0d4a951..87b738c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 531c640..5778aad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 07 18:47:56 CEST 2018 +#Thu Mar 14 15:23:27 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip diff --git a/gradlew b/gradlew index cccdd3d..af6708f 100755 --- a/gradlew +++ b/gradlew @@ -28,7 +28,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index e95643d..0f8d593 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/settings.gradle b/settings.gradle index 417ca2f..068c629 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,6 @@ -include 'asn1' -include 'z3950' +include 'z3950-asn1' +include 'z3950-api' +include 'z3950-common' +include 'z3950-client' +include 'z3950-client-netty' +include 'z3950-sru' diff --git a/z3950-api/build.gradle b/z3950-api/build.gradle new file mode 100644 index 0000000..337156f --- /dev/null +++ b/z3950-api/build.gradle @@ -0,0 +1,3 @@ +dependencies { + compile project(':z3950-asn1') +} diff --git a/z3950-api/src/main/java/org/xbib/z3950/api/Client.java b/z3950-api/src/main/java/org/xbib/z3950/api/Client.java new file mode 100644 index 0000000..b5cc15d --- /dev/null +++ b/z3950-api/src/main/java/org/xbib/z3950/api/Client.java @@ -0,0 +1,44 @@ +package org.xbib.z3950.api; + +import java.io.Closeable; +import java.io.IOException; +import java.util.List; + +public interface Client extends Closeable { + + int searchCQL(String query, int offset, int length, + SearchListener searchListener, + RecordListener recordListener) throws IOException; + + int searchPQF(String query, int offset, int length, + SearchListener searchListener, + RecordListener recordListener) throws IOException; + + void scanPQF(String query, int nTerms, int step, int position, + ScanListener scanListener) throws IOException; + + String getHost(); + + int getPort(); + + String getUser(); + + String getPass(); + + long getTimeout(); + + String getPreferredRecordSyntax(); + + String getResultSetName(); + + String getElementSetName(); + + String getEncoding(); + + String getFormat(); + + String getType(); + + List getDatabases(); + +} diff --git a/z3950-api/src/main/java/org/xbib/z3950/api/ClientProvider.java b/z3950-api/src/main/java/org/xbib/z3950/api/ClientProvider.java new file mode 100644 index 0000000..7e58b62 --- /dev/null +++ b/z3950-api/src/main/java/org/xbib/z3950/api/ClientProvider.java @@ -0,0 +1,6 @@ +package org.xbib.z3950.api; + +public interface ClientProvider { + + C getClient(); +} diff --git a/z3950/src/main/java/org/xbib/io/iso23950/InitListener.java b/z3950-api/src/main/java/org/xbib/z3950/api/InitListener.java similarity index 78% rename from z3950/src/main/java/org/xbib/io/iso23950/InitListener.java rename to z3950-api/src/main/java/org/xbib/z3950/api/InitListener.java index 01b5385..0a6e212 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/InitListener.java +++ b/z3950-api/src/main/java/org/xbib/z3950/api/InitListener.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.api; /** * diff --git a/z3950-api/src/main/java/org/xbib/z3950/api/Record.java b/z3950-api/src/main/java/org/xbib/z3950/api/Record.java new file mode 100644 index 0000000..2f1c973 --- /dev/null +++ b/z3950-api/src/main/java/org/xbib/z3950/api/Record.java @@ -0,0 +1,13 @@ +package org.xbib.z3950.api; + +import java.io.InputStream; +import java.nio.charset.Charset; + +public interface Record { + + int getNumber(); + + InputStream asStream(); + + String toString(Charset charset); +} diff --git a/z3950/src/main/java/org/xbib/io/iso23950/RecordListener.java b/z3950-api/src/main/java/org/xbib/z3950/api/RecordListener.java similarity index 77% rename from z3950/src/main/java/org/xbib/io/iso23950/RecordListener.java rename to z3950-api/src/main/java/org/xbib/z3950/api/RecordListener.java index e4e58d5..f619819 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/RecordListener.java +++ b/z3950-api/src/main/java/org/xbib/z3950/api/RecordListener.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.api; /** * diff --git a/z3950/src/main/java/org/xbib/io/iso23950/ScanListener.java b/z3950-api/src/main/java/org/xbib/z3950/api/ScanListener.java similarity index 82% rename from z3950/src/main/java/org/xbib/io/iso23950/ScanListener.java rename to z3950-api/src/main/java/org/xbib/z3950/api/ScanListener.java index 854fd7b..3bd8cd3 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/ScanListener.java +++ b/z3950-api/src/main/java/org/xbib/z3950/api/ScanListener.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.api; import org.xbib.asn1.BEREncoding; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/SearchListener.java b/z3950-api/src/main/java/org/xbib/z3950/api/SearchListener.java similarity index 86% rename from z3950/src/main/java/org/xbib/io/iso23950/SearchListener.java rename to z3950-api/src/main/java/org/xbib/z3950/api/SearchListener.java index fc8bf14..66d0ad4 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/SearchListener.java +++ b/z3950-api/src/main/java/org/xbib/z3950/api/SearchListener.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.api; import java.io.IOException; diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1Any.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1Any.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1Any.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1Any.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1BitString.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1BitString.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1BitString.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1BitString.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1Boolean.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1Boolean.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1Boolean.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1Boolean.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1Decoder.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1Decoder.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1Decoder.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1Decoder.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1EncodingException.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1EncodingException.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1EncodingException.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1EncodingException.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1Enumerated.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1Enumerated.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1Enumerated.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1Enumerated.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1Exception.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1Exception.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1Exception.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1Exception.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1External.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1External.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1External.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1External.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1GeneralString.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1GeneralString.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1GeneralString.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1GeneralString.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1GeneralizedTime.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1GeneralizedTime.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1GeneralizedTime.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1GeneralizedTime.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1GraphicString.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1GraphicString.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1GraphicString.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1GraphicString.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1IA5String.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1IA5String.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1IA5String.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1IA5String.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1Integer.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1Integer.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1Integer.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1Integer.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1Null.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1Null.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1Null.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1Null.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1NumericString.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1NumericString.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1NumericString.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1NumericString.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1ObjectDescriptor.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1ObjectDescriptor.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1ObjectDescriptor.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1ObjectDescriptor.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1ObjectIdentifier.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1ObjectIdentifier.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1ObjectIdentifier.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1ObjectIdentifier.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1OctetString.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1OctetString.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1OctetString.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1OctetString.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1PrintableString.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1PrintableString.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1PrintableString.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1PrintableString.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1Sequence.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1Sequence.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1Sequence.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1Sequence.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1Set.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1Set.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1Set.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1Set.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1T61String.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1T61String.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1T61String.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1T61String.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1UTCTime.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1UTCTime.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1UTCTime.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1UTCTime.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1VideotexString.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1VideotexString.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1VideotexString.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1VideotexString.java diff --git a/asn1/src/main/java/org/xbib/asn1/ASN1VisibleString.java b/z3950-asn1/src/main/java/org/xbib/asn1/ASN1VisibleString.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/ASN1VisibleString.java rename to z3950-asn1/src/main/java/org/xbib/asn1/ASN1VisibleString.java diff --git a/asn1/src/main/java/org/xbib/asn1/BERConstructed.java b/z3950-asn1/src/main/java/org/xbib/asn1/BERConstructed.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/BERConstructed.java rename to z3950-asn1/src/main/java/org/xbib/asn1/BERConstructed.java diff --git a/asn1/src/main/java/org/xbib/asn1/BEREncoding.java b/z3950-asn1/src/main/java/org/xbib/asn1/BEREncoding.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/BEREncoding.java rename to z3950-asn1/src/main/java/org/xbib/asn1/BEREncoding.java diff --git a/asn1/src/main/java/org/xbib/asn1/BERPrimitive.java b/z3950-asn1/src/main/java/org/xbib/asn1/BERPrimitive.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/BERPrimitive.java rename to z3950-asn1/src/main/java/org/xbib/asn1/BERPrimitive.java diff --git a/asn1/src/main/java/org/xbib/asn1/io/BERReader.java b/z3950-asn1/src/main/java/org/xbib/asn1/io/BERReader.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/io/BERReader.java rename to z3950-asn1/src/main/java/org/xbib/asn1/io/BERReader.java diff --git a/asn1/src/main/java/org/xbib/asn1/io/BERWriter.java b/z3950-asn1/src/main/java/org/xbib/asn1/io/BERWriter.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/io/BERWriter.java rename to z3950-asn1/src/main/java/org/xbib/asn1/io/BERWriter.java diff --git a/asn1/src/main/java/org/xbib/asn1/io/InputStreamBERReader.java b/z3950-asn1/src/main/java/org/xbib/asn1/io/InputStreamBERReader.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/io/InputStreamBERReader.java rename to z3950-asn1/src/main/java/org/xbib/asn1/io/InputStreamBERReader.java diff --git a/asn1/src/main/java/org/xbib/asn1/io/OutputStreamBERWriter.java b/z3950-asn1/src/main/java/org/xbib/asn1/io/OutputStreamBERWriter.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/io/OutputStreamBERWriter.java rename to z3950-asn1/src/main/java/org/xbib/asn1/io/OutputStreamBERWriter.java diff --git a/asn1/src/main/java/org/xbib/asn1/package-info.java b/z3950-asn1/src/main/java/org/xbib/asn1/package-info.java similarity index 100% rename from asn1/src/main/java/org/xbib/asn1/package-info.java rename to z3950-asn1/src/main/java/org/xbib/asn1/package-info.java diff --git a/z3950-client-netty/build.gradle b/z3950-client-netty/build.gradle new file mode 100644 index 0000000..db99d60 --- /dev/null +++ b/z3950-client-netty/build.gradle @@ -0,0 +1,5 @@ +dependencies { + compile project(':z3950-common') + compile "io.netty:netty-handler:${project.property('netty.version')}" + compile "io.netty:netty-transport:${project.property('netty.version')}" +} \ No newline at end of file diff --git a/z3950/src/main/java/org/xbib/io/iso23950/netty/NettyZClient.java b/z3950-client-netty/src/main/java/org/xbib/z3950/client/netty/NettyZClient.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/netty/NettyZClient.java rename to z3950-client-netty/src/main/java/org/xbib/z3950/client/netty/NettyZClient.java index b4a5cdf..93c5495 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/netty/NettyZClient.java +++ b/z3950-client-netty/src/main/java/org/xbib/z3950/client/netty/NettyZClient.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.netty; +package org.xbib.z3950.client.netty; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.ByteBuf; @@ -42,7 +42,6 @@ public class NettyZClient { } - public void shutdown() throws InterruptedException { group.shutdownGracefully().sync(); } diff --git a/z3950-client/build.gradle b/z3950-client/build.gradle new file mode 100644 index 0000000..f891098 --- /dev/null +++ b/z3950-client/build.gradle @@ -0,0 +1,3 @@ +dependencies { + compile project(':z3950-common') +} \ No newline at end of file diff --git a/z3950/src/main/java/org/xbib/io/iso23950/ZClient.java b/z3950-client/src/main/java/org/xbib/z3950/client/DefaultClient.java similarity index 82% rename from z3950/src/main/java/org/xbib/io/iso23950/ZClient.java rename to z3950-client/src/main/java/org/xbib/z3950/client/DefaultClient.java index 8e2fec7..c7f45ff 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/ZClient.java +++ b/z3950-client/src/main/java/org/xbib/z3950/client/DefaultClient.java @@ -1,12 +1,17 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.client; import org.xbib.asn1.io.InputStreamBERReader; import org.xbib.asn1.io.OutputStreamBERWriter; -import org.xbib.io.iso23950.operations.CloseOperation; -import org.xbib.io.iso23950.operations.InitOperation; -import org.xbib.io.iso23950.operations.PresentOperation; -import org.xbib.io.iso23950.operations.ScanOperation; -import org.xbib.io.iso23950.operations.SearchOperation; +import org.xbib.z3950.common.operations.CloseOperation; +import org.xbib.z3950.common.operations.InitOperation; +import org.xbib.z3950.common.operations.PresentOperation; +import org.xbib.z3950.common.operations.ScanOperation; +import org.xbib.z3950.common.operations.SearchOperation; +import org.xbib.z3950.api.Client; +import org.xbib.z3950.api.InitListener; +import org.xbib.z3950.api.RecordListener; +import org.xbib.z3950.api.ScanListener; +import org.xbib.z3950.api.SearchListener; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -27,9 +32,9 @@ import java.util.logging.Logger; /** * Default Z client. */ -public class ZClient implements AutoCloseable { +public class DefaultClient implements Client { - private static final Logger logger = Logger.getLogger(ZClient.class.getName()); + private static final Logger logger = Logger.getLogger(DefaultClient.class.getName()); private final String host; @@ -67,16 +72,16 @@ public class ZClient implements AutoCloseable { private OutputStreamBERWriter berWriter; - private ZClient(String host, int port, String user, String pass, long timeout, - String preferredRecordSyntax, - String resultSetName, - String elementSetName, - String encoding, - String format, - String type, - List databases, - Integer preferredMessageSize, - InitListener initListener) { + private DefaultClient(String host, int port, String user, String pass, long timeout, + String preferredRecordSyntax, + String resultSetName, + String elementSetName, + String encoding, + String format, + String type, + List databases, + Integer preferredMessageSize, + InitListener initListener) { this.host = host; this.port = port; this.user = user; @@ -127,6 +132,7 @@ public class ZClient implements AutoCloseable { } } + @Override public int searchCQL(String query, int offset, int length, SearchListener searchListener, RecordListener recordListener) throws IOException { @@ -167,6 +173,7 @@ public class ZClient implements AutoCloseable { } } + @Override public int searchPQF(String query, int offset, int length, SearchListener searchListener, RecordListener recordListener) throws IOException { @@ -208,6 +215,7 @@ public class ZClient implements AutoCloseable { } } + @Override public void scanPQF(String query, int nTerms, int step, int position, ScanListener scanListener) throws IOException { ensureConnected(); @@ -220,73 +228,68 @@ public class ZClient implements AutoCloseable { } } + @Override public String getHost() { return host; } + @Override public int getPort() { return port; } + @Override public String getUser() { return user; } + @Override public String getPass() { return pass; } + @Override public long getTimeout() { return timeout; } + @Override public String getPreferredRecordSyntax() { return preferredRecordSyntax; } + @Override public String getResultSetName() { return resultSetName; } + @Override public String getElementSetName() { return elementSetName; } + @Override public String getEncoding() { return encoding; } + @Override public String getFormat() { return format; } + @Override public String getType() { return type; } + @Override public List getDatabases() { return databases; } private void connect() throws IOException { - try { - lock.lock(); - Socket socket = new Socket(); - socket.connect(new InetSocketAddress(host, port), (int) timeout); - socket.setSoTimeout((int) timeout * 1000); - this.socket = socket; - InputStream src = new BufferedInputStream(socket.getInputStream()); - OutputStream dest = new BufferedOutputStream(socket.getOutputStream()); - this.berReader = new InputStreamBERReader(src); - this.berWriter = new OutputStreamBERWriter(dest); - InitOperation initOperation = new InitOperation(berReader, berWriter, user, pass); - if (initOperation.execute(preferredMessageSize, initListener)) { - throw new IOException("could not initiate connection"); - } - logger.log(Level.INFO, initOperation.getTargetInfo()); - } finally { - lock.unlock(); - } + } private boolean isConnected() { @@ -295,7 +298,24 @@ public class ZClient implements AutoCloseable { private void ensureConnected() throws IOException { if (!isConnected()) { - connect(); + try { + lock.lock(); + Socket socket = new Socket(); + socket.connect(new InetSocketAddress(host, port), (int) timeout); + socket.setSoTimeout((int) timeout * 1000); + this.socket = socket; + InputStream src = new BufferedInputStream(socket.getInputStream()); + OutputStream dest = new BufferedOutputStream(socket.getOutputStream()); + this.berReader = new InputStreamBERReader(src); + this.berWriter = new OutputStreamBERWriter(dest); + InitOperation initOperation = new InitOperation(berReader, berWriter, user, pass); + if (initOperation.execute(preferredMessageSize, initListener)) { + throw new IOException("could not initiate connection"); + } + logger.log(Level.INFO, initOperation.getTargetInfo()); + } finally { + lock.unlock(); + } } } @@ -331,7 +351,7 @@ public class ZClient implements AutoCloseable { public static class Builder { private static final ResourceBundle recordSyntaxBundle = - ResourceBundle.getBundle("org.xbib.io.iso23950.recordsyntax"); + ResourceBundle.getBundle("org.xbib.z3950.common.recordsyntax"); private String host; @@ -434,8 +454,8 @@ public class ZClient implements AutoCloseable { return this; } - public ZClient build() { - return new ZClient(host, port, user, pass, timeout, + public DefaultClient build() { + return new DefaultClient(host, port, user, pass, timeout, preferredRecordSyntax, resultSetName, elementSetName, diff --git a/z3950/src/test/java/org/xbib/io/iso23950/ZClientTest.java b/z3950-client/src/test/java/org/xbib/z3950/client/test/DefaultClientTest.java similarity index 71% rename from z3950/src/test/java/org/xbib/io/iso23950/ZClientTest.java rename to z3950-client/src/test/java/org/xbib/z3950/client/test/DefaultClientTest.java index 5a260e7..b6d09b0 100644 --- a/z3950/src/test/java/org/xbib/io/iso23950/ZClientTest.java +++ b/z3950-client/src/test/java/org/xbib/z3950/client/test/DefaultClientTest.java @@ -1,6 +1,7 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.client.test; import org.junit.Test; +import org.xbib.z3950.client.DefaultClient; import java.io.IOException; import java.io.InputStream; @@ -14,9 +15,9 @@ import java.util.logging.Logger; /** * */ -public class ZClientTest { +public class DefaultClientTest { - private static final Logger logger = Logger.getLogger(ZClientTest.class.getName()); + private static final Logger logger = Logger.getLogger(DefaultClientTest.class.getName()); @Test public void testCQL() { @@ -24,7 +25,7 @@ public class ZClientTest { String query = "bib.identifierISSN = 00280836"; int from = 1; int size = 10; - try (ZClient client = newZClient(serviceName)) { + try (DefaultClient client = newZClient(serviceName)) { logger.log(Level.INFO, "executing CQL " + serviceName); int count = client.searchCQL(query, from, size, (status, total, returned, elapsedMillis) -> @@ -37,31 +38,13 @@ public class ZClientTest { } } - @Test - public void testGBV() { - String serviceName = "GBV"; - String query = "gbv.controlNumberZDB = 1413423-8"; - int from = 1; - int size = 2; - try (ZClient client = newZClient(serviceName)) { - logger.log(Level.INFO, "executing CQL " + query); - int count = client.searchCQL(query, from, size, - (status, total, returned, elapsedMillis) -> - logger.log(Level.INFO, serviceName + " total results = " + total), - record -> logger.log(Level.INFO, "record = " + record)); - logger.log(Level.INFO, "returned records = " + count); - } catch (Exception e) { - logger.log(Level.SEVERE, e.getMessage(), e); - } - } - @Test public void testPQF() { for (String serviceName : Arrays.asList("LIBRIS", "SWB")) { String query = "@attr 1=8 \"00280836\""; int from = 1; int size = 10; - try (ZClient client = newZClient(serviceName)) { + try (DefaultClient client = newZClient(serviceName)) { logger.log(Level.INFO, "executing PQF " + serviceName); int count = client.searchPQF(query, from, size, (status, total, returned, elapsedMillis) -> @@ -74,21 +57,20 @@ public class ZClientTest { } } - private static ZClient newZClient(String name) throws IOException { + private DefaultClient newZClient(String name) throws IOException { return newZClient(getProperties(name)); } - private static Properties getProperties(String name) throws IOException { + private Properties getProperties(String name) throws IOException { Properties properties = new Properties(); - try (InputStream inputStream = - ZClient.class.getResourceAsStream("/org/xbib/io/iso23950/service/" + name + ".properties")) { + try (InputStream inputStream = getClass().getResourceAsStream(name + ".properties")) { properties.load(inputStream); } return properties; } - private static ZClient newZClient(Properties properties) { - ZClient.Builder builder = ZClient.builder(); + private static DefaultClient newZClient(Properties properties) { + DefaultClient.Builder builder = DefaultClient.builder(); if (properties.containsKey("host")) { builder.setHost(properties.getProperty("host")); } diff --git a/z3950-client/src/test/java/org/xbib/z3950/client/test/GBVZClientTest.java b/z3950-client/src/test/java/org/xbib/z3950/client/test/GBVZClientTest.java new file mode 100644 index 0000000..441c721 --- /dev/null +++ b/z3950-client/src/test/java/org/xbib/z3950/client/test/GBVZClientTest.java @@ -0,0 +1,110 @@ +package org.xbib.z3950.client.test; + +import org.junit.Test; +import org.xbib.z3950.client.DefaultClient; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; + +import static org.junit.Assert.assertEquals; + +/** + * GBV test. + */ +public class GBVZClientTest { + + private static final Logger logger = Logger.getLogger(GBVZClientTest.class.getName()); + + @Test + public void testGBV() { + String query = "@attr 1=4 linux"; + int from = 1; + int size = 10; + try (DefaultClient client = newZClient("GBV")) { + logger.log(Level.INFO, "executing PQF " + query); + int count = client.searchPQF(query, from, size, + (status, total, returned, elapsedMillis) -> + logger.log(Level.INFO, "total results = " + total + " millis = " + elapsedMillis), + record -> logger.log(Level.INFO, "record = " + record.toString(StandardCharsets.UTF_8))); + logger.log(Level.INFO, "record count = " + count); + } catch (Exception e) { + logger.log(Level.SEVERE, e.getMessage(), e); + } + } + + @Test + public void testControlNumberZDB() { + String serviceName = "GBV"; + String query = "bib.controlNumberZDB = 1413423-8"; + int from = 1; + int size = 2; + try (DefaultClient client = newZClient(serviceName)) { + logger.log(Level.INFO, "executing CQL " + query); + int count = client.searchCQL(query, from, size, + (status, total, returned, elapsedMillis) -> + logger.log(Level.INFO, serviceName + " total results = " + total), + record -> logger.log(Level.INFO, "record = " + record)); + logger.log(Level.INFO, "returned records = " + count); + assertEquals(1, count); + } catch (Exception e) { + logger.log(Level.SEVERE, e.getMessage(), e); + } + } + + + private DefaultClient newZClient(String name) throws IOException { + return newZClient(getProperties(name)); + } + + private Properties getProperties(String name) throws IOException { + Properties properties = new Properties(); + try (InputStream inputStream = getClass().getResourceAsStream(name + ".properties")) { + properties.load(inputStream); + } + return properties; + } + + private static DefaultClient newZClient(Properties properties) { + DefaultClient.Builder builder = DefaultClient.builder(); + if (properties.containsKey("host")) { + builder.setHost(properties.getProperty("host")); + } + if (properties.containsKey("port")) { + builder.setPort(Integer.parseInt(properties.getProperty("port"))); + } + if (properties.containsKey("user")) { + builder.setUser(properties.getProperty("user")); + } + if (properties.containsKey("pass")) { + builder.setPass(properties.getProperty("pass")); + } + if (properties.containsKey("database")) { + builder.setDatabases(Collections.singletonList(properties.getProperty("database"))); + } + if (properties.containsKey("elementsetname")) { + builder.setElementSetName(properties.getProperty("elementsetname")); + } + if (properties.containsKey("preferredrecordsyntax")) { + builder.setPreferredRecordSyntax(properties.getProperty("preferredrecordsyntax")); + } + if (properties.containsKey("resultsetname")) { + builder.setResultSetName(properties.getProperty("resultsetname")); + } + if (properties.containsKey("encoding")) { + builder.setEncoding(properties.getProperty("encoding")); + } + if (properties.containsKey("format")) { + builder.setFormat(properties.getProperty("format")); + } + if (properties.containsKey("type")) { + builder.setType(properties.getProperty("type")); + } + return builder.build(); + } + +} diff --git a/z3950/build.gradle b/z3950-common/build.gradle similarity index 54% rename from z3950/build.gradle rename to z3950-common/build.gradle index 90c80cf..c760873 100644 --- a/z3950/build.gradle +++ b/z3950-common/build.gradle @@ -4,8 +4,6 @@ plugins { } dependencies { - compile project(':asn1') + compile project(':z3950-api') compile "org.xbib:cql-common:${project.property('xbib-cql.version')}" - compile "io.netty:netty-handler:${project.property('netty.version')}" - compile "io.netty:netty-transport:${project.property('netty.version')}" } diff --git a/z3950-common/src/main/jacc/org/xbib/z3950/common/pqf/PQF.jacc b/z3950-common/src/main/jacc/org/xbib/z3950/common/pqf/PQF.jacc new file mode 100755 index 0000000..3fe9b2c --- /dev/null +++ b/z3950-common/src/main/jacc/org/xbib/z3950/common/pqf/PQF.jacc @@ -0,0 +1 @@ +%{ import java.io.Reader; import java.io.IOException; /** Mike Taylor, IndexData: "Prefix Query Format (PQF), also known as Prefix Query Notation (PQN) was defined in 1995, as part of the YAZ toolkit, and has since become the de facto standard representation of RPN queries." From: http://www.indexdata.com/yaz/doc/tools.tkl#PQF The grammar of the PQF is as follows: query ::= top-set query-struct. top-set ::= [ '@attrset' string ] query-struct ::= attr-spec | simple | complex | '@term' term-type query attr-spec ::= '@attr' [ string ] string query-struct complex ::= operator query-struct query-struct. operator ::= '@and' | '@or' | '@not' | '@prox' proximity. simple ::= result-set | term. result-set ::= '@set' string. term ::= string. proximity ::= exclusion distance ordered relation which-code unit-code. exclusion ::= '1' | '0' | 'void'. distance ::= integer. ordered ::= '1' | '0'. relation ::= integer. which-code ::= 'known' | 'private' | integer. unit-code ::= integer. term-type ::= 'general' | 'numeric' | 'string' | 'oid' | 'datetime' | 'null'. You will note that the syntax above is a fairly faithful representation of RPN, except for the Attribute, which has been moved a step away from the term, allowing you to associate one or more attributes with an entire query structure. The parser will automatically apply the given attributes to each term as required. The @attr operator is followed by an attribute specification (attr-spec above). The specification consists of an optional attribute set, an attribute type-value pair and a sub-query. The attribute type-value pair is packed in one string: an attribute type, an equals sign, and an attribute value, like this: @attr 1=1003. The type is always an integer but the value may be either an integer or a string (if it doesn't start with a digit character). A string attribute-value is encoded as a Type-1 ``complex'' attribute with the list of values containing the single string specified, and including no semantic indicators. */ %} %class PQFParser %interface PQFTokens %package org.xbib.z3950.common.pqf %token NL %token OR %token AND %token NOT %token ATTR %token ATTRSET %token TERM %token SET %token VOID %token KNOWN %token PRIVATE %token TERMTYPE %token CHARSTRING1 %token CHARSTRING2 %token OPERATORS %token EQUALS %token INTEGER %left AND %left OR %left NOT %type pqf %type querystruct %type expression %type attrstr %type term %type resultset %start pqf %% pqf : ATTRSET CHARSTRING1 querystruct { this.pqf = new PQF($2, $3); $$ = this.pqf; } | querystruct { this.pqf = new PQF($1); $$ = this.pqf; } ; querystruct : attrspec | simple | complex | TERM TERMTYPE pqf { $$ = new Query($3); }; attrspec : ATTR attrstr querystruct { $$ = new Query($2, $3); } | ATTR CHARSTRING1 attrstr querystruct { $$ = new Query($2, $3, $4); }; simple : resultset { $$ = new Query($1); } | term { $$ = new Query($1); }; complex : expression { $$ = new Query($1); }; resultset : SET CHARSTRING1 { $$ = new Setname($2); }; term : CHARSTRING1 { $$ = new Term($1); } | CHARSTRING2 { $$ = new Term($1); } }; attrstr: INTEGER EQUALS INTEGER { $$ = new AttrStr($1, $3); } | INTEGER EQUALS CHARSTRING1 { $$ = new AttrStr($1, $3); }; expression: AND querystruct querystruct { $$ = new Expression($1, $2, $3); } | OR querystruct querystruct { $$ = new Expression($1, $2, $3); } | NOT querystruct querystruct { $$ = new Expression($1, $2, $3); } ; %% private PQFLexer lexer; private PQF pqf; public PQFParser(Reader r) { this.lexer = new PQFLexer(r); lexer.nextToken(); } public void yyerror(String error) { throw new SyntaxException("PQF error at " + "[" + lexer.getLine() + "," + lexer.getColumn() +"]" + ": " + error); } public PQF getResult() { return pqf; } \ No newline at end of file diff --git a/z3950/src/main/java/org/xbib/io/iso23950/Record.java b/z3950-common/src/main/java/org/xbib/z3950/common/DefaultRecord.java similarity index 74% rename from z3950/src/main/java/org/xbib/io/iso23950/Record.java rename to z3950-common/src/main/java/org/xbib/z3950/common/DefaultRecord.java index 9ec57ee..e025156 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/Record.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/DefaultRecord.java @@ -1,4 +1,6 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.common; + +import org.xbib.z3950.api.Record; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -7,7 +9,7 @@ import java.nio.charset.Charset; /** * A record for Z39.50 presentations. */ -public class Record { +public class DefaultRecord implements Record { private final int number; @@ -15,20 +17,23 @@ public class Record { private final ByteArrayInputStream stream; - public Record(int number, byte[] content) { + public DefaultRecord(int number, byte[] content) { this.number = number; this.content = content; this.stream = new ByteArrayInputStream(content); } + @Override public int getNumber() { return number; } + @Override public InputStream asStream() { return stream; } + @Override public String toString(Charset charset) { return new String(content, charset); } diff --git a/z3950-common/src/main/java/org/xbib/z3950/common/Diagnostics.java b/z3950-common/src/main/java/org/xbib/z3950/common/Diagnostics.java new file mode 100644 index 0000000..c21897c --- /dev/null +++ b/z3950-common/src/main/java/org/xbib/z3950/common/Diagnostics.java @@ -0,0 +1,38 @@ +package org.xbib.z3950.common; + +import java.io.IOException; +import java.util.ResourceBundle; + +/** + * Diagnostics for Z server. + */ +public class Diagnostics extends IOException { + + private static final ResourceBundle bundle = + ResourceBundle.getBundle("org.xbib.z3950.common.diagnostics"); + + private static final long serialVersionUID = -899201811019819079L; + + private int diagCode; + + private String message; + + public Diagnostics(int diagCode, String message) { + super("" + diagCode + " " + bundle.getString(Integer.toString(diagCode)) + " " + message); + this.diagCode = diagCode; + this.message = message; + } + + public int getDiagCode() { + return diagCode; + } + + public String getPlainText() { + return message; + } + + @Override + public String toString() { + return message; + } +} diff --git a/z3950/src/main/java/org/xbib/io/iso23950/ErrorRecord.java b/z3950-common/src/main/java/org/xbib/z3950/common/ErrorRecord.java similarity index 56% rename from z3950/src/main/java/org/xbib/io/iso23950/ErrorRecord.java rename to z3950-common/src/main/java/org/xbib/z3950/common/ErrorRecord.java index bea445b..d75a90c 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/ErrorRecord.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/ErrorRecord.java @@ -1,9 +1,9 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.common; /** * */ -public class ErrorRecord extends Record { +public class ErrorRecord extends DefaultRecord { public ErrorRecord(int number, byte[] content) { super(number, content); diff --git a/z3950/src/main/java/org/xbib/io/iso23950/cql/CQLRPNGenerator.java b/z3950-common/src/main/java/org/xbib/z3950/common/cql/CQLRPNGenerator.java similarity index 91% rename from z3950/src/main/java/org/xbib/io/iso23950/cql/CQLRPNGenerator.java rename to z3950-common/src/main/java/org/xbib/z3950/common/cql/CQLRPNGenerator.java index 63cd26e..4cc03be 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/cql/CQLRPNGenerator.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/cql/CQLRPNGenerator.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.cql; +package org.xbib.z3950.common.cql; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Integer; @@ -22,16 +22,16 @@ import org.xbib.cql.SortSpec; import org.xbib.cql.SortedQuery; import org.xbib.cql.Term; import org.xbib.cql.Visitor; -import org.xbib.io.iso23950.v3.AttributeElement; -import org.xbib.io.iso23950.v3.AttributeElementAttributeValue; -import org.xbib.io.iso23950.v3.AttributeList; -import org.xbib.io.iso23950.v3.AttributeSetId; -import org.xbib.io.iso23950.v3.AttributesPlusTerm; -import org.xbib.io.iso23950.v3.Operand; -import org.xbib.io.iso23950.v3.Operator; -import org.xbib.io.iso23950.v3.RPNQuery; -import org.xbib.io.iso23950.v3.RPNStructure; -import org.xbib.io.iso23950.v3.RPNStructureRpnRpnOp; +import org.xbib.z3950.common.v3.AttributeElement; +import org.xbib.z3950.common.v3.AttributeElementAttributeValue; +import org.xbib.z3950.common.v3.AttributeList; +import org.xbib.z3950.common.v3.AttributeSetId; +import org.xbib.z3950.common.v3.AttributesPlusTerm; +import org.xbib.z3950.common.v3.Operand; +import org.xbib.z3950.common.v3.Operator; +import org.xbib.z3950.common.v3.RPNQuery; +import org.xbib.z3950.common.v3.RPNStructure; +import org.xbib.z3950.common.v3.RPNStructureRpnRpnOp; import java.util.HashMap; import java.util.Map; @@ -52,9 +52,9 @@ public final class CQLRPNGenerator implements Visitor { private final Map contexts = new HashMap() { private static final long serialVersionUID = 8199395368653216950L; { - put("bib", ResourceBundle.getBundle("org.xbib.io.iso23950.cql.bib-1")); - put("dc", ResourceBundle.getBundle("org.xbib.io.iso23950.cql.dc")); - put("gbv", ResourceBundle.getBundle("org.xbib.io.iso23950.cql.gbv")); + put("bib", ResourceBundle.getBundle("org.xbib.z3950.common.cql.bib-1")); + put("dc", ResourceBundle.getBundle("org.xbib.z3950.common.cql.dc")); + put("gbv", ResourceBundle.getBundle("org.xbib.z3950.common.cql.gbv")); } }; private Stack result; @@ -182,7 +182,7 @@ public final class CQLRPNGenerator implements Visitor { } Operand operand = new Operand(); operand.attrTerm = new AttributesPlusTerm(); - operand.attrTerm.term = new org.xbib.io.iso23950.v3.Term(); + operand.attrTerm.term = new org.xbib.z3950.common.v3.Term(); operand.attrTerm.term.c_general = new ASN1OctetString(node.getTerm().getValue()); Stack attrs = new Stack<>(); ASN1Any any = !result.isEmpty() && result.peek() instanceof AttributeElement ? result.pop() : null; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/cql/SyntaxException.java b/z3950-common/src/main/java/org/xbib/z3950/common/cql/SyntaxException.java similarity index 95% rename from z3950/src/main/java/org/xbib/io/iso23950/cql/SyntaxException.java rename to z3950-common/src/main/java/org/xbib/z3950/common/cql/SyntaxException.java index 0ff7cc8..613f899 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/cql/SyntaxException.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/cql/SyntaxException.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.cql; +package org.xbib.z3950.common.cql; /** * Syntax exception. diff --git a/z3950-common/src/main/java/org/xbib/z3950/common/cql/package-info.java b/z3950-common/src/main/java/org/xbib/z3950/common/cql/package-info.java new file mode 100644 index 0000000..0d26671 --- /dev/null +++ b/z3950-common/src/main/java/org/xbib/z3950/common/cql/package-info.java @@ -0,0 +1,4 @@ +/** + * + */ +package org.xbib.z3950.common.cql; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/MessageSizeTooSmallException.java b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/MessageSizeTooSmallException.java similarity index 86% rename from z3950/src/main/java/org/xbib/io/iso23950/exceptions/MessageSizeTooSmallException.java rename to z3950-common/src/main/java/org/xbib/z3950/common/exceptions/MessageSizeTooSmallException.java index b89f7e4..f4672ec 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/MessageSizeTooSmallException.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/MessageSizeTooSmallException.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.exceptions; +package org.xbib.z3950.common.exceptions; /** * diff --git a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/NoRecordsReturnedException.java b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/NoRecordsReturnedException.java similarity index 85% rename from z3950/src/main/java/org/xbib/io/iso23950/exceptions/NoRecordsReturnedException.java rename to z3950-common/src/main/java/org/xbib/z3950/common/exceptions/NoRecordsReturnedException.java index ec4332b..647848b 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/NoRecordsReturnedException.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/NoRecordsReturnedException.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.exceptions; +package org.xbib.z3950.common.exceptions; /** * diff --git a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/RequestTerminatedByAccessControlException.java b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/RequestTerminatedByAccessControlException.java similarity index 87% rename from z3950/src/main/java/org/xbib/io/iso23950/exceptions/RequestTerminatedByAccessControlException.java rename to z3950-common/src/main/java/org/xbib/z3950/common/exceptions/RequestTerminatedByAccessControlException.java index 54b490e..ec1a5c9 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/RequestTerminatedByAccessControlException.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/RequestTerminatedByAccessControlException.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.exceptions; +package org.xbib.z3950.common.exceptions; /** * diff --git a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/RequestTerminatedException.java b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/RequestTerminatedException.java similarity index 86% rename from z3950/src/main/java/org/xbib/io/iso23950/exceptions/RequestTerminatedException.java rename to z3950-common/src/main/java/org/xbib/z3950/common/exceptions/RequestTerminatedException.java index f3cb312..928f679 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/RequestTerminatedException.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/RequestTerminatedException.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.exceptions; +package org.xbib.z3950.common.exceptions; /** * diff --git a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/ZException.java b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/ZException.java similarity index 96% rename from z3950/src/main/java/org/xbib/io/iso23950/exceptions/ZException.java rename to z3950-common/src/main/java/org/xbib/z3950/common/exceptions/ZException.java index dbddd63..a7df318 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/ZException.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/ZException.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.exceptions; +package org.xbib.z3950.common.exceptions; import java.io.IOException; diff --git a/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/package-info.java b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/package-info.java new file mode 100644 index 0000000..c50c252 --- /dev/null +++ b/z3950-common/src/main/java/org/xbib/z3950/common/exceptions/package-info.java @@ -0,0 +1,4 @@ +/** + * + */ +package org.xbib.z3950.common.exceptions; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/operations/AbstractOperation.java b/z3950-common/src/main/java/org/xbib/z3950/common/operations/AbstractOperation.java similarity index 92% rename from z3950/src/main/java/org/xbib/io/iso23950/operations/AbstractOperation.java rename to z3950-common/src/main/java/org/xbib/z3950/common/operations/AbstractOperation.java index 2a19d74..61c0a97 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/operations/AbstractOperation.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/operations/AbstractOperation.java @@ -1,19 +1,19 @@ -package org.xbib.io.iso23950.operations; +package org.xbib.z3950.common.operations; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Exception; import org.xbib.asn1.BEREncoding; import org.xbib.asn1.io.BERReader; import org.xbib.asn1.io.BERWriter; -import org.xbib.io.iso23950.v3.Close; -import org.xbib.io.iso23950.v3.InitializeRequest; -import org.xbib.io.iso23950.v3.InitializeResponse; -import org.xbib.io.iso23950.v3.PresentRequest; -import org.xbib.io.iso23950.v3.PresentResponse; -import org.xbib.io.iso23950.v3.ScanRequest; -import org.xbib.io.iso23950.v3.ScanResponse; -import org.xbib.io.iso23950.v3.SearchRequest; -import org.xbib.io.iso23950.v3.SearchResponse; +import org.xbib.z3950.common.v3.Close; +import org.xbib.z3950.common.v3.InitializeRequest; +import org.xbib.z3950.common.v3.InitializeResponse; +import org.xbib.z3950.common.v3.PresentRequest; +import org.xbib.z3950.common.v3.PresentResponse; +import org.xbib.z3950.common.v3.ScanRequest; +import org.xbib.z3950.common.v3.ScanResponse; +import org.xbib.z3950.common.v3.SearchRequest; +import org.xbib.z3950.common.v3.SearchResponse; import java.io.IOException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/operations/CloseOperation.java b/z3950-common/src/main/java/org/xbib/z3950/common/operations/CloseOperation.java similarity index 61% rename from z3950/src/main/java/org/xbib/io/iso23950/operations/CloseOperation.java rename to z3950-common/src/main/java/org/xbib/z3950/common/operations/CloseOperation.java index 244d8dc..532671e 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/operations/CloseOperation.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/operations/CloseOperation.java @@ -1,15 +1,19 @@ -package org.xbib.io.iso23950.operations; +package org.xbib.z3950.common.operations; import org.xbib.asn1.ASN1Integer; import org.xbib.asn1.io.BERReader; import org.xbib.asn1.io.BERWriter; -import org.xbib.io.iso23950.v3.Close; -import org.xbib.io.iso23950.v3.CloseReason; +import org.xbib.z3950.common.v3.Close; +import org.xbib.z3950.common.v3.CloseReason; import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; public class CloseOperation extends AbstractOperation { + private static final Logger logger = Logger.getLogger(CloseOperation.class.getName()); + public CloseOperation(BERReader reader, BERWriter writer) { super(reader, writer); } @@ -19,6 +23,9 @@ public class CloseOperation extends AbstractOperation { close.closeReason = new CloseReason(); close.closeReason.value = new ASN1Integer(reason); close.referenceId = null; + if (logger.isLoggable(Level.FINE)) { + logger.log(Level.FINE, close.toString()); + } write(close); // do not wait, it may hang //waitClosePDU(); diff --git a/z3950/src/main/java/org/xbib/io/iso23950/operations/InitOperation.java b/z3950-common/src/main/java/org/xbib/z3950/common/operations/InitOperation.java similarity index 87% rename from z3950/src/main/java/org/xbib/io/iso23950/operations/InitOperation.java rename to z3950-common/src/main/java/org/xbib/z3950/common/operations/InitOperation.java index 66c6863..88fdd7e 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/operations/InitOperation.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/operations/InitOperation.java @@ -1,20 +1,21 @@ -package org.xbib.io.iso23950.operations; +package org.xbib.z3950.common.operations; import org.xbib.asn1.ASN1BitString; import org.xbib.asn1.ASN1GeneralString; import org.xbib.asn1.ASN1Integer; import org.xbib.asn1.io.BERReader; import org.xbib.asn1.io.BERWriter; -import org.xbib.io.iso23950.InitListener; -import org.xbib.io.iso23950.v3.IdAuthentication; -import org.xbib.io.iso23950.v3.IdAuthenticationIdPass; -import org.xbib.io.iso23950.v3.InitializeRequest; -import org.xbib.io.iso23950.v3.InitializeResponse; -import org.xbib.io.iso23950.v3.InternationalString; -import org.xbib.io.iso23950.v3.Options; -import org.xbib.io.iso23950.v3.ProtocolVersion; +import org.xbib.z3950.common.v3.IdAuthentication; +import org.xbib.z3950.common.v3.IdAuthenticationIdPass; +import org.xbib.z3950.common.v3.InitializeRequest; +import org.xbib.z3950.common.v3.InitializeResponse; +import org.xbib.z3950.common.v3.InternationalString; +import org.xbib.z3950.common.v3.Options; +import org.xbib.z3950.common.v3.ProtocolVersion; +import org.xbib.z3950.api.InitListener; import java.io.IOException; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -79,10 +80,9 @@ public class InitOperation extends AbstractOperation { + private static final Logger logger = Logger.getLogger(ScanOperation.class.getName()); + private final List databases; public ScanOperation(BERReader reader, BERWriter writer, @@ -51,6 +55,9 @@ public class ScanOperation extends AbstractOperation scanRequest.stepSize = new ASN1Integer(step); scanRequest.preferredPositionInResponse = new ASN1Integer(position); scanRequest.termListAndStartPoint = term; + if (logger.isLoggable(Level.FINE)) { + logger.log(Level.FINE, scanRequest.toString()); + } write(scanRequest); ScanResponse scanResponse = read(); if (scanResponse != null) { diff --git a/z3950/src/main/java/org/xbib/io/iso23950/operations/SearchOperation.java b/z3950-common/src/main/java/org/xbib/z3950/common/operations/SearchOperation.java similarity index 87% rename from z3950/src/main/java/org/xbib/io/iso23950/operations/SearchOperation.java rename to z3950-common/src/main/java/org/xbib/z3950/common/operations/SearchOperation.java index 4667364..541b856 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/operations/SearchOperation.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/operations/SearchOperation.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.operations; +package org.xbib.z3950.common.operations; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Boolean; @@ -9,18 +9,18 @@ import org.xbib.asn1.ASN1Sequence; import org.xbib.asn1.io.BERReader; import org.xbib.asn1.io.BERWriter; import org.xbib.cql.CQLParser; -import org.xbib.io.iso23950.Diagnostics; -import org.xbib.io.iso23950.cql.CQLRPNGenerator; -import org.xbib.io.iso23950.pqf.PQFParser; -import org.xbib.io.iso23950.pqf.PQFRPNGenerator; -import org.xbib.io.iso23950.v3.DatabaseName; -import org.xbib.io.iso23950.v3.InternationalString; -import org.xbib.io.iso23950.v3.OtherInformation1; -import org.xbib.io.iso23950.v3.PresentStatus; -import org.xbib.io.iso23950.v3.Query; -import org.xbib.io.iso23950.v3.RPNQuery; -import org.xbib.io.iso23950.v3.SearchRequest; -import org.xbib.io.iso23950.v3.SearchResponse; +import org.xbib.z3950.common.Diagnostics; +import org.xbib.z3950.common.cql.CQLRPNGenerator; +import org.xbib.z3950.common.pqf.PQFParser; +import org.xbib.z3950.common.pqf.PQFRPNGenerator; +import org.xbib.z3950.common.v3.DatabaseName; +import org.xbib.z3950.common.v3.InternationalString; +import org.xbib.z3950.common.v3.OtherInformation1; +import org.xbib.z3950.common.v3.PresentStatus; +import org.xbib.z3950.common.v3.Query; +import org.xbib.z3950.common.v3.RPNQuery; +import org.xbib.z3950.common.v3.SearchRequest; +import org.xbib.z3950.common.v3.SearchResponse; import java.io.IOException; import java.io.StringReader; @@ -79,13 +79,16 @@ public class SearchOperation extends AbstractOperation attrs = new Stack<>(); ASN1Any any = !result.isEmpty() && result.peek() instanceof AttributeElement ? result.pop() : null; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/pqf/Query.java b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/Query.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/pqf/Query.java rename to z3950-common/src/main/java/org/xbib/z3950/common/pqf/Query.java index 3764e45..db7f97b 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/pqf/Query.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/Query.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.pqf; +package org.xbib.z3950.common.pqf; import java.util.LinkedList; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/pqf/Setname.java b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/Setname.java similarity index 91% rename from z3950/src/main/java/org/xbib/io/iso23950/pqf/Setname.java rename to z3950-common/src/main/java/org/xbib/z3950/common/pqf/Setname.java index 2a9162f..ed8c396 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/pqf/Setname.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/Setname.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.pqf; +package org.xbib.z3950.common.pqf; /** * diff --git a/z3950/src/main/java/org/xbib/io/iso23950/pqf/SyntaxException.java b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/SyntaxException.java similarity index 90% rename from z3950/src/main/java/org/xbib/io/iso23950/pqf/SyntaxException.java rename to z3950-common/src/main/java/org/xbib/z3950/common/pqf/SyntaxException.java index e671fb1..c2653bf 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/pqf/SyntaxException.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/SyntaxException.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.pqf; +package org.xbib.z3950.common.pqf; /** * Syntax exception. diff --git a/z3950/src/main/java/org/xbib/io/iso23950/pqf/Term.java b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/Term.java similarity index 91% rename from z3950/src/main/java/org/xbib/io/iso23950/pqf/Term.java rename to z3950-common/src/main/java/org/xbib/z3950/common/pqf/Term.java index a9f0155..3234b15 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/pqf/Term.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/Term.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.pqf; +package org.xbib.z3950.common.pqf; /** * diff --git a/z3950/src/main/java/org/xbib/io/iso23950/pqf/Visitor.java b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/Visitor.java similarity index 94% rename from z3950/src/main/java/org/xbib/io/iso23950/pqf/Visitor.java rename to z3950-common/src/main/java/org/xbib/z3950/common/pqf/Visitor.java index 9a96781..ed22987 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/pqf/Visitor.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/Visitor.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.pqf; +package org.xbib.z3950.common.pqf; /** * PQF abstract syntax tree visitor. diff --git a/z3950-common/src/main/java/org/xbib/z3950/common/pqf/package-info.java b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/package-info.java new file mode 100644 index 0000000..34a23d3 --- /dev/null +++ b/z3950-common/src/main/java/org/xbib/z3950/common/pqf/package-info.java @@ -0,0 +1,4 @@ +/** + * + */ +package org.xbib.z3950.common.pqf; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlRequest.java index bf47e43..ddebe2b 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlRequestSecurityChallenge.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlRequestSecurityChallenge.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlRequestSecurityChallenge.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlRequestSecurityChallenge.java index 690e8ea..535f02f 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlRequestSecurityChallenge.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlRequestSecurityChallenge.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlResponse.java index bfe2181..d1ab5f6 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlResponseSecurityChallengeResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlResponseSecurityChallengeResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlResponseSecurityChallengeResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlResponseSecurityChallengeResponse.java index 023f0fe..e5080b7 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/AccessControlResponseSecurityChallengeResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AccessControlResponseSecurityChallengeResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeElement.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeElement.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeElement.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeElement.java index 226aa0e..95079f8 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeElement.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeElement.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeElementAttributeValue.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeElementAttributeValue.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeElementAttributeValue.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeElementAttributeValue.java index f49c286..35cdc95 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeElementAttributeValue.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeElementAttributeValue.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeElementAttributeValueComplex.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeElementAttributeValueComplex.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeElementAttributeValueComplex.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeElementAttributeValueComplex.java index d621c2b..a45246a 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeElementAttributeValueComplex.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeElementAttributeValueComplex.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeList.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeList.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeList.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeList.java index c4fbf6a..9dbaf0f 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeList.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeList.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeSetId.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeSetId.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeSetId.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeSetId.java index ea20d03..85dabbc 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributeSetId.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributeSetId.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Exception; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributesPlusTerm.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributesPlusTerm.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/AttributesPlusTerm.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributesPlusTerm.java index 0e6f97d..4a1d0ad 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/AttributesPlusTerm.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/AttributesPlusTerm.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Close.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Close.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Close.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Close.java index 459402d..d1a28f6 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Close.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Close.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/CloseReason.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/CloseReason.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/CloseReason.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/CloseReason.java index c945394..1ec1d39 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/CloseReason.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/CloseReason.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/CompSpec.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/CompSpec.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/CompSpec.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/CompSpec.java index 2941d4c..1291e3e 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/CompSpec.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/CompSpec.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Boolean; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/CompSpecDbSpecific.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/CompSpecDbSpecific.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/CompSpecDbSpecific.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/CompSpecDbSpecific.java index be50d93..fd41ba7 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/CompSpecDbSpecific.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/CompSpecDbSpecific.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/DatabaseName.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DatabaseName.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/DatabaseName.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/DatabaseName.java index 97f5cdd..63f6718 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/DatabaseName.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DatabaseName.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/DefaultDiagFormat.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DefaultDiagFormat.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/DefaultDiagFormat.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/DefaultDiagFormat.java index 8917ccd..335b50a 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/DefaultDiagFormat.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DefaultDiagFormat.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/DefaultDiagFormatAddinfo.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DefaultDiagFormatAddinfo.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/DefaultDiagFormatAddinfo.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/DefaultDiagFormatAddinfo.java index b377449..57ff7bf 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/DefaultDiagFormatAddinfo.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DefaultDiagFormatAddinfo.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/DeleteResultSetRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DeleteResultSetRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/DeleteResultSetRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/DeleteResultSetRequest.java index d229d24..1e3dce2 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/DeleteResultSetRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DeleteResultSetRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/DeleteResultSetResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DeleteResultSetResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/DeleteResultSetResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/DeleteResultSetResponse.java index 143e1f5..167f326 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/DeleteResultSetResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DeleteResultSetResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/DeleteSetStatus.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DeleteSetStatus.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/DeleteSetStatus.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/DeleteSetStatus.java index a522c4d..bbce216 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/DeleteSetStatus.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DeleteSetStatus.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/DiagRec.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DiagRec.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/DiagRec.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/DiagRec.java index f37d950..3d7f953 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/DiagRec.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/DiagRec.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ElementSetName.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ElementSetName.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ElementSetName.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ElementSetName.java index c870644..2e1049d 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ElementSetName.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ElementSetName.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ElementSetNames.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ElementSetNames.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ElementSetNames.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ElementSetNames.java index d465140..018adac 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ElementSetNames.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ElementSetNames.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ElementSetNamesDatabaseSpecific.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ElementSetNamesDatabaseSpecific.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ElementSetNamesDatabaseSpecific.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ElementSetNamesDatabaseSpecific.java index 081e46b..a19335d 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ElementSetNamesDatabaseSpecific.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ElementSetNamesDatabaseSpecific.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Entry.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Entry.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Entry.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Entry.java index f19d6b1..c56e60f 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Entry.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Entry.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ExtendedServicesRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ExtendedServicesRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ExtendedServicesRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ExtendedServicesRequest.java index bbad350..bc0e530 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ExtendedServicesRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ExtendedServicesRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ExtendedServicesResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ExtendedServicesResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ExtendedServicesResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ExtendedServicesResponse.java index 7e26fea..a0cb34d 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ExtendedServicesResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ExtendedServicesResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/FragmentSyntax.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/FragmentSyntax.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/FragmentSyntax.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/FragmentSyntax.java index 4e31c3c..0e1e21c 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/FragmentSyntax.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/FragmentSyntax.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/IdAuthentication.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/IdAuthentication.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/IdAuthentication.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/IdAuthentication.java index 8dcd2c9..0d61bf5 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/IdAuthentication.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/IdAuthentication.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/IdAuthenticationIdPass.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/IdAuthenticationIdPass.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/IdAuthenticationIdPass.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/IdAuthenticationIdPass.java index 44efca9..67b1d98 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/IdAuthenticationIdPass.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/IdAuthenticationIdPass.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/InfoCategory.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/InfoCategory.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/InfoCategory.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/InfoCategory.java index 717d06b..7ba3dff 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/InfoCategory.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/InfoCategory.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/InitializeRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/InitializeRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/InitializeRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/InitializeRequest.java index 7813ec9..e4c3650 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/InitializeRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/InitializeRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/InitializeResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/InitializeResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/InitializeResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/InitializeResponse.java index cef1658..5dfeb1d 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/InitializeResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/InitializeResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Boolean; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/IntUnit.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/IntUnit.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/IntUnit.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/IntUnit.java index 848651b..a0f193a 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/IntUnit.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/IntUnit.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/InternationalString.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/InternationalString.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/InternationalString.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/InternationalString.java index 0c64162..ae73d10 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/InternationalString.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/InternationalString.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Exception; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/KnownProximityUnit.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/KnownProximityUnit.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/KnownProximityUnit.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/KnownProximityUnit.java index 3946f24..a5595c1 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/KnownProximityUnit.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/KnownProximityUnit.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Exception; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ListEntries.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ListEntries.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ListEntries.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ListEntries.java index 47f4eb8..29fd6a1 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ListEntries.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ListEntries.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ListStatuses.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ListStatuses.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ListStatuses.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ListStatuses.java index 9cf4f71..67b8cad 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ListStatuses.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ListStatuses.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ListStatuses1.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ListStatuses1.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ListStatuses1.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ListStatuses1.java index b58fb71..a2cacc6 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ListStatuses1.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ListStatuses1.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/NamePlusRecord.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/NamePlusRecord.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/NamePlusRecord.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/NamePlusRecord.java index 1b5f8c5..7a4be7d 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/NamePlusRecord.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/NamePlusRecord.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/NamePlusRecordRecord.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/NamePlusRecordRecord.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/NamePlusRecordRecord.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/NamePlusRecordRecord.java index 22462a0..7451135 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/NamePlusRecordRecord.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/NamePlusRecordRecord.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributes.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributes.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributes.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributes.java index d7a0f1c..b7a03a5 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributes.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributes.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributes1.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributes1.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributes1.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributes1.java index 75467e6..dc0b440 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributes1.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributes1.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributesOccurrences.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributesOccurrences.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributesOccurrences.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributesOccurrences.java index 67ab452..910b7c4 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributesOccurrences.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributesOccurrences.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributesOccurrencesByDatabase.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributesOccurrencesByDatabase.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributesOccurrencesByDatabase.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributesOccurrencesByDatabase.java index 2822752..c9737bd 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/OccurrenceByAttributesOccurrencesByDatabase.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OccurrenceByAttributesOccurrencesByDatabase.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Operand.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Operand.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Operand.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Operand.java index 875e4f6..4f66afb 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Operand.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Operand.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Operator.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Operator.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Operator.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Operator.java index 2af048d..fc90454 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Operator.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Operator.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Options.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Options.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Options.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Options.java index 4c9c737..68bc93f 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Options.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Options.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1BitString; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/OtherInformation.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OtherInformation.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/OtherInformation.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/OtherInformation.java index 4ab0c3a..be081d7 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/OtherInformation.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OtherInformation.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/OtherInformation1.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OtherInformation1.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/OtherInformation1.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/OtherInformation1.java index 57e2108..193fb1e 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/OtherInformation1.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OtherInformation1.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/OtherInformationInformation.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OtherInformationInformation.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/OtherInformationInformation.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/OtherInformationInformation.java index 8288ca0..c1cbb84 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/OtherInformationInformation.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/OtherInformationInformation.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Permissions.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Permissions.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Permissions.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Permissions.java index 29f6afa..d640621 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Permissions.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Permissions.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Permissions1.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Permissions1.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Permissions1.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Permissions1.java index 3554a98..7f8393c 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Permissions1.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Permissions1.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/PresentRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/PresentRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentRequest.java index 825723b..8de0ba6 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/PresentRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/PresentRequestRecordComposition.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentRequestRecordComposition.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/PresentRequestRecordComposition.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentRequestRecordComposition.java index 8a5f98d..03b3f9e 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/PresentRequestRecordComposition.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentRequestRecordComposition.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/PresentResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/PresentResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentResponse.java index 6843413..7f06158 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/PresentResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/PresentStatus.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentStatus.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/PresentStatus.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentStatus.java index fe1698e..7749e87 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/PresentStatus.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/PresentStatus.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ProtocolVersion.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ProtocolVersion.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ProtocolVersion.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ProtocolVersion.java index df5326d..186cf43 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ProtocolVersion.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ProtocolVersion.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1BitString; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ProximityOperator.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ProximityOperator.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ProximityOperator.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ProximityOperator.java index d0291f8..acdbc01 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ProximityOperator.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ProximityOperator.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Boolean; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ProximityOperatorProximityUnitCode.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ProximityOperatorProximityUnitCode.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ProximityOperatorProximityUnitCode.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ProximityOperatorProximityUnitCode.java index 1309e53..8f4d073 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ProximityOperatorProximityUnitCode.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ProximityOperatorProximityUnitCode.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Query.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Query.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Query.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Query.java index 0d30730..7691d02 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Query.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Query.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/RPNQuery.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/RPNQuery.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/RPNQuery.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/RPNQuery.java index ed9cb49..e430143 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/RPNQuery.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/RPNQuery.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/RPNStructure.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/RPNStructure.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/RPNStructure.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/RPNStructure.java index cd0abc6..cc2a281 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/RPNStructure.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/RPNStructure.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/RPNStructureRpnRpnOp.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/RPNStructureRpnRpnOp.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/RPNStructureRpnRpnOp.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/RPNStructureRpnRpnOp.java index 7fe551b..bdc2c43 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/RPNStructureRpnRpnOp.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/RPNStructureRpnRpnOp.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Range.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Range.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Range.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Range.java index 259b5f5..ef1d2ee 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Range.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Range.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Records.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Records.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Records.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Records.java index 3387bb1..4fb275b 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Records.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Records.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ReferenceId.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ReferenceId.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ReferenceId.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ReferenceId.java index b6cfb46..5f5a398 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ReferenceId.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ReferenceId.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceControlRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceControlRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceControlRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceControlRequest.java index 32f8140..f530c24 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceControlRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceControlRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Boolean; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceControlResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceControlResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceControlResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceControlResponse.java index 9cae7da..41fd0bf 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceControlResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceControlResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Boolean; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReport.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReport.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReport.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReport.java index ad11db4..a0da709 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReport.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReport.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Exception; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReportId.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReportId.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReportId.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReportId.java index 79aa526..9362e30 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReportId.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReportId.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Exception; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReportRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReportRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReportRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReportRequest.java index 01848c0..20dcc9e 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReportRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReportRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReportResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReportResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReportResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReportResponse.java index cdfc8a6..73f89d2 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResourceReportResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResourceReportResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResultSetId.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResultSetId.java similarity index 98% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ResultSetId.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ResultSetId.java index e2b2679..18d3894 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResultSetId.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResultSetId.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResultSetPlusAttributes.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResultSetPlusAttributes.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ResultSetPlusAttributes.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ResultSetPlusAttributes.java index 584ad9f..e16f50e 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ResultSetPlusAttributes.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ResultSetPlusAttributes.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ScanRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ScanRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ScanRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ScanRequest.java index 471070c..4ef0ff1 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ScanRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ScanRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/ScanResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ScanResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/ScanResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/ScanResponse.java index 81f890a..764ff61 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/ScanResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/ScanResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SearchRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SearchRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SearchRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SearchRequest.java index 950a54a..d89a752 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SearchRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SearchRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Boolean; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SearchResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SearchResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SearchResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SearchResponse.java index ea2f168..5b44a98 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SearchResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SearchResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Boolean; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Segment.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Segment.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Segment.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Segment.java index 11f6538..371695b 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Segment.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Segment.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortElement.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortElement.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SortElement.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SortElement.java index e2bb66d..92a1b8f 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortElement.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortElement.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortElementDatabaseSpecific.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortElementDatabaseSpecific.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SortElementDatabaseSpecific.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SortElementDatabaseSpecific.java index 0a5ed03..796250d 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortElementDatabaseSpecific.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortElementDatabaseSpecific.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortKey.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKey.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SortKey.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKey.java index 232c691..5541144 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortKey.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKey.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortKeySortAttributes.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKeySortAttributes.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SortKeySortAttributes.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKeySortAttributes.java index 229cfc4..20501e6 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortKeySortAttributes.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKeySortAttributes.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortKeySpec.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKeySpec.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SortKeySpec.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKeySpec.java index 3b4181b..e4f1dab 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortKeySpec.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKeySpec.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortKeySpecMissingValueAction.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKeySpecMissingValueAction.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SortKeySpecMissingValueAction.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKeySpecMissingValueAction.java index 203ccd0..9ff329c 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortKeySpecMissingValueAction.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortKeySpecMissingValueAction.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SortRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SortRequest.java index fd0f642..a9d8df4 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortResponse.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortResponse.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SortResponse.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SortResponse.java index 92090d2..c6e4779 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SortResponse.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SortResponse.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Specification.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Specification.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Specification.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Specification.java index b618b8b..8996677 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Specification.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Specification.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/SpecificationElementSpec.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SpecificationElementSpec.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/SpecificationElementSpec.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/SpecificationElementSpec.java index 24c2608..16db163 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/SpecificationElementSpec.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/SpecificationElementSpec.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/StringOrNumeric.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/StringOrNumeric.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/StringOrNumeric.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/StringOrNumeric.java index 95b85ab..0e6c3b5 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/StringOrNumeric.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/StringOrNumeric.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Term.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Term.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Term.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Term.java index 4d40085..e2659f6 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Term.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Term.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/TermInfo.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/TermInfo.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/TermInfo.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/TermInfo.java index 79171da..a61c478 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/TermInfo.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/TermInfo.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/TriggerResourceControlRequest.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/TriggerResourceControlRequest.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/TriggerResourceControlRequest.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/TriggerResourceControlRequest.java index 701d903..a1cfe4b 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/TriggerResourceControlRequest.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/TriggerResourceControlRequest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1Boolean; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/Unit.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Unit.java similarity index 99% rename from z3950/src/main/java/org/xbib/io/iso23950/v3/Unit.java rename to z3950-common/src/main/java/org/xbib/z3950/common/v3/Unit.java index c02a07a..1b95387 100644 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/Unit.java +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/Unit.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.v3; +package org.xbib.z3950.common.v3; import org.xbib.asn1.ASN1Any; import org.xbib.asn1.ASN1EncodingException; diff --git a/z3950-common/src/main/java/org/xbib/z3950/common/v3/package-info.java b/z3950-common/src/main/java/org/xbib/z3950/common/v3/package-info.java new file mode 100644 index 0000000..514f8ae --- /dev/null +++ b/z3950-common/src/main/java/org/xbib/z3950/common/v3/package-info.java @@ -0,0 +1,4 @@ +/** + * + */ +package org.xbib.z3950.common.v3; diff --git a/z3950/src/main/jflex/org/xbib/io/iso23950/pqf/PQF.jflex b/z3950-common/src/main/jflex/org/xbib/z3950/common/pqf/PQF.jflex similarity index 98% rename from z3950/src/main/jflex/org/xbib/io/iso23950/pqf/PQF.jflex rename to z3950-common/src/main/jflex/org/xbib/z3950/common/pqf/PQF.jflex index 5f14a1a..7c2409a 100755 --- a/z3950/src/main/jflex/org/xbib/io/iso23950/pqf/PQF.jflex +++ b/z3950-common/src/main/jflex/org/xbib/z3950/common/pqf/PQF.jflex @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950.pqf; +package org.xbib.z3950.common.pqf; import java.io.*; diff --git a/z3950/src/test/java/org/xbib/io/iso23950/Bib1Test.java b/z3950-common/src/test/java/org/xbib/z3950/common/Bib1Test.java similarity index 94% rename from z3950/src/test/java/org/xbib/io/iso23950/Bib1Test.java rename to z3950-common/src/test/java/org/xbib/z3950/common/Bib1Test.java index 9225d23..50b1867 100644 --- a/z3950/src/test/java/org/xbib/io/iso23950/Bib1Test.java +++ b/z3950-common/src/test/java/org/xbib/z3950/common/Bib1Test.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.common; import org.junit.Test; diff --git a/z3950/src/test/java/org/xbib/io/iso23950/ParserTest.java b/z3950-common/src/test/java/org/xbib/z3950/common/ParserTest.java similarity index 96% rename from z3950/src/test/java/org/xbib/io/iso23950/ParserTest.java rename to z3950-common/src/test/java/org/xbib/z3950/common/ParserTest.java index 225bbee..978e8dc 100644 --- a/z3950/src/test/java/org/xbib/io/iso23950/ParserTest.java +++ b/z3950-common/src/test/java/org/xbib/z3950/common/ParserTest.java @@ -1,4 +1,4 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.common; import org.junit.Assert; diff --git a/z3950/src/test/java/org/xbib/io/iso23950/SearchTest.java b/z3950-common/src/test/java/org/xbib/z3950/common/SearchTest.java similarity index 82% rename from z3950/src/test/java/org/xbib/io/iso23950/SearchTest.java rename to z3950-common/src/test/java/org/xbib/z3950/common/SearchTest.java index 552aee7..57cd917 100644 --- a/z3950/src/test/java/org/xbib/io/iso23950/SearchTest.java +++ b/z3950-common/src/test/java/org/xbib/z3950/common/SearchTest.java @@ -1,8 +1,9 @@ -package org.xbib.io.iso23950; +package org.xbib.z3950.common; import org.junit.Test; -import org.xbib.io.iso23950.exceptions.MessageSizeTooSmallException; -import org.xbib.io.iso23950.exceptions.NoRecordsReturnedException; +import org.xbib.z3950.common.exceptions.MessageSizeTooSmallException; +import org.xbib.z3950.common.exceptions.NoRecordsReturnedException; +import org.xbib.z3950.common.DefaultClient; import java.util.Collections; import java.util.logging.Level; @@ -25,7 +26,7 @@ public class SearchTest { int from = 1; int length = 1; try { - ZClient client = ZClient.builder() + DefaultClient client = DefaultClient.builder() .setHost(host) .setPort(port) .setDatabases(Collections.singletonList(database)) diff --git a/z3950/src/test/java/org/xbib/io/iso23950/cql/CQL2RPNTest.java b/z3950-common/src/test/java/org/xbib/z3950/common/cql/CQL2RPNTest.java similarity index 84% rename from z3950/src/test/java/org/xbib/io/iso23950/cql/CQL2RPNTest.java rename to z3950-common/src/test/java/org/xbib/z3950/common/cql/CQL2RPNTest.java index 1a98d53..968b511 100644 --- a/z3950/src/test/java/org/xbib/io/iso23950/cql/CQL2RPNTest.java +++ b/z3950-common/src/test/java/org/xbib/z3950/common/cql/CQL2RPNTest.java @@ -1,7 +1,8 @@ -package org.xbib.io.iso23950.cql; +package org.xbib.z3950.common.cql; import org.junit.Test; import org.xbib.cql.CQLParser; +import org.xbib.z3950.common.cql.CQLRPNGenerator; /** * diff --git a/z3950-common/src/test/java/org/xbib/z3950/common/cql/package-info.java b/z3950-common/src/test/java/org/xbib/z3950/common/cql/package-info.java new file mode 100644 index 0000000..0d26671 --- /dev/null +++ b/z3950-common/src/test/java/org/xbib/z3950/common/cql/package-info.java @@ -0,0 +1,4 @@ +/** + * + */ +package org.xbib.z3950.common.cql; diff --git a/z3950-common/src/test/java/org/xbib/z3950/common/package-info.java b/z3950-common/src/test/java/org/xbib/z3950/common/package-info.java new file mode 100644 index 0000000..f75a28c --- /dev/null +++ b/z3950-common/src/test/java/org/xbib/z3950/common/package-info.java @@ -0,0 +1,4 @@ +/** + * + */ +package org.xbib.z3950.common; diff --git a/z3950/src/test/java/org/xbib/io/iso23950/pqf/PQFParserTest.java b/z3950-common/src/test/java/org/xbib/z3950/common/pqf/PQFParserTest.java similarity index 91% rename from z3950/src/test/java/org/xbib/io/iso23950/pqf/PQFParserTest.java rename to z3950-common/src/test/java/org/xbib/z3950/common/pqf/PQFParserTest.java index ee491f2..81f9ef4 100644 --- a/z3950/src/test/java/org/xbib/io/iso23950/pqf/PQFParserTest.java +++ b/z3950-common/src/test/java/org/xbib/z3950/common/pqf/PQFParserTest.java @@ -1,7 +1,7 @@ -package org.xbib.io.iso23950.pqf; +package org.xbib.z3950.common.pqf; import org.junit.Test; -import org.xbib.io.iso23950.ParserTest; +import org.xbib.z3950.common.ParserTest; import java.io.IOException; import java.io.StringReader; diff --git a/z3950-common/src/test/java/org/xbib/z3950/common/pqf/package-info.java b/z3950-common/src/test/java/org/xbib/z3950/common/pqf/package-info.java new file mode 100644 index 0000000..34a23d3 --- /dev/null +++ b/z3950-common/src/test/java/org/xbib/z3950/common/pqf/package-info.java @@ -0,0 +1,4 @@ +/** + * + */ +package org.xbib.z3950.common.pqf; diff --git a/z3950/src/test/resources/org/xbib/io/iso23950/pqf/pqf-must-succeed b/z3950-common/src/test/resources/org/xbib/z3950/common/pqf/pqf-must-succeed similarity index 98% rename from z3950/src/test/resources/org/xbib/io/iso23950/pqf/pqf-must-succeed rename to z3950-common/src/test/resources/org/xbib/z3950/common/pqf/pqf-must-succeed index 4f3784b..35fc81f 100644 --- a/z3950/src/test/resources/org/xbib/io/iso23950/pqf/pqf-must-succeed +++ b/z3950-common/src/test/resources/org/xbib/z3950/common/pqf/pqf-must-succeed @@ -14,4 +14,4 @@ dylan @term string "a UTF-8 string, maybe?" @or @and bob dylan @set Result-1 @attr 4=1 @and @attr 1=1 "bob dylan" @attr 1=4 "slow train coming" -@and @attr 2=4 @attr gils 1=2038 -114 @attr 2=2 @attr gils 1=2039 -109 \ No newline at end of file +@and @attr 2=4 @attr gils 1=2038 -114 @attr 2=2 @attr gils 1=2039 -109 diff --git a/z3950/src/main/resources/xsl/isodis25577-sru-response.xsl b/z3950-sru/src/main/resources/org/xbib/z3950/sru/isodis25577-sru-response.xsl similarity index 100% rename from z3950/src/main/resources/xsl/isodis25577-sru-response.xsl rename to z3950-sru/src/main/resources/org/xbib/z3950/sru/isodis25577-sru-response.xsl diff --git a/z3950/src/main/jacc/org/xbib/io/iso23950/pqf/PQF.jacc b/z3950/src/main/jacc/org/xbib/io/iso23950/pqf/PQF.jacc deleted file mode 100755 index be8fb94..0000000 --- a/z3950/src/main/jacc/org/xbib/io/iso23950/pqf/PQF.jacc +++ /dev/null @@ -1 +0,0 @@ -%{ import java.io.Reader; import java.io.IOException; /** Mike Taylor, IndexData: "Prefix Query Format (PQF), also known as Prefix Query Notation (PQN) was defined in 1995, as part of the YAZ toolkit, and has since become the de facto standard representation of RPN queries." From: http://www.indexdata.com/yaz/doc/tools.tkl#PQF The grammar of the PQF is as follows: query ::= top-set query-struct. top-set ::= [ '@attrset' string ] query-struct ::= attr-spec | simple | complex | '@term' term-type query attr-spec ::= '@attr' [ string ] string query-struct complex ::= operator query-struct query-struct. operator ::= '@and' | '@or' | '@not' | '@prox' proximity. simple ::= result-set | term. result-set ::= '@set' string. term ::= string. proximity ::= exclusion distance ordered relation which-code unit-code. exclusion ::= '1' | '0' | 'void'. distance ::= integer. ordered ::= '1' | '0'. relation ::= integer. which-code ::= 'known' | 'private' | integer. unit-code ::= integer. term-type ::= 'general' | 'numeric' | 'string' | 'oid' | 'datetime' | 'null'. You will note that the syntax above is a fairly faithful representation of RPN, except for the Attribute, which has been moved a step away from the term, allowing you to associate one or more attributes with an entire query structure. The parser will automatically apply the given attributes to each term as required. The @attr operator is followed by an attribute specification (attr-spec above). The specification consists of an optional attribute set, an attribute type-value pair and a sub-query. The attribute type-value pair is packed in one string: an attribute type, an equals sign, and an attribute value, like this: @attr 1=1003. The type is always an integer but the value may be either an integer or a string (if it doesn't start with a digit character). A string attribute-value is encoded as a Type-1 ``complex'' attribute with the list of values containing the single string specified, and including no semantic indicators. */ %} %class PQFParser %interface PQFTokens %package org.xbib.io.iso23950.pqf %token NL %token OR %token AND %token NOT %token ATTR %token ATTRSET %token TERM %token SET %token VOID %token KNOWN %token PRIVATE %token TERMTYPE %token CHARSTRING1 %token CHARSTRING2 %token OPERATORS %token EQUALS %token INTEGER %left AND %left OR %left NOT %type pqf %type querystruct %type expression %type attrstr %type term %type resultset %start pqf %% pqf : ATTRSET CHARSTRING1 querystruct { this.pqf = new PQF($2, $3); $$ = this.pqf; } | querystruct { this.pqf = new PQF($1); $$ = this.pqf; } ; querystruct : attrspec | simple | complex | TERM TERMTYPE pqf { $$ = new Query($3); }; attrspec : ATTR attrstr querystruct { $$ = new Query($2, $3); } | ATTR CHARSTRING1 attrstr querystruct { $$ = new Query($2, $3, $4); }; simple : resultset { $$ = new Query($1); } | term { $$ = new Query($1); }; complex : expression { $$ = new Query($1); }; resultset : SET CHARSTRING1 { $$ = new Setname($2); }; term : CHARSTRING1 { $$ = new Term($1); } | CHARSTRING2 { $$ = new Term($1); } }; attrstr: INTEGER EQUALS INTEGER { $$ = new AttrStr($1, $3); } | INTEGER EQUALS CHARSTRING1 { $$ = new AttrStr($1, $3); }; expression: AND querystruct querystruct { $$ = new Expression($1, $2, $3); } | OR querystruct querystruct { $$ = new Expression($1, $2, $3); } | NOT querystruct querystruct { $$ = new Expression($1, $2, $3); } ; %% private PQFLexer lexer; private PQF pqf; public PQFParser(Reader r) { this.lexer = new PQFLexer(r); lexer.nextToken(); } public void yyerror(String error) { throw new SyntaxException("PQF error at " + "[" + lexer.getLine() + "," + lexer.getColumn() +"]" + ": " + error); } public PQF getResult() { return pqf; } \ No newline at end of file diff --git a/z3950/src/main/java/org/xbib/io/iso23950/Diagnostics.java b/z3950/src/main/java/org/xbib/io/iso23950/Diagnostics.java deleted file mode 100644 index 957dd07..0000000 --- a/z3950/src/main/java/org/xbib/io/iso23950/Diagnostics.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.xbib.io.iso23950; - -import java.io.IOException; -import java.util.ResourceBundle; - -/** - * Diagnostics for Z server. - */ -public class Diagnostics extends IOException { - - private static final ResourceBundle bundle = - ResourceBundle.getBundle("org.xbib.io.iso23950.diagnostics"); - - private static final long serialVersionUID = -899201811019819079L; - - private int diagCode; - - private String message; - - private String details; - - public Diagnostics(int diagCode) { - super("" + diagCode); - this.diagCode = diagCode; - } - - public Diagnostics(int diagCode, String message) { - super("" + diagCode + " " + message); - this.diagCode = diagCode; - this.message = message; - } - - public Diagnostics(int diagCode, String message, String details) { - super("" + diagCode + " " + message + " " + details); - this.diagCode = diagCode; - this.message = message; - this.details = details; - } - - public String getPlainText() { - String[] s = bundle.getString(Integer.toString(diagCode)).split("\\|"); - if (message == null) { - message = s.length > 0 ? s[1] : ""; - } - if (details == null) { - details = s.length > 1 ? s[2] : ""; - } - StringBuilder sb = new StringBuilder(); - sb.append("diag code=").append(diagCode) - .append(" message=").append(message) - .append(" details=").append(details); - return sb.toString(); - } - - @Override - public String toString() { - return getPlainText(); - } -} diff --git a/z3950/src/main/java/org/xbib/io/iso23950/cql/package-info.java b/z3950/src/main/java/org/xbib/io/iso23950/cql/package-info.java deleted file mode 100644 index ac6aa8f..0000000 --- a/z3950/src/main/java/org/xbib/io/iso23950/cql/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * - */ -package org.xbib.io.iso23950.cql; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/package-info.java b/z3950/src/main/java/org/xbib/io/iso23950/exceptions/package-info.java deleted file mode 100644 index 7ecad78..0000000 --- a/z3950/src/main/java/org/xbib/io/iso23950/exceptions/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * - */ -package org.xbib.io.iso23950.exceptions; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/operations/package-info.java b/z3950/src/main/java/org/xbib/io/iso23950/operations/package-info.java deleted file mode 100644 index abf2ec5..0000000 --- a/z3950/src/main/java/org/xbib/io/iso23950/operations/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * - */ -package org.xbib.io.iso23950.operations; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/package-info.java b/z3950/src/main/java/org/xbib/io/iso23950/package-info.java deleted file mode 100644 index d679460..0000000 --- a/z3950/src/main/java/org/xbib/io/iso23950/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * - */ -package org.xbib.io.iso23950; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/pqf/package-info.java b/z3950/src/main/java/org/xbib/io/iso23950/pqf/package-info.java deleted file mode 100644 index 251e741..0000000 --- a/z3950/src/main/java/org/xbib/io/iso23950/pqf/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * - */ -package org.xbib.io.iso23950.pqf; diff --git a/z3950/src/main/java/org/xbib/io/iso23950/v3/package-info.java b/z3950/src/main/java/org/xbib/io/iso23950/v3/package-info.java deleted file mode 100644 index 4e64c6a..0000000 --- a/z3950/src/main/java/org/xbib/io/iso23950/v3/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * - */ -package org.xbib.io.iso23950.v3; diff --git a/z3950/src/test/java/org/xbib/io/iso23950/cql/package-info.java b/z3950/src/test/java/org/xbib/io/iso23950/cql/package-info.java deleted file mode 100644 index ac6aa8f..0000000 --- a/z3950/src/test/java/org/xbib/io/iso23950/cql/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * - */ -package org.xbib.io.iso23950.cql; diff --git a/z3950/src/test/java/org/xbib/io/iso23950/package-info.java b/z3950/src/test/java/org/xbib/io/iso23950/package-info.java deleted file mode 100644 index d679460..0000000 --- a/z3950/src/test/java/org/xbib/io/iso23950/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * - */ -package org.xbib.io.iso23950; diff --git a/z3950/src/test/java/org/xbib/io/iso23950/pqf/package-info.java b/z3950/src/test/java/org/xbib/io/iso23950/pqf/package-info.java deleted file mode 100644 index 251e741..0000000 --- a/z3950/src/test/java/org/xbib/io/iso23950/pqf/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * - */ -package org.xbib.io.iso23950.pqf; diff --git a/z3950/src/test/resources/log4j2.xml b/z3950/src/test/resources/log4j2.xml deleted file mode 100644 index f71aced..0000000 --- a/z3950/src/test/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file