From 5807cb504a2c8cdf425a8405d9317888bd86c7f1 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Mon, 19 Dec 2016 16:40:50 +0000 Subject: [PATCH] Get everything building for 2.3 release --- .project | 6 + hapi-base/.classpath | 14 +- hapi-base/.project | 65 +++--- .../org.eclipse.core.resources.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 2 +- hapi-base/pom.xml | 5 +- .../src/main/java/ca/uhn/hl7v2/Version.java | 33 +-- .../ca/uhn/hl7v2/model/GenericMessage.java | 14 +- .../ca/uhn/hl7v2/model/SuperStructure.java | 6 + .../ca/uhn/hl7v2/parser/FixFieldDataType.java | 2 +- ...AllowableSegmentsInSuperstructureRule.java | 4 + hapi-dist/.project | 6 + hapi-dist/pom.xml | 2 +- hapi-examples/.project | 47 +++-- hapi-examples/pom.xml | 2 +- hapi-hl7overhttp/.classpath | 60 +++--- hapi-hl7overhttp/.project | 34 ++-- .../org.eclipse.core.resources.prefs | 5 + .../.settings/org.eclipse.jdt.core.prefs | 8 +- hapi-hl7overhttp/pom.xml | 13 +- .../client/HohRawClientMultithreadedTest.java | 2 +- hapi-osgi-base/pom.xml | 3 +- hapi-sourcegen/.classpath | 93 +++------ hapi-sourcegen/.project | 47 +++-- .../.settings/org.eclipse.jdt.core.prefs | 8 +- hapi-sourcegen/pom.xml | 2 +- .../hl7v2/sourcegen/DataTypeGenerator.java | 26 ++- .../uhn/hl7v2/sourcegen/SegmentGenerator.java | 111 ++++++++-- hapi-structures-v21/.project | 12 ++ hapi-structures-v21/pom.xml | 4 +- hapi-structures-v22/.classpath | 30 ++- hapi-structures-v22/.project | 6 + .../.settings/org.eclipse.jdt.core.prefs | 7 +- hapi-structures-v22/pom.xml | 4 +- hapi-structures-v23/.project | 12 ++ hapi-structures-v23/pom.xml | 4 +- hapi-structures-v231-alternatenames/pom.xml | 4 +- hapi-structures-v231/.classpath | 43 +++- hapi-structures-v231/.project | 37 ++-- hapi-structures-v231/pom.xml | 4 +- hapi-structures-v24/.project | 12 ++ hapi-structures-v24/pom.xml | 4 +- hapi-structures-v25/.classpath | 32 ++- hapi-structures-v25/.project | 6 + .../.settings/org.eclipse.jdt.core.prefs | 7 +- hapi-structures-v25/pom.xml | 4 +- hapi-structures-v251/.project | 12 ++ hapi-structures-v251/pom.xml | 4 +- hapi-structures-v26/.project | 12 ++ hapi-structures-v26/pom.xml | 3 +- hapi-structures-v27/.classpath | 7 - hapi-structures-v27/.project | 23 --- .../.settings/org.eclipse.jdt.core.prefs | 6 - .../.settings/org.maven.ide.eclipse.prefs | 8 - hapi-structures-v27/pom.xml | 191 ------------------ hapi-structures-v271/.classpath | 7 - hapi-structures-v271/.project | 23 --- .../.settings/org.eclipse.jdt.core.prefs | 6 - .../.settings/org.maven.ide.eclipse.prefs | 8 - hapi-structures-v271/pom.xml | 191 ------------------ hapi-structures-v28/.classpath | 7 - hapi-structures-v28/.project | 23 --- .../.settings/org.eclipse.jdt.core.prefs | 6 - .../.settings/org.maven.ide.eclipse.prefs | 8 - hapi-structures-v28/pom.xml | 191 ------------------ hapi-structures-v281/.classpath | 7 - hapi-structures-v281/.project | 23 --- .../.settings/org.eclipse.jdt.core.prefs | 6 - .../.settings/org.maven.ide.eclipse.prefs | 8 - hapi-structures-v281/pom.xml | 191 ------------------ hapi-test/.classpath | 81 +------- .../.settings/org.eclipse.jdt.core.prefs | 6 +- hapi-test/pom.xml | 10 +- .../conf/check/DefaultValidatorTest.java | 35 ++++ .../uhn/hl7v2/model/SuperStructureTest.java | 25 +++ .../uhn/hl7v2/parser/NewPipeParserTest.java | 32 +++ hapi-testmindeps/pom.xml | 2 +- hapi-testnodeps/.classpath | 29 ++- hapi-testnodeps/.project | 37 ++-- .../org.eclipse.core.resources.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- hapi-testnodeps/pom.xml | 2 +- hapi-testpanel/.classpath | 65 +++--- hapi-testpanel/.project | 46 ++--- .../.settings/org.eclipse.jdt.core.prefs | 2 +- hapi-testpanel/pom.xml | 7 +- .../uhn/hl7v2/testpanel/OSXInitializer.java | 18 +- .../model/msg/Hl7V2MessageImplTest.java | 30 ++- pom.xml | 96 +++++++-- 90 files changed, 915 insertions(+), 1446 deletions(-) delete mode 100644 hapi-structures-v27/.classpath delete mode 100644 hapi-structures-v27/.project delete mode 100644 hapi-structures-v27/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-structures-v27/.settings/org.maven.ide.eclipse.prefs delete mode 100644 hapi-structures-v27/pom.xml delete mode 100644 hapi-structures-v271/.classpath delete mode 100644 hapi-structures-v271/.project delete mode 100644 hapi-structures-v271/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-structures-v271/.settings/org.maven.ide.eclipse.prefs delete mode 100644 hapi-structures-v271/pom.xml delete mode 100644 hapi-structures-v28/.classpath delete mode 100644 hapi-structures-v28/.project delete mode 100644 hapi-structures-v28/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-structures-v28/.settings/org.maven.ide.eclipse.prefs delete mode 100644 hapi-structures-v28/pom.xml delete mode 100644 hapi-structures-v281/.classpath delete mode 100644 hapi-structures-v281/.project delete mode 100644 hapi-structures-v281/.settings/org.eclipse.jdt.core.prefs delete mode 100644 hapi-structures-v281/.settings/org.maven.ide.eclipse.prefs delete mode 100644 hapi-structures-v281/pom.xml diff --git a/.project b/.project index c4e31f4ff..32911ff0d 100644 --- a/.project +++ b/.project @@ -10,8 +10,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/hapi-base/.classpath b/hapi-base/.classpath index 539c045db..9ed43b4c8 100644 --- a/hapi-base/.classpath +++ b/hapi-base/.classpath @@ -6,17 +6,11 @@ - - + - - - - - @@ -26,7 +20,11 @@ - + + + + + diff --git a/hapi-base/.project b/hapi-base/.project index 76ce9412d..f810e2286 100644 --- a/hapi-base/.project +++ b/hapi-base/.project @@ -1,41 +1,34 @@ - - - hapi-base + + + hapi-base HAPI (HL7 application programming interface; pronounced "happy") is an open-source, object-oriented HL7 2.x parser for Java. HL7 (http://hl7org) is a messaging specification for healthcare information systems. This project is not affiliated with the HL7 organization; we are just writing some software that conforms to their specification. The project was initiated by University Health Network - (a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - + (a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature + + diff --git a/hapi-base/.settings/org.eclipse.core.resources.prefs b/hapi-base/.settings/org.eclipse.core.resources.prefs index abdea9ac0..839d647ee 100644 --- a/hapi-base/.settings/org.eclipse.core.resources.prefs +++ b/hapi-base/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/hapi-base/.settings/org.eclipse.jdt.core.prefs b/hapi-base/.settings/org.eclipse.jdt.core.prefs index b6647994a..5696c5b53 100644 --- a/hapi-base/.settings/org.eclipse.jdt.core.prefs +++ b/hapi-base/.settings/org.eclipse.jdt.core.prefs @@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -92,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-base/.settings/org.eclipse.wst.common.project.facet.core.xml b/hapi-base/.settings/org.eclipse.wst.common.project.facet.core.xml index a1f6907b8..5c9bd7532 100644 --- a/hapi-base/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/hapi-base/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,5 +1,5 @@ - + diff --git a/hapi-base/pom.xml b/hapi-base/pom.xml index ccf1dc7d5..6c2c9737c 100644 --- a/hapi-base/pom.xml +++ b/hapi-base/pom.xml @@ -2,7 +2,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml 4.0.0 @@ -50,7 +50,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -180,7 +179,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package @@ -229,7 +227,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/Version.java b/hapi-base/src/main/java/ca/uhn/hl7v2/Version.java index 64bd1107b..cc78f346e 100644 --- a/hapi-base/src/main/java/ca/uhn/hl7v2/Version.java +++ b/hapi-base/src/main/java/ca/uhn/hl7v2/Version.java @@ -34,19 +34,18 @@ GNU General Public License (the "GPL"), in which case the provisions of the GPL public enum Version { - V21("2.1"), - V22("2.2"), - V23("2.3"), - V231("2.3.1"), - V24("2.4"), - V25("2.5"), - V251("2.5.1"), - V26("2.6"), - V27("2.7"), - V271("2.7.1"), - V28("2.8"), - V281("2.8.1"); - + V21("2.1"), // - + V22("2.2"), // - + V23("2.3"), // - + V231("2.3.1"), // - + V24("2.4"), // - + V25("2.5"), // - + V251("2.5.1"), // - + V26("2.6"), // - + V27("2.7"), // - + V271("2.7.1"), // - + V28("2.8"), // - + V281("2.8.1"); // - private String version; private static ArrayList ourVersionsOnClasspath; @@ -252,6 +251,14 @@ public GenericMessage newGenericMessage(ModelClassFactory mcf) { return new GenericMessage.V251(mcf); case V26: return new GenericMessage.V26(mcf); + case V27: + return new GenericMessage.V27(mcf); + case V271: + return new GenericMessage.V271(mcf); + case V28: + return new GenericMessage.V28(mcf); + case V281: + return new GenericMessage.V281(mcf); default: throw new Error("Unknown version (this is a HAPI bug): " + this.getVersion()); } diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/GenericMessage.java b/hapi-base/src/main/java/ca/uhn/hl7v2/model/GenericMessage.java index 6b7783682..0a9a3e536 100644 --- a/hapi-base/src/main/java/ca/uhn/hl7v2/model/GenericMessage.java +++ b/hapi-base/src/main/java/ca/uhn/hl7v2/model/GenericMessage.java @@ -138,31 +138,35 @@ public V26(ModelClassFactory factory) { } public static class V27 extends GenericMessage { - public V27(ModelClassFactory factory) { + private static final long serialVersionUID = -1693277295151324396L; + public V27(ModelClassFactory factory) { super(factory); } public String getVersion() { return Version.V27.getVersion(); } } public static class V271 extends GenericMessage { - public V271(ModelClassFactory factory) { + private static final long serialVersionUID = -1693277295151324396L; + public V271(ModelClassFactory factory) { super(factory); } public String getVersion() { return Version.V271.getVersion(); } } public static class V28 extends GenericMessage { - public V28(ModelClassFactory factory) { + private static final long serialVersionUID = -1693277295151324396L; + public V28(ModelClassFactory factory) { super(factory); } public String getVersion() { return Version.V28.getVersion(); } } public static class V281 extends GenericMessage { - public V281(ModelClassFactory factory) { + private static final long serialVersionUID = -1693277295151324396L; + public V281(ModelClassFactory factory) { super(factory); } public String getVersion() { return Version.V281.getVersion(); } } - + } diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/model/SuperStructure.java b/hapi-base/src/main/java/ca/uhn/hl7v2/model/SuperStructure.java index 2ec989a04..5d85b623a 100644 --- a/hapi-base/src/main/java/ca/uhn/hl7v2/model/SuperStructure.java +++ b/hapi-base/src/main/java/ca/uhn/hl7v2/model/SuperStructure.java @@ -13,5 +13,11 @@ public interface SuperStructure extends Group { Set getStructuresWhichChildAppliesTo(String theChildName); List getChildNamesForStructure(String theStructure); + + /** + * Returns a set containing any non-standard element names that were added + * to this structure + */ + Set getNonStandardNames(); } diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/parser/FixFieldDataType.java b/hapi-base/src/main/java/ca/uhn/hl7v2/parser/FixFieldDataType.java index 3f45d0460..6ac3164e3 100644 --- a/hapi-base/src/main/java/ca/uhn/hl7v2/parser/FixFieldDataType.java +++ b/hapi-base/src/main/java/ca/uhn/hl7v2/parser/FixFieldDataType.java @@ -154,7 +154,7 @@ public static void fix(Segment segment, int typeField, int dataField, String def Varies v = (Varies)rep; if (type.getValue() == null) { if (defaultType != null) { - LOG.debug("setting default {}-{} type to {}", segment.getName(), typeField, defaultType); + LOG.debug("setting default {}-{} type to {}", new Object[] {segment.getName(), typeField, defaultType}); type.setValue(defaultType); } } // if diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/validation/builder/support/OnlyAllowableSegmentsInSuperstructureRule.java b/hapi-base/src/main/java/ca/uhn/hl7v2/validation/builder/support/OnlyAllowableSegmentsInSuperstructureRule.java index 6ebd290be..921af32cd 100644 --- a/hapi-base/src/main/java/ca/uhn/hl7v2/validation/builder/support/OnlyAllowableSegmentsInSuperstructureRule.java +++ b/hapi-base/src/main/java/ca/uhn/hl7v2/validation/builder/support/OnlyAllowableSegmentsInSuperstructureRule.java @@ -60,9 +60,13 @@ public ValidationException[] apply(Message msg) { private void checkStructure(SuperStructure theMsg, List theExceptions) { String messageStructure = theMsg.getMessage().getName(); + Set nonStandardNames = theMsg.getNonStandardNames(); FORNAME: for (String name : theMsg.getNames()) { + if (nonStandardNames != null && nonStandardNames.contains(name)) { + continue; + } try { for (Structure rep : theMsg.getAll(name)) { diff --git a/hapi-dist/.project b/hapi-dist/.project index feea97594..1236d7f8a 100644 --- a/hapi-dist/.project +++ b/hapi-dist/.project @@ -10,8 +10,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.maven.ide.eclipse.maven2Nature diff --git a/hapi-dist/pom.xml b/hapi-dist/pom.xml index cc78a05a3..206acfb83 100644 --- a/hapi-dist/pom.xml +++ b/hapi-dist/pom.xml @@ -4,7 +4,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml diff --git a/hapi-examples/.project b/hapi-examples/.project index 60d323127..b97ffd1ac 100644 --- a/hapi-examples/.project +++ b/hapi-examples/.project @@ -1,24 +1,35 @@ + - hapi-examples - HAPI (HL7 application programming interface; pronounced "happy") is an open-source, + hapi-examples + HAPI (HL7 application programming interface; pronounced "happy") is an open-source, object-oriented HL7 2.x parser for Java. HL7 (http://hl7org) is a messaging specification for healthcare information systems. This project is not affiliated with the HL7 organization; we are just writing some software that conforms to their specification. The project was initiated by University Health Network (a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - hapi-hl7overhttp - - - - org.maven.ide.eclipse.maven2Builder - - - org.eclipse.jdt.core.javabuilder - - - - org.maven.ide.eclipse.maven2Nature - org.eclipse.jdt.core.javanature - - \ No newline at end of file + + hapi-hl7overhttp + + + + org.maven.ide.eclipse.maven2Builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.maven.ide.eclipse.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/hapi-examples/pom.xml b/hapi-examples/pom.xml index fd6ebff35..3feba85c0 100644 --- a/hapi-examples/pom.xml +++ b/hapi-examples/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml diff --git a/hapi-hl7overhttp/.classpath b/hapi-hl7overhttp/.classpath index e5b018cc1..f5639d785 100644 --- a/hapi-hl7overhttp/.classpath +++ b/hapi-hl7overhttp/.classpath @@ -1,38 +1,42 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + - + - - - - + - + - - - - - - - - + diff --git a/hapi-hl7overhttp/.project b/hapi-hl7overhttp/.project index 9b5809249..8a347a7b5 100644 --- a/hapi-hl7overhttp/.project +++ b/hapi-hl7overhttp/.project @@ -1,18 +1,28 @@ + - hapi-hl7overhttp - HAPI (HL7 application programming interface; pronounced "happy") is an open-source, + hapi-hl7overhttp + HAPI (HL7 application programming interface; pronounced "happy") is an open-source, object-oriented HL7 2.x parser for Java. HL7 (http://hl7org) is a messaging specification for healthcare information systems. This project is not affiliated with the HL7 organization; we are just writing some software that conforms to their specification. The project was initiated by University Health Network (a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/hapi-hl7overhttp/.settings/org.eclipse.core.resources.prefs b/hapi-hl7overhttp/.settings/org.eclipse.core.resources.prefs index 48ac03760..0a9a7afc1 100644 --- a/hapi-hl7overhttp/.settings/org.eclipse.core.resources.prefs +++ b/hapi-hl7overhttp/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,8 @@ eclipse.preferences.version=1 +encoding//src/main/binresources=UTF-8 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 encoding//src/test/java/ca/uhn/hl7v2/hoh/encoder/Hl7OverHttpDecoderTest.java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/hapi-hl7overhttp/.settings/org.eclipse.jdt.core.prefs b/hapi-hl7overhttp/.settings/org.eclipse.jdt.core.prefs index 210739dee..60105c1b9 100644 --- a/hapi-hl7overhttp/.settings/org.eclipse.jdt.core.prefs +++ b/hapi-hl7overhttp/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ -#Mon Jul 23 21:25:30 EDT 2012 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-hl7overhttp/pom.xml b/hapi-hl7overhttp/pom.xml index 7aa97540b..a6609435a 100644 --- a/hapi-hl7overhttp/pom.xml +++ b/hapi-hl7overhttp/pom.xml @@ -2,7 +2,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml 4.0.0 @@ -89,6 +89,12 @@ ${jetty.version} true + + org.mortbay.jetty + jetty-sslengine + ${jetty.version} + true + junit junit @@ -151,7 +157,7 @@ - true + jsw @@ -290,7 +296,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package @@ -359,7 +364,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package @@ -434,7 +438,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m diff --git a/hapi-hl7overhttp/src/test/java/ca/uhn/hl7v2/hoh/raw/client/HohRawClientMultithreadedTest.java b/hapi-hl7overhttp/src/test/java/ca/uhn/hl7v2/hoh/raw/client/HohRawClientMultithreadedTest.java index b127533ee..c3b7313e6 100644 --- a/hapi-hl7overhttp/src/test/java/ca/uhn/hl7v2/hoh/raw/client/HohRawClientMultithreadedTest.java +++ b/hapi-hl7overhttp/src/test/java/ca/uhn/hl7v2/hoh/raw/client/HohRawClientMultithreadedTest.java @@ -219,7 +219,7 @@ public void testReconnectAutomaticallyAfterUnexpectedClose() throws Exception { try { response = client.sendAndReceive(new RawSendable(message)); - } catch (DecodeException e) { + } catch (Exception e) { // We're allowed to fail once } diff --git a/hapi-osgi-base/pom.xml b/hapi-osgi-base/pom.xml index add2ac88a..b394d5a98 100644 --- a/hapi-osgi-base/pom.xml +++ b/hapi-osgi-base/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -107,7 +107,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true true diff --git a/hapi-sourcegen/.classpath b/hapi-sourcegen/.classpath index 0e7a495dc..dd7ee1076 100644 --- a/hapi-sourcegen/.classpath +++ b/hapi-sourcegen/.classpath @@ -1,70 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + diff --git a/hapi-sourcegen/.project b/hapi-sourcegen/.project index 863962fac..26f41849f 100644 --- a/hapi-sourcegen/.project +++ b/hapi-sourcegen/.project @@ -1,24 +1,35 @@ + - hapi-sourcegen - HAPI (HL7 application programming interface; pronounced "happy") is an open-source, + hapi-sourcegen + HAPI (HL7 application programming interface; pronounced "happy") is an open-source, object-oriented HL7 2.x parser for Java. HL7 (http://hl7org) is a messaging specification for healthcare information systems. This project is not affiliated with the HL7 organization; we are just writing some software that conforms to their specification. The project was initiated by University Health Network (a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - hapi-base - - - - org.maven.ide.eclipse.maven2Builder - - - org.eclipse.jdt.core.javabuilder - - - - org.maven.ide.eclipse.maven2Nature - org.eclipse.jdt.core.javanature - - + + hapi-base + + + + org.maven.ide.eclipse.maven2Builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.maven.ide.eclipse.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/hapi-sourcegen/.settings/org.eclipse.jdt.core.prefs b/hapi-sourcegen/.settings/org.eclipse.jdt.core.prefs index 416f4fb69..5ce451889 100644 --- a/hapi-sourcegen/.settings/org.eclipse.jdt.core.prefs +++ b/hapi-sourcegen/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-sourcegen/pom.xml b/hapi-sourcegen/pom.xml index 794d020bd..6ccca7ea2 100644 --- a/hapi-sourcegen/pom.xml +++ b/hapi-sourcegen/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml diff --git a/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/sourcegen/DataTypeGenerator.java b/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/sourcegen/DataTypeGenerator.java index d9b9077d7..c404cd2cb 100644 --- a/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/sourcegen/DataTypeGenerator.java +++ b/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/sourcegen/DataTypeGenerator.java @@ -40,6 +40,8 @@ GNU General Public License (the �GPL�), in which case the provisions of the import java.sql.Statement; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; @@ -222,15 +224,28 @@ public static void make(File targetDirectory, String dataType, String version, S String[] desc = new String[numComponents]; int[] table = new int[numComponents]; DatatypeComponentDef[] componentDefs = new DatatypeComponentDef[numComponents]; + Set names = new HashSet(); for (int i = 0; i < numComponents; i++) { type[i] = (String)dataTypes.get(i); - desc[i] = (String)descriptions.get(i); + String componentName = (String)descriptions.get(i); + + if (names.contains(componentName)) { + for (int j = 2; ; j++) { + if (!names.contains(componentName + j)) { + componentName = componentName + j; + break; + } + } + } + names.add(componentName); + + desc[i] = componentName; table[i] = ((Integer) tables.get(i)).intValue(); String typeName = (String)dataTypes.get(i); typeName = SourceGenerator.getAlternateType(typeName, version); - componentDefs[i] = new DatatypeComponentDef(dataType, i, typeName, (String)descriptions.get(i), ((Integer) tables.get(i)).intValue()); + componentDefs[i] = new DatatypeComponentDef(dataType, i, typeName, componentName, ((Integer) tables.get(i)).intValue()); } source = makeComposite(dataType, description, componentDefs, type, desc, table, version, basePackage, theTemplatePackage); @@ -291,6 +306,13 @@ private static String makeComposite(String dataType, String description, Datatyp StringWriter out = new StringWriter(); + for (int i = 0; i < dataTypes.length; i++) { + if (dataTypes[i].equals(dataType)) { + log.warn("Datatype {} has a child also of type {}! Can not recurse like this", dataType, dataType); + dataTypes[i] = "ST"; + } + } + theTemplatePackage = theTemplatePackage.replace(".", "/"); Template template = VelocityFactory.getClasspathTemplateInstance(theTemplatePackage + "/datatype_composite.vsm"); Context ctx = new VelocityContext(); diff --git a/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/sourcegen/SegmentGenerator.java b/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/sourcegen/SegmentGenerator.java index 3a2026d46..2b7ec385c 100644 --- a/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/sourcegen/SegmentGenerator.java +++ b/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/sourcegen/SegmentGenerator.java @@ -37,13 +37,18 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ca.uhn.hl7v2.AbstractHL7Exception; import ca.uhn.hl7v2.HL7Exception; import ca.uhn.hl7v2.database.NormativeDatabase; import ca.uhn.hl7v2.parser.DefaultModelClassFactory; @@ -64,7 +69,7 @@ public class SegmentGenerator extends java.lang.Object { *

Creates skeletal source code (without correct data structure but no business * logic) for all segments found in the normative database.

*/ - public static void makeAll(String baseDirectory, String version, String theTemplatePackage, String theFileExt) throws IOException, SQLException, HL7Exception { + public static void makeAll(String baseDirectory, String version, String theTemplatePackage, String theFileExt) throws IOException, SQLException, HL7Exception, MojoExecutionException { //make base directory if (!(baseDirectory.endsWith("\\") || baseDirectory.endsWith("/"))) { baseDirectory = baseDirectory + "/"; @@ -89,8 +94,9 @@ public static void makeAll(String baseDirectory, String version, String theTempl makeSegment(seg, version, theTemplatePackage, targetDir, theFileExt); } catch (Exception e) { - System.err.println("Error creating source code for all segments: " + e.getMessage()); - e.printStackTrace(); +// System.err.println("Error creating source code for all segments: " + e.getMessage()); +// e.printStackTrace(); + throw new MojoExecutionException("Failure generating segments", e); } } } @@ -152,10 +158,44 @@ public static void makeSegment(String name, String version, String theTemplatePa try { Connection conn = normativeDatabase.getConnection(); +// sql.append("SELECT "); +// sql.append("HL7SegmentDataElements.seg_code, HL7SegmentDataElements.seq_no, "); +// sql.append("HL7SegmentDataElements.repetitional, HL7SegmentDataElements.repetitions, "); +// sql.append("HL7DataElements.description, HL7DataElements.length, HL7DataElements.table_id, "); +// sql.append("HL7SegmentDataElements.req_opt, HL7Segments.description, HL7DataElements.data_structure "); +// sql.append("FROM HL7Versions RIGHT JOIN (HL7Segments INNER JOIN (HL7DataElements INNER JOIN HL7SegmentDataElements "); +// sql.append("ON (HL7DataElements.version_id = HL7SegmentDataElements.version_id) "); +// sql.append("AND (HL7DataElements.data_item = HL7SegmentDataElements.data_item)) "); +// sql.append("ON (HL7Segments.version_id = HL7SegmentDataElements.version_id) "); +// sql.append("AND (HL7Segments.seg_code = HL7SegmentDataElements.seg_code)) "); +// sql.append("ON (HL7Versions.version_id = HL7Segments.version_id) "); +// sql.append("WHERE HL7SegmentDataElements.seg_code = '"); +// sql.append(name); +// sql.append("' and HL7Versions.hl7_version = '"); +// sql.append(version); +// sql.append("' ORDER BY HL7SegmentDataElements.seg_code, HL7SegmentDataElements.seq_no;"); + +// if (false) { + listTables(conn, "HL7SegmentDataElements"); + listTables(conn, "HL7DataElements"); + listTables(conn, "HL7Segments"); +// } + + String lengthColName; + if (version.startsWith("2.7") || version.startsWith("2.8")) { + lengthColName = "HL7DataElements.max_length"; + } else { + lengthColName = "HL7DataElements.length"; + } + StringBuffer sql = new StringBuffer(); - sql.append("SELECT HL7SegmentDataElements.seg_code, HL7SegmentDataElements.seq_no, "); + sql.append("SELECT "); +// sql.append("HL7SegmentDataElements.*, "); +// sql.append("HL7DataElements.*, "); +// sql.append("HL7Segments.* "); + sql.append("HL7SegmentDataElements.seg_code, HL7SegmentDataElements.seq_no, "); sql.append("HL7SegmentDataElements.repetitional, HL7SegmentDataElements.repetitions, "); - sql.append("HL7DataElements.description, HL7DataElements.length, HL7DataElements.table_id, "); + sql.append("HL7DataElements.description, " + lengthColName + ", HL7DataElements.table_id, "); sql.append("HL7SegmentDataElements.req_opt, HL7Segments.description, HL7DataElements.data_structure "); sql.append("FROM HL7Versions RIGHT JOIN (HL7Segments INNER JOIN (HL7DataElements INNER JOIN HL7SegmentDataElements "); sql.append("ON (HL7DataElements.version_id = HL7SegmentDataElements.version_id) "); @@ -163,15 +203,23 @@ public static void makeSegment(String name, String version, String theTemplatePa sql.append("ON (HL7Segments.version_id = HL7SegmentDataElements.version_id) "); sql.append("AND (HL7Segments.seg_code = HL7SegmentDataElements.seg_code)) "); sql.append("ON (HL7Versions.version_id = HL7Segments.version_id) "); - sql.append("WHERE HL7SegmentDataElements.seg_code = '"); + sql.append("WHERE "); + sql.append("HL7SegmentDataElements.seg_code = '"); sql.append(name); sql.append("' and HL7Versions.hl7_version = '"); sql.append(version); - sql.append("' ORDER BY HL7SegmentDataElements.seg_code, HL7SegmentDataElements.seq_no;"); + sql.append("' "); + sql.append("ORDER BY HL7SegmentDataElements.seg_code, HL7SegmentDataElements.seq_no;"); //System.out.println(sql.toString()); //for debugging - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery(sql.toString()); - + + Statement stmt; + ResultSet rs; + try { + stmt = conn.createStatement(); + rs = stmt.executeQuery(sql.toString()); + } catch (Exception e) { + throw new MojoFailureException("Failed to execute the following SQL: " + sql.toString(), e); + } List usedFieldDescs = new ArrayList(); int index = 0; while (rs.next()) { @@ -209,7 +257,7 @@ public static void makeSegment(String name, String version, String theTemplatePa if (se.type.equals("-") || se.type.equals("NUL")) { se.type = "NULLDT"; } - + /* * *** * index is 1-indexed here!! @@ -240,8 +288,9 @@ public static void makeSegment(String name, String version, String theTemplatePa stmt.close(); normativeDatabase.returnConnection(conn); } catch (SQLException sqle) { - sqle.printStackTrace(); - return; +// sqle.printStackTrace(); +// return; + throw new MojoFailureException("Failed to generate segment", sqle); } String fileName = theTargetDir.toString() + "/" + name + "." + theFileExt; @@ -252,6 +301,39 @@ public static void makeSegment(String name, String version, String theTemplatePa } + private static void listTables(Connection conn, String tableName) throws MojoFailureException, SQLException { + { + StringBuffer sql = new StringBuffer(); + sql.append("SELECT "); + sql.append(tableName + ".* "); + sql.append("FROM " + tableName + " "); + //System.out.println(sql.toString()); //for debugging + + Statement stmt; + ResultSet rs; + try { + stmt = conn.createStatement(); + rs = stmt.executeQuery(sql.toString()); + } catch (Exception e) { + throw new MojoFailureException("Failed to execute the following SQL: " + sql.toString(), e); + } + + rs.next(); + Set cols = new HashSet(); + for (int i = 0; i < rs.getMetaData().getColumnCount(); i++) { + cols.add(rs.getMetaData().getColumnName(i+1)); + } +// System.out.println(); +// System.out.println(tableName + "Cols: " + cols); +// System.out.println(); + + rs.close(); + stmt.close(); + } + + + } + public static void writeSegment(String fileName, String version, String segmentName, ArrayList elements, String description, String basePackage, String[] datatypePackages, String theTemplatePackage) throws Exception { @@ -277,5 +359,6 @@ public static void writeSegment(String fileName, String version, String segmentN out.flush(); out.close(); } - + + } diff --git a/hapi-structures-v21/.project b/hapi-structures-v21/.project index 7806a20c5..1295987c6 100644 --- a/hapi-structures-v21/.project +++ b/hapi-structures-v21/.project @@ -5,13 +5,25 @@ + + org.eclipse.jdt.core.javabuilder + + + org.maven.ide.eclipse.maven2Builder + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature org.maven.ide.eclipse.maven2Nature diff --git a/hapi-structures-v21/pom.xml b/hapi-structures-v21/pom.xml index e7421d82a..0bed89a3a 100644 --- a/hapi-structures-v21/pom.xml +++ b/hapi-structures-v21/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -123,7 +123,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -146,7 +145,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package diff --git a/hapi-structures-v22/.classpath b/hapi-structures-v22/.classpath index 16f01e2ee..697625a69 100644 --- a/hapi-structures-v22/.classpath +++ b/hapi-structures-v22/.classpath @@ -1,7 +1,33 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-structures-v22/.project b/hapi-structures-v22/.project index 578e3f421..f7c2ba605 100644 --- a/hapi-structures-v22/.project +++ b/hapi-structures-v22/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/hapi-structures-v22/.settings/org.eclipse.jdt.core.prefs b/hapi-structures-v22/.settings/org.eclipse.jdt.core.prefs index ad299139d..60105c1b9 100644 --- a/hapi-structures-v22/.settings/org.eclipse.jdt.core.prefs +++ b/hapi-structures-v22/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,5 @@ -#Fri Feb 18 20:44:43 EST 2011 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-structures-v22/pom.xml b/hapi-structures-v22/pom.xml index fbd3a7511..78afc969e 100644 --- a/hapi-structures-v22/pom.xml +++ b/hapi-structures-v22/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -122,7 +122,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -145,7 +144,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package diff --git a/hapi-structures-v23/.project b/hapi-structures-v23/.project index 813cb1403..a8b45640b 100644 --- a/hapi-structures-v23/.project +++ b/hapi-structures-v23/.project @@ -5,13 +5,25 @@ + + org.eclipse.jdt.core.javabuilder + + + org.maven.ide.eclipse.maven2Builder + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature org.maven.ide.eclipse.maven2Nature diff --git a/hapi-structures-v23/pom.xml b/hapi-structures-v23/pom.xml index dfad712e1..e322f173f 100644 --- a/hapi-structures-v23/pom.xml +++ b/hapi-structures-v23/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -122,7 +122,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -145,7 +144,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package diff --git a/hapi-structures-v231-alternatenames/pom.xml b/hapi-structures-v231-alternatenames/pom.xml index 300df12a6..c22c890de 100644 --- a/hapi-structures-v231-alternatenames/pom.xml +++ b/hapi-structures-v231-alternatenames/pom.xml @@ -4,7 +4,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -124,7 +124,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -147,7 +146,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package diff --git a/hapi-structures-v231/.classpath b/hapi-structures-v231/.classpath index aba77fdd6..aee4d1d8a 100644 --- a/hapi-structures-v231/.classpath +++ b/hapi-structures-v231/.classpath @@ -1,10 +1,35 @@ + - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-structures-v231/.project b/hapi-structures-v231/.project index 79ecabc73..e72a43f8a 100644 --- a/hapi-structures-v231/.project +++ b/hapi-structures-v231/.project @@ -1,20 +1,29 @@ + - hapi-structures-v231 - HAPI (HL7 application programming interface; pronounced "happy") is an open-source, + hapi-structures-v231 + HAPI (HL7 application programming interface; pronounced "happy") is an open-source, object-oriented HL7 2.x parser for Java. HL7 (http://hl7org) is a messaging specification for healthcare information systems. This project is not affiliated with the HL7 organization; we are just writing some software that conforms to their specification. The project was initiated by University Health Network (a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - hapi-base - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file + + hapi-base + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/hapi-structures-v231/pom.xml b/hapi-structures-v231/pom.xml index 1482d12a1..d18410813 100644 --- a/hapi-structures-v231/pom.xml +++ b/hapi-structures-v231/pom.xml @@ -4,7 +4,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -123,7 +123,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -146,7 +145,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package diff --git a/hapi-structures-v24/.project b/hapi-structures-v24/.project index 30e73687e..45dea0bca 100644 --- a/hapi-structures-v24/.project +++ b/hapi-structures-v24/.project @@ -5,13 +5,25 @@ + + org.eclipse.jdt.core.javabuilder + + + org.maven.ide.eclipse.maven2Builder + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature org.maven.ide.eclipse.maven2Nature diff --git a/hapi-structures-v24/pom.xml b/hapi-structures-v24/pom.xml index d325e7c01..925223890 100644 --- a/hapi-structures-v24/pom.xml +++ b/hapi-structures-v24/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -122,7 +122,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -145,7 +144,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package diff --git a/hapi-structures-v25/.classpath b/hapi-structures-v25/.classpath index 16f01e2ee..9ebee2499 100644 --- a/hapi-structures-v25/.classpath +++ b/hapi-structures-v25/.classpath @@ -1,7 +1,33 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-structures-v25/.project b/hapi-structures-v25/.project index 7c1c4e393..55aef72ce 100644 --- a/hapi-structures-v25/.project +++ b/hapi-structures-v25/.project @@ -15,8 +15,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature org.maven.ide.eclipse.maven2Nature diff --git a/hapi-structures-v25/.settings/org.eclipse.jdt.core.prefs b/hapi-structures-v25/.settings/org.eclipse.jdt.core.prefs index 580f851e8..60105c1b9 100644 --- a/hapi-structures-v25/.settings/org.eclipse.jdt.core.prefs +++ b/hapi-structures-v25/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,5 @@ -#Fri Feb 18 20:44:44 EST 2011 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-structures-v25/pom.xml b/hapi-structures-v25/pom.xml index 41f14174d..b484ac576 100644 --- a/hapi-structures-v25/pom.xml +++ b/hapi-structures-v25/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -122,7 +122,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -145,7 +144,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package diff --git a/hapi-structures-v251/.project b/hapi-structures-v251/.project index 75e0b3007..03b66594d 100644 --- a/hapi-structures-v251/.project +++ b/hapi-structures-v251/.project @@ -5,13 +5,25 @@ + + org.eclipse.jdt.core.javabuilder + + + org.maven.ide.eclipse.maven2Builder + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature org.maven.ide.eclipse.maven2Nature diff --git a/hapi-structures-v251/pom.xml b/hapi-structures-v251/pom.xml index 6567686d6..82b3d4fa5 100644 --- a/hapi-structures-v251/pom.xml +++ b/hapi-structures-v251/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -122,7 +122,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -145,7 +144,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} package diff --git a/hapi-structures-v26/.project b/hapi-structures-v26/.project index 8c6480aa7..36e01d2c8 100644 --- a/hapi-structures-v26/.project +++ b/hapi-structures-v26/.project @@ -5,13 +5,25 @@ + + org.eclipse.jdt.core.javabuilder + + + org.maven.ide.eclipse.maven2Builder + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature org.maven.ide.eclipse.maven2Nature diff --git a/hapi-structures-v26/pom.xml b/hapi-structures-v26/pom.xml index c9e04bc6c..9c994214c 100644 --- a/hapi-structures-v26/pom.xml +++ b/hapi-structures-v26/pom.xml @@ -4,7 +4,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -123,7 +123,6 @@ maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m diff --git a/hapi-structures-v27/.classpath b/hapi-structures-v27/.classpath deleted file mode 100644 index 16f01e2ee..000000000 --- a/hapi-structures-v27/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/hapi-structures-v27/.project b/hapi-structures-v27/.project deleted file mode 100644 index 403d28d67..000000000 --- a/hapi-structures-v27/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-structures-v27 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - - diff --git a/hapi-structures-v27/.settings/org.eclipse.jdt.core.prefs b/hapi-structures-v27/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 580f851e8..000000000 --- a/hapi-structures-v27/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Feb 18 20:44:44 EST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/hapi-structures-v27/.settings/org.maven.ide.eclipse.prefs b/hapi-structures-v27/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index a93466275..000000000 --- a/hapi-structures-v27/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Fri Feb 18 20:40:46 EST 2011 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/hapi-structures-v27/pom.xml b/hapi-structures-v27/pom.xml deleted file mode 100644 index 0339e3de7..000000000 --- a/hapi-structures-v27/pom.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - hapi - ca.uhn.hapi - 2.3-alpha1 - ../pom.xml - - - 4.0.0 - - ca.uhn.hapi - hapi-structures-v27 - HAPI - Java HL7 API - Generated Structures v2.7 - - jar - - - - ca.uhn.hapi - hapi-base - ${hapi.version} - - - - - false - 2.7 - v27 - ${sourcegen.jdbcUrl.old} - - - - - - ca.uhn.hapi - hapi-sourcegen - - - ${gen.version} - generate-sources - - sourcegen - - true - - ${gen.version} - ${sourcegen.jdbcUrl} - ${sourcegen.jdbcUser.old} - ${sourcegen.jdbcPassword.old} - ${basedir}/target/generated-sources/sourcegen - ${basedir}/target/generated-sources/resourcegen - - - - - - ca.uhn.hapi - hapi-sourcegen - ${hapi.version} - - - superstructure_adt - - superstructuregen - - - ${basedir}/target/generated-sources/superstructuregen - ADT_AXX - ${gen.version} - - ADT_A[0-9]{2} - - - - - - - ca.uhn.hapi - hapi-base - ${hapi.version} - - - ca.uhn.hapi - hapi-structures-${gen.version.short} - ${hapi.version.stable} - - - - - maven-antrun-plugin - - - post-site - true - - - - - - - - - - - - run - - - - - - - - ${basedir}/target/generated-sources/resourcegen - false - - - - - - - - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - true - - 128m - ${plugin.javadoc.maxmemory} - true - true - - http://hl7api.sourceforge.net/base/apidocs/ - - - - - - - - - DIST - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - - package - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - package - - jar-no-fork - - - - - - org.codehaus.mojo - retrotranslator-maven-plugin - 1.0-alpha-4 - - - - translate-project - - - true - - - - - - - - - - diff --git a/hapi-structures-v271/.classpath b/hapi-structures-v271/.classpath deleted file mode 100644 index 16f01e2ee..000000000 --- a/hapi-structures-v271/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/hapi-structures-v271/.project b/hapi-structures-v271/.project deleted file mode 100644 index abcb67ba4..000000000 --- a/hapi-structures-v271/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-structures-v271 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - - diff --git a/hapi-structures-v271/.settings/org.eclipse.jdt.core.prefs b/hapi-structures-v271/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 580f851e8..000000000 --- a/hapi-structures-v271/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Feb 18 20:44:44 EST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/hapi-structures-v271/.settings/org.maven.ide.eclipse.prefs b/hapi-structures-v271/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index a93466275..000000000 --- a/hapi-structures-v271/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Fri Feb 18 20:40:46 EST 2011 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/hapi-structures-v271/pom.xml b/hapi-structures-v271/pom.xml deleted file mode 100644 index e63429cf0..000000000 --- a/hapi-structures-v271/pom.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - hapi - ca.uhn.hapi - 2.3-alpha1 - ../pom.xml - - - 4.0.0 - - ca.uhn.hapi - hapi-structures-v271 - HAPI - Java HL7 API - Generated Structures v2.7.1 - - jar - - - - ca.uhn.hapi - hapi-base - ${hapi.version} - - - - - false - 2.7.1 - v271 - ${sourcegen.jdbcUrl.old} - - - - - - ca.uhn.hapi - hapi-sourcegen - - - ${gen.version} - generate-sources - - sourcegen - - true - - ${gen.version} - ${sourcegen.jdbcUrl} - ${sourcegen.jdbcUser.old} - ${sourcegen.jdbcPassword.old} - ${basedir}/target/generated-sources/sourcegen - ${basedir}/target/generated-sources/resourcegen - - - - - - ca.uhn.hapi - hapi-sourcegen - ${hapi.version} - - - superstructure_adt - - superstructuregen - - - ${basedir}/target/generated-sources/superstructuregen - ADT_AXX - ${gen.version} - - ADT_A[0-9]{2} - - - - - - - ca.uhn.hapi - hapi-base - ${hapi.version} - - - ca.uhn.hapi - hapi-structures-${gen.version.short} - ${hapi.version.stable} - - - - - maven-antrun-plugin - - - post-site - true - - - - - - - - - - - - run - - - - - - - - ${basedir}/target/generated-sources/resourcegen - false - - - - - - - - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - true - - 128m - ${plugin.javadoc.maxmemory} - true - true - - http://hl7api.sourceforge.net/base/apidocs/ - - - - - - - - - DIST - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - - package - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - package - - jar-no-fork - - - - - - org.codehaus.mojo - retrotranslator-maven-plugin - 1.0-alpha-4 - - - - translate-project - - - true - - - - - - - - - - diff --git a/hapi-structures-v28/.classpath b/hapi-structures-v28/.classpath deleted file mode 100644 index 16f01e2ee..000000000 --- a/hapi-structures-v28/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/hapi-structures-v28/.project b/hapi-structures-v28/.project deleted file mode 100644 index 6bb7235a2..000000000 --- a/hapi-structures-v28/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-structures-v28 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - - diff --git a/hapi-structures-v28/.settings/org.eclipse.jdt.core.prefs b/hapi-structures-v28/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 580f851e8..000000000 --- a/hapi-structures-v28/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Feb 18 20:44:44 EST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/hapi-structures-v28/.settings/org.maven.ide.eclipse.prefs b/hapi-structures-v28/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index a93466275..000000000 --- a/hapi-structures-v28/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Fri Feb 18 20:40:46 EST 2011 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/hapi-structures-v28/pom.xml b/hapi-structures-v28/pom.xml deleted file mode 100644 index 5e72a1064..000000000 --- a/hapi-structures-v28/pom.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - hapi - ca.uhn.hapi - 2.3-alpha1 - ../pom.xml - - - 4.0.0 - - ca.uhn.hapi - hapi-structures-v28 - HAPI - Java HL7 API - Generated Structures v2.8 - - jar - - - - ca.uhn.hapi - hapi-base - ${hapi.version} - - - - - false - 2.8 - v28 - ${sourcegen.jdbcUrl.old} - - - - - - ca.uhn.hapi - hapi-sourcegen - - - ${gen.version} - generate-sources - - sourcegen - - true - - ${gen.version} - ${sourcegen.jdbcUrl} - ${sourcegen.jdbcUser.old} - ${sourcegen.jdbcPassword.old} - ${basedir}/target/generated-sources/sourcegen - ${basedir}/target/generated-sources/resourcegen - - - - - - ca.uhn.hapi - hapi-sourcegen - ${hapi.version} - - - superstructure_adt - - superstructuregen - - - ${basedir}/target/generated-sources/superstructuregen - ADT_AXX - ${gen.version} - - ADT_A[0-9]{2} - - - - - - - ca.uhn.hapi - hapi-base - ${hapi.version} - - - ca.uhn.hapi - hapi-structures-${gen.version.short} - ${hapi.version.stable} - - - - - maven-antrun-plugin - - - post-site - true - - - - - - - - - - - - run - - - - - - - - ${basedir}/target/generated-sources/resourcegen - false - - - - - - - - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - true - - 128m - ${plugin.javadoc.maxmemory} - true - true - - http://hl7api.sourceforge.net/base/apidocs/ - - - - - - - - - DIST - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - - package - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - package - - jar-no-fork - - - - - - org.codehaus.mojo - retrotranslator-maven-plugin - 1.0-alpha-4 - - - - translate-project - - - true - - - - - - - - - - diff --git a/hapi-structures-v281/.classpath b/hapi-structures-v281/.classpath deleted file mode 100644 index 16f01e2ee..000000000 --- a/hapi-structures-v281/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/hapi-structures-v281/.project b/hapi-structures-v281/.project deleted file mode 100644 index d14b8060d..000000000 --- a/hapi-structures-v281/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - hapi-structures-v281 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature - - diff --git a/hapi-structures-v281/.settings/org.eclipse.jdt.core.prefs b/hapi-structures-v281/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 580f851e8..000000000 --- a/hapi-structures-v281/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Feb 18 20:44:44 EST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/hapi-structures-v281/.settings/org.maven.ide.eclipse.prefs b/hapi-structures-v281/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index a93466275..000000000 --- a/hapi-structures-v281/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Fri Feb 18 20:40:46 EST 2011 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/hapi-structures-v281/pom.xml b/hapi-structures-v281/pom.xml deleted file mode 100644 index 6a3014a4b..000000000 --- a/hapi-structures-v281/pom.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - hapi - ca.uhn.hapi - 2.3-alpha1 - ../pom.xml - - - 4.0.0 - - ca.uhn.hapi - hapi-structures-v28 - HAPI - Java HL7 API - Generated Structures v2.8.1 - - jar - - - - ca.uhn.hapi - hapi-base - ${hapi.version} - - - - - false - 2.8.1 - v281 - ${sourcegen.jdbcUrl.old} - - - - - - ca.uhn.hapi - hapi-sourcegen - - - ${gen.version} - generate-sources - - sourcegen - - true - - ${gen.version} - ${sourcegen.jdbcUrl} - ${sourcegen.jdbcUser.old} - ${sourcegen.jdbcPassword.old} - ${basedir}/target/generated-sources/sourcegen - ${basedir}/target/generated-sources/resourcegen - - - - - - ca.uhn.hapi - hapi-sourcegen - ${hapi.version} - - - superstructure_adt - - superstructuregen - - - ${basedir}/target/generated-sources/superstructuregen - ADT_AXX - ${gen.version} - - ADT_A[0-9]{2} - - - - - - - ca.uhn.hapi - hapi-base - ${hapi.version} - - - ca.uhn.hapi - hapi-structures-${gen.version.short} - ${hapi.version.stable} - - - - - maven-antrun-plugin - - - post-site - true - - - - - - - - - - - - run - - - - - - - - ${basedir}/target/generated-sources/resourcegen - false - - - - - - - - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - true - - 128m - ${plugin.javadoc.maxmemory} - true - true - - http://hl7api.sourceforge.net/base/apidocs/ - - - - - - - - - DIST - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - - package - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - package - - jar-no-fork - - - - - - org.codehaus.mojo - retrotranslator-maven-plugin - 1.0-alpha-4 - - - - translate-project - - - true - - - - - - - - - - diff --git a/hapi-test/.classpath b/hapi-test/.classpath index 726960dc8..cbf809670 100644 --- a/hapi-test/.classpath +++ b/hapi-test/.classpath @@ -8,81 +8,22 @@ - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - diff --git a/hapi-test/.settings/org.eclipse.jdt.core.prefs b/hapi-test/.settings/org.eclipse.jdt.core.prefs index ff974c8bc..92eb1cf57 100644 --- a/hapi-test/.settings/org.eclipse.jdt.core.prefs +++ b/hapi-test/.settings/org.eclipse.jdt.core.prefs @@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -92,4 +92,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/hapi-test/pom.xml b/hapi-test/pom.xml index d36404f5d..7a96cd67b 100644 --- a/hapi-test/pom.xml +++ b/hapi-test/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml @@ -62,8 +62,6 @@ hapi-structures-v26 ${hapi.version.structures} - - + - + --> ca.uhn.hapi hapi-sourcegen diff --git a/hapi-test/src/test/java/ca/uhn/hl7v2/conf/check/DefaultValidatorTest.java b/hapi-test/src/test/java/ca/uhn/hl7v2/conf/check/DefaultValidatorTest.java index f003eef83..33fc3d9d8 100644 --- a/hapi-test/src/test/java/ca/uhn/hl7v2/conf/check/DefaultValidatorTest.java +++ b/hapi-test/src/test/java/ca/uhn/hl7v2/conf/check/DefaultValidatorTest.java @@ -7,6 +7,8 @@ import java.util.Arrays; import java.util.List; +import org.apache.commons.io.IOUtils; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -18,6 +20,7 @@ import ca.uhn.hl7v2.conf.store.ProfileCodeStore; import ca.uhn.hl7v2.conf.store.ProfileStoreFactory; import ca.uhn.hl7v2.model.v24.message.ACK; +import ca.uhn.hl7v2.model.v251.message.ORU_R01; import ca.uhn.hl7v2.parser.PipeParser; /** @@ -130,6 +133,38 @@ public void testRequiredSegment() throws Exception { } + /** + * Issue reported on mailing list + */ + public void testOru() throws Exception { + ClassLoader cl = ProfileParser.class.getClassLoader(); + InputStream instream = cl.getResourceAsStream("ca/uhn/hl7v2/conf/ORU_R01.xml"); + if (instream == null) throw new Exception("can't find the xml file"); + BufferedReader in = new BufferedReader(new InputStreamReader(instream)); + int tmp = 0; + StringBuffer buf = new StringBuffer(); + while ((tmp = in.read()) != -1) { + buf.append((char) tmp); + } + String profileString = buf.toString(); + //System.out.println(profileString); + ProfileParser parser = new ProfileParser(false); + RuntimeProfile prof = parser.parse(profileString); + + DefaultValidator v = new DefaultValidator(); + + String message = IOUtils.toString(cl.getResourceAsStream("ca/uhn/hl7v2/conf/ORU_R01.hl7")); + ORU_R01 msg = new ca.uhn.hl7v2.model.v251.message.ORU_R01(); + msg.parse(message.replaceAll("(\\n|\\r)+", "\r")); + + HL7Exception[] problems = v.validate(msg, prof.getMessage()); + String toString = Arrays.asList(problems).toString(); + + assertTrue(toString, problems.length == 0); + + } + + public void testNotSupportedSegment() throws Exception { ClassLoader cl = ProfileParser.class.getClassLoader(); diff --git a/hapi-test/src/test/java/ca/uhn/hl7v2/model/SuperStructureTest.java b/hapi-test/src/test/java/ca/uhn/hl7v2/model/SuperStructureTest.java index bff65fbf3..5089d4685 100644 --- a/hapi-test/src/test/java/ca/uhn/hl7v2/model/SuperStructureTest.java +++ b/hapi-test/src/test/java/ca/uhn/hl7v2/model/SuperStructureTest.java @@ -1,5 +1,6 @@ package ca.uhn.hl7v2.model; +import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; import java.io.IOException; @@ -17,6 +18,7 @@ import ca.uhn.hl7v2.parser.DefaultModelClassFactory; import ca.uhn.hl7v2.parser.PipeParser; import ca.uhn.hl7v2.util.ReflectionUtil; +import ca.uhn.hl7v2.validation.impl.ValidationContextImpl; public class SuperStructureTest { @@ -41,6 +43,29 @@ public void testParseTwoPidA01() throws HL7Exception { } + @Test + public void testEncodeWithZSegment() throws HL7Exception { + ADT_AXX msg = new ADT_AXX(); + + String message = "MSH|^~\\&|NES|NINTENDO|AGNEW|CORNERCUBICLE|20010101000000||ADT^A01|Q123456789T123456789X123456|P|2.3\r\n" + + "PID|2||123456789|0123456789^AA^^JP|BROS^MARIO^^^^||19850101000000|M|||123 FAKE STREET^MARIO \\T\\ LUIGI BROS PLACE^TOADSTOOL KINGDOM^NES^A1B2C3^JP^HOME^^1234|1234|(555)555-0123^HOME^JP:1234567|||S|MSH|12345678|||||||0|||||N\r\n"; + + msg.parse(message); + + msg.addNonstandardSegment("ZZZ"); + GenericSegment zzz = (GenericSegment) msg.get("ZZZ"); + zzz.parse("ZZZ|1|2"); + + DefaultHapiContext ctx = new DefaultHapiContext(); +// ctx.setValidationContext(new ValidationContextImpl()); + + String out = ctx.getPipeParser().encode(msg); + ourLog.info(out); + + assertThat(out, containsString("ZZZ|1|2")); + } + + @Test public void testParseTwoPidA17() throws HL7Exception { ADT_AXX msg = new ADT_AXX(); diff --git a/hapi-test/src/test/java/ca/uhn/hl7v2/parser/NewPipeParserTest.java b/hapi-test/src/test/java/ca/uhn/hl7v2/parser/NewPipeParserTest.java index 678e13c04..61b7b0d33 100644 --- a/hapi-test/src/test/java/ca/uhn/hl7v2/parser/NewPipeParserTest.java +++ b/hapi-test/src/test/java/ca/uhn/hl7v2/parser/NewPipeParserTest.java @@ -12,6 +12,7 @@ import ca.uhn.hl7v2.model.v24.datatype.FT; import ca.uhn.hl7v2.model.v24.datatype.HD; import ca.uhn.hl7v2.model.v24.datatype.SI; +import ca.uhn.hl7v2.model.v24.group.ORU_R01_OBSERVATION; import ca.uhn.hl7v2.model.v24.message.ACK; import ca.uhn.hl7v2.model.v24.message.ADT_A01; import ca.uhn.hl7v2.model.v24.message.ORU_R01; @@ -78,6 +79,37 @@ protected Message transform(String input) throws Throwable { } + @Test + public void testParseRepeatingObx5() throws Exception { + String msg = "MSH|^~\\&|HNAM|CL|CL_RADNET|CL|20110628095233||ORU^R01|Q2301030099T1904270849|P|2.4\r" + + "PID|1||10011682^^^CL_MRN Pool^^CD:237968946|60683166^^^DONOTSEND^^CD:237968946|CLABTEST^ONE||19500101120000|F||C|34605 W 12 MILE RD^^FARM MILLS^MN^48331-3263^CD:309221^CD:756^^CD:637908|CD:637908|(248)489-6000^CD:170||CD:151|M|CD:3391461|606831661088^^^DONOTSEND^FIN NBR^CD:237968946||||CD:654655774|||0|||CD:654897458\r" + + "PV1|1|Inpatient|MS^0414^1^CL^^^MMCCN|3|||5332^Rahiman^Abdul|||MED|MS|||1|||5332^Rahiman^Doctor|A||60|||||||||||||||||||CL||Active|||20110329113000\r" + + "ORC|NW|3415770735^HNAM_ORDERID|||RL||||20110628095142|71573^Doctor^Janet^D^^^^^DONOTSEND^^^^COMMUNITY DR NBR~70988^Doctor^Janet^D^^^^^DONOTSEND^^^^Personnel Primary Identifier~FHJDB2293^Doctor^Janet^D^^^^^DONOTSEND^^^^External Identifier~T^Doctor^Janet^D^^^^^DONOTSEND^^^^CD:296695676|||||20110628095231|||CD:2562^Written|71573^Doctor^Janet^D^^^^^DONOTSEND^^^^COMMUNITY DR NBR~70988^Doctor^Janet^D^^^^^DONOTSEND^^^^Personnel Primary Identifier~FHJDB2293^Doctor^Janet^D^^^^^DONOTSEND^^^^External Identifier~T^Doctor^Janet^D^^^^^DONOTSEND^^^^CD:296695676\r" + + "OBR|1|3415770735^HNAM_ORDERID||CL987^MRA Head w and w/o Contrast|||||||||||Rad Type&Rad Type|||||00000MR20110001703^HNA_ACCN~8546871^HNA_ACCNID~7515376^HNA_PACSID|CD:232990825|20110628095231||Magnetic Resonance Imaging|||1^^0^20110628095100^^RT||||^Dizziness\r" + + "OBX|1|TX|20725^ROUTINE HEMATOLOGY|H7800-4|This~Is~A~Report~~~~~||||||I|||200704021122\r" + + "NTE|1|P|Special Instructions-\r"; + + Parser p = new GenericParser(); + + Message hapiMsg; + + // The parse method performs the actual parsing + + hapiMsg = p.parse(msg); + + ORU_R01_OBSERVATION obx = ((ORU_R01) hapiMsg).getPATIENT_RESULT(0).getORDER_OBSERVATION(0).getOBSERVATION(0); + assertEquals("This", obx.getOBX().getObx5_ObservationValue()[0].encode()); + assertEquals("Is", obx.getOBX().getObx5_ObservationValue()[1].encode()); + assertEquals("A", obx.getOBX().getObx5_ObservationValue()[2].encode()); + assertEquals("Report", obx.getOBX().getObx5_ObservationValue()[3].encode()); + assertEquals("", obx.getOBX().getObx5_ObservationValue()[4].encode()); + assertEquals("", obx.getOBX().getObx5_ObservationValue()[5].encode()); + assertEquals("", obx.getOBX().getObx5_ObservationValue()[6].encode()); + assertEquals("", obx.getOBX().getObx5_ObservationValue()[7].encode()); + + } + + /** * Bug 207 contributed by Jens Villadsen *

diff --git a/hapi-testmindeps/pom.xml b/hapi-testmindeps/pom.xml index 7b205fd23..cd462529d 100644 --- a/hapi-testmindeps/pom.xml +++ b/hapi-testmindeps/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml diff --git a/hapi-testnodeps/.classpath b/hapi-testnodeps/.classpath index 07e202f59..fa99d4ffc 100644 --- a/hapi-testnodeps/.classpath +++ b/hapi-testnodeps/.classpath @@ -1,14 +1,25 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-testnodeps/.project b/hapi-testnodeps/.project index 9b535e3d9..3d0692156 100644 --- a/hapi-testnodeps/.project +++ b/hapi-testnodeps/.project @@ -1,15 +1,24 @@ + - hapi-testnodeps - This project contains unit tests which verify that HAPI works correctly when it has no structure JARs on the classpath. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - hapi-base - - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - - \ No newline at end of file + hapi-testnodeps + This project contains unit tests which verify that HAPI works correctly when it has no structure JARs on the classpath. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + hapi-base + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/hapi-testnodeps/.settings/org.eclipse.core.resources.prefs b/hapi-testnodeps/.settings/org.eclipse.core.resources.prefs index 73d60d644..8dd9b1df3 100644 --- a/hapi-testnodeps/.settings/org.eclipse.core.resources.prefs +++ b/hapi-testnodeps/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Sat Mar 21 16:05:35 EDT 2009 eclipse.preferences.version=1 +encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/hapi-testnodeps/.settings/org.eclipse.jdt.core.prefs b/hapi-testnodeps/.settings/org.eclipse.jdt.core.prefs index 589bcbceb..75bbcdb60 100644 --- a/hapi-testnodeps/.settings/org.eclipse.jdt.core.prefs +++ b/hapi-testnodeps/.settings/org.eclipse.jdt.core.prefs @@ -5,9 +5,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/hapi-testnodeps/pom.xml b/hapi-testnodeps/pom.xml index 684e8b6c7..60c84db93 100644 --- a/hapi-testnodeps/pom.xml +++ b/hapi-testnodeps/pom.xml @@ -3,7 +3,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml diff --git a/hapi-testpanel/.classpath b/hapi-testpanel/.classpath index b2ca2ee25..91dbb706d 100644 --- a/hapi-testpanel/.classpath +++ b/hapi-testpanel/.classpath @@ -6,48 +6,41 @@ - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-testpanel/.project b/hapi-testpanel/.project index a41324c1d..b6bfcee26 100644 --- a/hapi-testpanel/.project +++ b/hapi-testpanel/.project @@ -1,28 +1,28 @@ - - - hapi-testpanel + + + hapi-testpanel HAPI (HL7 application programming interface; pronounced "happy") is an open-source, object-oriented HL7 2.x parser for Java. HL7 (http://hl7org) is a messaging specification for healthcare information systems. This project is not affiliated with the HL7 organization; we are just writing some software that conforms to their specification. The project was initiated by University Health Network - (a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - + (a large multi-site teaching hospital in Toronto, Canada). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.jdt.core.javanature + + diff --git a/hapi-testpanel/.settings/org.eclipse.jdt.core.prefs b/hapi-testpanel/.settings/org.eclipse.jdt.core.prefs index 86dac5818..0f69a6fbe 100644 --- a/hapi-testpanel/.settings/org.eclipse.jdt.core.prefs +++ b/hapi-testpanel/.settings/org.eclipse.jdt.core.prefs @@ -93,4 +93,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/hapi-testpanel/pom.xml b/hapi-testpanel/pom.xml index ac8384926..10ab0536d 100644 --- a/hapi-testpanel/pom.xml +++ b/hapi-testpanel/pom.xml @@ -2,7 +2,7 @@ hapi ca.uhn.hapi - 2.3-alpha1 + 2.3 ../pom.xml 2.0.1 @@ -125,8 +125,9 @@ com.apple - applejavaextensions - 1.5.4 + AppleJavaExtensions + + 1.4 provided diff --git a/hapi-testpanel/src/main/java/ca/uhn/hl7v2/testpanel/OSXInitializer.java b/hapi-testpanel/src/main/java/ca/uhn/hl7v2/testpanel/OSXInitializer.java index c5ad8e015..725c14317 100644 --- a/hapi-testpanel/src/main/java/ca/uhn/hl7v2/testpanel/OSXInitializer.java +++ b/hapi-testpanel/src/main/java/ca/uhn/hl7v2/testpanel/OSXInitializer.java @@ -37,15 +37,15 @@ public class OSXInitializer { public void run(final Controller theController) { com.apple.eawt.Application macApp = com.apple.eawt.Application.getApplication(); macApp.setDockIconImage(ImageFactory.getHapi64().getImage()); - macApp.setAboutHandler(new com.apple.eawt.AboutHandler() { - public void handleAbout( com.apple.eawt.AppEvent.AboutEvent theArg0) { - theController.showAboutDialog(); - }}); - macApp.setQuitHandler(new com.apple.eawt.QuitHandler() { - - public void handleQuitRequestWith( com.apple.eawt.AppEvent.QuitEvent theArg0, com.apple.eawt.QuitResponse theArg1) { - theController.close(); - }}); +// macApp.setAboutHandler(new com.apple.eawt.AboutHandler() { +// public void handleAbout( com.apple.eawt.AppEvent.AboutEvent theArg0) { +// theController.showAboutDialog(); +// }}); +// macApp.setQuitHandler(new com.apple.eawt.QuitHandler() { +// +// public void handleQuitRequestWith( com.apple.eawt.AppEvent.QuitEvent theArg0, com.apple.eawt.QuitResponse theArg1) { +// theController.close(); +// }}); } } diff --git a/hapi-testpanel/src/test/java/ca/uhn/hl7v2/testpanel/model/msg/Hl7V2MessageImplTest.java b/hapi-testpanel/src/test/java/ca/uhn/hl7v2/testpanel/model/msg/Hl7V2MessageImplTest.java index 9649d17bd..8fbf8756b 100644 --- a/hapi-testpanel/src/test/java/ca/uhn/hl7v2/testpanel/model/msg/Hl7V2MessageImplTest.java +++ b/hapi-testpanel/src/test/java/ca/uhn/hl7v2/testpanel/model/msg/Hl7V2MessageImplTest.java @@ -25,18 +25,35 @@ */ package ca.uhn.hl7v2.testpanel.model.msg; +import java.io.IOException; import java.util.ArrayList; -import junit.framework.Assert; - +import org.junit.After; +import org.junit.Before; import org.junit.Test; +import ca.uhn.hl7v2.DefaultHapiContext; import ca.uhn.hl7v2.HL7Exception; import ca.uhn.hl7v2.model.v26.message.ADT_A01; +import ca.uhn.hl7v2.parser.Parser; import ca.uhn.hl7v2.testpanel.util.Range; +import ca.uhn.hl7v2.validation.builder.support.NoValidationBuilder; +import junit.framework.Assert; public class Hl7V2MessageImplTest { + private DefaultHapiContext myCtx; + + @Before + public void before() { + myCtx = new DefaultHapiContext(new NoValidationBuilder()); + } + + @After + public void after() throws IOException { + myCtx.close(); + } + @Test public void testFindRange() throws HL7Exception { @@ -45,6 +62,7 @@ public void testFindRange() throws HL7Exception { Range startRange = new Range(10, message.length()); ADT_A01 parsed = new ADT_A01(); + parsed.setParser(myCtx.getGenericParser()); parsed.parse(message); ArrayList path = new ArrayList() { @@ -129,7 +147,7 @@ public void testFindSegmentRangeNoTrailing() throws Exception { public void testFindRangeWithRep() throws Exception { String message = "MSH|^~\\&|\r" // 10 chars - + "PID|f1r1~f1r2~\r"; + + "PID|11~12~\r"; Range startRange = new Range(10, message.length()-1); ADT_A01 parsed = new ADT_A01(); @@ -142,10 +160,10 @@ public void testFindRangeWithRep() throws Exception { }; Range range = Hl7V2MessageBase.findFieldRange(path, 1, startRange, message, parsed); - Assert.assertEquals("f1r1", range.applyTo(message)); + Assert.assertEquals("11", range.applyTo(message)); range = Hl7V2MessageBase.findFieldRange(path, 2, startRange, message, parsed); - Assert.assertEquals("f1r2", range.applyTo(message)); + Assert.assertEquals("12", range.applyTo(message)); range = Hl7V2MessageBase.findFieldRange(path, 3, startRange, message, parsed); Assert.assertEquals("", range.applyTo(message)); @@ -166,6 +184,7 @@ public void testFindRangeWithRepAndComponents() throws Exception { Range startRange = new Range(10, message.length()-1); ADT_A01 parsed = new ADT_A01(); + parsed.setParser(myCtx.getGenericParser()); parsed.parse(message); ArrayList path = new ArrayList() { @@ -191,6 +210,7 @@ public void testFindRangeWithRepAndNoTrailing() throws Exception { Range startRange = new Range(10, message.length()); ADT_A01 parsed = new ADT_A01(); + parsed.setParser(myCtx.getGenericParser()); parsed.parse(message); ArrayList path = new ArrayList() { diff --git a/pom.xml b/pom.xml index b00b5ebfe..12842f9b0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ org.sonatype.oss oss-parent - 6 + 9 4.0.0 ca.uhn.hapi hapi pom - 2.3-alpha1 + 2.3 HAPI - The Open Source Java HL7 Parser and API http://hl7api.sourceforge.net/ @@ -208,6 +208,65 @@ versions-maven-plugin 1.3.1 + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + ca.uhn.hapi + + hapi-sourcegen + + + [2.2,) + + + confgen + xsdconfgen + sourcegen + + + + + + + + + + org.codehaus.mojo + + + buildnumber-maven-plugin + + + [1.2,) + + + + create-timestamp + + + + + + + + + + + @@ -261,12 +320,16 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.6.0 1.6 1.6 + true 1024m + + true + true - 2.3-alpha1 - 2.2 + 2.3 + 2.3 2.2 2.0.1 @@ -334,7 +398,6 @@ 2.7 2.5.2 1.4 - 2.9 2.3 1.5 3.2 @@ -479,7 +542,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -533,7 +595,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven.javadoc.plugin.version} true 128m @@ -623,15 +684,21 @@ jdbc:odbc:hl7v65 + jdbc:odbc:hl7v7 + + + jdbc:odbc:hl7v8 + + ALLMODULES hapi-base - hapi-examples + hapi-sourcegen hapi-structures-v21 hapi-structures-v22 @@ -641,10 +708,11 @@ hapi-structures-v25 hapi-structures-v251 hapi-structures-v26 - hapi-structures-v27 - hapi-structures-v271 - hapi-structures-v28 - hapi-structures-v281 + hapi-structures-v27 + hapi-structures-v271 + hapi-structures-v28 + hapi-structures-v281 + hapi-hl7overhttp hapi-osgi-base hapi-testpanel