diff --git a/build.xml b/build.xml index 9985b82125..afc949de34 100644 --- a/build.xml +++ b/build.xml @@ -141,8 +141,8 @@ The survey will run until the fall. -
-
+
+

@@ -170,8 +170,8 @@ The survey will run until the fall. -

-
+
+
@@ -199,8 +199,8 @@ The survey will run until the fall. -
-
+
+
diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/HapiContext.java b/hapi-base/src/main/java/ca/uhn/hl7v2/HapiContext.java index d127bdcef6..57fbe8826b 100644 --- a/hapi-base/src/main/java/ca/uhn/hl7v2/HapiContext.java +++ b/hapi-base/src/main/java/ca/uhn/hl7v2/HapiContext.java @@ -285,7 +285,7 @@ public interface HapiContext extends Closeable { * service instances provided by this interface. Note that the returned service will not * be started, and must manually be started using {@link HL7Service#start()} or * {@link HL7Service#startAndWait()} - * @see here for an example of how to use this method + * @see here for an example of how to use this method * @see #setSocketFactory(SocketFactory) */ HL7Service newServer(int port, boolean tls); @@ -302,7 +302,7 @@ public interface HapiContext extends Closeable { * service instances provided by this interface. Note that the returned service will not * be started, and must manually be started using {@link HL7Service#start()} or * {@link HL7Service#startAndWait()} - * @see here<> for an example of how to use this method + * @see here<> for an example of how to use this method * @see #setSocketFactory(SocketFactory) */ HL7Service newServer(int port, boolean tls, boolean acceptAll); @@ -318,7 +318,7 @@ public interface HapiContext extends Closeable { * service instances provided by this interface. Note that the returned service will not * be started, and must manually be started using {@link HL7Service#start()} or * {@link HL7Service#startAndWait()} - * @see here for an example of how to use this method + * @see here for an example of how to use this method * @see #setSocketFactory(SocketFactory) */ HL7Service newServer(int inboundPort, int outboundPort, boolean tls); @@ -342,7 +342,7 @@ public interface HapiContext extends Closeable { * will attempt to connect to the specified address, and will throw an exception * if it fails to connect. * @throws HL7Exception If the connection can not be initialized for any reason - * @see here for an example of how to use this method + * @see here for an example of how to use this method */ Connection newClient(String host, int port, boolean tls) throws HL7Exception; @@ -361,7 +361,7 @@ public interface HapiContext extends Closeable { * @param tls Whether or not to use SSL/TLS * @return Returns a connection which can be used to transmit messages. * @throws HL7Exception If the connection can not be initialized for any reason - * @see here for an example of how to use this method + * @see here for an example of how to use this method */ Connection newLazyClient(String host, int port, boolean tls) throws HL7Exception; diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/app/ConnectionHub.java b/hapi-base/src/main/java/ca/uhn/hl7v2/app/ConnectionHub.java index 3dd7ac9b16..1a5587a2a4 100644 --- a/hapi-base/src/main/java/ca/uhn/hl7v2/app/ConnectionHub.java +++ b/hapi-base/src/main/java/ca/uhn/hl7v2/app/ConnectionHub.java @@ -385,7 +385,7 @@ public boolean isOpen(ConnectionData key) { * Returns the singleton instance of ConnectionHub * * @deprecated Use {@link HapiContext#getConnectionHub()} to get an instance of ConnectionHub. - * See this example page for an example of how to use ConnectionHub. + * See this example page for an example of how to use ConnectionHub. */ public static ConnectionHub getInstance() { return getInstance(DefaultExecutorService.getDefaultService()); @@ -395,7 +395,7 @@ public static ConnectionHub getInstance() { * Returns the singleton instance of ConnectionHub. * * @deprecated Use {@link HapiContext#getConnectionHub()} to get an instance of ConnectionHub. - * See this example page for an example of how to use ConnectionHub. + * See this example page for an example of how to use ConnectionHub. */ public synchronized static ConnectionHub getInstance(ExecutorService service) { if (instance == null || service.isShutdown()) { @@ -408,7 +408,7 @@ public synchronized static ConnectionHub getInstance(ExecutorService service) { * Returns the singleton instance of ConnectionHub. * * @deprecated Use {@link HapiContext#getConnectionHub()} to get an instance of ConnectionHub. - * See this example page for an example of how to use ConnectionHub. + * See this example page for an example of how to use ConnectionHub. */ public static ConnectionHub getInstance(HapiContext context) { if (instance == null || context.getExecutorService().isShutdown()) { @@ -423,7 +423,7 @@ public static ConnectionHub getInstance(HapiContext context) { * service. *

*

- * See this example page + * See this example page * for an example of how to use ConnectionHub. *

*/ diff --git a/hapi-base/src/main/java/ca/uhn/hl7v2/parser/GenericModelClassFactory.java b/hapi-base/src/main/java/ca/uhn/hl7v2/parser/GenericModelClassFactory.java index 72df3c7965..0dd188358e 100644 --- a/hapi-base/src/main/java/ca/uhn/hl7v2/parser/GenericModelClassFactory.java +++ b/hapi-base/src/main/java/ca/uhn/hl7v2/parser/GenericModelClassFactory.java @@ -46,7 +46,7 @@ GNU General Public License (the "GPL"), in which case the provisions of the GPL *

* This can be used to run HAPI without any structure JARs, as the generic MCF * has no structure dependencies. See the - * using multiple versions + * using multiple versions * example for more information. *

* diff --git a/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/HandlingMultipleVersions.java b/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/HandlingMultipleVersions.java index 6ef17435f4..1f4d9bc9ac 100644 --- a/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/HandlingMultipleVersions.java +++ b/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/HandlingMultipleVersions.java @@ -122,7 +122,7 @@ public static void main(String[] args) throws Exception { * The second technique is to use the Terser. The Terser allows you * to access field values using a path-like notation. For more information * on the Terser, see the example here: - * http://hl7api.sourceforge.net/xref/ca/uhn/hl7v2/examples/ExampleUseTerser.html + * https://hapifhir.github.io/hapi-hl7v2/xref/ca/uhn/hl7v2/examples/ExampleUseTerser.html */ // This time we just use a normal ModelClassFactory, which means we will be diff --git a/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/LazilySendAMessage.java b/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/LazilySendAMessage.java index 49bca8e779..e496220782 100644 --- a/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/LazilySendAMessage.java +++ b/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/LazilySendAMessage.java @@ -115,7 +115,7 @@ public static void main(String[] args) throws Exception { * the same connection, even with a long delay between messages. * * See - * http://hl7api.sourceforge.net/xref/ca/uhn/hl7v2/examples/SendLotsOfMessages.html + * https://hapifhir.github.io/hapi-hl7v2/xref/ca/uhn/hl7v2/examples/SendLotsOfMessages.html * for an example of this. */ connection.close(); diff --git a/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/SendAndReceiveAMessage.java b/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/SendAndReceiveAMessage.java index ef51eacd0b..0db752b0a2 100644 --- a/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/SendAndReceiveAMessage.java +++ b/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/SendAndReceiveAMessage.java @@ -170,7 +170,7 @@ public static void main(String[] args) throws Exception { * the same connection, even with a long delay between messages. * * See - * http://hl7api.sourceforge.net/xref/ca/uhn/hl7v2/examples/SendLotsOfMessages.html + * https://hapifhir.github.io/hapi-hl7v2/xref/ca/uhn/hl7v2/examples/SendLotsOfMessages.html * for an example of this. */ connection.close(); diff --git a/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/TheHapiContext.java b/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/TheHapiContext.java index 7852b314d6..e31a76d7b5 100644 --- a/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/TheHapiContext.java +++ b/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/TheHapiContext.java @@ -104,7 +104,7 @@ public static void main(String[] args) { /* * See the rest of the examples for more information on how to * use the context: - * http://hl7api.sourceforge.net/devbyexample.html + * https://hapifhir.github.io/hapi-hl7v2/devbyexample.html */ diff --git a/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/custommodel/v25/segment/ZPI.java b/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/custommodel/v25/segment/ZPI.java index cb84c2f080..1c3fbc9fc7 100644 --- a/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/custommodel/v25/segment/ZPI.java +++ b/hapi-examples/src/main/java/ca/uhn/hl7v2/examples/custommodel/v25/segment/ZPI.java @@ -40,7 +40,7 @@ private void init(ModelClassFactory factory) { * the ZPI segment. * * See here for information on the arguments to this method: - * http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/model/AbstractSegment.html#add%28java.lang.Class,%20boolean,%20int,%20int,%20java.lang.Object[],%20java.lang.String%29 + * https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/model/AbstractSegment.html#add%28java.lang.Class,%20boolean,%20int,%20int,%20java.lang.Object[],%20java.lang.String%29 */ add(ST.class, true, 0, 100, new Object[]{ getMessage() }, "Pet Name(s)"); add(NM.class, false, 1, 4, new Object[]{ getMessage() }, "Shoe Size"); diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/IClient.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/IClient.html index 77b23239fb..7deab7ca91 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/IClient.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/IClient.html @@ -463,9 +463,8 @@

setSigner

Parameters:
theSigner - If provided, sets the Signature Profile signer implementation to use. See http://hl7api.sourceforge.net/hapi-hl7overhttp/specification. - html#SIGNATURE_PROFILE
+ "https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/signature.html" + >https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/signature.html diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/DecodeException.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/DecodeException.html index d374928e44..8267a38918 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/DecodeException.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/DecodeException.html @@ -192,15 +192,15 @@

Uses of -IReceivable<Message> -AbstractClient.sendAndReceiveMessage(ISendable<Message> theMessageToSend) +IReceivable<Message> +AbstractClient.sendAndReceiveMessage(ISendable<Message> theMessageToSend)
Sends a message, waits for the response, and then returns the response if any
-IReceivable<Message> -AbstractClient.sendAndReceiveMessage(Message theMessageToSend) +IReceivable<Message> +AbstractClient.sendAndReceiveMessage(Message theMessageToSend)
Sends a message, waits for the response, and then returns the response if any (this method is a convenience method for AbstractClient.sendAndReceiveMessage(ISendable)
diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/EncodeException.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/EncodeException.html index 9c70e2fea7..6b9847706c 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/EncodeException.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/EncodeException.html @@ -134,15 +134,15 @@

Uses of -IReceivable<Message> -AbstractClient.sendAndReceiveMessage(ISendable<Message> theMessageToSend) +IReceivable<Message> +AbstractClient.sendAndReceiveMessage(ISendable<Message> theMessageToSend)
Sends a message, waits for the response, and then returns the response if any
-IReceivable<Message> -AbstractClient.sendAndReceiveMessage(Message theMessageToSend) +IReceivable<Message> +AbstractClient.sendAndReceiveMessage(Message theMessageToSend)
Sends a message, waits for the response, and then returns the response if any (this method is a convenience method for AbstractClient.sendAndReceiveMessage(ISendable)
diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/IReceivable.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/IReceivable.html index 0156dd54c0..b2266840c5 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/IReceivable.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/IReceivable.html @@ -169,15 +169,15 @@

Uses of -IReceivable<Message> -AbstractClient.sendAndReceiveMessage(ISendable<Message> theMessageToSend) +IReceivable<Message> +AbstractClient.sendAndReceiveMessage(ISendable<Message> theMessageToSend)
Sends a message, waits for the response, and then returns the response if any
-IReceivable<Message> -AbstractClient.sendAndReceiveMessage(Message theMessageToSend) +IReceivable<Message> +AbstractClient.sendAndReceiveMessage(Message theMessageToSend)
Sends a message, waits for the response, and then returns the response if any (this method is a convenience method for AbstractClient.sendAndReceiveMessage(ISendable)
diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/ISendable.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/ISendable.html index 78ae5f63cf..c7c366a86c 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/ISendable.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/api/class-use/ISendable.html @@ -183,8 +183,8 @@

Uses of -IReceivable<Message> -AbstractClient.sendAndReceiveMessage(ISendable<Message> theMessageToSend) +IReceivable<Message> +AbstractClient.sendAndReceiveMessage(ISendable<Message> theMessageToSend)
Sends a message, waits for the response, and then returns the response if any
diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/api/MessageReceivable.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/api/MessageReceivable.html index 238b90cdd5..18659b26f3 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/api/MessageReceivable.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/api/MessageReceivable.html @@ -101,7 +101,7 @@

Class MessageReceivable

  • java.lang.Object
  • @@ -135,13 +135,13 @@

    Constructor Summary

    Constructor and Description -MessageSendable(Message theMessage) +MessageSendable(Message theMessage)
    Constructor
    -MessageSendable(Message theMessage, - Parser theParser) +MessageSendable(Message theMessage, + Parser theParser)
    Constructor
    @@ -165,7 +165,7 @@

    Method Summary

    getEncodingStyle()  -Message +Message getMessage()  @@ -204,14 +204,14 @@

    Constructor Detail

    @@ -221,16 +221,16 @@

    MessageSendable

    @@ -252,7 +252,7 @@

    writeMessage

    throws IOException
    Specified by:
    -
    writeMessage in interface ISendable<Message>
    +
    writeMessage in interface ISendable<Message>
    Throws:
    IOException
    @@ -267,7 +267,7 @@

    getEncodingStyle

    public EncodingStyle getEncodingStyle()
    Specified by:
    -
    getEncodingStyle in interface ISendable<Message>
    +
    getEncodingStyle in interface ISendable<Message>
  • @@ -280,7 +280,7 @@

    getResponseCode

    public ResponseCode getResponseCode()
    Specified by:
    -
    getResponseCode in interface IResponseSendable<Message>
    +
    getResponseCode in interface IResponseSendable<Message>
    @@ -290,10 +290,10 @@

    getResponseCode

    diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/AbstractClient.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/AbstractClient.html index 8d969ca916..d18015516e 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/AbstractClient.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/AbstractClient.html @@ -148,7 +148,7 @@

    Constructor Summary

    protected AbstractClient(T theRawClient, - Parser theParser) + Parser theParser)
    Constructor
    @@ -174,9 +174,9 @@

    Method Summary

    -Parser +Parser getParser() -
    Returns the Parser to use to parsing and encoding messages within +
    Returns the Parser to use to parsing and encoding messages within this client (may return null)
    @@ -227,15 +227,15 @@

    Method Summary

    -IReceivable<Message> -sendAndReceiveMessage(ISendable<Message> theMessageToSend) +IReceivable<Message> +sendAndReceiveMessage(ISendable<Message> theMessageToSend)
    Sends a message, waits for the response, and then returns the response if any
    -IReceivable<Message> -sendAndReceiveMessage(Message theMessageToSend) +IReceivable<Message> +sendAndReceiveMessage(Message theMessageToSend)
    Sends a message, waits for the response, and then returns the response if any (this method is a convenience method for sendAndReceiveMessage(ISendable)
    @@ -268,8 +268,8 @@

    Method Summary

    void -setParser(Parser theParser) -
    Sets the Parser to use to parsing and encoding messages within +setParser(Parser theParser) +
    Sets the Parser to use to parsing and encoding messages within this client
    @@ -366,7 +366,7 @@

    AbstractClient

  • AbstractClient

    protected AbstractClient(T theRawClient,
    -                         Parser theParser)
    + Parser theParser)
    Constructor
    Parameters:
    @@ -469,8 +469,8 @@

    getHost

    • getParser

      -
      public Parser getParser()
      -
      Returns the Parser to use to parsing and encoding messages within +
      public Parser getParser()
      +
      Returns the Parser to use to parsing and encoding messages within this client (may return null)
    @@ -563,12 +563,12 @@

    getUrlString

    @@ -597,12 +597,12 @@

    sendAndReceiveMessage

    @@ -680,8 +680,8 @@

    setHost

    • setParser

      -
      public void setParser(Parser theParser)
      -
      Sets the Parser to use to parsing and encoding messages within +
      public void setParser(Parser theParser)
      +
      Sets the Parser to use to parsing and encoding messages within this client
    @@ -749,9 +749,8 @@

    setSigner

    Parameters:
    theSigner - If provided, sets the Signature Profile signer implementation to use. See http://hl7api.sourceforge.net/hapi-hl7overhttp/specification. - html#SIGNATURE_PROFILE
    + "https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/signature.html" + >https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/signature.html
  • diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/HohClientMultithreaded.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/HohClientMultithreaded.html index e61923e106..c0ff48de07 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/HohClientMultithreaded.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/HohClientMultithreaded.html @@ -168,7 +168,7 @@

    Constructor Summary

    HohClientMultithreaded(String theHost, int thePort, String theUriPath, - Parser theParser) + Parser theParser)
    Constructor
    @@ -179,7 +179,7 @@

    Constructor Summary

    HohClientMultithreaded(URL theUrl, - Parser theParser) + Parser theParser)
    Constructor
    @@ -286,7 +286,7 @@

    HohClientMultithreaded

    public HohClientMultithreaded(String theHost,
                                   int thePort,
                                   String theUriPath,
    -                              Parser theParser)
    + Parser theParser)
    Constructor
    Parameters:
    @@ -320,7 +320,7 @@

    HohClientMultithreaded

  • HohClientMultithreaded

    public HohClientMultithreaded(URL theUrl,
    -                              Parser theParser)
    + Parser theParser)
    Constructor
    Parameters:
    diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/HohClientSimple.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/HohClientSimple.html index b85b649ae2..3e3cfe8d90 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/HohClientSimple.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/client/HohClientSimple.html @@ -150,7 +150,7 @@

    Constructor Summary

    HohClientSimple(String theHost, int thePort, String theUriPath, - Parser theParser) + Parser theParser)
    Constructor
    @@ -161,7 +161,7 @@

    Constructor Summary

    HohClientSimple(URL theUrl, - Parser theParser) + Parser theParser)
    Constructor
    @@ -265,7 +265,7 @@

    HohClientSimple

    public HohClientSimple(String theHost,
                            int thePort,
                            String theUriPath,
    -                       Parser theParser)
    + Parser theParser)
    Constructor
    Parameters:
    @@ -299,7 +299,7 @@

    HohClientSimple

  • HohClientSimple

    public HohClientSimple(URL theUrl,
    -                       Parser theParser)
    + Parser theParser)
    Constructor
    Parameters:
    diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/server/HohServlet.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/server/HohServlet.html index e62a176c2c..4a775eab47 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/server/HohServlet.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/hapi/server/HohServlet.html @@ -174,14 +174,14 @@

    Method Summary

    void -setApplication(ReceivingApplication<? extends Message> theApplication) +setApplication(ReceivingApplication<? extends Message> theApplication)
    Route all messages to a single application
    void -setApplicationRouter(ApplicationRouter theApplicationRouter) +setApplicationRouter(ApplicationRouter theApplicationRouter)
    Constructor which accepts an ApplicationRouter which may direct different types of messages to different applications
    @@ -260,7 +260,7 @@

    Method Detail

  • diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/listener/IRelayListener.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/listener/IRelayListener.html index 20efe55125..069755972f 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/listener/IRelayListener.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/listener/IRelayListener.html @@ -132,8 +132,8 @@

    Method Summary

    void -registerApplication(ApplicationRouter.AppRoutingData theAppRouting, - ReceivingApplication<? extends Message> theReceivingApplication)  +registerApplication(ApplicationRouter.AppRoutingData theAppRouting, + ReceivingApplication<? extends Message> theReceivingApplication) 
  • @@ -129,8 +129,8 @@

    Methods inherited from interface org.springframework.beans.factory.Name
  • -

    Methods inherited from interface ca.uhn.hl7v2.protocol.ReceivingApplication

    -canProcess, processMessage
  • +

    Methods inherited from interface ca.uhn.hl7v2.protocol.ReceivingApplication

    +canProcess, processMessage diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/RelayHttpSender.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/RelayHttpSender.html index ca51153627..cb860cd870 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/RelayHttpSender.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/RelayHttpSender.html @@ -120,13 +120,13 @@

    Class RelayHttpSender

  • All Implemented Interfaces:
    -
    IClient, IClientMultithreaded, IRelaySender<Message>, ReceivingApplication<Message>, org.springframework.beans.factory.Aware, org.springframework.beans.factory.BeanNameAware, org.springframework.beans.factory.InitializingBean, org.springframework.beans.factory.NamedBean
    +
    IClient, IClientMultithreaded, IRelaySender<Message>, ReceivingApplication<Message>, org.springframework.beans.factory.Aware, org.springframework.beans.factory.BeanNameAware, org.springframework.beans.factory.InitializingBean, org.springframework.beans.factory.NamedBean


    public class RelayHttpSender
     extends HohClientMultithreaded
    -implements IRelaySender<Message>, org.springframework.beans.factory.BeanNameAware, org.springframework.beans.factory.InitializingBean
    +implements IRelaySender<Message>, org.springframework.beans.factory.BeanNameAware, org.springframework.beans.factory.InitializingBean
  • @@ -168,7 +168,7 @@

    Method Summary

    boolean -canProcess(Message theMessage) +canProcess(Message theMessage)
    Returns true
    @@ -183,8 +183,8 @@

    Method Summary

    getIoRetries()  -Message -processMessage(Message theMessage, +Message +processMessage(Message theMessage, Map<String,Object> theMetadata) @@ -282,13 +282,13 @@

    afterPropertiesSet

    @@ -324,16 +324,16 @@

    getIoRetries

    diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/package-summary.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/package-summary.html index c3037d249f..8a60dd52d9 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/package-summary.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/package-summary.html @@ -84,7 +84,7 @@

    Package ca.uhn.hl7v2.hoh.relay.sender

    -IRelaySender<T extends Message> +IRelaySender<T extends Message>   diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/package-tree.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/package-tree.html index d97735bb35..87161e5c5d 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/package-tree.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/relay/sender/package-tree.html @@ -98,10 +98,10 @@

    Interface Hierarchy

    • org.springframework.beans.factory.NamedBean
    • -
    • ca.uhn.hl7v2.protocol.ReceivingApplication<T> +
    • ca.uhn.hl7v2.protocol.ReceivingApplication<T>
      • ca.uhn.hl7v2.hoh.relay.sender.IRelaySender<T> (also extends org.springframework.beans.factory.NamedBean)
      diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/util/HapiSocketTlsFactoryWrapper.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/util/HapiSocketTlsFactoryWrapper.html index 2d169d4584..2c49582d53 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/util/HapiSocketTlsFactoryWrapper.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/util/HapiSocketTlsFactoryWrapper.html @@ -110,13 +110,13 @@

      Class HapiSocketTlsF
    • All Implemented Interfaces:
      -
      SocketFactory
      +
      SocketFactory


      public class HapiSocketTlsFactoryWrapper
       extends Object
      -implements SocketFactory
      +implements SocketFactory
      Wraps an HoH ISocketFactory instance for use in HAPI. Note that the wrapped methods will only be used to create TLS socket instances.
    • @@ -232,7 +232,7 @@

      createSocket

      throws IOException
      Specified by:
      -
      createSocket in interface SocketFactory
      +
      createSocket in interface SocketFactory
      Throws:
      IOException
      @@ -248,7 +248,7 @@

      createTlsSocket

      throws IOException
      Specified by:
      -
      createTlsSocket in interface SocketFactory
      +
      createTlsSocket in interface SocketFactory
      Throws:
      IOException
      @@ -264,7 +264,7 @@

      createServerSocket

      throws IOException
      Specified by:
      -
      createServerSocket in interface SocketFactory
      +
      createServerSocket in interface SocketFactory
      Throws:
      IOException
      @@ -280,7 +280,7 @@

      createTlsServerSocket

      throws IOException
      Specified by:
      -
      createTlsServerSocket in interface SocketFactory
      +
      createTlsServerSocket in interface SocketFactory
      Throws:
      IOException
      @@ -296,7 +296,7 @@

      configureNewAcceptedSocket

      throws SocketException
      Specified by:
      -
      configureNewAcceptedSocket in interface SocketFactory
      +
      configureNewAcceptedSocket in interface SocketFactory
      Throws:
      SocketException
      diff --git a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/util/package-tree.html b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/util/package-tree.html index ba7db334bf..5ef9823b4b 100644 --- a/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/util/package-tree.html +++ b/hapi-hl7overhttp/apidocs/ca/uhn/hl7v2/hoh/util/package-tree.html @@ -84,7 +84,7 @@

      Class Hierarchy

    • ca.uhn.hl7v2.hoh.util.GZipUtils
    • -
    • ca.uhn.hl7v2.hoh.util.HapiSocketTlsFactoryWrapper (implements ca.uhn.hl7v2.util.SocketFactory)
    • +
    • ca.uhn.hl7v2.hoh.util.HapiSocketTlsFactoryWrapper (implements ca.uhn.hl7v2.util.SocketFactory)
    • ca.uhn.hl7v2.hoh.util.HTTPUtils
    • ca.uhn.hl7v2.hoh.util.IOUtils
    • ca.uhn.hl7v2.hoh.util.KeystoreUtils
    • ca.uhn.hl7v2.hoh.relay.Launcher
    • -
    • ca.uhn.hl7v2.llp.LowerLayerProtocol +
    • ca.uhn.hl7v2.llp.LowerLayerProtocol @@ -218,10 +218,10 @@

      Interface Hierarchy

    • org.springframework.beans.factory.NamedBean
    • -
    • ca.uhn.hl7v2.protocol.ReceivingApplication<T> +
    • ca.uhn.hl7v2.protocol.ReceivingApplication<T>
      • ca.uhn.hl7v2.hoh.relay.sender.IRelaySender<T> (also extends org.springframework.beans.factory.NamedBean)
      diff --git a/hapi-hl7overhttp/apidocs/serialized-form.html b/hapi-hl7overhttp/apidocs/serialized-form.html index fa1f2cec61..2036f25514 100644 --- a/hapi-hl7overhttp/apidocs/serialized-form.html +++ b/hapi-hl7overhttp/apidocs/serialized-form.html @@ -171,7 +171,7 @@

      Serialized Fields

    • diff --git a/hapi-hl7overhttp/apidocs/src-html/ca/uhn/hl7v2/hoh/api/IClient.html b/hapi-hl7overhttp/apidocs/src-html/ca/uhn/hl7v2/hoh/api/IClient.html index 42ef65faa9..2e5ad12ef7 100644 --- a/hapi-hl7overhttp/apidocs/src-html/ca/uhn/hl7v2/hoh/api/IClient.html +++ b/hapi-hl7overhttp/apidocs/src-html/ca/uhn/hl7v2/hoh/api/IClient.html @@ -125,8 +125,8 @@ 117 * @param theSigner 118 * If provided, sets the Signature Profile signer implementation 119 * to use. See <a href= -120 * "http://hl7api.sourceforge.net/hapi-hl7overhttp/specification.html#SIGNATURE_PROFILE" -121 * >http://hl7api.sourceforge.net/hapi-hl7overhttp/specification. +120 * "https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/signature.html" +121 * >https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/specification. 122 * html#SIGNATURE_PROFILE</a> 123 */ 124 void setSigner(ISigner theSigner); diff --git a/hapi-hl7overhttp/cobertura/ca.uhn.hl7v2.hoh.api.IClient.html b/hapi-hl7overhttp/cobertura/ca.uhn.hl7v2.hoh.api.IClient.html index 9de3a37b17..a87db6d2d7 100644 --- a/hapi-hl7overhttp/cobertura/ca.uhn.hl7v2.hoh.api.IClient.html +++ b/hapi-hl7overhttp/cobertura/ca.uhn.hl7v2.hoh.api.IClient.html @@ -256,9 +256,9 @@
      Coverage Report - ca.uhn.hl7v2.hoh.api.IClient
       119  
                *            to use. See <a href=
       120   -
                *            "http://hl7api.sourceforge.net/hapi-hl7overhttp/specification.html#SIGNATURE_PROFILE"
      +
                *            "https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/signature.html"
       121   -
                *            >http://hl7api.sourceforge.net/hapi-hl7overhttp/specification.
      +
                *            >https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/specification.
       122  
                *            html#SIGNATURE_PROFILE</a>
       123   diff --git a/hapi-hl7overhttp/cryptography_and_keystores.html b/hapi-hl7overhttp/cryptography_and_keystores.html index 49e9105d1b..166043af98 100644 --- a/hapi-hl7overhttp/cryptography_and_keystores.html +++ b/hapi-hl7overhttp/cryptography_and_keystores.html @@ -165,7 +165,7 @@

      TLS Mutual Authentication

      As a note, a keystore file containing private keys is commonly referred to as a keystore, but a keystore file containing public certificates is commonly referred to as a truststore. These do not neccesarily need to be two separate files (the - CustomCertificateTlsSocketFactory + CustomCertificateTlsSocketFactory within the HL7 over HTTP library uses a single file for instance) but many applications will separate these out.)

      diff --git a/hapi-hl7overhttp/index.html b/hapi-hl7overhttp/index.html index e3b10320fd..32fdeb4a51 100644 --- a/hapi-hl7overhttp/index.html +++ b/hapi-hl7overhttp/index.html @@ -95,8 +95,8 @@

      HL7 over HTTP

      - - + +
      diff --git a/hapi-hl7overhttp/pom.xml b/hapi-hl7overhttp/pom.xml index 69ac5ece81..df7febdd25 100644 --- a/hapi-hl7overhttp/pom.xml +++ b/hapi-hl7overhttp/pom.xml @@ -448,7 +448,7 @@ false http://docs.oracle.com/javase/6/docs/api/ - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-hl7overhttp/src/main/java/ca/uhn/hl7v2/hoh/api/IClient.java b/hapi-hl7overhttp/src/main/java/ca/uhn/hl7v2/hoh/api/IClient.java index 9d88b8654a..29d0d10a7c 100644 --- a/hapi-hl7overhttp/src/main/java/ca/uhn/hl7v2/hoh/api/IClient.java +++ b/hapi-hl7overhttp/src/main/java/ca/uhn/hl7v2/hoh/api/IClient.java @@ -117,8 +117,8 @@ public interface IClient { * @param theSigner * If provided, sets the Signature Profile signer implementation * to use. See http://hl7api.sourceforge.net/hapi-hl7overhttp/specification. + * "https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/signature.html" + * >https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/specification. * html#SIGNATURE_PROFILE */ void setSigner(ISigner theSigner); diff --git a/hapi-hl7overhttp/src/main/relayresources/conf/config.xml b/hapi-hl7overhttp/src/main/relayresources/conf/config.xml index 54da9ba0a3..7be26fd4e0 100644 --- a/hapi-hl7overhttp/src/main/relayresources/conf/config.xml +++ b/hapi-hl7overhttp/src/main/relayresources/conf/config.xml @@ -9,7 +9,7 @@ started up. This configuration file has three example beans, but you may add as many as you like. See the following URL for more information on configuration options: -http://hl7api.sourceforge.net/hapi-hl7overhttp/relay_config.html +https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/relay_config.html --> diff --git a/hapi-hl7overhttp/src/site/xdoc/cryptography_and_keystores.xml b/hapi-hl7overhttp/src/site/xdoc/cryptography_and_keystores.xml index 236fdd4439..ea38f420ba 100644 --- a/hapi-hl7overhttp/src/site/xdoc/cryptography_and_keystores.xml +++ b/hapi-hl7overhttp/src/site/xdoc/cryptography_and_keystores.xml @@ -75,7 +75,7 @@ As a note, a keystore file containing private keys is commonly referred to as a keystore, but a keystore file containing public certificates is commonly referred to as a truststore. These do not neccesarily need to be two separate files (the - CustomCertificateTlsSocketFactory + CustomCertificateTlsSocketFactory within the HL7 over HTTP library uses a single file for instance) but many applications will separate these out.)

      diff --git a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/hapi/server/HohServletTest.MyReceivingApp.html b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/hapi/server/HohServletTest.MyReceivingApp.html index a2665984db..b89e1d2e6a 100644 --- a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/hapi/server/HohServletTest.MyReceivingApp.html +++ b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/hapi/server/HohServletTest.MyReceivingApp.html @@ -110,7 +110,7 @@

      Class HohServletTe
    • All Implemented Interfaces:
      -
      ReceivingApplication<Message>
      +
      ReceivingApplication<Message>
      Enclosing class:
      @@ -120,7 +120,7 @@

      Class HohServletTe
      public class HohServletTest.MyReceivingApp
       extends Object
      -implements ReceivingApplication<Message>
      +implements ReceivingApplication<Message>

    @@ -158,11 +158,11 @@

    Method Summary

    boolean -canProcess(Message theMessage)  +canProcess(Message theMessage)  -Message -processMessage(Message theMessage, +Message +processMessage(Message theMessage, Map<String,Object> theMetadata)  @@ -210,10 +210,10 @@

    Method Detail

    @@ -223,16 +223,16 @@

    canProcess

    diff --git a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/hapi/server/package-tree.html b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/hapi/server/package-tree.html index b878edcee8..8d0d41eb4b 100644 --- a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/hapi/server/package-tree.html +++ b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/hapi/server/package-tree.html @@ -83,7 +83,7 @@

    Class Hierarchy

  • java.lang.Object
  • diff --git a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/LlpServerTest.html b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/LlpServerTest.html index 5b56a3292d..62a586a821 100644 --- a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/LlpServerTest.html +++ b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/LlpServerTest.html @@ -110,13 +110,13 @@

    Class LlpServerTest

  • All Implemented Interfaces:
    -
    ConnectionListener, ReceivingApplication<Message>
    +
    ConnectionListener, ReceivingApplication<Message>


    public class LlpServerTest
     extends Object
    -implements ReceivingApplication<Message>, ConnectionListener
    +implements ReceivingApplication<Message>, ConnectionListener
  • @@ -162,19 +162,19 @@

    Method Summary

    boolean -canProcess(Message theArg0)  +canProcess(Message theArg0)  void -connectionDiscarded(Connection theArg0)  +connectionDiscarded(Connection theArg0)  void -connectionReceived(Connection theArg0)  +connectionReceived(Connection theArg0)  -Message -processMessage(Message theArg0, +Message +processMessage(Message theArg0, Map<String,Object> metadata)  @@ -339,10 +339,10 @@

    after

    @@ -352,16 +352,16 @@

    canProcess

    @@ -371,10 +371,10 @@

    processMessage

    @@ -384,10 +384,10 @@

    connectionDiscarded

    diff --git a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/ServerSocketThreadForTesting.html b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/ServerSocketThreadForTesting.html index 4b4fa23442..3b71d39127 100644 --- a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/ServerSocketThreadForTesting.html +++ b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/ServerSocketThreadForTesting.html @@ -231,7 +231,7 @@

    Method Summary

    getMessage()  -Message +Message getReply()  @@ -260,7 +260,7 @@

    Method Summary

    void -setReply(Message theReply)  +setReply(Message theReply)  void @@ -430,7 +430,7 @@

    getMessage

    • getReply

      -
      public Message getReply()
      +
      public Message getReply()
      Returns:
      the reply
      @@ -502,7 +502,7 @@

      setMessage

      • setReply

        -
        public void setReply(Message theReply)
        +
        public void setReply(Message theReply)
        Parameters:
        theReply - the reply to set
        diff --git a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/package-tree.html b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/package-tree.html index b31b6bba1d..1d93efd4fa 100644 --- a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/package-tree.html +++ b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/llp/package-tree.html @@ -83,7 +83,7 @@

        Class Hierarchy

      • java.lang.Object
        • ca.uhn.hl7v2.hoh.llp.LlpClientTest
        • -
        • ca.uhn.hl7v2.hoh.llp.LlpServerTest (implements ca.uhn.hl7v2.app.ConnectionListener, ca.uhn.hl7v2.protocol.ReceivingApplication<T>)
        • +
        • ca.uhn.hl7v2.hoh.llp.LlpServerTest (implements ca.uhn.hl7v2.app.ConnectionListener, ca.uhn.hl7v2.protocol.ReceivingApplication<T>)
        • java.lang.Thread (implements java.lang.Runnable)
          • ca.uhn.hl7v2.hoh.llp.ServerSocketThreadForTesting
          • diff --git a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/relay/sender/HttpSenderTest.html b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/relay/sender/HttpSenderTest.html index 62fbf0d736..3db6fe5408 100644 --- a/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/relay/sender/HttpSenderTest.html +++ b/hapi-hl7overhttp/testapidocs/ca/uhn/hl7v2/hoh/relay/sender/HttpSenderTest.html @@ -245,17 +245,17 @@

            before

          • testSenderWithTls

            public void testSenderWithTls()
            -                       throws HL7Exception,
            +                       throws HL7Exception,
                                           IOException,
            -                              LLPException,
            +                              LLPException,
                                           InterruptedException,
                                           DecodeException,
                                           EncodeException
            Throws:
            -
            HL7Exception
            +
            HL7Exception
            IOException
            -
            LLPException
            +
            LLPException
            InterruptedException
            DecodeException
            EncodeException
            @@ -269,17 +269,17 @@

            testSenderWithTls

          • testErrorMessageReferencesRelay

            public void testErrorMessageReferencesRelay()
            -                                     throws HL7Exception,
            +                                     throws HL7Exception,
                                                         IOException,
            -                                            LLPException,
            +                                            LLPException,
                                                         InterruptedException,
                                                         DecodeException,
                                                         EncodeException
            Throws:
            -
            HL7Exception
            +
            HL7Exception
            IOException
            -
            LLPException
            +
            LLPException
            InterruptedException
            DecodeException
            EncodeException
            diff --git a/hapi-hl7overhttp/testapidocs/overview-tree.html b/hapi-hl7overhttp/testapidocs/overview-tree.html index f1c170b38f..b9660b032d 100644 --- a/hapi-hl7overhttp/testapidocs/overview-tree.html +++ b/hapi-hl7overhttp/testapidocs/overview-tree.html @@ -101,7 +101,7 @@

            Class Hierarchy

          • ca.uhn.hl7v2.hoh.raw.client.HohRawClientSimpleTest
          • ca.uhn.hl7v2.hoh.raw.server.HohRawServletTest (implements ca.uhn.hl7v2.hoh.api.IAuthorizationServerCallback, ca.uhn.hl7v2.hoh.api.IMessageHandler<T>)
          • ca.uhn.hl7v2.hoh.hapi.server.HohServletTest
          • -
          • ca.uhn.hl7v2.hoh.hapi.server.HohServletTest.MyReceivingApp (implements ca.uhn.hl7v2.protocol.ReceivingApplication<T>)
          • +
          • ca.uhn.hl7v2.hoh.hapi.server.HohServletTest.MyReceivingApp (implements ca.uhn.hl7v2.protocol.ReceivingApplication<T>)
          • ca.uhn.hl7v2.hoh.util.Holder<T>
          • ca.uhn.hl7v2.hoh.relay.sender.HttpSenderTest
          • java.io.InputStream (implements java.io.Closeable) @@ -111,7 +111,7 @@

            Class Hierarchy

          • ca.uhn.hl7v2.hoh.util.KeystoreUtilsTest
          • ca.uhn.hl7v2.hoh.llp.LlpClientTest
          • -
          • ca.uhn.hl7v2.hoh.llp.LlpServerTest (implements ca.uhn.hl7v2.app.ConnectionListener, ca.uhn.hl7v2.protocol.ReceivingApplication<T>)
          • +
          • ca.uhn.hl7v2.hoh.llp.LlpServerTest (implements ca.uhn.hl7v2.app.ConnectionListener, ca.uhn.hl7v2.protocol.ReceivingApplication<T>)
          • ca.uhn.hl7v2.hoh.util.RandomServerPortProvider
          • ca.uhn.hl7v2.hoh.encoder.ResponseCodeTest
          • java.lang.Thread (implements java.lang.Runnable) diff --git a/hapi-hl7overhttp/xref/ca/uhn/hl7v2/hoh/api/IClient.html b/hapi-hl7overhttp/xref/ca/uhn/hl7v2/hoh/api/IClient.html index c04e709b39..7df920ae6a 100644 --- a/hapi-hl7overhttp/xref/ca/uhn/hl7v2/hoh/api/IClient.html +++ b/hapi-hl7overhttp/xref/ca/uhn/hl7v2/hoh/api/IClient.html @@ -127,8 +127,8 @@ 117 * @param theSigner 118 * If provided, sets the Signature Profile signer implementation 119 * to use. See <a href= -120 * "http://hl7api.sourceforge.net/hapi-hl7overhttp/specification.html#SIGNATURE_PROFILE" -121 * >http://hl7api.sourceforge.net/hapi-hl7overhttp/specification. +120 * "https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/signature.htmlhttps://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/signature.html" +121 * >https://hapifhir.github.io/hapi-hl7v2/hapi-hl7overhttp/specification. 122 * html#SIGNATURE_PROFILE</a> 123 */ 124 void setSigner(ISigner theSigner); diff --git a/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/mvnplugin/XsdConfGenMojo.java b/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/mvnplugin/XsdConfGenMojo.java index 55b216053d..84b617472e 100644 --- a/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/mvnplugin/XsdConfGenMojo.java +++ b/hapi-sourcegen/src/main/java/ca/uhn/hl7v2/mvnplugin/XsdConfGenMojo.java @@ -106,7 +106,7 @@ public class XsdConfGenMojo extends AbstractMojo { private String targetDirectory; /** - * The Message Workbench tool generally creates segment groups as two level + * The Messaging Workbench tool generally creates segment groups as two level * structures, with an outer group which has only a single child which is * the actual group. If this is set to true (which is the default), these * "bogus" groups are filtered. diff --git a/hapi-sourcegen/src/site/xdoc/confgen-usage.xml.vm b/hapi-sourcegen/src/site/xdoc/confgen-usage.xml.vm index 467a9e706e..4195bb9a04 100644 --- a/hapi-sourcegen/src/site/xdoc/confgen-usage.xml.vm +++ b/hapi-sourcegen/src/site/xdoc/confgen-usage.xml.vm @@ -46,7 +46,7 @@ It will mess up the indenting in a few spots

            Generating a conformance profile requires a free tool - called Message Workbench. Message Workbench is free, and can be downloaded + called Messaging Workbench. Messaging Workbench is free, and can be downloaded from the HL7 tools page (look for "Messaging Workbench" under "V2 Tools"). Note that this tool is Windows only. diff --git a/hapi-structures-superstructures/pom.xml b/hapi-structures-superstructures/pom.xml index f37165937a..2392bbdd01 100644 --- a/hapi-structures-superstructures/pom.xml +++ b/hapi-structures-superstructures/pom.xml @@ -330,7 +330,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v21/pom.xml b/hapi-structures-v21/pom.xml index 7b52d73c8e..aab260edc6 100644 --- a/hapi-structures-v21/pom.xml +++ b/hapi-structures-v21/pom.xml @@ -91,7 +91,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v22/pom.xml b/hapi-structures-v22/pom.xml index bb0308b82b..f83abb5589 100644 --- a/hapi-structures-v22/pom.xml +++ b/hapi-structures-v22/pom.xml @@ -90,7 +90,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v23/pom.xml b/hapi-structures-v23/pom.xml index 65fb055dca..f1c12b22dd 100644 --- a/hapi-structures-v23/pom.xml +++ b/hapi-structures-v23/pom.xml @@ -90,7 +90,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v231-alternatenames/pom.xml b/hapi-structures-v231-alternatenames/pom.xml index 95bef44472..d3ec71ebb5 100644 --- a/hapi-structures-v231-alternatenames/pom.xml +++ b/hapi-structures-v231-alternatenames/pom.xml @@ -130,7 +130,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v231/pom.xml b/hapi-structures-v231/pom.xml index 89e89489f0..e401893914 100644 --- a/hapi-structures-v231/pom.xml +++ b/hapi-structures-v231/pom.xml @@ -91,7 +91,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v24/pom.xml b/hapi-structures-v24/pom.xml index b5f741d3d4..55b4a100cc 100644 --- a/hapi-structures-v24/pom.xml +++ b/hapi-structures-v24/pom.xml @@ -90,7 +90,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v25/pom.xml b/hapi-structures-v25/pom.xml index 21dce1ccee..c1ed733d4e 100644 --- a/hapi-structures-v25/pom.xml +++ b/hapi-structures-v25/pom.xml @@ -90,7 +90,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v251/pom.xml b/hapi-structures-v251/pom.xml index b1d9f910b6..03e2e785c4 100644 --- a/hapi-structures-v251/pom.xml +++ b/hapi-structures-v251/pom.xml @@ -90,7 +90,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v26/pom.xml b/hapi-structures-v26/pom.xml index 5cfe7fb670..a6cd4798e6 100644 --- a/hapi-structures-v26/pom.xml +++ b/hapi-structures-v26/pom.xml @@ -91,7 +91,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v27/pom.xml b/hapi-structures-v27/pom.xml index 93e5bb5512..10369bf637 100644 --- a/hapi-structures-v27/pom.xml +++ b/hapi-structures-v27/pom.xml @@ -91,7 +91,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v271/pom.xml b/hapi-structures-v271/pom.xml index 2065d29909..8366e74958 100644 --- a/hapi-structures-v271/pom.xml +++ b/hapi-structures-v271/pom.xml @@ -92,7 +92,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v28/pom.xml b/hapi-structures-v28/pom.xml index c91bb9ec9c..afe1fd2faf 100644 --- a/hapi-structures-v28/pom.xml +++ b/hapi-structures-v28/pom.xml @@ -91,7 +91,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-structures-v281/pom.xml b/hapi-structures-v281/pom.xml index 3c79d408b1..babb3aec7e 100644 --- a/hapi-structures-v281/pom.xml +++ b/hapi-structures-v281/pom.xml @@ -125,7 +125,7 @@ true true - http://hl7api.sourceforge.net/base/apidocs/ + https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ diff --git a/hapi-testpanel/index.html b/hapi-testpanel/index.html index 202e2c4292..a6ad05b4e1 100644 --- a/hapi-testpanel/index.html +++ b/hapi-testpanel/index.html @@ -80,8 +80,8 @@

            HAPI TestPanel

            - - + +
            diff --git a/hapi-testpanel/install.html b/hapi-testpanel/install.html index 39e3df6503..9d1c9a05f5 100644 --- a/hapi-testpanel/install.html +++ b/hapi-testpanel/install.html @@ -180,7 +180,7 @@

            Sending a message to yourself This help document is not yet complete. Want to help finish it? - Get in touch with James Agnew. + Get in touch with James Agnew.

            diff --git a/hapi-testpanel/src/main/java/ca/uhn/hl7v2/testpanel/ui/NothingSelectedPanel.java b/hapi-testpanel/src/main/java/ca/uhn/hl7v2/testpanel/ui/NothingSelectedPanel.java index 83f30d3b3b..2326a2ca2b 100644 --- a/hapi-testpanel/src/main/java/ca/uhn/hl7v2/testpanel/ui/NothingSelectedPanel.java +++ b/hapi-testpanel/src/main/java/ca/uhn/hl7v2/testpanel/ui/NothingSelectedPanel.java @@ -115,7 +115,7 @@ public void actionPerformed(ActionEvent e) { @Override public void mouseClicked(MouseEvent e) { try { - Desktop.getDesktop().browse(new URI("http://hl7api.sourceforge.net/license.html")); + Desktop.getDesktop().browse(new URI("https://hapifhir.github.io/hapi-hl7v2/license.html")); } catch (IOException e1) { e1.printStackTrace(); } catch (URISyntaxException e1) { diff --git a/hapi-testpanel/src/site/xdoc/install.xml b/hapi-testpanel/src/site/xdoc/install.xml index 28a2b8fb08..d333cb3d5c 100644 --- a/hapi-testpanel/src/site/xdoc/install.xml +++ b/hapi-testpanel/src/site/xdoc/install.xml @@ -101,7 +101,7 @@

            This help document is not yet complete. Want to help finish it? - Get in touch with James Agnew. + Get in touch with James Agnew.

            diff --git a/hapi-testpanel/src/site/xdoc/validation.xml b/hapi-testpanel/src/site/xdoc/validation.xml index 0537c1b2c8..22e95e0382 100644 --- a/hapi-testpanel/src/site/xdoc/validation.xml +++ b/hapi-testpanel/src/site/xdoc/validation.xml @@ -23,7 +23,7 @@

            By default, TestPanel uses HAPI's built in validation, known as - DefaultValidation + DefaultValidation . The validation performs basic data type checks, such as making sure that NM datatype fields do not contain text, TS datatype fields contain valid dates, etc. @@ -49,8 +49,8 @@

            - Conformance profiles are generally created using a tool called Message Workbench (MWB), - which is available here. + Conformance profiles are generally created using a tool called Messaging Workbench (MWB), + which is available here.

            diff --git a/hapi-testpanel/validation.html b/hapi-testpanel/validation.html index d88b330800..d2e835653a 100644 --- a/hapi-testpanel/validation.html +++ b/hapi-testpanel/validation.html @@ -79,7 +79,7 @@

            Message Validation

            By default, TestPanel uses HAPI's built in validation, known as - DefaultValidation + DefaultValidation . The validation performs basic data type checks, such as making sure that NM datatype fields do not contain text, TS datatype fields contain valid dates, etc. @@ -109,8 +109,8 @@

            Conformance Profiles

            - Conformance profiles are generally created using a tool called Message Workbench (MWB), - which is available here. + Conformance profiles are generally created using a tool called Messaging Workbench (MWB), + which is available here.

            diff --git a/pom.xml b/pom.xml index 6736000da9..eb32dfe42c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ pom 2.6.0 HAPI - The Open Source Java HL7 Parser and API - http://hl7api.sourceforge.net/ + https://hapifhir.github.io/hapi-hl7v2/ 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 @@ -564,8 +564,8 @@ -
            -
            +
            +

            @@ -593,8 +593,8 @@ -

            -
            +
            +
            @@ -622,8 +622,8 @@ -
            -
            +
            +
            diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 3ec4af1119..e756718f98 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -328,7 +328,7 @@ process unknown versions of HL7 (e.g. 2.99) if configured to allow this. See GenericModelClassFactory + GenericModelClassFactory ]]> for more information. @@ -428,7 +428,7 @@
          • When GenericParser parses a message, the - Parser + Parser instance associated with the message is set appropriately to either the Pipe Parser or the XML Parser. This means that calls to generateAck().encode() @@ -448,11 +448,11 @@ that was parsed by an XML parser (for instance on an ST, or another datatype). - ConnectionHub]]> + ConnectionHub]]> and - SimpleServer]]> + SimpleServer]]> now each accept a custom - socket factory]]> + socket factory]]> instance, which can be used to allow custom configuration on sockets, or special TLS configurations. This checkin also corrects an issue where the "tls" parameter on ConnectionHub was not honoured. @@ -468,7 +468,7 @@ AbstractTextPrimitive#getValueAsHtml() + AbstractTextPrimitive#getValueAsHtml() ]]> now properly escapes HTML reserved characters: @@ -478,7 +478,7 @@ Fix an issue that prevented the sample code for Custom Model Classes + Custom Model Classes ]]> from working properly. Thanks to Michael Connor for reporting. @@ -497,7 +497,7 @@ Improve error message in ExtendedMinLowerLayerProtocol + ExtendedMinLowerLayerProtocol ]]> when an incoming message can't be processed because it contains an invalid MSH segment. @@ -506,14 +506,14 @@ Allow ReceivingApplicationExceptionHandler + ReceivingApplicationExceptionHandler ]]> to process exceptions even when un-parseable messages are received. New parser configuration option for customizing Unexpected segment (e.g. Z-segment) behaviour + Unexpected segment (e.g. Z-segment) behaviour ]]> in terms of where in the structure the segment gets placed. Thanks to Michael Connor for suggesting this! @@ -532,7 +532,7 @@ Introduce new PipeParser non-greedy mode + non-greedy mode ]]> which can be used to give the parser hints on how to proceed when the choice of where to put the next @@ -623,9 +623,9 @@ in three ways: -
          • OBX getOBX(), which returns the first repetition, creating it if neccesary -
          • OBX getOBX(int rep), which returns a specific repetition -
          • List<OBX> getOBXAll(), which returns all repetitions (or an empty list if there are none) +
          • OBX getOBX(), which returns the first repetition, creating it if neccesary +
          • OBX getOBX(int rep), which returns a specific repetition +
          • List<OBX> getOBXAll(), which returns all repetitions (or an empty list if there are none)
          ]]> @@ -639,13 +639,13 @@
          ]]> In addition, MinLowerLayerProtocol + MinLowerLayerProtocol ]]> has received a new constructor which accepts a CharSet as a parameter, meaning that individual LLP instances may have their CharSet specified, as opposed to using a global System Property + System Property

          ]]> Note that a dependency existed in HAPI 2.0-beta1 on XML libraries being @@ -662,7 +662,7 @@ Correct an integer overflow issue when CommonTS#setValue(Calendar) + CommonTS#setValue(Calendar) ]]> is invoked with a calendar containing some high timezone offset values. Thanks to Jason Thompson for reporting and @@ -670,7 +670,7 @@ CommonTS#getValueAsCalendar() + CommonTS#getValueAsCalendar() ]]> now sets the TimeZone associated with the returned Calendar object to have a TZ-offset equivalent to the offset provided in the raw HL7 data (e.g. if the value was "201201010800-0400", Calendar.setTimeZone(TimeZone) will be called with @@ -701,7 +701,7 @@ A new configuration bean, ParserConfiguration + ParserConfiguration ]]> has been added which allows the parser to be configured for specific behaviour. @@ -713,11 +713,11 @@ Add a new method to Hl7InputStreamMessageStringIterator + Hl7InputStreamMessageStringIterator ]]> and Hl7InputStreamMessageIterator + Hl7InputStreamMessageIterator ]]> called setIgnoreComments(boolean) which allows the iterator to ignore lines beginning with a hash (#). This allows you to put @@ -726,7 +726,7 @@ Correct two issues with AbstractPrimitive#parse(String) + AbstractPrimitive#parse(String) ]]> This is the method which is used (for example) if parse is called on an ST type. Previously if an escape sequence (e.g. "Snakes \T\ Ladders") was @@ -765,13 +765,13 @@ String structure types (ST, FT, TX) now have a new method getValueAsHtml() + getValueAsHtml() ]]> which converts any HL7 formatting codes (\H\, \.sp 55\, \.ce\, etc.) in the string to their HTML equivalent. This functionality can also be used to convert any other string containing HL7 formatting codes to the equivalent HTML codes using: FormattedTextEncoder + FormattedTextEncoder ]]> @@ -787,27 +787,27 @@ Minor API changes: -
        • Add a new method to Connection, getRemotePort, which returns the port number of the remote socket the connection is bound to.
        • -
        • Add several new factory methods to ConnectionHub which allow creating a new connection using an instantiated instance of a LowerLayerProtocol implementation instead of just supplying a type to be instantiated by ConnectionHub
        • -
        • Add new method to TwoPortService called getServiceExitedWithException(). In the event that the service exits unexpectedly, this method allows you to retrieve the exception which caused the failure (e.g. a BindException in the event that the port was already in use by another application).
        • -
        • Modify Conformance Profile DefaultValidator so that it can be used to validate individual parts of a message (e.g. only one segment, group, etc.) and not just the entire message
        • +
        • Add a new method to Connection, getRemotePort, which returns the port number of the remote socket the connection is bound to.
        • +
        • Add several new factory methods to ConnectionHub which allow creating a new connection using an instantiated instance of a LowerLayerProtocol implementation instead of just supplying a type to be instantiated by ConnectionHub
        • +
        • Add new method to TwoPortService called getServiceExitedWithException(). In the event that the service exits unexpectedly, this method allows you to retrieve the exception which caused the failure (e.g. a BindException in the event that the port was already in use by another application).
        • +
        • Modify Conformance Profile DefaultValidator so that it can be used to validate individual parts of a message (e.g. only one segment, group, etc.) and not just the entire message
        ]]> Message#parse(java.lang.String) + Message#parse(java.lang.String) ]]> and Message#encode() + Message#encode() ]]> now work correctly when the message parser is an XML based parser. Previously these convenience methods only worked for Pipe parsers. Message#generateACK() + Message#generateACK() ]]> now respects the ModelClassFactory used to build/parse the message from which the ACK is being generated. This means for example that if a CanonicalModelClassFactory is used to construct a message, that same CMCF will be used to @@ -820,7 +820,7 @@ Add a system property to MessageIDGenerator + MessageIDGenerator ]]> which prevents it from failing if it is unable to read or write the message file. (Not that this feature sometimes failed to work in 2.0-beta1. This has been corrected.) @@ -843,7 +843,7 @@ Provide the DefaultValidationWithoutTN + RSP_K21 + RSP_K21 ]]> structure for v2.5.1 and v2.6 now has a repeatable QUERY_RESPONSE group. This addresses an inconsistency in the HL7 specification for those two versions. @@ -879,7 +879,7 @@ ORL_O34 + ORL_O34 ]]> structure for v2.5.1 has two child structures with the same name (SPECIMEN). The second is now named OBSERVATION_REQUEST_SPECIMEN to prevent a recursive loop when parsing an ORL^O34 @@ -887,7 +887,7 @@ ORL_O34 + ORL_O34 ]]> structure for v2.5 is missing an outer group called RESPONSE. This group contains only one nested group, so it doesn't do much but its absence could affect XML encoding. @@ -895,14 +895,14 @@ MRG + MRG ]]> segment for v2.3 should have type XPN in position MRG.7 (Prior Patient Name) instead of type CX. Thanks to Fco. Javier Broullón for reporting. PID + PID ]]> segment for v2.3 should allow repeatable elements in PID-5 (Patient Name). Thanks to Stéphane for reporting. @@ -937,12 +937,12 @@ Fix an issue where calling AbstractPrimitive#parse(String) + AbstractPrimitive#parse(String) ]]> (for example on an ST datatype) would not clear pre-existing extra components + extra components ]]> if any were defined. @@ -954,7 +954,7 @@ beginning to end. For example, in an ORU^R01 message with a populated OBX segment, but no data in the mandatory OBR segment which begins the ORDER_OBSERVATION group (see - reference]]>), + reference]]>), the message would still contain an empty OBR segment when encoded: @@ -973,7 +973,7 @@ ]]> - Group]]> + Group]]> interface now has a new method: isGroup(String). This method allows callers to determine if a child structure is a segment or a group. The only provided implementation, AbstractGroup, implements this method, so the API change should not have any effect on users. @@ -1055,21 +1055,21 @@ HAPI libraries are now available in the Maven Central Repo. Thanks to Francis De Brabandere for figuring out how to make this happen! (Regression in 1.0-beta1) Some structures contained incorrect version information which led to inability to parse Z segments Message types now have a convenience method initQuickstart which sets default values to MSH segment (field separator, message type, etc) - HAPI now has a Maven plugin which generates Message/Group/Segment struxctures based on an HL7 conformance profile. See the conformance]]> page for more information. + HAPI now has a Maven plugin which generates Message/Group/Segment struxctures based on an HL7 conformance profile. See the conformance]]> page for more information. Allow users of HAPI SimpleServer to create an Application that handles errors. The provided patch adds an interface, which should be implemented by exception aware Applications. The application can then re-dispatch the provided ACK, or a create a completely new message. Correct XML encoding of OMD_O03. (OMD_O03.DIET was incorrectly being encoded simply as "DIE") Correct the spelling of the name TIMING in a number of group structures (e.g. OML_O21_TIMING which was previously OML_O21_TIIMING) Update structure classes source generator to use an Apache Velocity based template instead of simple hard-coded string concatenation. This will make it much easier to add new features to the structures in the future. - Message now has a method Message#printStructure()]]>, which returns a useful String for debugging containing a description of the entire structure of the message + Message now has a method Message#printStructure()]]>, which returns a useful String for debugging containing a description of the entire structure of the message GenericParser ignores custom ModelClassFactory implementations passed into its constructor. Thanks to John R for reporting. XML parser now parses subsequent datatype components correctly when a component is missing. E.g. if ED.1 is missing but ED.2 is present: Previously, ED.2 would be parsed as ED.1. Parsing OBX-5 failed when value (as indicated by OBX-2) was a type which requires a table number (IS or ID). HAPI now defaults to table 0. Parsing OBX-5 failed when value (as indicated by OBX-2) was a type which requires a table number (IS or ID). HAPI now defaults to table 0. Add check to ConnectionHub to avoid returning a connection which was explicitly closed. Also update "send and receive" example in documentation to show correct way of discarding a connection using ConnectionHub. HAPI now logs the current version as it is being initialized, for troubleshooting purposes. - Add getters and setters to DT, TM, and TS data types to get and set values using standard Java Date and Calendar objects. (Examples here and here]]>) - Add factory method]]> to PipeParser which returns an instance with validation disabled (useful for one-liner parse routines) - Add system property]]> to allow OBX-2 to contain invalid values and still parse + Add getters and setters to DT, TM, and TS data types to get and set values using standard Java Date and Calendar objects. (Examples here and here]]>) + Add factory method]]> to PipeParser which returns an instance with validation disabled (useful for one-liner parse routines) + Add system property]]> to allow OBX-2 to contain invalid values and still parse diff --git a/src/docs/examples/Create_A_Message.bat b/src/docs/examples/Create_A_Message.bat index d38245ecd6..db7fc804ea 100644 --- a/src/docs/examples/Create_A_Message.bat +++ b/src/docs/examples/Create_A_Message.bat @@ -1,7 +1,7 @@ rem ******************************************* rem * This batch file runs example code rem * -rem * For more info, see: http://hl7api.sourceforge.net/devbyexample.html +rem * For more info, see: https://hapifhir.github.io/hapi-hl7v2/devbyexample.html rem ******************************************* setlocal ENABLEDELAYEDEXPANSION diff --git a/src/docs/examples/Create_A_Message.sh b/src/docs/examples/Create_A_Message.sh index 020e0d041d..7d75609338 100755 --- a/src/docs/examples/Create_A_Message.sh +++ b/src/docs/examples/Create_A_Message.sh @@ -1,7 +1,7 @@ # ******************************************* # * This batch file runs example code # * -# * For more info, see: http://hl7api.sourceforge.net/devbyexample.html +# * For more info, see: https://hapifhir.github.io/hapi-hl7v2/devbyexample.html # ******************************************* CP="." diff --git a/src/docs/examples/Run_Test_Panel.bat b/src/docs/examples/Run_Test_Panel.bat index d86238ea43..c62e8c78ff 100644 --- a/src/docs/examples/Run_Test_Panel.bat +++ b/src/docs/examples/Run_Test_Panel.bat @@ -1,7 +1,7 @@ rem ******************************************* rem * This batch file runs the HAPI test panel rem * -rem * For more info, see: http://hl7api.sourceforge.net/testpanel.html +rem * For more info, see: https://hapifhir.github.io/hapi-hl7v2/hapi-testpanel/index.html rem ******************************************* setlocal ENABLEDELAYEDEXPANSION diff --git a/src/docs/examples/Run_Test_Panel.sh b/src/docs/examples/Run_Test_Panel.sh index 4b5a1d5552..a563b8f195 100755 --- a/src/docs/examples/Run_Test_Panel.sh +++ b/src/docs/examples/Run_Test_Panel.sh @@ -2,7 +2,7 @@ # ******************************************* # * This batch file runs the HAPI test panel # * -# * For more info, see: http://hl7api.sourceforge.net/testpanel.html +# * For more info, see: https://hapifhir.github.io/hapi-hl7v2/hapi-testpanel/index.html # ******************************************* CP="." diff --git a/src/docs/readme.txt b/src/docs/readme.txt index 350d24f348..f94898bbb4 100644 --- a/src/docs/readme.txt +++ b/src/docs/readme.txt @@ -6,7 +6,7 @@ Thanks for downloading HAPI! You have downloaded a distribution of HAPI - the open-sourced HL7 library. For information about HAPI's license, please visit - http://hl7api.sourceforge.net/license.html + https://hapifhir.github.io/hapi-hl7v2/license.html This package also contains several libraries which are licensed under other license agreements. @@ -23,13 +23,13 @@ What's in this distribution? examples/ Contains scripts to run the HAPI examples. Fore more information about - these examples, visit http://hl7api.sourceforge.net/devbyexample.html + these examples, visit https://hapifhir.github.io/hapi-hl7v2/devbyexample.html ------- Including HAPI in your application For information about including HAPI in your application, please visit - http://hl7api.sourceforge.net/using_hapi.html + https://hapifhir.github.io/hapi-hl7v2/getting_started.html Incidentally, we would love to hear success (and non-success) stories! @@ -37,7 +37,7 @@ Including HAPI in your application Getting help HAPI's website has examples covering a number of things you might want to - do using HAPI. See http://hl7api.sourceforge.net/devbyexample.html + do using HAPI. See https://hapifhir.github.io/hapi-hl7v2/devbyexample.html In addition, the HAPI Developer's mailing list is a great place to ask questions and look for answers: diff --git a/src/jdk14docs/readme.txt b/src/jdk14docs/readme.txt index 120acd49d6..ec5f6347f6 100644 --- a/src/jdk14docs/readme.txt +++ b/src/jdk14docs/readme.txt @@ -13,7 +13,7 @@ Thanks for downloading HAPI! You have downloaded a distribution of HAPI - the open-sourced HL7 library. For information about HAPI's license, please visit - http://hl7api.sourceforge.net/license.html + https://hapifhir.github.io/hapi-hl7v2/license.html This package also contains several libraries which are licensed under other license agreements. @@ -30,13 +30,13 @@ What's in this distribution? examples/ Contains scripts to run the HAPI examples. Fore more information about - these examples, visit http://hl7api.sourceforge.net/devbyexample.html + these examples, visit https://hapifhir.github.io/hapi-hl7v2/devbyexample.html ------- Including HAPI in your application For information about including HAPI in your application, please visit - http://hl7api.sourceforge.net/using_hapi.html + https://hapifhir.github.io/hapi-hl7v2/getting_started.html Incidentally, we would love to hear success (and non-success) stories! @@ -44,7 +44,7 @@ Including HAPI in your application Getting help HAPI's website has examples covering a number of things you might want to - do using HAPI. See http://hl7api.sourceforge.net/devbyexample.html + do using HAPI. See https://hapifhir.github.io/hapi-hl7v2/devbyexample.html In addition, the HAPI Developer's mailing list is a great place to ask questions and look for answers: diff --git a/src/site/apt/configuring_hapi.apt b/src/site/apt/configuring_hapi.apt index 2d8bca43e8..0401d0ef7d 100644 --- a/src/site/apt/configuring_hapi.apt +++ b/src/site/apt/configuring_hapi.apt @@ -17,8 +17,8 @@ Configuring HAPI * HAPI Context HAPI can be configured by using one or more instances of - {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/HapiContext.html}HapiContext}}, particularly - its default implementation {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/DefaultHapiContext.html}DefaultHapiContext}}. + {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/HapiContext.html}HapiContext}}, particularly + its default implementation {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/DefaultHapiContext.html}DefaultHapiContext}}. The HAPI Context is the "single point of contact" for configuring HAPI parsers, validators, and server components. It furthermore provides factory methods that obtain parsers, validators etc. that are corresondingly configured: @@ -30,18 +30,18 @@ PipeParser parser = context.getPipeParser(); --------- This code snippet modifies the default configuration by using a custom - {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/parser/ModelClassFactory.html}ModelClassFactory}}. + {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/parser/ModelClassFactory.html}ModelClassFactory}}. The obtained PipeParser is then configured to use this ModelClassFactory. Other configuration items include - {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/impl/builder/ValidationRuleBuilder.html}ValidationRuleBuilder}}, - {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/ValidationContext.html}ValidationContext}} and + {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/impl/builder/ValidationRuleBuilder.html}ValidationRuleBuilder}}, + {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/ValidationContext.html}ValidationContext}} and ParserConfiguration (see below). * HAPI Parser The HAPI Parser may be configured using a - {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/parser/ParserConfiguration.html}ParserConfiguration}} + {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/parser/ParserConfiguration.html}ParserConfiguration}} object. The ParserConfiguration is a bean which sets and retrieves parser configuration diff --git a/src/site/apt/conformance.apt b/src/site/apt/conformance.apt index 70d683c5da..db6372b842 100644 --- a/src/site/apt/conformance.apt +++ b/src/site/apt/conformance.apt @@ -33,7 +33,7 @@ Conformance Class Generator * Usage First, generate a conformance profile using the - {{{http://www.hl7.org/documentcenter/public/wg/ictc/MWB%20Release%206.8.zip}Message Workbench}} tool. + {{{http://www.hl7.org/documentcenter/public/wg/ictc/MWB%20Release%206.8.zip}Messaging Workbench}} tool. This tool will export your profile as an XML file, which can be read by the conformance class generator. Save this file in your project under @@ -90,7 +90,7 @@ target/generated-sources/confgen Runtime Message Validator - The {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/conf/check/DefaultValidator.html}Default Validator}} + The {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/conf/check/DefaultValidator.html}Default Validator}} accepts a conformance profile and validates a message against it at runtime. Example usage: +---------------+ diff --git a/src/site/apt/older_news.apt b/src/site/apt/older_news.apt index fdb809dabc..54af2c9946 100644 --- a/src/site/apt/older_news.apt +++ b/src/site/apt/older_news.apt @@ -49,7 +49,7 @@ What's New - July 11, 2010 The resulting site is here: [REMOVED] - This site has the added useful benefit that it will generate {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/util/Terser.html}Terser}} + This site has the added useful benefit that it will generate {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/util/Terser.html}Terser}} expressions for you, which should make using the Terser a bit easier. I am planning on opening the source code to this app soon, and if anyone would like to diff --git a/src/site/apt/using_maven.apt.vm b/src/site/apt/using_maven.apt.vm index 28b2231c20..78b1241393 100644 --- a/src/site/apt/using_maven.apt.vm +++ b/src/site/apt/using_maven.apt.vm @@ -1,6 +1,6 @@ Downloading HAPI - If you aren't using Maven, HAPI can be downloaded at our {{{http://sourceforge.net/projects/hl7api/files/hl7api/}Sourceforge Download Site}}. + If you aren't using Maven, HAPI can be downloaded at our {{{https://github.com/hapifhir/hapi-hl7v2/releases}GitHub Release Site}}. Adding HAPI to your application diff --git a/src/site/apt/validation.apt b/src/site/apt/validation.apt index 589ed736c2..795140643d 100644 --- a/src/site/apt/validation.apt +++ b/src/site/apt/validation.apt @@ -17,16 +17,16 @@ Validation of HL7 messages The HAPI library offers support for validating HL7 messages by definition of rules that check against constraints on primitive type level, message level, and encoded message level. - [{{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/PrimitiveTypeRule.html}PrimitiveTypeRule}}] + [{{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/PrimitiveTypeRule.html}PrimitiveTypeRule}}] A validation rule that applies to primitive types like ID, IS, NM. PrimitiveTypeRules are enforced every time a primitive value is set. - [{{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/MessageRule.html}MessageRule}}] + [{{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/MessageRule.html}MessageRule}}] A validation rule that applies to a fully populated message object. MessageRules are enforced (depending on runtime configuration) just after an inbound message has been parsed, or just before an outbound message is encoded. - [{{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/EncodingRule.html}EncodingRule}}] + [{{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/EncodingRule.html}EncodingRule}}] A validation rule that applies to encoded message strings. EncodingRules are intended for criteria that are specific to the encoded form of a message, e.g. "no empty tags in an XML message". EncodingRules are enforced (depending on runtime configuration) before an inbound message @@ -42,14 +42,14 @@ Validation of HL7 messages Binding and scope determine which rules are applied to which parts of a certain message. There is a predefined set of default PrimitiveTypeRules that - conform to the HL7 specification for the corresponding types ({{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/impl/DefaultValidation.html}DefaultValidation}}). + conform to the HL7 specification for the corresponding types ({{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/impl/DefaultValidation.html}DefaultValidation}}). This set is used when no other rules have been defined. Other predefined sets are - {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/impl/DefaultValidationWithoutTN.html}DefaultValidationWithoutTN}} - and {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/impl/NoValidation.html}NoValidation}}. + {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/impl/DefaultValidationWithoutTN.html}DefaultValidationWithoutTN}} + and {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/impl/NoValidation.html}NoValidation}}. * ValidationContext - A {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/ValidationContext.html}ValidationContext}} + A {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/ValidationContext.html}ValidationContext}} is the place where Rules and RuleBindings are collected. Parsers and Message Validators can be configured with a <<>> to enforce validation during parsing, encoding, or on demand. @@ -63,7 +63,7 @@ Validation of HL7 messages easy to write and to understand. As the default rule sets have been re-implemented as well, they serve as a - good example. The validation class to be written now extends {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/builder/ValidationRuleBuilder.html}ValidationRuleBuilder}} instead of + good example. The validation class to be written now extends {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/builder/ValidationRuleBuilder.html}ValidationRuleBuilder}} instead of <<>>: +---------------------------------------+ @@ -106,7 +106,7 @@ Validation of HL7 messages } +---------------------------------------+ - To define a custom rule builder, you extend {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/builder/ValidationRuleBuilder.html}ValidationRuleBuilder}} + To define a custom rule builder, you extend {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/builder/ValidationRuleBuilder.html}ValidationRuleBuilder}} or a subclass thereof, and implement the <<>> method. <<>> defines PrimitiveTypeRules that are either valid for all HL7 v2 versions @@ -172,7 +172,7 @@ Validation of HL7 messages +---------------------------------------+ Alternatively, if you prefer composition over inheritance, - you can simply extend {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/validation/builder/DelegatingValidationRuleBuilder.html}DelegatingValidationRuleBuilder}} : + you can simply extend {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/validation/builder/DelegatingValidationRuleBuilder.html}DelegatingValidationRuleBuilder}} : +---------------------------------------+ public class MyCustomRuleBuilder extends DelegatingValidationRuleBuilder { diff --git a/src/site/apt/whatsnew.apt b/src/site/apt/whatsnew.apt index 6a0be387c3..44f0fba603 100644 --- a/src/site/apt/whatsnew.apt +++ b/src/site/apt/whatsnew.apt @@ -23,7 +23,7 @@ Version 1.1 HAPI now includes a Maven Plugin which can be used to translate an HL7 Conformance Profile into a set of HAPI structure objects representing Message/Group/Segment types. See the - {{{http://hl7api.sourceforge.net/conformance.html}conformance}} page + {{{https://hapifhir.github.io/hapi-hl7v2/conformance.html}conformance}} page for more information. @@ -78,7 +78,7 @@ Version 1.1 ** Application Exception Handlers - Application instances may now declare an {{{http://hl7api.sourceforge.net/base/apidocs/ca/uhn/hl7v2/app/ApplicationExceptionHandler.html}additional interface}} which allows them to process + Application instances may now declare an {{{https://hapifhir.github.io/hapi-hl7v2/base/apidocs/ca/uhn/hl7v2/app/ApplicationExceptionHandler.html}additional interface}} which allows them to process exceptions and optionally override the system generated response message. (Thanks to Gabriel Landais) +----------------+ diff --git a/src/site/resources/conf/compiler_manual/Contact_Information.htm b/src/site/resources/conf/compiler_manual/Contact_Information.htm index ce75a48541..52f072f962 100644 --- a/src/site/resources/conf/compiler_manual/Contact_Information.htm +++ b/src/site/resources/conf/compiler_manual/Contact_Information.htm @@ -178,7 +178,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

         

        @@ -283,7 +283,7 @@

        Contact Information


        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/FAQ.htm b/src/site/resources/conf/compiler_manual/FAQ.htm index bee87c9cd2..84b2146ec2 100644 --- a/src/site/resources/conf/compiler_manual/FAQ.htm +++ b/src/site/resources/conf/compiler_manual/FAQ.htm @@ -171,7 +171,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

         

        @@ -317,7 +317,7 @@

        Conformance


        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/Figure1.htm b/src/site/resources/conf/compiler_manual/Figure1.htm index c9fdf40ed4..b22062c2b7 100644 --- a/src/site/resources/conf/compiler_manual/Figure1.htm +++ b/src/site/resources/conf/compiler_manual/Figure1.htm @@ -136,7 +136,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents    Procedure1

        @@ -184,7 +184,7 @@

        User Manual


        HAPI Home    Table of Contents    Procedure1

        diff --git a/src/site/resources/conf/compiler_manual/Figure2.htm b/src/site/resources/conf/compiler_manual/Figure2.htm index ae7499c8be..e7d2691704 100644 --- a/src/site/resources/conf/compiler_manual/Figure2.htm +++ b/src/site/resources/conf/compiler_manual/Figure2.htm @@ -135,7 +135,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents      Procedure1

        @@ -189,7 +189,7 @@

        User Manual


        HAPI Home    Table of Contents      Procedure1

        diff --git a/src/site/resources/conf/compiler_manual/Figure3.htm b/src/site/resources/conf/compiler_manual/Figure3.htm index e2b28f2aae..f68e2842ef 100644 --- a/src/site/resources/conf/compiler_manual/Figure3.htm +++ b/src/site/resources/conf/compiler_manual/Figure3.htm @@ -135,7 +135,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents      Procedure1

        @@ -197,7 +197,7 @@

        User Manual

         

        HAPI Home    Table of Contents      Procedure1

        diff --git a/src/site/resources/conf/compiler_manual/Figure4.htm b/src/site/resources/conf/compiler_manual/Figure4.htm index d33b1c460a..ab7e8532d0 100644 --- a/src/site/resources/conf/compiler_manual/Figure4.htm +++ b/src/site/resources/conf/compiler_manual/Figure4.htm @@ -135,7 +135,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents      Sample Universal Markup @@ -191,7 +191,7 @@

        User Manual


        HAPI Home    Table of Contents      Sample Universal Markup diff --git a/src/site/resources/conf/compiler_manual/Glossary.htm b/src/site/resources/conf/compiler_manual/Glossary.htm index f48d1c9f59..c347cbee58 100644 --- a/src/site/resources/conf/compiler_manual/Glossary.htm +++ b/src/site/resources/conf/compiler_manual/Glossary.htm @@ -185,7 +185,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

         

        @@ -323,7 +323,7 @@

        Sub-Component


        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/Installation.htm b/src/site/resources/conf/compiler_manual/Installation.htm index 32d3d46417..720a132d34 100644 --- a/src/site/resources/conf/compiler_manual/Installation.htm +++ b/src/site/resources/conf/compiler_manual/Installation.htm @@ -167,10 +167,10 @@

        HAPI Conformance Classes System

        User Manual

        -

        HAPI HomeHAPI Home    Table of Contents      Download System

        +href="https://hapifhir.github.io/hapi-hl7v2">Download System

         

        @@ -211,7 +211,7 @@

        Installation1.      Download the archive containing the HAPI Conformance Class System from the HAPI Web site -at http://hl7api.sourceforge.net.

        +at https://hapifhir.github.io/hapi-hl7v2/.

         

        @@ -247,10 +247,10 @@

        Installation -

        HAPI HomeHAPI Home    Table of Contents      Download System

        +href="https://hapifhir.github.io/hapi-hl7v2">Download System

         

        diff --git a/src/site/resources/conf/compiler_manual/Introduction.htm b/src/site/resources/conf/compiler_manual/Introduction.htm index b9be7d3433..fec387dabd 100644 --- a/src/site/resources/conf/compiler_manual/Introduction.htm +++ b/src/site/resources/conf/compiler_manual/Introduction.htm @@ -265,7 +265,7 @@

        User Manual

         

        HAPI Home    Table of Contents

         

        @@ -361,7 +361,7 @@

        Health Level 7 Application Programming Interface

         

        HAPI (HL7 application programming interface) at http://hl7api.sourceforge.net is an open-source HL7 +class=MsoHyperlink>https://hapifhir.github.io/hapi-hl7v2/ is an open-source HL7 library for Java.   Its major features include the following:

        @@ -489,7 +489,7 @@

        Message Profiles


        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/Procedure1.htm b/src/site/resources/conf/compiler_manual/Procedure1.htm index 657a5802cd..bba928bdc2 100644 --- a/src/site/resources/conf/compiler_manual/Procedure1.htm +++ b/src/site/resources/conf/compiler_manual/Procedure1.htm @@ -302,7 +302,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

         

        @@ -516,7 +516,7 @@

        How to create a message profile with the Messaging Workbench


        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/Procedure2.htm b/src/site/resources/conf/compiler_manual/Procedure2.htm index 6b855e5c30..9981e75bcd 100644 --- a/src/site/resources/conf/compiler_manual/Procedure2.htm +++ b/src/site/resources/conf/compiler_manual/Procedure2.htm @@ -197,7 +197,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

         

        @@ -402,7 +402,7 @@


        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/Procedure3.htm b/src/site/resources/conf/compiler_manual/Procedure3.htm index 84717742dc..a8fb9031a7 100644 --- a/src/site/resources/conf/compiler_manual/Procedure3.htm +++ b/src/site/resources/conf/compiler_manual/Procedure3.htm @@ -325,7 +325,7 @@

        HAPI Conformance

        User Manual

        HAPI Home    Table of Contents

         

        @@ -504,7 +504,7 @@

        How to Build a Program with the Compiled Profile

        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/Related_Documentation_and_Links.htm b/src/site/resources/conf/compiler_manual/Related_Documentation_and_Links.htm index fde2915ec7..68ca690f70 100644 --- a/src/site/resources/conf/compiler_manual/Related_Documentation_and_Links.htm +++ b/src/site/resources/conf/compiler_manual/Related_Documentation_and_Links.htm @@ -221,7 +221,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

         

        @@ -273,7 +273,7 @@

        Related Documentation and Links< tab-stops:list .75in'>·        HAPI (Health Level 7 Application Programming -Interface): http://hl7api.sourceforge.net

        +Interface): https://hapifhir.github.io/hapi-hl7v2/

         

        @@ -371,7 +371,7 @@

        Related Documentation and Links<

        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/Sample_Code.htm b/src/site/resources/conf/compiler_manual/Sample_Code.htm index d8f775e8b8..e8cd92b3f2 100644 --- a/src/site/resources/conf/compiler_manual/Sample_Code.htm +++ b/src/site/resources/conf/compiler_manual/Sample_Code.htm @@ -140,7 +140,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

         

        @@ -534,7 +534,7 @@

        Sample Code


        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/Sample_JavaDocs.htm b/src/site/resources/conf/compiler_manual/Sample_JavaDocs.htm index a1e76b8835..84b6712369 100644 --- a/src/site/resources/conf/compiler_manual/Sample_JavaDocs.htm +++ b/src/site/resources/conf/compiler_manual/Sample_JavaDocs.htm @@ -150,7 +150,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/Sample_Universal_Markup_Language_Diagram.htm b/src/site/resources/conf/compiler_manual/Sample_Universal_Markup_Language_Diagram.htm index c88e150598..f58d5e71e5 100644 --- a/src/site/resources/conf/compiler_manual/Sample_Universal_Markup_Language_Diagram.htm +++ b/src/site/resources/conf/compiler_manual/Sample_Universal_Markup_Language_Diagram.htm @@ -137,7 +137,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

         

        @@ -180,7 +180,7 @@

        Sample Uniform Modeling Language Diagram

        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/System_Description.htm b/src/site/resources/conf/compiler_manual/System_Description.htm index 57eee9ad71..e28b1ab8d3 100644 --- a/src/site/resources/conf/compiler_manual/System_Description.htm +++ b/src/site/resources/conf/compiler_manual/System_Description.htm @@ -135,7 +135,7 @@

        User Manual

         

        HAPI Home    Table of Contents

         

        @@ -202,7 +202,7 @@

        System Description

        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/System_Requirements.htm b/src/site/resources/conf/compiler_manual/System_Requirements.htm index 6ca712363a..51a3651b1d 100644 --- a/src/site/resources/conf/compiler_manual/System_Requirements.htm +++ b/src/site/resources/conf/compiler_manual/System_Requirements.htm @@ -206,7 +206,7 @@

        User Manual

        HAPI Home    Table of Contents

        Softwar

        ·                    All of HAPI, including HAPI Conformance Classes System, -which can be downloaded from HAPI at http://hl7api.sourceforge.net.

        +which can be downloaded from HAPI at https://hapifhir.github.io/hapi-hl7v2/.

        Softwar

        HAPI Home    Table of Contents

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

         

        @@ -483,7 +483,7 @@

        Solution


        HAPI Home    Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/Verification_and_Validation.htm b/src/site/resources/conf/compiler_manual/Verification_and_Validation.htm index e2904e3e49..a65e5f12c1 100644 --- a/src/site/resources/conf/compiler_manual/Verification_and_Validation.htm +++ b/src/site/resources/conf/compiler_manual/Verification_and_Validation.htm @@ -187,7 +187,7 @@

        HAPI Conformance Classes System

        User Manual

        HAPI Home    Table of Contents

        @@ -300,7 +300,7 @@

        How to Validate Installation


        HAPI Home          Table of Contents

         

        diff --git a/src/site/resources/conf/compiler_manual/index.htm b/src/site/resources/conf/compiler_manual/index.htm index 2f59878100..2d89a5a702 100644 --- a/src/site/resources/conf/compiler_manual/index.htm +++ b/src/site/resources/conf/compiler_manual/index.htm @@ -210,8 +210,8 @@

        User Manual

         

        HAPI Home    Download System

        +href="https://hapifhir.github.io/hapi-hl7v2">HAPI Home    Download System

         

        @@ -425,8 +425,8 @@

        List of Figures


        -

        HAPI Home    Download +

        HAPI Home    Download System

         

        diff --git a/src/site/resources/testpanel.html b/src/site/resources/testpanel.html index 8517ea9443..fe6dc7b10a 100644 --- a/src/site/resources/testpanel.html +++ b/src/site/resources/testpanel.html @@ -2,8 +2,8 @@ HAPI TestPanel - + -The TestPanel page has moved here +The TestPanel page has moved here \ No newline at end of file diff --git a/src/site/site.xml b/src/site/site.xml index 6bc5472983..693b9141c8 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -40,7 +40,7 @@ - + diff --git a/src/site/xdoc/getting_started.xml.vm b/src/site/xdoc/getting_started.xml.vm index efb79080f1..49090d8b57 100644 --- a/src/site/xdoc/getting_started.xml.vm +++ b/src/site/xdoc/getting_started.xml.vm @@ -12,7 +12,7 @@

        If you aren't using Maven, HAPI can be downloaded at our - Sourceforge Download Site. + GitHub Release Site.

        diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 2eb08c385e..0121e7bb3e 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -1,451 +1,451 @@ - - - - - The Open Source HL7 API for Java - James Agnew - - - - - -

        -

        - This is the home page for the HAPI project. - HAPI (HL7 application - programming interface; - pronounced "happy") is an open-source, - object-oriented HL7 2.x parser for - Java. - HL7 - ( - http://hl7.org - ) - 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). - -

        - - - - - - - -
        -

        HL7 v2 Java API

        - A full featured Java API you can use to add HL7 capabilities to - your applications. -
          - -
        • - Use HAPI: - Check out - HAPI by example - or the - JavaDocs - to learn how to use HAPI in your application. -
        • -
        • - Get Help: - Subscribe or browse our - mailing list - to ask questions and find answers. -
        • -
        • - Help improve HAPI: - Report an issue, submit an idea, or get started developing - new features - here - . -
        • -
        -
        -

        FHIR Java API

        - HAPI has now introduced an API for developing applications - based on the emerging HL7 FHIR specification. - See the - HAPI FHIR site to learn more. -
        -

        HAPI TestPanel

        - A rich testing application which can be used to edit HL7 messages, - transmit them, validate them, and more. - TestPanel Screenshot -
        - -
        - -
        -

        - AbstractMessage.copy() changed Z segments within the message. This has been corrected - so the copy() method now returns an identical copy of the original message. -

        -
        - -
        -

        - A last minute bug found in HAPI FHIR 2.4 and 2.5 was discovered and fixed, so - two new releases have been produced. -

        -
        - -
        - -

        - Over five years since the last release, we are pleased to announce - availability of HAPI HL7v2 2.4 and HAPI HL7v2 2.5. - These releases are being produced on the same day with one difference: - Version 2.4 uses the legacy javax.servlet package in the hapi-hl7overhttp - module, whereversion 2.5 uses the new jakarta.servlet package in this module. - There are no other material differences between the two versions. - These releases include the following changes: -

        -
          -
        • - This release addresses a - security vulnerability in the XML parser used to parse XML-based HL7 v2.x messages. -
        • -
        • - JDK 11+ is now required in order to use or build this library. -
        • -
        • - The Testpanel application can now be run on modern JDKs (the - previous version failed to start on JDK 9+ due to a Java module - issue). -
        • -
        • - The module that has historically been used to generate the "HL7 structures" - source files has been retired, and the generated structures are now checked - in to the source repository. Unfortunately the generator is not sustainable - in its current form (it required a Windows XP VM in order to run, and that - VM has finally stopped working). If you are interested in helping to modernize - the structures generator, please get in touch! -
        • -
        • - Check the the Changelog for a complete list - of changes. -
        • - -
        - -
        - -
        - -

        - A new version of HAPI HL7v2 has been released! This new version includes a number - of bugfixes, as well as new message structures for the following versions of - HL7: v2.7, v2.8, and v2.8.1. -

        - -

        - In addition, we have changed the TestPanel distribution so that it is now - distributed as a simple executable JAR with some scripts to start it. -

        - -

        - I want to thank everyone who has been waiting for this release for their patience. - I have stated on the mailing list quite a few times over the last few years that a - new release was imminent, and it never materialized. The basic explanation for this - is that building a new release has become quite a laborious process that requires - quite a lot of hand-holding. -

        - -

        - A bit of insight into the HAPI HL7v2 build process: - The basic trouble is that building the structures is only possible on a Windows XP - system because of the way it works. Essentially the build requires an ODBC driver for - an Access MDB file (this is how the HL7 databases are distributed) and this driver was - discontinued after Windows XP. Unfortunately the Javac compiler is unwilling to compile - the large number of files that make up a structure JAR on Windows XP, so the process now - involves building structures on XP, then copying them into a build on Linux and compiling. - This whole thing really needs refactoring, but this would be a huge project and isn't - something we have capacity to take on at this point. -

        - -

        - As an additional note, we have now migrated the project from Sourceforge over to - GitHub: https://github.com/hapifhir/hapi-hl7v2. - The new project website can be found at: - https://hapifhir.github.io/hapi-hl7v2. - As a side note, we are now going to refer to this project as - "HAPI HL7v2" and the FHIR version of HAPI as "HAPI FHIR". Hopefully this will remove some - confusion, as these are completely separate libraries with separate release cycles. -

        - -

        - Thanks to everyone who contributed to this release. As always, check the - the Changelog for details about what's - new. -

        - -

        - James Agnew

        - -
        - -
        - -

        - A new release of HAPI (Core library, HL7 over HTTP, and Structures) - has been uploaded to Sourceforge and the central Maven repo. -

        - -

        - This new release is packed with new features. Read about them in - the Changelog. There are also - a number of upgrades to the base API. -

        - -

        - James Agnew

        - -
        - - - - - - + + + + + The Open Source HL7 API for Java + James Agnew + + + + + +
        +

        + This is the home page for the HAPI project. + HAPI (HL7 application + programming interface; + pronounced "happy") is an open-source, + object-oriented HL7 2.x parser for + Java. + HL7 + ( + http://hl7.org + ) + 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). + +

        + + + + + + + +
        +

        HL7 v2 Java API

        + A full featured Java API you can use to add HL7 capabilities to + your applications. +
          + +
        • + Use HAPI: + Check out + HAPI by example + or the + JavaDocs + to learn how to use HAPI in your application. +
        • +
        • + Get Help: + Subscribe or browse our + mailing list + to ask questions and find answers. +
        • +
        • + Help improve HAPI: + Report an issue, submit an idea, or get started developing + new features + here + . +
        • +
        +
        +

        FHIR Java API

        + HAPI has now introduced an API for developing applications + based on the emerging HL7 FHIR specification. + See the + HAPI FHIR site to learn more. +
        +

        HAPI TestPanel

        + A rich testing application which can be used to edit HL7 messages, + transmit them, validate them, and more. + TestPanel Screenshot +
        + +
        + +
        +

        + AbstractMessage.copy() changed Z segments within the message. This has been corrected + so the copy() method now returns an identical copy of the original message. +

        +
        + +
        +

        + A last minute bug found in HAPI FHIR 2.4 and 2.5 was discovered and fixed, so + two new releases have been produced. +

        +
        + +
        + +

        + Over five years since the last release, we are pleased to announce + availability of HAPI HL7v2 2.4 and HAPI HL7v2 2.5. + These releases are being produced on the same day with one difference: + Version 2.4 uses the legacy javax.servlet package in the hapi-hl7overhttp + module, whereversion 2.5 uses the new jakarta.servlet package in this module. + There are no other material differences between the two versions. + These releases include the following changes: +

        +
          +
        • + This release addresses a + security vulnerability in the XML parser used to parse XML-based HL7 v2.x messages. +
        • +
        • + JDK 11+ is now required in order to use or build this library. +
        • +
        • + The Testpanel application can now be run on modern JDKs (the + previous version failed to start on JDK 9+ due to a Java module + issue). +
        • +
        • + The module that has historically been used to generate the "HL7 structures" + source files has been retired, and the generated structures are now checked + in to the source repository. Unfortunately the generator is not sustainable + in its current form (it required a Windows XP VM in order to run, and that + VM has finally stopped working). If you are interested in helping to modernize + the structures generator, please get in touch! +
        • +
        • + Check the the Changelog for a complete list + of changes. +
        • + +
        + +
        + +
        + +

        + A new version of HAPI HL7v2 has been released! This new version includes a number + of bugfixes, as well as new message structures for the following versions of + HL7: v2.7, v2.8, and v2.8.1. +

        + +

        + In addition, we have changed the TestPanel distribution so that it is now + distributed as a simple executable JAR with some scripts to start it. +

        + +

        + I want to thank everyone who has been waiting for this release for their patience. + I have stated on the mailing list quite a few times over the last few years that a + new release was imminent, and it never materialized. The basic explanation for this + is that building a new release has become quite a laborious process that requires + quite a lot of hand-holding. +

        + +

        + A bit of insight into the HAPI HL7v2 build process: + The basic trouble is that building the structures is only possible on a Windows XP + system because of the way it works. Essentially the build requires an ODBC driver for + an Access MDB file (this is how the HL7 databases are distributed) and this driver was + discontinued after Windows XP. Unfortunately the Javac compiler is unwilling to compile + the large number of files that make up a structure JAR on Windows XP, so the process now + involves building structures on XP, then copying them into a build on Linux and compiling. + This whole thing really needs refactoring, but this would be a huge project and isn't + something we have capacity to take on at this point. +

        + +

        + As an additional note, we have now migrated the project from Sourceforge over to + GitHub: https://github.com/hapifhir/hapi-hl7v2. + The new project website can be found at: + https://hapifhir.github.io/hapi-hl7v2. + As a side note, we are now going to refer to this project as + "HAPI HL7v2" and the FHIR version of HAPI as "HAPI FHIR". Hopefully this will remove some + confusion, as these are completely separate libraries with separate release cycles. +

        + +

        + Thanks to everyone who contributed to this release. As always, check the + the Changelog for details about what's + new. +

        + +

        - James Agnew

        + +
        + +
        + +

        + A new release of HAPI (Core library, HL7 over HTTP, and Structures) + has been uploaded to Sourceforge and the central Maven repo. +

        + +

        + This new release is packed with new features. Read about them in + the Changelog. There are also + a number of upgrades to the base API. +

        + +

        - James Agnew

        + +
        + + + + + +
        diff --git a/src/srcdocs/readme.txt b/src/srcdocs/readme.txt index 10fd476216..391dfb2fea 100644 --- a/src/srcdocs/readme.txt +++ b/src/srcdocs/readme.txt @@ -8,10 +8,10 @@ Thanks for downloading HAPI! Note that this is not the standard distribution of HAPI! If you are simply looking to include HAPI in your application, you probably want the regular binary distribution of HAPI. Please visit our website for more information: - http://hl7api.sourceforge.net + https://hapifhir.github.io/hapi-hl7v2/ For information about HAPI's license, please visit - http://hl7api.sourceforge.net/license.html + https://hapifhir.github.io/hapi-hl7v2/license.html This package also contains several libraries which are licensed under other license agreements. @@ -37,7 +37,7 @@ Building HAPI Including HAPI in your application For information about including HAPI in your application, please visit - http://hl7api.sourceforge.net/using_hapi.html + https://hapifhir.github.io/hapi-hl7v2/getting_started.html Incidentally, we would love to hear success (and non-success) stories! @@ -45,7 +45,7 @@ Including HAPI in your application Getting help HAPI's website has examples covering a number of things you might want to - do using HAPI. See http://hl7api.sourceforge.net/devbyexample.html + do using HAPI. See https://hapifhir.github.io/hapi-hl7v2/devbyexample.html In addition, the HAPI Developer's mailing list is a great place to ask questions and look for answers: