Menu
▾
▴
braid-svn — List for all SVN commit e-mails relating to Braid project
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
(2) |
Mar
(20) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(22) |
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(5) |
Feb
(1) |
Mar
(5) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <we...@us...> - 2010-05-20 16:20:39
|
Revision: 78
http://braid.svn.sourceforge.net/braid/?rev=78&view=rev
Author: wenzhi
Date: 2010-05-20 16:20:33 +0000 (Thu, 20 May 2010)
Log Message:
-----------
bump up the project version to 1.2.3-SNAPSHOT.
Modified Paths:
--------------
trunk/base/build.properties
trunk/bridge/build.properties
trunk/build-ws.xml
trunk/build.xml
trunk/ihe/build.properties
Modified: trunk/base/build.properties
===================================================================
--- trunk/base/build.properties 2010-05-20 16:08:47 UTC (rev 77)
+++ trunk/base/build.properties 2010-05-20 16:20:33 UTC (rev 78)
@@ -8,4 +8,4 @@
srcJavaDirUtil1=src
srcJavaDirUtil2=test
distDirUtil=../common
-utilJarName=braid-base-1.2.2.jar
\ No newline at end of file
+utilJarName=braid-base-1.2.3-SNAPSHOT.jar
\ No newline at end of file
Modified: trunk/bridge/build.properties
===================================================================
--- trunk/bridge/build.properties 2010-05-20 16:08:47 UTC (rev 77)
+++ trunk/bridge/build.properties 2010-05-20 16:20:33 UTC (rev 78)
@@ -2,10 +2,10 @@
to_exclude=**/*.java
tempDir=./build
jarDir=../common
-basejarname=braid-base-1.2.2.jar
-ihejarname=braid-ihe-1.2.2.jar
+basejarname=braid-base-1.2.3-SNAPSHOT.jar
+ihejarname=braid-ihe-1.2.3-SNAPSHOT.jar
#To create util jar
srcJavaDirUtil1=src
distDirUtil=../common
-utilJarName=braid-bridge-1.2.2.jar
+utilJarName=braid-bridge-1.2.3-SNAPSHOT.jar
Modified: trunk/build-ws.xml
===================================================================
--- trunk/build-ws.xml 2010-05-20 16:08:47 UTC (rev 77)
+++ trunk/build-ws.xml 2010-05-20 16:20:33 UTC (rev 78)
@@ -3,12 +3,12 @@
<description>build file for the Braid IHE client libraries</description>
<!-- set global properties for this build -->
<property name="project" value="braid-ws" />
- <property name="version" value="1.2.2" />
+ <property name="version" value="1.2.3-SNAPSHOT" />
<property name="final.name" value="${project}-${version}" />
- <property name="zipfilename" value="braid-ws-1.2.2.zip"/>
- <property name="tarfilename" value="braid-ws-1.2.2.tar.gz"/>
- <property name="basejarname" value="braid-base-1.2.2.jar"/>
- <property name="ihejarname" value="braid-ihe-1.2.2.jar"/>
+ <property name="zipfilename" value="braid-ws-${version}.zip"/>
+ <property name="tarfilename" value="braid-ws-${version}.tar.gz"/>
+ <property name="basejarname" value="braid-base-${version}.jar"/>
+ <property name="ihejarname" value="braid-ihe-${version}.jar"/>
<property name="src" value="src"/>
<property name="test" value="test"/>
<property name="ihe.dir" value="Ihe"/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-05-20 16:08:47 UTC (rev 77)
+++ trunk/build.xml 2010-05-20 16:20:33 UTC (rev 78)
@@ -3,12 +3,12 @@
<description>build file for the Braid IHE client libraries</description>
<!-- set global properties for this build -->
<property name="project" value="braid" />
- <property name="version" value="1.2.2" />
+ <property name="version" value="1.2.3-SNAPSHOT" />
<property name="final.name" value="${project}-${version}" />
- <property name="zipfilename" value="braid-1.2.2.zip"/>
- <property name="tarfilename" value="braid-1.2.2.tar.gz"/>
- <property name="basejarname" value="braid-base-1.2.2.jar"/>
- <property name="ihejarname" value="braid-ihe-1.2.2.jar"/>
+ <property name="zipfilename" value="braid-${version}.zip"/>
+ <property name="tarfilename" value="braid-${version}.tar.gz"/>
+ <property name="basejarname" value="braid-base-${version}.jar"/>
+ <property name="ihejarname" value="braid-ihe-${version}.jar"/>
<property name="src" value="src"/>
<property name="test" value="test"/>
<property name="ihe.dir" value="ihe"/>
Modified: trunk/ihe/build.properties
===================================================================
--- trunk/ihe/build.properties 2010-05-20 16:08:47 UTC (rev 77)
+++ trunk/ihe/build.properties 2010-05-20 16:20:33 UTC (rev 78)
@@ -2,7 +2,7 @@
to_exclude=**/*.java
tempDir=./build
jarDir=../common
-basejarname=braid-base-1.2.2.jar
+basejarname=braid-base-1.2.3-SNAPSHOT.jar
reports=./reports
#To create util jar
@@ -10,4 +10,4 @@
srcJavaDirUtil2=test
srcJavaDirUtil3=mesatests
distDirUtil=../common
-utilJarName=braid-ihe-1.2.2.jar
\ No newline at end of file
+utilJarName=braid-ihe-1.2.3-SNAPSHOT.jar
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2010-05-20 16:08:53
|
Revision: 77
http://braid.svn.sourceforge.net/braid/?rev=77&view=rev
Author: wenzhi
Date: 2010-05-20 16:08:47 +0000 (Thu, 20 May 2010)
Log Message:
-----------
Release Branch 1.2.2
Added Paths:
-----------
branches/RB-1.2.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-10-28 15:37:42
|
Revision: 74
http://braid.svn.sourceforge.net/braid/?rev=74&view=rev
Author: wenzhi
Date: 2009-10-28 15:37:29 +0000 (Wed, 28 Oct 2009)
Log Message:
-----------
support non-unique code in a codeType.
Modified Paths:
--------------
trunk/base/src/com/misyshealthcare/connect/net/CodeSet.java
trunk/base/src/com/misyshealthcare/connect/util/Pair.java
Modified: trunk/base/src/com/misyshealthcare/connect/net/CodeSet.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/CodeSet.java 2009-10-01 22:45:10 UTC (rev 73)
+++ trunk/base/src/com/misyshealthcare/connect/net/CodeSet.java 2009-10-28 15:37:29 UTC (rev 74)
@@ -17,6 +17,8 @@
import java.util.Hashtable;
import java.util.Set;
+import com.misyshealthcare.connect.util.Pair;
+
/**
* This class describes an ebXML coding scheme.
*
@@ -27,8 +29,9 @@
private String name = null;
private String classificationScheme = null;
- private Hashtable<String, CodeSetEntry> entries = null;
-
+ //Pair<String(code), String(codingScheme)>
+ //code is required (cannot be null) while codingScheme is optional.
+ private Hashtable<Pair, CodeSetEntry> entries = null;
/**
* Create a new code set with the given name and ebXML
* classification scheme ID.
@@ -39,7 +42,7 @@
public CodeSet(String name, String classificationScheme) {
this.name = name;
this.classificationScheme = classificationScheme;
- entries = new Hashtable<String, CodeSetEntry>();
+ entries = new Hashtable<Pair, CodeSetEntry>();
}
/**
@@ -63,7 +66,7 @@
entry.displayName = displayName;
entry.codingScheme = codingSchemeName;
entry.ext = ext;
- entries.put(code, entry);
+ entries.put(new Pair(code, codingSchemeName), entry);
}
/**
@@ -84,36 +87,93 @@
* Check whether this code set contains a particular code value.
*
* @param code The code value to check
+ *
+ * @deprecated the new data structure requires a codingScheme,
+ * so use {@link #containsCode(String, String)} instead of this method.
+ *
* @return True if this code set contains this value as a code
*/
public boolean containsCode(String code) {
- return entries.containsKey(code);
+ for ( Pair pair : entries.keySet() ) {
+ if (pair._first == null)
+ continue;
+ if (pair._first.equals(code))
+ return true;
+ }
+ return false;
}
/**
+ * Check whether this code set contains a particular code value.
+ *
+ * @param code The code value to check
+ * @param codingScheme The codingScheme of the code
+ * @return True if this code set contains this value as a code
+ */
+ public boolean containsCode(String code, String codingScheme) {
+ return entries.containsKey(new Pair(code, codingScheme));
+ }
+
+
+ /**
* Get the display name for a particular code value.
*
* @param code The code value
+ *
+ * @deprecated the new data structure requires a codingScheme,
+ * so use {@link #getDisplayName(String, String)} instead of this method.
+ *
* @return The display name for this code value
*/
public String getDisplayName(String code) {
- CodeSetEntry entry = entries.get(code);
+ for ( Pair pair : entries.keySet() ) {
+ if (pair._first == null)
+ continue;
+ if (pair._first.equals(code)) {
+ CodeSetEntry entry = entries.get(pair);
+ if (entry != null) {
+ return entry.displayName;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Get the display name for a particular code value.
+ *
+ * @param code The code value
+ * @param codingScheme The codingScheme of the code
+ * @return The display name for this code value
+ */
+ public String getDisplayName(String code, String codingScheme) {
+ CodeSetEntry entry = entries.get(new Pair(code, codingScheme));
if (entry != null) {
return entry.displayName;
}
return null;
}
-
+
/**
* Get the name of the coding scheme that the code value is taken from.
*
* @param code The code value
+ *
+ * @deprecated the new data structure requires a codingScheme,
+ * so use {@link #getDisplayName(String, String)} instead of this method.
+ *
* @return The coding scheme this code value is taken from
*/
public String getCodingScheme(String code) {
- CodeSetEntry entry = entries.get(code);
- if (entry != null) {
- return entry.codingScheme;
+ for ( Pair pair : entries.keySet() ) {
+ if (pair._first == null)
+ continue;
+ if (pair._first.equals(code)) {
+ CodeSetEntry entry = entries.get(pair);
+ if (entry != null) {
+ return entry.codingScheme;
+ }
+ }
}
return null;
}
@@ -122,10 +182,11 @@
* Get the extension name of the code type that the code value is taken from.
*
* @param code The code value
+ * @param codingScheme The codingScheme of the code
* @return The code extension this code value is taken from
*/
- public String getExt(String code) {
- CodeSetEntry entry = entries.get(code);
+ public String getExt(String code, String codingScheme) {
+ CodeSetEntry entry = entries.get(new Pair(code, codingScheme));
if (entry != null) {
return entry.ext;
}
@@ -152,7 +213,7 @@
*
* @return the set of codeSet keys.
*/
- public Set<String> getCodeSetKeys() {
+ public Set<Pair> getCodeSetKeys() {
return entries.keySet();
}
Modified: trunk/base/src/com/misyshealthcare/connect/util/Pair.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/util/Pair.java 2009-10-01 22:45:10 UTC (rev 73)
+++ trunk/base/src/com/misyshealthcare/connect/util/Pair.java 2009-10-28 15:37:29 UTC (rev 74)
@@ -47,4 +47,42 @@
_first = first;
_second = second;
}
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((_first == null) ? 0 : _first.hashCode());
+ result = prime * result + ((_second == null) ? 0 : _second.hashCode());
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (!(obj instanceof Pair))
+ return false;
+ final Pair other = (Pair) obj;
+ if (_first == null) {
+ if (other._first != null)
+ return false;
+ } else if (!_first.equals(other._first))
+ return false;
+ if (_second == null) {
+ if (other._second != null)
+ return false;
+ } else if (!_second.equals(other._second))
+ return false;
+ return true;
+ }
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-10-01 22:45:18
|
Revision: 73
http://braid.svn.sourceforge.net/braid/?rev=73&view=rev
Author: wenzhi
Date: 2009-10-01 22:45:10 +0000 (Thu, 01 Oct 2009)
Log Message:
-----------
Prepare the build script on the trunk for future braid 1.2.2
Modified Paths:
--------------
trunk/base/build.properties
trunk/bridge/build.properties
trunk/build-ws.xml
trunk/build.xml
trunk/ihe/build.properties
Added Paths:
-----------
trunk/common/braid-base-1.2.2.jar
trunk/common/braid-bridge-1.2.2.jar
trunk/common/braid-ihe-1.2.2.jar
Removed Paths:
-------------
trunk/common/braid-base-1.2.1.jar
trunk/common/braid-bridge-1.2.1.jar
trunk/common/braid-ihe-1.2.1.jar
Modified: trunk/base/build.properties
===================================================================
--- trunk/base/build.properties 2009-10-01 22:21:00 UTC (rev 72)
+++ trunk/base/build.properties 2009-10-01 22:45:10 UTC (rev 73)
@@ -8,4 +8,4 @@
srcJavaDirUtil1=src
srcJavaDirUtil2=test
distDirUtil=../common
-utilJarName=braid-base-1.2.1.jar
\ No newline at end of file
+utilJarName=braid-base-1.2.2.jar
\ No newline at end of file
Modified: trunk/bridge/build.properties
===================================================================
--- trunk/bridge/build.properties 2009-10-01 22:21:00 UTC (rev 72)
+++ trunk/bridge/build.properties 2009-10-01 22:45:10 UTC (rev 73)
@@ -2,10 +2,10 @@
to_exclude=**/*.java
tempDir=./build
jarDir=../common
-basejarname=braid-base-1.2.1.jar
-ihejarname=braid-ihe-1.2.1.jar
+basejarname=braid-base-1.2.2.jar
+ihejarname=braid-ihe-1.2.2.jar
#To create util jar
srcJavaDirUtil1=src
distDirUtil=../common
-utilJarName=braid-bridge-1.2.1.jar
+utilJarName=braid-bridge-1.2.2.jar
Modified: trunk/build-ws.xml
===================================================================
--- trunk/build-ws.xml 2009-10-01 22:21:00 UTC (rev 72)
+++ trunk/build-ws.xml 2009-10-01 22:45:10 UTC (rev 73)
@@ -3,12 +3,12 @@
<description>build file for the Braid IHE client libraries</description>
<!-- set global properties for this build -->
<property name="project" value="braid-ws" />
- <property name="version" value="1.2.1" />
+ <property name="version" value="1.2.2" />
<property name="final.name" value="${project}-${version}" />
- <property name="zipfilename" value="braid-ws-1.2.1.zip"/>
- <property name="tarfilename" value="braid-ws-1.2.1.tar.gz"/>
- <property name="basejarname" value="braid-base-1.2.1.jar"/>
- <property name="ihejarname" value="braid-ihe-1.2.1.jar"/>
+ <property name="zipfilename" value="braid-ws-1.2.2.zip"/>
+ <property name="tarfilename" value="braid-ws-1.2.2.tar.gz"/>
+ <property name="basejarname" value="braid-base-1.2.2.jar"/>
+ <property name="ihejarname" value="braid-ihe-1.2.2.jar"/>
<property name="src" value="src"/>
<property name="test" value="test"/>
<property name="ihe.dir" value="Ihe"/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-10-01 22:21:00 UTC (rev 72)
+++ trunk/build.xml 2009-10-01 22:45:10 UTC (rev 73)
@@ -3,12 +3,12 @@
<description>build file for the Braid IHE client libraries</description>
<!-- set global properties for this build -->
<property name="project" value="braid" />
- <property name="version" value="1.2.1" />
+ <property name="version" value="1.2.2" />
<property name="final.name" value="${project}-${version}" />
- <property name="zipfilename" value="braid-1.2.1.zip"/>
- <property name="tarfilename" value="braid-1.2.1.tar.gz"/>
- <property name="basejarname" value="braid-base-1.2.1.jar"/>
- <property name="ihejarname" value="braid-ihe-1.2.1.jar"/>
+ <property name="zipfilename" value="braid-1.2.2.zip"/>
+ <property name="tarfilename" value="braid-1.2.2.tar.gz"/>
+ <property name="basejarname" value="braid-base-1.2.2.jar"/>
+ <property name="ihejarname" value="braid-ihe-1.2.2.jar"/>
<property name="src" value="src"/>
<property name="test" value="test"/>
<property name="ihe.dir" value="ihe"/>
Deleted: trunk/common/braid-base-1.2.1.jar
===================================================================
(Binary files differ)
Added: trunk/common/braid-base-1.2.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/braid-base-1.2.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/common/braid-bridge-1.2.1.jar
===================================================================
(Binary files differ)
Added: trunk/common/braid-bridge-1.2.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/braid-bridge-1.2.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/common/braid-ihe-1.2.1.jar
===================================================================
(Binary files differ)
Added: trunk/common/braid-ihe-1.2.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/braid-ihe-1.2.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/ihe/build.properties
===================================================================
--- trunk/ihe/build.properties 2009-10-01 22:21:00 UTC (rev 72)
+++ trunk/ihe/build.properties 2009-10-01 22:45:10 UTC (rev 73)
@@ -2,7 +2,7 @@
to_exclude=**/*.java
tempDir=./build
jarDir=../common
-basejarname=braid-base-1.2.1.jar
+basejarname=braid-base-1.2.2.jar
reports=./reports
#To create util jar
@@ -10,4 +10,4 @@
srcJavaDirUtil2=test
srcJavaDirUtil3=mesatests
distDirUtil=../common
-utilJarName=braid-ihe-1.2.1.jar
\ No newline at end of file
+utilJarName=braid-ihe-1.2.2.jar
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-10-01 22:22:06
|
Revision: 72
http://braid.svn.sourceforge.net/braid/?rev=72&view=rev
Author: wenzhi
Date: 2009-10-01 22:21:00 +0000 (Thu, 01 Oct 2009)
Log Message:
-----------
internal release of version 1.2.1 which includes some bug fixes.
Added Paths:
-----------
branches/RB-1.2.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-10-01 22:19:03
|
Revision: 71
http://braid.svn.sourceforge.net/braid/?rev=71&view=rev
Author: wenzhi
Date: 2009-10-01 22:18:46 +0000 (Thu, 01 Oct 2009)
Log Message:
-----------
Internal braid 1.2.1 release which includes some bug fixes.
Modified Paths:
--------------
trunk/base/build.properties
trunk/base/build.xml
trunk/bridge/build.properties
trunk/bridge/build.xml
trunk/build-ws.xml
trunk/build.xml
trunk/ihe/build.properties
trunk/ihe/build.xml
Added Paths:
-----------
trunk/common/braid-base-1.2.1.jar
trunk/common/braid-bridge-1.2.1.jar
trunk/common/braid-ihe-1.2.1.jar
Removed Paths:
-------------
trunk/common/braid-base-1.2.jar
trunk/common/braid-bridge-1.2.jar
trunk/common/braid-ihe-1.2.jar
Modified: trunk/base/build.properties
===================================================================
--- trunk/base/build.properties 2009-09-02 08:54:22 UTC (rev 70)
+++ trunk/base/build.properties 2009-10-01 22:18:46 UTC (rev 71)
@@ -8,4 +8,4 @@
srcJavaDirUtil1=src
srcJavaDirUtil2=test
distDirUtil=../common
-utilJarName=braid-base-1.2.jar
\ No newline at end of file
+utilJarName=braid-base-1.2.1.jar
\ No newline at end of file
Modified: trunk/base/build.xml
===================================================================
--- trunk/base/build.xml 2009-09-02 08:54:22 UTC (rev 70)
+++ trunk/base/build.xml 2009-10-01 22:18:46 UTC (rev 71)
@@ -25,7 +25,7 @@
<!-- Compile infrastructure source code "-->
<target name="compile" >
- <javac failonerror="true" debug="true" srcdir="${srcDir}" destdir="${tempDir}" classpath="${classpath}" />
+ <javac failonerror="true" target="1.5" debug="true" srcdir="${srcDir}" destdir="${tempDir}" classpath="${classpath}" />
</target>
<!-- Create the jar. Depends on the following properties:
Modified: trunk/bridge/build.properties
===================================================================
--- trunk/bridge/build.properties 2009-09-02 08:54:22 UTC (rev 70)
+++ trunk/bridge/build.properties 2009-10-01 22:18:46 UTC (rev 71)
@@ -2,10 +2,10 @@
to_exclude=**/*.java
tempDir=./build
jarDir=../common
-basejarname=braid-base-1.2.jar
-ihejarname=braid-ihe-1.2.jar
+basejarname=braid-base-1.2.1.jar
+ihejarname=braid-ihe-1.2.1.jar
#To create util jar
srcJavaDirUtil1=src
distDirUtil=../common
-utilJarName=braid-bridge-1.2.jar
+utilJarName=braid-bridge-1.2.1.jar
Modified: trunk/bridge/build.xml
===================================================================
--- trunk/bridge/build.xml 2009-09-02 08:54:22 UTC (rev 70)
+++ trunk/bridge/build.xml 2009-10-01 22:18:46 UTC (rev 71)
@@ -30,7 +30,7 @@
<!-- Compile infrastructure source code -->
<target name="compile" depends="outputClassDir,setClasspath">
<!-- Another possible flag: debuglevel="lines,vars" -->
- <javac failonerror="true" target="1.6" debug="true" srcdir="${srcDir}" destdir="${tempDir}" classpath="${classpath}" />
+ <javac failonerror="true" target="1.5" debug="true" srcdir="${srcDir}" destdir="${tempDir}" classpath="${classpath}" />
</target>
<!--Create the jar. Depends on the following properties:
Modified: trunk/build-ws.xml
===================================================================
--- trunk/build-ws.xml 2009-09-02 08:54:22 UTC (rev 70)
+++ trunk/build-ws.xml 2009-10-01 22:18:46 UTC (rev 71)
@@ -3,12 +3,12 @@
<description>build file for the Braid IHE client libraries</description>
<!-- set global properties for this build -->
<property name="project" value="braid-ws" />
- <property name="version" value="1.2" />
+ <property name="version" value="1.2.1" />
<property name="final.name" value="${project}-${version}" />
- <property name="zipfilename" value="braid-ws-1.2.zip"/>
- <property name="tarfilename" value="braid-ws-1.2.tar.gz"/>
- <property name="basejarname" value="braid-base-1.2.jar"/>
- <property name="ihejarname" value="braid-ihe-1.2.jar"/>
+ <property name="zipfilename" value="braid-ws-1.2.1.zip"/>
+ <property name="tarfilename" value="braid-ws-1.2.1.tar.gz"/>
+ <property name="basejarname" value="braid-base-1.2.1.jar"/>
+ <property name="ihejarname" value="braid-ihe-1.2.1.jar"/>
<property name="src" value="src"/>
<property name="test" value="test"/>
<property name="ihe.dir" value="Ihe"/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-09-02 08:54:22 UTC (rev 70)
+++ trunk/build.xml 2009-10-01 22:18:46 UTC (rev 71)
@@ -3,12 +3,12 @@
<description>build file for the Braid IHE client libraries</description>
<!-- set global properties for this build -->
<property name="project" value="braid" />
- <property name="version" value="1.2" />
+ <property name="version" value="1.2.1" />
<property name="final.name" value="${project}-${version}" />
- <property name="zipfilename" value="braid-1.2.zip"/>
- <property name="tarfilename" value="braid-1.2.tar.gz"/>
- <property name="basejarname" value="braid-base-1.2.jar"/>
- <property name="ihejarname" value="braid-ihe-1.2.jar"/>
+ <property name="zipfilename" value="braid-1.2.1.zip"/>
+ <property name="tarfilename" value="braid-1.2.1.tar.gz"/>
+ <property name="basejarname" value="braid-base-1.2.1.jar"/>
+ <property name="ihejarname" value="braid-ihe-1.2.1.jar"/>
<property name="src" value="src"/>
<property name="test" value="test"/>
<property name="ihe.dir" value="ihe"/>
Added: trunk/common/braid-base-1.2.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/braid-base-1.2.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/common/braid-base-1.2.jar
===================================================================
(Binary files differ)
Added: trunk/common/braid-bridge-1.2.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/braid-bridge-1.2.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/common/braid-bridge-1.2.jar
===================================================================
(Binary files differ)
Added: trunk/common/braid-ihe-1.2.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/braid-ihe-1.2.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/common/braid-ihe-1.2.jar
===================================================================
(Binary files differ)
Modified: trunk/ihe/build.properties
===================================================================
--- trunk/ihe/build.properties 2009-09-02 08:54:22 UTC (rev 70)
+++ trunk/ihe/build.properties 2009-10-01 22:18:46 UTC (rev 71)
@@ -2,7 +2,7 @@
to_exclude=**/*.java
tempDir=./build
jarDir=../common
-basejarname=braid-base-1.2.jar
+basejarname=braid-base-1.2.1.jar
reports=./reports
#To create util jar
@@ -10,4 +10,4 @@
srcJavaDirUtil2=test
srcJavaDirUtil3=mesatests
distDirUtil=../common
-utilJarName=braid-ihe-1.2.jar
\ No newline at end of file
+utilJarName=braid-ihe-1.2.1.jar
\ No newline at end of file
Modified: trunk/ihe/build.xml
===================================================================
--- trunk/ihe/build.xml 2009-09-02 08:54:22 UTC (rev 70)
+++ trunk/ihe/build.xml 2009-10-01 22:18:46 UTC (rev 71)
@@ -29,7 +29,7 @@
<!-- Compile infrastructure source code -->
<target name="compile" >
<!-- Another possible flag: debuglevel="lines,vars" -->
- <javac failonerror="true" target="1.6" debug="true" srcdir="${srcDir}" destdir="${tempDir}" classpath="${classpath}" />
+ <javac failonerror="true" target="1.5" debug="true" srcdir="${srcDir}" destdir="${tempDir}" classpath="${classpath}" />
</target>
<!-- Compile and Create the jar. Depends on the following properties:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-06-19 13:24:38
|
Revision: 67
http://braid.svn.sourceforge.net/braid/?rev=67&view=rev
Author: wenzhi
Date: 2009-06-19 13:24:29 +0000 (Fri, 19 Jun 2009)
Log Message:
-----------
temp checkin for testing
Modified Paths:
--------------
trunk/ihe/test/com/misyshealthcare/connect/doc/ccd/ReferralSummaryTest.java
Modified: trunk/ihe/test/com/misyshealthcare/connect/doc/ccd/ReferralSummaryTest.java
===================================================================
--- trunk/ihe/test/com/misyshealthcare/connect/doc/ccd/ReferralSummaryTest.java 2009-06-17 16:30:19 UTC (rev 66)
+++ trunk/ihe/test/com/misyshealthcare/connect/doc/ccd/ReferralSummaryTest.java 2009-06-19 13:24:29 UTC (rev 67)
@@ -60,7 +60,7 @@
*/
public class ReferralSummaryTest extends TestCase {
- String outputFile = System.getProperty("java.io.tmpdir") + File.pathSeparator + "referralSummary.xml";
+ String outputFile = System.getProperty("user.dir") + File.separator + "referralSummary.xml";
protected void setUp() throws Exception {
LibraryConfig.getInstance().setOidSource(MemoryOidSource.getInstance());
LibraryConfig.getInstance().setOidRoot("2.16.840.1.113883.3.28.1");
@@ -69,9 +69,9 @@
public void tearDown() {
File file = new File(outputFile);
- if ( file.exists() ) {
- file.delete();
- }
+// if ( file.exists() ) {
+// file.delete();
+// }
}
public void testReferralSummary() throws Exception {
@@ -95,8 +95,8 @@
ReferralSummaryBuilder builder = new ReferralSummaryBuilder(data);
CCDDocument doc = builder.build(outputFile);
System.out.println("file path="+outputFile);
- // Document doc = CDABuilder.getInstance().buildReferralSummary(data, outputFile);
- //assertEquals("text/xml", doc.getMimeType());
+// CCDDocument doc = CDABuilder.getInstance().buildReferralSummary(data, outputFile);
+// assertEquals("text/xml", doc.getMimeType());
}
private LabResult[] _getLabResults() {
@@ -122,7 +122,7 @@
private AdvanceDirective[] _getAdvanceDirective() {
AdvanceDirective[] ads = new AdvanceDirective[1];
- ads[0] = new AdvanceDirective("Do not resuscitate", new Code("304251008", null, "2.16.840.1.113883.6.96", null), GregorianCalendar.getInstance(), "completed", "No comment", null);
+ ads[0] = new AdvanceDirective("Do not resuscitate", new Code("304251008", null, "SNOMED", null), GregorianCalendar.getInstance(), "completed", "No comment", null);
return ads;
}
private String[] _getPlanOfCare() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-06-17 16:31:44
|
Revision: 66
http://braid.svn.sourceforge.net/braid/?rev=66&view=rev
Author: wenzhi
Date: 2009-06-17 16:30:19 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
1. Handled null pointer in connection
2. Added a few utility methods to CodeSet.
Modified Paths:
--------------
trunk/base/src/com/misyshealthcare/connect/net/CodeSet.java
trunk/base/src/com/misyshealthcare/connect/net/DescriptionLoader.java
trunk/base/src/com/misyshealthcare/connect/net/IConnectionDescription.java
trunk/base/src/com/misyshealthcare/connect/net/StandardConnection.java
trunk/base/src/com/misyshealthcare/connect/net/StandardConnectionDescription.java
trunk/base/src/com/misyshealthcare/connect/net/StandardServerConnection.java
Modified: trunk/base/src/com/misyshealthcare/connect/net/CodeSet.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/CodeSet.java 2009-06-17 16:27:52 UTC (rev 65)
+++ trunk/base/src/com/misyshealthcare/connect/net/CodeSet.java 2009-06-17 16:30:19 UTC (rev 66)
@@ -15,6 +15,7 @@
package com.misyshealthcare.connect.net;
import java.util.Hashtable;
+import java.util.Set;
/**
* This class describes an ebXML coding scheme.
@@ -54,12 +55,14 @@
* @param code The code value
* @param displayName A human-readable description of the code value
* @param codingSchemeName The name of the coding scheme this value is taken from
+ * @param ext A mime-type extension
*/
- public void addEntry(String code, String displayName, String codingSchemeName) {
+ public void addEntry(String code, String displayName, String codingSchemeName, String ext) {
CodeSetEntry entry = new CodeSetEntry();
entry.value = code;
entry.displayName = displayName;
entry.codingScheme = codingSchemeName;
+ entry.ext = ext;
entries.put(code, entry);
}
@@ -114,6 +117,20 @@
}
return null;
}
+
+ /**
+ * Get the extension name of the code type that the code value is taken from.
+ *
+ * @param code The code value
+ * @return The code extension this code value is taken from
+ */
+ public String getExt(String code) {
+ CodeSetEntry entry = entries.get(code);
+ if (entry != null) {
+ return entry.ext;
+ }
+ return null;
+ }
/**
* A private class to group a code value with its display name and coding
@@ -127,7 +144,16 @@
String value = null;
String displayName = null;
String codingScheme = null;
-
+ String ext = null;
}
+
+ /**
+ * Get a set of CodeSet keys
+ *
+ * @return the set of codeSet keys.
+ */
+ public Set<String> getCodeSetKeys() {
+ return entries.keySet();
+ }
}
Modified: trunk/base/src/com/misyshealthcare/connect/net/DescriptionLoader.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/DescriptionLoader.java 2009-06-17 16:27:52 UTC (rev 65)
+++ trunk/base/src/com/misyshealthcare/connect/net/DescriptionLoader.java 2009-06-17 16:30:19 UTC (rev 66)
@@ -378,8 +378,9 @@
if (classScheme != null) logMissingAttributeWarning(codeNode.getNodeName(), "codingScheme", connection);
codingScheme = classScheme;
}
+ String ext = getAttributeValue(codeNode, "ext");
// Save away the scheme
- scheme.addEntry(code, display, codingScheme);
+ scheme.addEntry(code, display, codingScheme, ext);
}
} else if (codeNode instanceof Element) {
logUnexpectedTagWarning(codeNode.getNodeName(), connection);
Modified: trunk/base/src/com/misyshealthcare/connect/net/IConnectionDescription.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/IConnectionDescription.java 2009-06-17 16:27:52 UTC (rev 65)
+++ trunk/base/src/com/misyshealthcare/connect/net/IConnectionDescription.java 2009-06-17 16:30:19 UTC (rev 66)
@@ -16,6 +16,7 @@
package com.misyshealthcare.connect.net;
import java.util.List;
+import java.util.Set;
/** The basic connection description interface.
@@ -70,6 +71,13 @@
public String getDescription();
/**
+ * Get all the code type names.
+ *
+ * @return a set of coding type names
+ */
+ public Set<String> getAllCodeTypeNames();
+
+ /**
* Get an ebXML coding scheme that is defined for this connection.
*
* @param typeName The name of the coding/classification scheme
Modified: trunk/base/src/com/misyshealthcare/connect/net/StandardConnection.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/StandardConnection.java 2009-06-17 16:27:52 UTC (rev 65)
+++ trunk/base/src/com/misyshealthcare/connect/net/StandardConnection.java 2009-06-17 16:30:19 UTC (rev 66)
@@ -18,7 +18,9 @@
import java.net.Socket;
import java.io.IOException;
+import org.apache.log4j.Logger;
+
/** A standard non encrypted tcp connection.
*
* This should not be created directly but rather, requested from the ConnectionFactory.
@@ -28,6 +30,7 @@
* @version 2.0 - Oct 25, 2005
*/
public class StandardConnection extends GenericConnection {
+ private static final Logger LOG = Logger.getLogger(StandardConnection.class.getName());
/** Used by the factory to create a connection. */
public StandardConnection(IConnectionDescription connectionDescription) {
@@ -40,6 +43,8 @@
socket = new Socket(description.getHostname(), description.getPort());
// TODO add ATNA logging message, perhaps in finally?
} catch (IOException e) {
+ LOG.error("Failed to create a socket on hostname:" + description.getHostname()
+ +" port:" + description.getPort(), e);
socket = null;
}
}
Modified: trunk/base/src/com/misyshealthcare/connect/net/StandardConnectionDescription.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/StandardConnectionDescription.java 2009-06-17 16:27:52 UTC (rev 65)
+++ trunk/base/src/com/misyshealthcare/connect/net/StandardConnectionDescription.java 2009-06-17 16:30:19 UTC (rev 66)
@@ -199,6 +199,15 @@
return DescriptionLoader.processDescriptionIncludeFile(this, new File(filename));
}
+ public Set<String> getAllCodeTypeNames() {
+ if (codingSchemes != null) {
+ return codingSchemes.keySet();
+ } else {
+ LOG.debug("Looking up non-existent coding scheme: " + name);
+ return null;
+ }
+
+ }
/* (non-Javadoc)
* @see com.misyshealthcare.connect.net.IConnectionDescription#getCodeSet()
*/
Modified: trunk/base/src/com/misyshealthcare/connect/net/StandardServerConnection.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/StandardServerConnection.java 2009-06-17 16:27:52 UTC (rev 65)
+++ trunk/base/src/com/misyshealthcare/connect/net/StandardServerConnection.java 2009-06-17 16:30:19 UTC (rev 66)
@@ -19,6 +19,8 @@
import java.net.ServerSocket;
import java.io.IOException;
+import org.apache.log4j.Logger;
+
/** A standard non encrypted tcp server connection.
*
* This should not be created directly but rather, requested from the ConnectionFactory.
@@ -27,6 +29,7 @@
* @version 2.0, May 9, 2007
*/
public class StandardServerConnection extends GenericServerConnection {
+ private static final Logger LOG = Logger.getLogger(StandardServerConnection.class.getName());
/** Used by the factory to create a connection. */
public StandardServerConnection(IConnectionDescription connectionDescription) {
@@ -39,6 +42,7 @@
ssocket = new ServerSocket(description.getPort());
// TODO add ATNA logging message, perhaps in finally?
} catch (IOException e) {
+ LOG.error("Failed to create a server socket on port:" + description.getPort(), e);
ssocket = null;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-06-17 16:28:55
|
Revision: 65
http://braid.svn.sourceforge.net/braid/?rev=65&view=rev
Author: wenzhi
Date: 2009-06-17 16:27:52 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
added OpenXDS registry and repository server config.
Modified Paths:
--------------
trunk/ihe/mesatests/xds/Test11746.java
trunk/ihe/src/com/misyshealthcare/connect/doc/ccd/BaseBuildingComponent.java
trunk/ihe/src/config/connectathon/IheActors.xml
trunk/ihe/src/config/connectathon/XdsMisys.xml
trunk/ihe/src/config/connectathon/XdsRepositorySubmitConnections.xml
Modified: trunk/ihe/mesatests/xds/Test11746.java
===================================================================
--- trunk/ihe/mesatests/xds/Test11746.java 2009-04-03 22:50:31 UTC (rev 64)
+++ trunk/ihe/mesatests/xds/Test11746.java 2009-06-17 16:27:52 UTC (rev 65)
@@ -83,7 +83,8 @@
MesaTestLogger log = new MesaTestLogger(System.out);
log.writeTestBegin("11746");
- TestKit.configActor(log, "xds_rep_nist"); //Nist XDS.a
+ TestKit.configActor(log, "xdsb_rep_openxds"); //OpenXDS XDS.b
+ //TestKit.configActor(log, "xds_rep_nist"); //Nist XDS.a
//TestKit.configActor(log, "xds_srep_nist"); // Secure Nist XDS.a
//TestKit.configActor(log, "xdsb_rep_nist"); //Nist XDS.b
//TestKit.configActor(log, "xdsb_srep_nist"); // Secure Nist XDS.b
Modified: trunk/ihe/src/com/misyshealthcare/connect/doc/ccd/BaseBuildingComponent.java
===================================================================
--- trunk/ihe/src/com/misyshealthcare/connect/doc/ccd/BaseBuildingComponent.java 2009-04-03 22:50:31 UTC (rev 64)
+++ trunk/ihe/src/com/misyshealthcare/connect/doc/ccd/BaseBuildingComponent.java 2009-06-17 16:27:52 UTC (rev 65)
@@ -1103,14 +1103,16 @@
EffectiveDates eDates = insurance.getEffectiveDates();
if (null != eDates) {
IVLTS time = participant.addNewTime();
+
if (null != eDates.getStart()) {
- IVXBTS low = time.addNewLow();
- low.setValue(dfLong.format(eDates.getStart().getTime()));
+ time.setValue(dfLong.format(eDates.getStart().getTime()));
+// IVXBTS low = time.addNewLow();
+// low.setValue(dfLong.format(eDates.getStart().getTime()));
}
- if (null != eDates.getEnd()) {
- IVXBTS high = time.addNewHigh();
- high.setValue(dfLong.format(eDates.getEnd().getTime()));
- }
+// if (null != eDates.getEnd()) {
+// IVXBTS high = time.addNewHigh();
+// high.setValue(dfLong.format(eDates.getEnd().getTime()));
+// }
}
// build Assigned Entity
POCDMT000040AssociatedEntity entity = participant
Modified: trunk/ihe/src/config/connectathon/IheActors.xml
===================================================================
--- trunk/ihe/src/config/connectathon/IheActors.xml 2009-04-03 22:50:31 UTC (rev 64)
+++ trunk/ihe/src/config/connectathon/IheActors.xml 2009-06-17 16:27:52 UTC (rev 65)
@@ -224,6 +224,10 @@
<!-- **************************************************** -->
<!-- XDS.b Repository Actors for Submission -->
+ <actor name="xdsb_rep_openxds" type="XdsDocumentSource">
+ <description>XDS.b Submit OpenXDS</description>
+ <connection consumer="openxds-xdsb-submit"/>
+ </actor>
<actor name="xdsb_rep_nist" type="XdsDocumentSource">
<description>XDS.b Submit NIST</description>
<connection consumer="nist-xdsb-submit"/>
Modified: trunk/ihe/src/config/connectathon/XdsMisys.xml
===================================================================
--- trunk/ihe/src/config/connectathon/XdsMisys.xml 2009-04-03 22:50:31 UTC (rev 64)
+++ trunk/ihe/src/config/connectathon/XdsMisys.xml 2009-06-17 16:27:52 UTC (rev 65)
@@ -147,7 +147,7 @@
to source code code values appropriate for this registry/repository. -->
<stringMap name="sourceId">
<entry string="EMR-MISYSCONNECT" code="1.3.6.1.4.1.21367.2009.1.2.108" />
- <entry string="EMRFAC" code="1.3.6.1.4.1.21367.2009.1.2.108" />
+ <entry string="EMR-ULTRATURQ" code="1.3.6.1.4.1.21367.2009.1.2.108" />
<entry string="XDSDEMO" code="1.3.6.1.4.1.21367.2009.1.2.108" />
</stringMap>
Modified: trunk/ihe/src/config/connectathon/XdsRepositorySubmitConnections.xml
===================================================================
--- trunk/ihe/src/config/connectathon/XdsRepositorySubmitConnections.xml 2009-04-03 22:50:31 UTC (rev 64)
+++ trunk/ihe/src/config/connectathon/XdsRepositorySubmitConnections.xml 2009-06-17 16:27:52 UTC (rev 65)
@@ -233,6 +233,15 @@
</secureconnection>
<!-- ***************************************************************** -->
<!--The following connections are for XDS.b Submission -->
+ <standardconnection name="openxds-xdsb-submit">
+ <hostname>localhost</hostname>
+ <port>8020</port>
+ <urlPath>/axis2/services/xdsrepositoryb</urlPath>
+ <property name="XDS.b" value="true"/>
+ <property name="TestPatientId" value="ad479512dd91412^^^&1.3.6.1.4.1.21367.2005.3.7&ISO"/>
+ <includefile name="XdsCodes.xml" />
+ <includefile name="XdsMisys.xml" />
+ </standardconnection>
<standardconnection name="nist-xdsb-submit">
<hostname>ihexds.nist.gov</hostname>
<port>9080</port>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-04-03 22:50:35
|
Revision: 64
http://braid.svn.sourceforge.net/braid/?rev=64&view=rev
Author: wenzhi
Date: 2009-04-03 22:50:31 +0000 (Fri, 03 Apr 2009)
Log Message:
-----------
fixed Sex unknown type code
Modified Paths:
--------------
trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java
Modified: trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java 2009-03-20 15:53:30 UTC (rev 63)
+++ trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java 2009-04-03 22:50:31 UTC (rev 64)
@@ -228,7 +228,7 @@
MALE("Male", "M"),
FEMALE("Female", "F"),
OTHER("Other", "O"), // IHE value (I leave it to your imagination)
- UNKNOWN("Unknown", "UN");
+ UNKNOWN("Unknown", "U");
private String value = null;
private String cdaValue = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-03-20 15:53:35
|
Revision: 63
http://braid.svn.sourceforge.net/braid/?rev=63&view=rev
Author: wenzhi
Date: 2009-03-20 15:53:30 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
Internal Release Braid-1.2
Added Paths:
-----------
branches/RB-1.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-03-20 15:51:38
|
Revision: 62
http://braid.svn.sourceforge.net/braid/?rev=62&view=rev
Author: wenzhi
Date: 2009-03-20 15:51:33 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
Internal Release Braid-1.2
Modified Paths:
--------------
trunk/base/build.properties
trunk/bridge/build.properties
trunk/build-ws.xml
trunk/build.xml
trunk/ihe/build.properties
Added Paths:
-----------
trunk/common/braid-base-1.2.jar
trunk/common/braid-bridge-1.2.jar
trunk/common/braid-ihe-1.2.jar
Removed Paths:
-------------
trunk/common/braid-base-1.1.jar
trunk/common/braid-bridge-1.1.jar
trunk/common/braid-ihe-1.1.jar
Modified: trunk/base/build.properties
===================================================================
--- trunk/base/build.properties 2009-03-20 15:48:20 UTC (rev 61)
+++ trunk/base/build.properties 2009-03-20 15:51:33 UTC (rev 62)
@@ -8,4 +8,4 @@
srcJavaDirUtil1=src
srcJavaDirUtil2=test
distDirUtil=../common
-utilJarName=braid-base-1.1.jar
\ No newline at end of file
+utilJarName=braid-base-1.2.jar
\ No newline at end of file
Modified: trunk/bridge/build.properties
===================================================================
--- trunk/bridge/build.properties 2009-03-20 15:48:20 UTC (rev 61)
+++ trunk/bridge/build.properties 2009-03-20 15:51:33 UTC (rev 62)
@@ -2,10 +2,10 @@
to_exclude=**/*.java
tempDir=./build
jarDir=../common
-basejarname=braid-base-1.1.jar
-ihejarname=braid-ihe-1.1.jar
+basejarname=braid-base-1.2.jar
+ihejarname=braid-ihe-1.2.jar
#To create util jar
srcJavaDirUtil1=src
distDirUtil=../common
-utilJarName=braid-bridge-1.1.jar
+utilJarName=braid-bridge-1.2.jar
Modified: trunk/build-ws.xml
===================================================================
--- trunk/build-ws.xml 2009-03-20 15:48:20 UTC (rev 61)
+++ trunk/build-ws.xml 2009-03-20 15:51:33 UTC (rev 62)
@@ -3,12 +3,12 @@
<description>build file for the Braid IHE client libraries</description>
<!-- set global properties for this build -->
<property name="project" value="braid-ws" />
- <property name="version" value="1.1" />
+ <property name="version" value="1.2" />
<property name="final.name" value="${project}-${version}" />
- <property name="zipfilename" value="braid-ws-1.1.zip"/>
- <property name="tarfilename" value="braid-ws-1.1.tar.gz"/>
- <property name="basejarname" value="braid-base-1.1.jar"/>
- <property name="ihejarname" value="braid-ihe-1.1.jar"/>
+ <property name="zipfilename" value="braid-ws-1.2.zip"/>
+ <property name="tarfilename" value="braid-ws-1.2.tar.gz"/>
+ <property name="basejarname" value="braid-base-1.2.jar"/>
+ <property name="ihejarname" value="braid-ihe-1.2.jar"/>
<property name="src" value="src"/>
<property name="test" value="test"/>
<property name="ihe.dir" value="Ihe"/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-03-20 15:48:20 UTC (rev 61)
+++ trunk/build.xml 2009-03-20 15:51:33 UTC (rev 62)
@@ -3,12 +3,12 @@
<description>build file for the Braid IHE client libraries</description>
<!-- set global properties for this build -->
<property name="project" value="braid" />
- <property name="version" value="1.1" />
+ <property name="version" value="1.2" />
<property name="final.name" value="${project}-${version}" />
- <property name="zipfilename" value="braid-1.1.zip"/>
- <property name="tarfilename" value="braid-1.1.tar.gz"/>
- <property name="basejarname" value="braid-base-1.1.jar"/>
- <property name="ihejarname" value="braid-ihe-1.1.jar"/>
+ <property name="zipfilename" value="braid-1.2.zip"/>
+ <property name="tarfilename" value="braid-1.2.tar.gz"/>
+ <property name="basejarname" value="braid-base-1.2.jar"/>
+ <property name="ihejarname" value="braid-ihe-1.2.jar"/>
<property name="src" value="src"/>
<property name="test" value="test"/>
<property name="ihe.dir" value="ihe"/>
Deleted: trunk/common/braid-base-1.1.jar
===================================================================
(Binary files differ)
Added: trunk/common/braid-base-1.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/braid-base-1.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/common/braid-bridge-1.1.jar
===================================================================
(Binary files differ)
Added: trunk/common/braid-bridge-1.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/braid-bridge-1.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/common/braid-ihe-1.1.jar
===================================================================
(Binary files differ)
Added: trunk/common/braid-ihe-1.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/common/braid-ihe-1.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/ihe/build.properties
===================================================================
--- trunk/ihe/build.properties 2009-03-20 15:48:20 UTC (rev 61)
+++ trunk/ihe/build.properties 2009-03-20 15:51:33 UTC (rev 62)
@@ -2,7 +2,7 @@
to_exclude=**/*.java
tempDir=./build
jarDir=../common
-basejarname=braid-base-1.1.jar
+basejarname=braid-base-1.2.jar
reports=./reports
#To create util jar
@@ -10,4 +10,4 @@
srcJavaDirUtil2=test
srcJavaDirUtil3=mesatests
distDirUtil=../common
-utilJarName=braid-ihe-1.1.jar
\ No newline at end of file
+utilJarName=braid-ihe-1.2.jar
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-03-20 15:48:35
|
Revision: 61
http://braid.svn.sourceforge.net/braid/?rev=61&view=rev
Author: wenzhi
Date: 2009-03-20 15:48:20 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
Fixed Estimated time of arrival
Modified Paths:
--------------
trunk/bridge/src/com/misyshealthcare/connect/doc/ccd/mapping/MapEDReferralData.java
Modified: trunk/bridge/src/com/misyshealthcare/connect/doc/ccd/mapping/MapEDReferralData.java
===================================================================
--- trunk/bridge/src/com/misyshealthcare/connect/doc/ccd/mapping/MapEDReferralData.java 2009-03-18 15:20:09 UTC (rev 60)
+++ trunk/bridge/src/com/misyshealthcare/connect/doc/ccd/mapping/MapEDReferralData.java 2009-03-20 15:48:20 UTC (rev 61)
@@ -14,10 +14,11 @@
*/
package com.misyshealthcare.connect.doc.ccd.mapping;
+import java.util.Calendar;
+
import com.misyshealthcare.connect.base.SharedEnums;
import com.misyshealthcare.connect.doc.ccd.CCDException;
import com.misyshealthcare.connect.doc.ccd.EDReferralData;
-import com.misyshealthcare.connect.doc.ccd.EstimatedTime;
import com.misyshealthcare.connect.doc.ccd.ProposedDisposition;
import com.misyshealthcare.connect.doc.ccd.TransportMode;
/*
@@ -90,16 +91,12 @@
/**
* Convert EstimatedTime into the ccd package's EstimatedTime
* @param estimatedTimeOfArrival
- * @return <code>EstimatedTime</code>
+ * @return arrival time
*/
- public static EstimatedTime convertEstimatedTimeofArrival(
+ public static Calendar convertEstimatedTimeofArrival(
com.misyshealthcare.connect.doc.ccd.xsd.EstimatedTime estimatedTimeOfArrival) {
if(estimatedTimeOfArrival == null) return null;
- EstimatedTime retEstTime = new EstimatedTime();
- retEstTime.setStandardDeviation(estimatedTimeOfArrival.getStandardDeviation());
- retEstTime.setTime(estimatedTimeOfArrival.getTime());
- retEstTime.setUnit(estimatedTimeOfArrival.getUnit());
- return retEstTime;
+ return estimatedTimeOfArrival.getTime();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-03-18 15:20:12
|
Revision: 60
http://braid.svn.sourceforge.net/braid/?rev=60&view=rev
Author: wenzhi
Date: 2009-03-18 15:20:09 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
Added the Setters.
Modified Paths:
--------------
trunk/base/src/com/misyshealthcare/connect/net/Identifier.java
Modified: trunk/base/src/com/misyshealthcare/connect/net/Identifier.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/Identifier.java 2009-03-18 15:18:10 UTC (rev 59)
+++ trunk/base/src/com/misyshealthcare/connect/net/Identifier.java 2009-03-18 15:20:09 UTC (rev 60)
@@ -62,6 +62,18 @@
}
/**
+ * Set the symbol namespace ID.
+ *
+ * @param namespace The symbolic namespace ID
+ */
+ public void setNamespaceId(String namespace) {
+ if (namespace != null)
+ this.namespaceId = namespace.trim();
+ else
+ this.namespaceId = null;
+ }
+
+ /**
* Get the universal ID for this assigning authority.
*
* @return The universal ID
@@ -71,6 +83,24 @@
}
/**
+ * Set the universal ID for this assigning authority.
+ *
+ * @param universal The universal ID
+ */
+ public void setUniversalId(String universal) {
+ if (universal != null)
+ universalId = universal.trim();
+ else
+ universalId = null;
+
+ if (universalId != null) {
+ universalKey = universalId;
+ if (universalIdType != null)
+ universalKey = universalKey + "&" + universalIdType;
+ }
+ }
+
+ /**
* Get the type of the universal ID for this assigning authority.
*
* @return The universal ID type
@@ -80,6 +110,24 @@
}
/**
+ * Set the type of the universal ID for this assigning authority.
+ *
+ * @param univeralIdType The universal ID type
+ */
+ public void setUniversalIdType(String universalIdType) {
+ if (universalIdType != null)
+ this.universalIdType = universalIdType.trim();
+ else
+ this.universalIdType = null;
+
+ if (universalId != null) {
+ universalKey = universalId;
+ if (universalIdType != null)
+ universalKey = universalKey + "&" + universalIdType;
+ }
+ }
+
+ /**
* Get the value of the Patient ID in this assigning authority.
*
* @param patientId The patient ID object holding all possible IDs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-03-18 15:18:18
|
Revision: 59
http://braid.svn.sourceforge.net/braid/?rev=59&view=rev
Author: wenzhi
Date: 2009-03-18 15:18:10 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
Added a couple more cipersuits for .NET applications: "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "SSL_RSA_WITH_DES_CBC_SHA"
Modified Paths:
--------------
trunk/base/src/com/misyshealthcare/connect/net/SecureSocketFactory.java
Modified: trunk/base/src/com/misyshealthcare/connect/net/SecureSocketFactory.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/SecureSocketFactory.java 2009-02-08 22:39:04 UTC (rev 58)
+++ trunk/base/src/com/misyshealthcare/connect/net/SecureSocketFactory.java 2009-03-18 15:18:10 UTC (rev 59)
@@ -289,7 +289,8 @@
try {
ss = (javax.net.ssl.SSLServerSocket) getSSLContext().getServerSocketFactory().createServerSocket(port);
ss.setNeedClientAuth( true );
- String[] strings = { "SSL_RSA_WITH_NULL_SHA", "TLS_RSA_WITH_AES_128_CBC_SHA" };
+ String[] strings = { "SSL_RSA_WITH_NULL_SHA", "TLS_RSA_WITH_AES_128_CBC_SHA",
+ "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "SSL_RSA_WITH_DES_CBC_SHA"};
ss.setEnabledCipherSuites(strings);
} catch (IOException e) {
LOG.error("I/O problem creating server socket.", e);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-02-08 22:39:06
|
Revision: 58
http://braid.svn.sourceforge.net/braid/?rev=58&view=rev
Author: wenzhi
Date: 2009-02-08 22:39:04 +0000 (Sun, 08 Feb 2009)
Log Message:
-----------
Updated braid base lib - fixed Identifier Authority Name.
Modified Paths:
--------------
trunk/base/src/com/misyshealthcare/connect/net/Identifier.java
Modified: trunk/base/src/com/misyshealthcare/connect/net/Identifier.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/Identifier.java 2009-01-19 20:24:19 UTC (rev 57)
+++ trunk/base/src/com/misyshealthcare/connect/net/Identifier.java 2009-02-08 22:39:04 UTC (rev 58)
@@ -129,10 +129,14 @@
public String getAuthorityNameString() {
StringBuffer sb = new StringBuffer();
if (namespaceId != null) sb.append(namespaceId);
- sb.append('&');
- if (universalId != null) sb.append(universalId);
- sb.append('&');
- if (universalIdType != null) sb.append(universalIdType);
+ if (universalId != null) {
+ sb.append('&');
+ sb.append(universalId);
+ if (universalIdType != null) {
+ sb.append('&');
+ sb.append(universalIdType);
+ }
+ }
return sb.toString();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-01-19 20:06:22
|
Revision: 55
http://braid.svn.sourceforge.net/braid/?rev=55&view=rev
Author: wenzhi
Date: 2009-01-19 20:05:45 +0000 (Mon, 19 Jan 2009)
Log Message:
-----------
Added MaritalStatus enum types
Modified Paths:
--------------
trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java
Modified: trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java 2009-01-10 17:05:36 UTC (rev 54)
+++ trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java 2009-01-19 20:05:45 UTC (rev 55)
@@ -283,6 +283,66 @@
}
}
+ /**
+ * Adminstratice sex types
+ */
+ @SuppressWarnings("unused")
+ public enum MartitalStatusType {
+ SEPARATED("Separated", "A"),
+ DIVORCED("Divorced", "D"),
+ MARRIED("Married", "M"),
+ SINGLE("Single", "S"),
+ WIDOWED("Widowed", "W"),
+ COMMON_LAW("Common Law", "C"),
+ LIVING_TOGETHER("Living Together", "G"),
+ DOMESTIC_PARTNER("Domestic Partner", "P"),
+ REGISTERED_DOMESTIC_PARTNER("Registered Domestic Partner", "R"),
+ LEGALLY_SEPARATED("Legally Separated", "E"),
+ ANNULLED("Annulled", "N"),
+ INTERLOCUTORY("Interlocutory", "I"),
+ UNMARRIED("Unmarried", "B"),
+ UNREPORTED("Unreported", "T"),
+ OTHER("Other", "O"),
+ UNKNOWN("Unknown", "U");
+
+ private String value = null;
+ private String hl7Value = null;
+
+ private MartitalStatusType(String value, String hl7Value) {
+ this.value = value;
+ this.hl7Value = hl7Value;
+ }
+
+ public String getValue() {
+ return this.value;
+ }
+
+ /**
+ * Gets the HL7 value
+ *
+ * @return the HL7 value
+ */
+ public String getHL7Value() {
+ return this.hl7Value;
+ }
+
+ /**
+ * Converts from String HL7 value to its corresponding enum type.
+ *
+ * @param hl7Value the String value to be converted
+ * @return the MartitalStatusType enum
+ */
+ public MartitalStatusType hl7ValueOf(String hl7Value) {
+ MartitalStatusType[] types = MartitalStatusType.values();
+ for (MartitalStatusType type : types) {
+ if (type.getHL7Value().equalsIgnoreCase( hl7Value ) ) {
+ return type;
+ }
+ }
+ return UNKNOWN;
+ }
+ }
+
public enum PatientContactType {
GUARDIAN("Guardian", "GUARD"),
AGENT_PATIENT("Agents of Patient", "AGNT"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-01-10 17:05:38
|
Revision: 54
http://braid.svn.sourceforge.net/braid/?rev=54&view=rev
Author: wenzhi
Date: 2009-01-10 17:05:36 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
Added HL7 Address Types.
Modified Paths:
--------------
trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java
Modified: trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java 2009-01-10 17:03:16 UTC (rev 53)
+++ trunk/base/src/com/misyshealthcare/connect/base/SharedEnums.java 2009-01-10 17:05:36 UTC (rev 54)
@@ -27,21 +27,34 @@
*/
@SuppressWarnings("unused")
public enum AddressType {
- HOME("HOME", "Home"),
- WORK("WORK", "Work"),
- OTHER("OTHER", "Other"),
- UNKNOWN("UNKNOWN", "Unknown");
+ HOME("HOME", "Home", "H"),
+ WORK("WORK", "Work", "O"), //Office
+ OTHER("OTHER", "Other", null),
+ UNKNOWN("UNKNOWN", "Unknown", null),
+ TEMPORARY("TEMPORARY", "Temporary", "C"), //Current Or Temporary
+ PERMANENT("PERMANENT", "Permanent", "P"), //Permanent
+ MAILING("MAILING", "Mailing", "M"), //Mailing
+ BUSINESS("BUSINESS", "Business", "B"), // Firm/Business
+ BIRTH ("BIRTH", "Birth", "N"), //Birth (nee) (birth address, not otherwise specified)
+ BIRTH_DELIVERY("BIRTH DELIVERY", "Birth Delivery", "BDL"), //Birth delivery location (address where birth occurred)
+ RESIDENCE_AT_BIRTH("RESIDENCE AT BIRTH", "Residence at Birth", "BR"), // Residence at birth (home address at time of birth)
+ ORIGIN("ORIGIN", "Origin", "F"), // Country Of Origin
+ LEGAL("LEGAL", "Legal", "L"), // Legal Address
+ REGISTRY_HOME("REGISTRY HOME", "Registry Home", "RH"), // Registry home. Refers to the information system, typically managed by a public health agency, that stores patient information such as immunization histories or cancer data, regardless of where the patient obtains services.
+ BAD_ADDRESS("BAD ADDRESS", "Bad Address", "BA"); // Bad address
private String value = null;
private String printValue = null;
-
- private AddressType(String value, String printValue) {
+ private String hl7Value = null;
+
+ private AddressType(String value, String printValue, String hl7Value) {
this.value = value;
this.printValue = printValue;
+ this.hl7Value = hl7Value;
}
public String getValue() { return this.value; }
public String getPrintValue() { return this.printValue; }
-
+ public String getHL7Value() { return this.hl7Value; }
/**
* Maps a value from its String format to corresponding AddressType.
* @param value
@@ -61,6 +74,48 @@
if (value.equals("RESIDENCE")) return HOME;
return OTHER;
}
+
+ /**
+ * Converts from String HL7 value to its corresponding enum type.
+ *
+ * @param hl7Value the String value to be converted
+ * @return the AddressType enum
+ */
+ public static AddressType hl7ValueOf(String hl7Value) {
+ if (hl7Value == null) return UNKNOWN;
+
+ AddressType[] types = AddressType.values();
+ for (AddressType type : types) {
+ String value = type.getHL7Value();
+ if (value == null)
+ continue;
+ if (type.getHL7Value().equalsIgnoreCase( hl7Value ) ) {
+ return type;
+ }
+ }
+ return UNKNOWN;
+ }
+
+ /**
+ * Maps a value from its String format to corresponding AddressType.
+ * @param value
+ * @return the AddressType
+ */
+ public static AddressType mapValueOfB(String value) {
+ if (null == value) return UNKNOWN;
+ value = value.toUpperCase();
+ AddressType[] types = AddressType.values();
+ for (AddressType type : types) {
+ if (type.getValue().equals( value ) ||
+ type.getValue().startsWith(value) ) {
+ return type;
+ }
+ }
+ if (value.equals("OFFICE")) return WORK;
+ if (value.equals("RESIDENCE")) return HOME;
+ return OTHER;
+ }
+
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-01-10 17:03:24
|
Revision: 53
http://braid.svn.sourceforge.net/braid/?rev=53&view=rev
Author: wenzhi
Date: 2009-01-10 17:03:16 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
Added Certificates for Mesa Tests
Added Paths:
-----------
trunk/ihe/src/config/connectathon/certs/
trunk/ihe/src/config/connectathon/certs/EHR_MISYS.cer
trunk/ihe/src/config/connectathon/certs/EHR_MISYS.csr
trunk/ihe/src/config/connectathon/certs/EHR_MISYS.key
trunk/ihe/src/config/connectathon/certs/EHR_MISYS_08_KEY.p12
trunk/ihe/src/config/connectathon/certs/EHR_MISYS_08_TRUST.jks
trunk/ihe/src/config/connectathon/certs/EHR_MISYS_KEY.key
trunk/ihe/src/config/connectathon/certs/EHR_MISYS_TRUST.key
trunk/ihe/src/config/connectathon/certs/Identrus_Test_Root.cer
trunk/ihe/src/config/connectathon/certs/README.txt
trunk/ihe/src/config/connectathon/certs/Wells_CA.cer
trunk/ihe/src/config/connectathon/certs/keystore.key
trunk/ihe/src/config/connectathon/certs/mesa_keystore1_2009.p12
trunk/ihe/src/config/connectathon/certs/mesa_truststore_2009.jks
Added: trunk/ihe/src/config/connectathon/certs/EHR_MISYS.cer
===================================================================
--- trunk/ihe/src/config/connectathon/certs/EHR_MISYS.cer (rev 0)
+++ trunk/ihe/src/config/connectathon/certs/EHR_MISYS.cer 2009-01-10 17:03:16 UTC (rev 53)
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIE0TCCA7mgAwIBAgICDwgwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAlVT
+MRQwEgYDVQQKEwtXZWxscyBGYXJnbzEwMC4GA1UECxMnV2VsbHMgRmFyZ28gVUFU
+IENlcnRpZmljYXRlIEF1dGhvcml0aWVzMTkwNwYDVQQDEzBXZWxscyBGYXJnbyBV
+QVQgSWRlbnRydXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwMTA2MTk0
+NzM5WhcNMDkwMTA2MTk0NzM4WjB3MQswCQYDVQQGEwJVUzEZMBcGA1UEChMQTWlz
+eXMgSGVhbHRoY2FyZTELMAkGA1UECBMCTkMxEDAOBgNVBAcTB1JhbGVpZ2gxFTAT
+BgNVBAsTDE1pc3lzQ29ubmVjdDEXMBUGA1UEAxMObWlzeXMxLmloZS5uZXQwgZ8w
+DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMp1Fc93gA6NqORlisp71xMBTwOU+QIH
+Hzo29uhnr1g9YTSjHSQG6SErSfZtRgm7b5mK+PJijpdakEDYPxvGsosXV4J2hpY0
+2bCxtEXp0sOCc/lNpfpzDsQKwXiBcI3Qxuhf0oBANnTR2oYv7cL7Qg41zdteEsIn
+6rHC7vNHKuPxAgMBAAGjggHPMIIByzAlBgNVHREEHjAcgRpwZXRlLnBhbG1lckB3
+ZWxsc2ZhcmdvLmNvbTA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUHMAGGHmh0dHBz
+Oi8va3Vycm9zLndlbGxzZmFyZ28uY29tLzCB9gYDVR0gBIHuMIHrMIHoBgtghkgB
+hvt7g3QAADCB2DCB1QYIKwYBBQUHAgIwgcgagcVUaGlzIENlcnRpZmljYXRlIG1h
+eSBiZSByZWxpZWQgdXBvbiBvbmx5IGJ5IGVpdGhlcjogKDEpIGEgUmVseWluZyBD
+dXN0b21lciBvZiBhbiBJZGVudHJ1cyBQYXJ0aWNpcGFudCwgb3IgKDIpIGEgcGFy
+dHkgYm91bmQgdG8gdGhlIGFsdGVybmF0aXZlIHBvbGljeSByZWdpbWUgc3BlY2lm
+aWVkIGVsc2V3aGVyZSBpbiB0aGlzIENlcnRpZmljYXRlLjAOBgNVHQ8BAf8EBAMC
+BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGko
+HDsCAVptJL4rpXpTe+tZzZa/MB0GA1UdDgQWBBSEHZhxk6EwsHu0bOY8RJ2O2yRA
+pDANBgkqhkiG9w0BAQUFAAOCAQEAK2h+yLcB+tMiUFNTPHKsdpBJV6VKYEQ/ZM77
+/0p+BzY75TytfbVKxw+HLVKUkk9Gv6Yiz5JtImoXPq3Hs9Grh0CGnmPLSedOo+0v
+EVbOf/bDN8qaoP0ucfVEkggGHeXRUPNMmYCnL0m9RmFwWnN2QGDzMhoWuzZs3Kwf
+QcaU3XvhBz7QoFBSdZijanjDqxLtdyiEPdabiOKC2gdPBG+BtgAZT7W6a83QC3rS
+OQjGIFkwR15P04ssunaaYMpOb1mi1iu0e6mZ9vSSLL1GkqFSMAH6eQd+ECvQE2GJ
+RUb1eNnq104QRJpDOeNM7PJC6vGnvOVEjey6U49KDuRKWn/8Ww==
+-----END CERTIFICATE-----
Added: trunk/ihe/src/config/connectathon/certs/EHR_MISYS.csr
===================================================================
--- trunk/ihe/src/config/connectathon/certs/EHR_MISYS.csr (rev 0)
+++ trunk/ihe/src/config/connectathon/certs/EHR_MISYS.csr 2009-01-10 17:03:16 UTC (rev 53)
@@ -0,0 +1,10 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIIBtzCCASACAQAwdzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdo
+MRkwFwYDVQQKExBNaXN5cyBIZWFsdGhjYXJlMRUwEwYDVQQLEwxNaXN5c0Nvbm5lY3QxFzAVBgNV
+BAMTDm1pc3lzMS5paGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKdRXPd4AOjajk
+ZYrKe9cTAU8DlPkCBx86NvboZ69YPWE0ox0kBukhK0n2bUYJu2+ZivjyYo6XWpBA2D8bxrKLF1eC
+doaWNNmwsbRF6dLDgnP5TaX6cw7ECsF4gXCN0MboX9KAQDZ00dqGL+3C+0IONc3bXhLCJ+qxwu7z
+Ryrj8QIDAQABoAAwDQYJKoZIhvcNAQEEBQADgYEAPdOZRXS7G2MBkq1L717jTewOjOqCeWgy9qzE
+rZ6rj2ySLaRrxNeXrHG9RW1pFP58StkNR2mM0wT4c3rEuMzsZJo5hMAMyPJMJnurzsCLNEgiD1Cv
+PTC8t25QUBqKgOXIz9KxItlZgNeOhlkVMbOsg0UNvTbODpH7DytUY1Bk3UA=
+-----END NEW CERTIFICATE REQUEST-----
Added: trunk/ihe/src/config/connectathon/certs/EHR_MISYS.key
===================================================================
(Binary files differ)
Property changes on: trunk/ihe/src/config/connectathon/certs/EHR_MISYS.key
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ihe/src/config/connectathon/certs/EHR_MISYS_08_KEY.p12
===================================================================
(Binary files differ)
Property changes on: trunk/ihe/src/config/connectathon/certs/EHR_MISYS_08_KEY.p12
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ihe/src/config/connectathon/certs/EHR_MISYS_08_TRUST.jks
===================================================================
(Binary files differ)
Property changes on: trunk/ihe/src/config/connectathon/certs/EHR_MISYS_08_TRUST.jks
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ihe/src/config/connectathon/certs/EHR_MISYS_KEY.key
===================================================================
(Binary files differ)
Property changes on: trunk/ihe/src/config/connectathon/certs/EHR_MISYS_KEY.key
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ihe/src/config/connectathon/certs/EHR_MISYS_TRUST.key
===================================================================
(Binary files differ)
Property changes on: trunk/ihe/src/config/connectathon/certs/EHR_MISYS_TRUST.key
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ihe/src/config/connectathon/certs/Identrus_Test_Root.cer
===================================================================
--- trunk/ihe/src/config/connectathon/certs/Identrus_Test_Root.cer (rev 0)
+++ trunk/ihe/src/config/connectathon/certs/Identrus_Test_Root.cer 2009-01-10 17:03:16 UTC (rev 53)
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIErzCCA5egAwIBAgIEPnDwhzANBgkqhkiG9w0BAQUFADCBgjEVMBMGA1UEChMM
+SWRlbnRydXMgTExDMS0wKwYDVQQLEyRJZGVudHJ1cyBSb290IENlcnRpZmljYXRl
+ICBBdXRob3JpdHkxOjA4BgNVBAMTMUlkZW50cnVzIFJvb3QgUHJlcHJvZHVjdGlv
+biBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNOTkxMjE0MTYwMzUxWhcNMTQxMjEx
+MTYwMzUxWjCBgjEVMBMGA1UEChMMSWRlbnRydXMgTExDMS0wKwYDVQQLEyRJZGVu
+dHJ1cyBSb290IENlcnRpZmljYXRlICBBdXRob3JpdHkxOjA4BgNVBAMTMUlkZW50
+cnVzIFJvb3QgUHJlcHJvZHVjdGlvbiBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSfCMhXNnSRRwRWtv8qqo3x9z4
+rZj60HAudDPoxwSjqXdqbo0dWS3a44ZHq8DAcoT/EdXipiezDC+roIiYKEn610zD
+0U+rLnxQEeJqBZ+5QLR0Hpzv6XQqClxCKcW6+AB5qS7StrYSUfUklKg67dtNbfod
+3zm/+jdZLSFT7mkD/VLjH7rGgdu72MqpYW1X80SpZjReL/DM2ImGNLjM8Z8fkkDa
+sFT357ysSZgrck8q0iZpen9q1IAw3kEUhbJqQyvvoqU72F10/LHm4ibGfPgi55sr
+ew5hKzOaOlaobVzXLs3CRfFsQFOlZ7dugVd6PSqY1pdSDdkxkONatkEPk1JxAgMB
+AAGjggEpMIIBJTAPBgNVHRMBAf8EBTADAQH/MIHBBgNVHSAEgbkwgbYwgbMGByqG
+SIb6ZQEwgacwgaQGCCsGAQUFBwICMIGXGoGUQ2VydGlmaWNhdGVzIGFyZSBpc3N1
+ZWQgdW5kZXIgdGhpcyBwb2xpY3kgdG8gc3Vib3JkaW5hdGUgTDEgQ0FzLCBSQXMg
+YW5kIE9DU1AgcmVzcG9uZGVycyBlc3RhYmxpc2hlZCBhbmQgb3BlcmF0ZWQgYnkg
+SWRlbnRydXMgYW5kIGl0cyBQYXJ0aWNpcGFudHMuIDAdBgNVHQ4EFgQUv4qF7ugR
+vyyM1DPA2MC6fY8AY4kwHwYDVR0jBBgwFoAUv4qF7ugRvyyM1DPA2MC6fY8AY4kw
+DgYDVR0PAQH/BAQDAgL8MA0GCSqGSIb3DQEBBQUAA4IBAQClVtG5L9Dzo2SDZ0vC
+Y1QRUZel9SqLIAclya31JQoiLOoJpCjzAcuyfuKYR1BuH6OBJtDPaKd3GyPggvMA
+VXgZP2gNkxoAXyvuCQROgmnrBHLdl/FQLy876UtOGKAMMz89UctFKIDwMtWd/QTS
+F733oK88b0pxfF2rSQabQF0PY88dPvxvhQ/CgjQeegysiAkK5llnFPlz06cJcVUk
+pYJzvjRTkQxnFKofxE5Ek9LyJ3T5RmVQU1rntT1dNpQI/SQzxez2l8VevxHsAAbO
+IPfSJPD2ICrkL2EUG9AYMclvS1QOi+2pT682pHHkcnwXD+BbsJ9ZvVSwR0uhEQxB
+Kqk9
+-----END CERTIFICATE-----
Added: trunk/ihe/src/config/connectathon/certs/README.txt
===================================================================
--- trunk/ihe/src/config/connectathon/certs/README.txt (rev 0)
+++ trunk/ihe/src/config/connectathon/certs/README.txt 2009-01-10 17:03:16 UTC (rev 53)
@@ -0,0 +1,19 @@
+README.txt - This file.
+keystore.key - initial unsigned generated key, saved and never touched. In case something goes FUBAR.
+EHR_MISYS.key - copy of key, for uniform naming. Used to generate csr.
+EHR_MISYS.csr - signing request. Sent to CA.
+EHR_MISYS.cer - signed cert made by CA from .csr. Recieved from CA.
+EHR_MISYS_KEY.key - Keystore with root certs and signed master key.
+Identrus_Test_Root.cer - Root cert.
+Wells_CA.cer - Intermediate cert.
+EHR_MISYS_TRUST.key - keystore for holding cert that signed all other certs.
+
+EMR_MISYS_08_KEY.p12 - self-signed certificate keystore
+EMR_MISYS_08_TRUST.jsk - truststore
+
+to generate key:
+openssl pkcs12 -export -out keystore.pkcs12 -in test_sys_1.cert.pem -inkey test_sys_1.key.pem
+to generate truststore:
+keytool -import -alias mesa -file mesa.cert -keystore TrustStore
+
+
Added: trunk/ihe/src/config/connectathon/certs/Wells_CA.cer
===================================================================
--- trunk/ihe/src/config/connectathon/certs/Wells_CA.cer (rev 0)
+++ trunk/ihe/src/config/connectathon/certs/Wells_CA.cer 2009-01-10 17:03:16 UTC (rev 53)
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFLjCCBBagAwIBAgIEQfa5XzANBgkqhkiG9w0BAQUFADCBgjEVMBMGA1UEChMM
+SWRlbnRydXMgTExDMS0wKwYDVQQLEyRJZGVudHJ1cyBSb290IENlcnRpZmljYXRl
+ICBBdXRob3JpdHkxOjA4BgNVBAMTMUlkZW50cnVzIFJvb3QgUHJlcHJvZHVjdGlv
+biBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDUwMTI1MjEyNTUxWhcNMTIwMTI0
+MjEyNTUxWjCBkDELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMTAw
+LgYDVQQLEydXZWxscyBGYXJnbyBVQVQgQ2VydGlmaWNhdGUgQXV0aG9yaXRpZXMx
+OTA3BgNVBAMTMFdlbGxzIEZhcmdvIFVBVCBJZGVudHJ1cyBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoyjMIX
+itrTKII2UlTRVqHcytAcJQ0k9nA4geRS5Qc7BG9/vbSNfUv3yIrxzKEDOs0xpkhA
+QsbqOA4P8xs8kMpXEGN38AWlIJFScXYuz5ltmshzjd69Wqsi+Iaw4582vgbdC8Cd
+DUWIfrI26sqTmx8BRYN9EPCg2YKACno7lCfXYT+aOkBL/o8w6JGhyyGGCjkWs10X
+T7C5vGCf63Ko0new37ZMLRM2rol1ALYIm0IG01h5gh4htqYcGEzbLJEesAlHsAxn
+VpRfHM+vdcmzzKFCL2J4yJdw3GjeiCHwS+RhyM+nInjhEdbllKU/LXeVrcx/++8P
+4CvzLanxoGU5n8MCAwEAAaOCAZowggGWMBIGA1UdEwEB/wQIMAYBAf8CAQcwDgYD
+VR0PAQH/BAQDAgH2MIHJBgNVHSAEgcEwgb4wgbsGCSqGSIb6ZQEGATCBrTCBqgYI
+KwYBBQUHAgIwgZ0agZpUaGlzIGNlcnRpZmljYXRlIGlzIGZvciB0aGUgc29sZSB1
+c2Ugb2YgVEVTVElORy4gSWRlbnRydXMgYWNjZXB0cyBubyBsaWFiaWxpdHkgZm9y
+IGFueSBjbGFpbSBleGNlcHQgYXMgZXhwcmVzc2x5IHByb3ZpZGVkIGluIGl0cyBP
+cGVyYXRpbmcgUnVsZXMgSUwtT1BSVUwuMGQGCCsGAQUFBwEBBFgwVjAsBggrBgEF
+BQcwAYYgaHR0cHM6Ly9pZGVudHJ1czIwLmlkZW50cnVzLmNvbS8wJgYIKoZIhvpl
+BAGGGmh0dHBzOi8vVEMyMC5pZGVudHJ1cy5jb20vMB8GA1UdIwQYMBaAFL+Khe7o
+Eb8sjNQzwNjAun2PAGOJMB0GA1UdDgQWBBRpKBw7AgFabSS+K6V6U3vrWc2WvzAN
+BgkqhkiG9w0BAQUFAAOCAQEAck9CGBNLr9adHOD/EZ26S9lkdwByGZOPejJe4vln
+TdKHqmDzz64LvTspLB1btasSl0YGeEFqItk02H/I6/9J4ztuahHveuToTgOhkOj5
+5TJRH2ki2N9l2j8ceqkEf5w28Hn+EMTc5UCruKaIdvZgzy85KSFul3Wrx+WRBPHA
+JrIAG7Xc7C+TLdNa92uxsdD1IAnS1NVXcpJAtwboNhKf6dh+u0GfIShTdyqAGXnZ
+j7tO1+3kj46ILMCNyQbUL1etILcbftHVApqugk14s0ronnQ1DZLVBdowxwK0bXyv
+lGmysSWDl4lR7TEjKij/wnvej9S+BNOTWuciPKVpq7cAAQ==
+-----END CERTIFICATE-----
Added: trunk/ihe/src/config/connectathon/certs/keystore.key
===================================================================
(Binary files differ)
Property changes on: trunk/ihe/src/config/connectathon/certs/keystore.key
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ihe/src/config/connectathon/certs/mesa_keystore1_2009.p12
===================================================================
(Binary files differ)
Property changes on: trunk/ihe/src/config/connectathon/certs/mesa_keystore1_2009.p12
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/ihe/src/config/connectathon/certs/mesa_truststore_2009.jks
===================================================================
(Binary files differ)
Property changes on: trunk/ihe/src/config/connectathon/certs/mesa_truststore_2009.jks
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-01-10 17:00:15
|
Revision: 52
http://braid.svn.sourceforge.net/braid/?rev=52&view=rev
Author: wenzhi
Date: 2009-01-10 17:00:11 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
Fixed PIX and ATNA Mesa Tests for Connectathon 2009
Modified Paths:
--------------
trunk/ihe/mesatests/atna/Test11143.java
trunk/ihe/mesatests/atna/Test11180.java
trunk/ihe/mesatests/pix/Test10501.java
trunk/ihe/mesatests/pix/Test10502.java
trunk/ihe/mesatests/pix/Test10503.java
trunk/ihe/src/config/connectathon/AuditRepositoryConnections.xml
trunk/ihe/src/config/connectathon/GlobalMisys.xml
trunk/ihe/src/config/connectathon/IheActors.xml
trunk/ihe/src/config/connectathon/LocalMisys.xml
trunk/ihe/src/config/connectathon/PixMisys.xml
Modified: trunk/ihe/mesatests/atna/Test11143.java
===================================================================
--- trunk/ihe/mesatests/atna/Test11143.java 2009-01-10 16:58:17 UTC (rev 51)
+++ trunk/ihe/mesatests/atna/Test11143.java 2009-01-10 17:00:11 UTC (rev 52)
@@ -28,7 +28,7 @@
import com.misyshealthcare.connect.net.IConnection;
import com.misyshealthcare.connect.net.IConnectionDescription;
-/** Test rig for MESA test 11141.
+/** Test rig for MESA test 11143.
*
* This tests the basic TLS connectivity.
*
@@ -39,7 +39,7 @@
public class Test11143 {
/**
- * Run MESA Test 11801
+ * Run MESA Test
*/
public static void main(String[] args) {
String test = "11143";
Modified: trunk/ihe/mesatests/atna/Test11180.java
===================================================================
--- trunk/ihe/mesatests/atna/Test11180.java 2009-01-10 16:58:17 UTC (rev 51)
+++ trunk/ihe/mesatests/atna/Test11180.java 2009-01-10 17:00:11 UTC (rev 52)
@@ -57,7 +57,7 @@
// Set up audit trail.
ArrayList<IConnectionDescription> repositories = new ArrayList<IConnectionDescription>();
repositories.add(ConnectionFactory.getConnectionDescription("log4j_audittrail"));
-// repositories.add(ConnectionFactory.getConnectionDescription("mesa_arr_bsd"));
+ repositories.add(ConnectionFactory.getConnectionDescription("mesa_arr_bsd"));
AuditBroker broker = AuditBroker.getInstance();
broker.registerAuditSource(new IheAuditTrail("SecureNode", repositories));
IheAuditTrail doccons = new IheAuditTrail("DocumentConsumer", repositories);
@@ -88,16 +88,28 @@
// ------- TEST --------
// broker.userLogin();
+ //11181
// doccons.start();
+
+ //11190
// broker.nodeAuthenticationFailure(ConnectionFactory.getConnectionDescription("MISYS-SECURE-2"));
+
+ //11199
doccons.patientQueryIssued(ConnectionFactory.getConnectionDescription("MISYS-SECURE-1"), patient, true);
// doccons.documentSubmitted(ConnectionFactory.getConnectionDescription("MISYS-SECURE-1"), patient, submissionsetobject);
// doccons.documentStoredQuery(ConnectionFactory.getConnectionDescription("MISYS-SECURE-1"), patient, queryobject );
//doccons.documentRetrieved(ConnectionFactory.getConnectionDescription("MISYS-SECURE-1"), patient, documentobject);
-// doccons.recordAccessed(patient);
+
+ //11195
+// doccons.recordAccessed(patient);
+
+ //11196
// doccons.recordExported(patient, "USB Media");
+ //11197
// doccons.recordImported(patient, "USB Media");
-// doccons.stop();
+
+ //11182
+// doccons.stop();
// broker.userLogout();
// ------- END TEST --------
Modified: trunk/ihe/mesatests/pix/Test10501.java
===================================================================
--- trunk/ihe/mesatests/pix/Test10501.java 2009-01-10 16:58:17 UTC (rev 51)
+++ trunk/ihe/mesatests/pix/Test10501.java 2009-01-10 17:00:11 UTC (rev 52)
@@ -33,9 +33,9 @@
MesaTestLogger logger = new MesaTestLogger(System.out);
logger.writeTestBegin(test);
- TestKit.configActor(logger, "pixmesa");
+ TestKit.configActor(logger, "pix_q_mesa");
ConfigurationLoader loader = ConfigurationLoader.getInstance();
- ConfigurationLoader.ActorDescription actor = loader.getDescriptionById("pixmesa");
+ ConfigurationLoader.ActorDescription actor = loader.getDescriptionById("pix_q_mesa");
IConnectionDescription connection = actor.getConnection();
TestPixQuery tester = new TestPixQuery(connection, logger);
Modified: trunk/ihe/mesatests/pix/Test10502.java
===================================================================
--- trunk/ihe/mesatests/pix/Test10502.java 2009-01-10 16:58:17 UTC (rev 51)
+++ trunk/ihe/mesatests/pix/Test10502.java 2009-01-10 17:00:11 UTC (rev 52)
@@ -34,9 +34,9 @@
MesaTestLogger logger = new MesaTestLogger(System.out);
logger.writeTestBegin(test);
- TestKit.configActor(logger, "pixmesa");
+ TestKit.configActor(logger, "pix_q_mesa");
ConfigurationLoader loader = ConfigurationLoader.getInstance();
- ConfigurationLoader.ActorDescription actor = loader.getDescriptionById("pixmesa");
+ ConfigurationLoader.ActorDescription actor = loader.getDescriptionById("pix_q_mesa");
IConnectionDescription connection = actor.getConnection();
TestPixQuery tester = new TestPixQuery(connection, logger);
Modified: trunk/ihe/mesatests/pix/Test10503.java
===================================================================
--- trunk/ihe/mesatests/pix/Test10503.java 2009-01-10 16:58:17 UTC (rev 51)
+++ trunk/ihe/mesatests/pix/Test10503.java 2009-01-10 17:00:11 UTC (rev 52)
@@ -32,9 +32,9 @@
MesaTestLogger logger = new MesaTestLogger(System.out);
logger.writeTestBegin(test);
- TestKit.configActor(logger, "pixmesa");
+ TestKit.configActor(logger, "pix_q_mesa");
ConfigurationLoader loader = ConfigurationLoader.getInstance();
- ConfigurationLoader.ActorDescription actor = loader.getDescriptionById("pixmesa");
+ ConfigurationLoader.ActorDescription actor = loader.getDescriptionById("pix_q_mesa");
IConnectionDescription connection = actor.getConnection();
TestPixQuery tester = new TestPixQuery(connection, logger);
Modified: trunk/ihe/src/config/connectathon/AuditRepositoryConnections.xml
===================================================================
--- trunk/ihe/src/config/connectathon/AuditRepositoryConnections.xml 2009-01-10 16:58:17 UTC (rev 51)
+++ trunk/ihe/src/config/connectathon/AuditRepositoryConnections.xml 2009-01-10 17:00:11 UTC (rev 52)
@@ -9,12 +9,12 @@
<port>1234</port>
<Property name="TYPE" value="LOG4J LOGGER" />
<PropertySet name="localhost">
- <entry name="MACHINENAME" value="misys" />
- <entry name="HOSTNAME" value="misys1" />
+ <entry name="MACHINENAME" value="allscripts" />
+ <entry name="HOSTNAME" value="allscripts1" />
<entry name="IP" value="10.242.0.51" />
- <entry name="SITE" value="MISYS" />
- <entry name="SOURCE" value="EHR_MISYS" />
- <entry name="APPNAME" value="MisysConnect" />
+ <entry name="SITE" value="ALLSCRIPTS" />
+ <entry name="SOURCE" value="ALLSCRIPTS" />
+ <entry name="APPNAME" value="AllscriptsConnect" />
<!--entry value="AENAME=ER_MISYS" name="AENAME"/-->
</PropertySet>
<propertyset name="ParticipantObject">
@@ -29,17 +29,17 @@
</IDENTIFIER>
</standardconnection>
- <standardconnection name="mesa-arr-bsd">
+ <standardconnection name="mesa_arr_bsd">
<hostname>localhost</hostname>
<port>4000</port>
<Property name="TYPE" value="BSD SYSLOG" />
<PropertySet name="localhost">
- <entry name="MACHINENAME" value="misys" />
- <entry name="HOSTNAME" value="misys1" />
+ <entry name="MACHINENAME" value="allscripts" />
+ <entry name="HOSTNAME" value="allscripts1" />
<entry name="IP" value="10.242.0.51" />
- <entry name="SITE" value="MISYS" />
- <entry name="SOURCE" value="EHR_MISYS" />
- <entry name="APPNAME" value="MisysConnect" />
+ <entry name="SITE" value="ALLSCRIPTS" />
+ <entry name="SOURCE" value="ALLSCRIPTS" />
+ <entry name="APPNAME" value="AllscriptsConnect" />
<!--entry value="AENAME=ER_MISYS" name="AENAME"/-->
</PropertySet>
<propertyset name="ParticipantObject">
@@ -184,9 +184,9 @@
<entry name="DocumentIdType" value="DocumentId" />
</propertyset>
<!-- Trust and Keystore -->
- <KEYSTORE>certs/mesa_keystore.p12</KEYSTORE>
+ <KEYSTORE>certs/mesa_keystore1_2009.p12</KEYSTORE>
<KEYPASS>password</KEYPASS>
- <TRUSTSTORE>certs/mesa_truststore.jks</TRUSTSTORE>
+ <TRUSTSTORE>certs/mesa_truststore_2009.jks</TRUSTSTORE>
<TRUSTPASS>password</TRUSTPASS>
</secureconnection>
@@ -209,9 +209,9 @@
<entry name="DocumentIdType" value="DocumentId" />
</propertyset>
<!-- Trust and Keystore -->
- <KEYSTORE>certs/mesa_keystore.p12</KEYSTORE>
+ <KEYSTORE>certs/mesa_keystore1_2009.p12</KEYSTORE>
<KEYPASS>password</KEYPASS>
- <TRUSTSTORE>certs/mesa_truststore.jks</TRUSTSTORE>
+ <TRUSTSTORE>certs/mesa_truststore_2009.jks</TRUSTSTORE>
<TRUSTPASS>password</TRUSTPASS>
</secureconnection>
@@ -234,9 +234,9 @@
<entry name="DocumentIdType" value="DocumentId" />
</propertyset>
<!-- Trust and Keystore -->
- <KEYSTORE>certs/mesa_keystore.p12</KEYSTORE>
+ <KEYSTORE>certs/mesa_keystore1_2009.p12</KEYSTORE>
<KEYPASS>password</KEYPASS>
- <TRUSTSTORE>certs/mesa_truststore.jks</TRUSTSTORE>
+ <TRUSTSTORE>certs/mesa_truststore_2009.jks</TRUSTSTORE>
<TRUSTPASS>password</TRUSTPASS>
</secureconnection>
Modified: trunk/ihe/src/config/connectathon/GlobalMisys.xml
===================================================================
--- trunk/ihe/src/config/connectathon/GlobalMisys.xml 2009-01-10 16:58:17 UTC (rev 51)
+++ trunk/ihe/src/config/connectathon/GlobalMisys.xml 2009-01-10 17:00:11 UTC (rev 52)
@@ -10,11 +10,11 @@
</Identifier>
<Identifier name="SendingApplication">
- <NamespaceId>EHR_MISYS</NamespaceId>
+ <NamespaceId>EHR_ALLSCRIPTS_CONNECT</NamespaceId>
</Identifier>
<Identifier name="SendingFacility">
- <NamespaceId>MISYS</NamespaceId>
+ <NamespaceId>ALLSCRIPTS</NamespaceId>
</Identifier>
<EnumMap class="IPatientConsumer$CreationReason">
Modified: trunk/ihe/src/config/connectathon/IheActors.xml
===================================================================
--- trunk/ihe/src/config/connectathon/IheActors.xml 2009-01-10 16:58:17 UTC (rev 51)
+++ trunk/ihe/src/config/connectathon/IheActors.xml 2009-01-10 17:00:11 UTC (rev 52)
@@ -462,7 +462,7 @@
<actor name="arr_mesa" type="SecureNode">
<description>ARR MESA</description>
- <audittrail consumer="mesa-arr-bsd" />
+ <audittrail consumer="mesa_arr_bsd" />
</actor>
<actor name="arr_nist" type="SecureNode">
Modified: trunk/ihe/src/config/connectathon/LocalMisys.xml
===================================================================
--- trunk/ihe/src/config/connectathon/LocalMisys.xml 2009-01-10 16:58:17 UTC (rev 51)
+++ trunk/ihe/src/config/connectathon/LocalMisys.xml 2009-01-10 17:00:11 UTC (rev 52)
@@ -4,17 +4,17 @@
<!-- Use the Local Assigning Authority to sign our IDs for these feeds -->
<Identifier name="LocalAssigningAuthority">
- <NamespaceId>MIE1</NamespaceId>
- <UniversalId>1.3.6.1.4.1.21367.2008.1.2.323</UniversalId>
+ <NamespaceId>ALEH</NamespaceId>
+ <UniversalId>1.3.6.1.4.1.21367.2009.1.2.335</UniversalId>
<UniversalIdType>ISO</UniversalIdType>
</Identifier>
<Identifier name="SendingApplication">
- <NamespaceId>EHR_MISYS</NamespaceId>
+ <NamespaceId>EHR_ALLSCRIPTS_CONNECT</NamespaceId>
</Identifier>
<Identifier name="SendingFacility">
- <NamespaceId>MISYS</NamespaceId>
+ <NamespaceId>ALLSCRIPTS</NamespaceId>
</Identifier>
<EnumMap class="IPatientConsumer$CreationReason">
Modified: trunk/ihe/src/config/connectathon/PixMisys.xml
===================================================================
--- trunk/ihe/src/config/connectathon/PixMisys.xml 2009-01-10 16:58:17 UTC (rev 51)
+++ trunk/ihe/src/config/connectathon/PixMisys.xml 2009-01-10 17:00:11 UTC (rev 52)
@@ -2,8 +2,8 @@
<Configuration>
<Identifier name="LocalAssigningAuthority">
- <NamespaceId>MIE1</NamespaceId>
- <UniversalId>1.3.6.1.4.1.21367.2008.1.2.323</UniversalId>
+ <NamespaceId>ALEH</NamespaceId>
+ <UniversalId>1.3.6.1.4.1.21367.2009.1.2.335</UniversalId>
<UniversalIdType>ISO</UniversalIdType>
</Identifier>
@@ -14,11 +14,11 @@
</Identifier>
<Identifier name="SendingApplication">
- <NamespaceId>EHR_MISYS</NamespaceId>
+ <NamespaceId>EHR_ALLSCRIPTS_CONNECT</NamespaceId>
</Identifier>
<Identifier name="SendingFacility">
- <NamespaceId>MISYS</NamespaceId>
+ <NamespaceId>ALLSCRIPTS</NamespaceId>
</Identifier>
<PropertySet name="PixQueryName">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2009-01-10 16:58:22
|
Revision: 51
http://braid.svn.sourceforge.net/braid/?rev=51&view=rev
Author: wenzhi
Date: 2009-01-10 16:58:17 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
Fixed return domain
Modified Paths:
--------------
trunk/ihe/src/com/misyshealthcare/connect/ihe/PatientDemographicsSupplier.java
trunk/ihe/src/com/misyshealthcare/connect/ihe/PixManager.java
Modified: trunk/ihe/src/com/misyshealthcare/connect/ihe/PatientDemographicsSupplier.java
===================================================================
--- trunk/ihe/src/com/misyshealthcare/connect/ihe/PatientDemographicsSupplier.java 2008-12-31 10:47:39 UTC (rev 50)
+++ trunk/ihe/src/com/misyshealthcare/connect/ihe/PatientDemographicsSupplier.java 2009-01-10 16:58:17 UTC (rev 51)
@@ -452,24 +452,6 @@
}
/**
- * Validate whether an ID domain is valid against the connection configuration.
- *
- * @param id The request ID domain to be validated
- * @param description
- * @return <code>true</code> if the idDomain is valid.
- */
- private boolean validateRequestDomain(Identifier id, IConnectionDescription description) {
- if (id == null) return false;
-
- List<Identifier> identifiers = description.getAllIdentifiers("domain");
- for (Identifier identifier : identifiers) {
- if (identifier.equals(id))
- return true;
- }
- return false;
- }
-
- /**
* Get the value of a given component
*
* @param data
@@ -1043,17 +1025,35 @@
* @param connection
* @return The authority according the configuration
*/
- private Identifier reconcileIdentifier(Identifier authority, IConnectionDescription connection) {
- List<Identifier> identifiers = connection.getAllIdentifiers("domain");
+ public static Identifier reconcileIdentifier(Identifier authority, IConnectionDescription connection) {
+ List<Identifier> identifiers = connection.getAllIdentifiersByType("domain");
for (Identifier identifier : identifiers) {
if ( identifier.equals(authority) ) {
return identifier;
}
}
- //no identifier is found, just return the orinigal authority
+ //no identifier is found, just return the original authority
return authority;
}
+
+ /**
+ * Validate whether an ID domain is valid against the connection configuration.
+ *
+ * @param id The request ID domain to be validated
+ * @param description
+ * @return <code>true</code> if the idDomain is valid.
+ */
+ public static boolean validateRequestDomain(Identifier id, IConnectionDescription description) {
+ if (id == null) return false;
+ List<Identifier> identifiers = description.getAllIdentifiersByType("domain");
+ for (Identifier identifier : identifiers) {
+ if (identifier.equals(id))
+ return true;
+ }
+ return false;
+ }
+
/**
* Throw a new patient exception and log it as well.
*
Modified: trunk/ihe/src/com/misyshealthcare/connect/ihe/PixManager.java
===================================================================
--- trunk/ihe/src/com/misyshealthcare/connect/ihe/PixManager.java 2008-12-31 10:47:39 UTC (rev 50)
+++ trunk/ihe/src/com/misyshealthcare/connect/ihe/PixManager.java 2009-01-10 16:58:17 UTC (rev 51)
@@ -297,16 +297,17 @@
* @param description
* @return <code>true</code> if the idDomain is valid.
*/
- private boolean validateRequestDomain(Identifier id, IConnectionDescription description) {
+ public static boolean validateRequestDomain(Identifier id, IConnectionDescription description) {
if (id == null) return false;
- List<Identifier> identifiers = description.getAllIdentifiers("domain");
+ List<Identifier> identifiers = description.getAllIdentifiersByType("domain");
for (Identifier identifier : identifiers) {
if (identifier.equals(id))
return true;
}
return false;
}
+
//
// /**
// * Get the connect PID from SystemID and Unique PatientID
@@ -364,7 +365,7 @@
* @return The authority according the configuration
*/
private Identifier reconcileIdentifier(Identifier authority, IConnectionDescription connection) {
- List<Identifier> identifiers = connection.getAllIdentifiers("domain");
+ List<Identifier> identifiers = connection.getAllIdentifiersByType("domain");
for (Identifier identifier : identifiers) {
if ( identifier.equals(authority) ) {
return identifier;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2008-12-19 05:59:19
|
Revision: 48
http://braid.svn.sourceforge.net/braid/?rev=48&view=rev
Author: wenzhi
Date: 2008-12-19 05:59:13 +0000 (Fri, 19 Dec 2008)
Log Message:
-----------
Added a type attribute to the Identifier tag in xml configuration.
Modified Paths:
--------------
trunk/base/src/com/misyshealthcare/connect/base/audit/AuditCodeMappings.java
trunk/base/src/com/misyshealthcare/connect/net/DescriptionLoader.java
trunk/base/src/com/misyshealthcare/connect/net/IConnectionDescription.java
trunk/base/src/com/misyshealthcare/connect/net/StandardConnectionDescription.java
trunk/base/test/com/misyshealthcare/connect/net/StandardConnectionDescriptionTest.java
Modified: trunk/base/src/com/misyshealthcare/connect/base/audit/AuditCodeMappings.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/base/audit/AuditCodeMappings.java 2008-10-21 19:48:24 UTC (rev 47)
+++ trunk/base/src/com/misyshealthcare/connect/base/audit/AuditCodeMappings.java 2008-12-19 05:59:13 UTC (rev 48)
@@ -29,7 +29,7 @@
*
* For each enumeration there is a "getValue" function
* which provides the information for that code mapping in the official
- * format. These should only be used by the audit objet factory.
+ * format. These should only be used by the audit object factory.
*
* @see AuditObjectFactory
* @author Josh Flachsbart
Modified: trunk/base/src/com/misyshealthcare/connect/net/DescriptionLoader.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/DescriptionLoader.java 2008-10-21 19:48:24 UTC (rev 47)
+++ trunk/base/src/com/misyshealthcare/connect/net/DescriptionLoader.java 2008-12-19 05:59:13 UTC (rev 48)
@@ -543,7 +543,7 @@
* connection configuration.
* <p>
* <pre>
- * XML: AssigningAuthority name=""
+ * XML: AssigningAuthority name="" type=""
* NamespaceId
* UniversalId
* UniversalIdType
@@ -554,6 +554,8 @@
*/
private static void processIdentifier(StandardConnectionDescription connection, Node authority) {
String setName = getAttributeValue(authority, "name");
+ String type = getAttributeValue(authority, "type");
+
if (setName == null) {
// No authority name, can't save values
logMissingAttributeWarning(authority.getNodeName(), "name", connection);
@@ -584,7 +586,7 @@
// We did, add the authority
// Create a property set for this entry
Identifier theAuthority = new Identifier(namespaceId, universalId, universalIdType);
- connection.addIdentifier(setName, theAuthority);
+ connection.addIdentifier(setName, type, theAuthority);
}
}
Modified: trunk/base/src/com/misyshealthcare/connect/net/IConnectionDescription.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/IConnectionDescription.java 2008-10-21 19:48:24 UTC (rev 47)
+++ trunk/base/src/com/misyshealthcare/connect/net/IConnectionDescription.java 2008-12-19 05:59:13 UTC (rev 48)
@@ -118,13 +118,14 @@
public Identifier getIdentifier(String name);
/**
- * Get all identifiers with a common name prefix.
+ * Get all identifiers of a given type.
*
- * @param namePrefix The name prefix of identifiers to be find
- * @return The list of Identifiers whose name starting with namePrefix
+ * @param type the type of identifier
+ * @return The list of Identifiers whose type is matched with the given type.
+ * Returns an empty list if nothing is found by this type.
*/
- public List<Identifier> getAllIdentifiers(String namePrefix);
-
+ public List<Identifier> getAllIdentifiersByType(String type);
+
/**
* Get an object map that is defined for this connection
*
Modified: trunk/base/src/com/misyshealthcare/connect/net/StandardConnectionDescription.java
===================================================================
--- trunk/base/src/com/misyshealthcare/connect/net/StandardConnectionDescription.java 2008-10-21 19:48:24 UTC (rev 47)
+++ trunk/base/src/com/misyshealthcare/connect/net/StandardConnectionDescription.java 2008-12-19 05:59:13 UTC (rev 48)
@@ -16,14 +16,16 @@
package com.misyshealthcare.connect.net;
import java.io.File;
+import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
-import java.util.ArrayList;
import java.util.Set;
import org.apache.log4j.Logger;
+import com.misyshealthcare.connect.util.Pair;
+
/** A description of an insecure connection. <p />
*
* This should only be obtained throught the ConnectionFactory's
@@ -52,7 +54,8 @@
private Hashtable<String, CodeSet> codingSchemes = null;
private Hashtable<Class, EnumMap> enumMaps = null;
private Hashtable<String, StringMap> stringMaps = null;
- private Hashtable<String, Identifier> identifiers = null;
+ //Pair<String(type), Identifier>
+ private Hashtable<String, Pair> identifiers = null;
private Hashtable<String, ObjectMap> objectMaps = null;
private Hashtable<String, ObjectEntry> objects = null;
private Hashtable<String, ObjectList> objectLists = null;
@@ -450,48 +453,56 @@
if (name == null) return null;
String key = name.toLowerCase();
if ((identifiers != null) && (identifiers.containsKey(key))) {
- return identifiers.get(key);
+ return (Identifier)identifiers.get(key)._second;
} else {
LOG.debug("Looking up non-existent identifier: " + name);
return null;
}
}
+
/**
- * Get all identifiers with a common name prefix.
+ * Get all identifiers of a given type.
*
- * @param namePrefix The name prefix of identifiers to be find
- * @return The list of Identifiers whose name starting with namePrefix
+ * @param type the type of identifier
+ * @return The list of Identifiers whose type is matched with the given type.
+ * Returns an empty list if nothing is found by this type.
*/
- public List<Identifier> getAllIdentifiers(String namePrefix) {
+ public List<Identifier> getAllIdentifiersByType(String type) {
List<Identifier> ret = new ArrayList<Identifier>();
- if (namePrefix == null || identifiers == null) return ret;
+ if (type == null || identifiers == null) return ret;
- String prefix = namePrefix.toLowerCase();
+ String lowType = type.toLowerCase();
Set<String> keys = identifiers.keySet();
for (String key : keys) {
- if (key.startsWith(prefix)) {
- ret.add( identifiers.get( key ) );
+ //_first is type; _second is Identifier
+ String tempType = (String)identifiers.get(key)._first;
+ if (tempType == null)
+ continue;
+ if (lowType.equalsIgnoreCase( tempType )) {
+ ret.add( (Identifier)identifiers.get( key )._second );
}
}
return ret;
}
+
/**
- * Add a new identifier to this connection description. This method is used when loading
- * configuration files.
+ * Add a new identifier with a given type to this connection description.
+ * This method is used when loading configuration files.
*
+ * @param name The required name of this Identifier
+ * @param type The optional type of this Identifier
* @param authority The identifier to add
*/
- public void addIdentifier(String name, Identifier authority) {
+ public void addIdentifier(String name, String type, Identifier authority) {
if (authority != null) {
if (name != null) {
- if (identifiers == null) identifiers = new Hashtable<String, Identifier>();
- identifiers.put(name.toLowerCase(), authority);
+ if (identifiers == null) identifiers = new Hashtable<String, Pair>();
+ identifiers.put(name.toLowerCase(), new Pair(type, authority));
} else {
LOG.debug("Adding identifier with no name to connection: " + this.name);
}
}
}
-
}
Modified: trunk/base/test/com/misyshealthcare/connect/net/StandardConnectionDescriptionTest.java
===================================================================
--- trunk/base/test/com/misyshealthcare/connect/net/StandardConnectionDescriptionTest.java 2008-10-21 19:48:24 UTC (rev 47)
+++ trunk/base/test/com/misyshealthcare/connect/net/StandardConnectionDescriptionTest.java 2008-12-19 05:59:13 UTC (rev 48)
@@ -14,18 +14,11 @@
*/
package com.misyshealthcare.connect.net;
+import java.util.List;
+
import junit.framework.TestCase;
import com.misyshealthcare.connect.base.SharedEnums;
-import com.misyshealthcare.connect.net.CodeSet;
-import com.misyshealthcare.connect.net.EnumMap;
-import com.misyshealthcare.connect.net.Identifier;
-import com.misyshealthcare.connect.net.PropertySet;
-import com.misyshealthcare.connect.net.StandardConnectionDescription;
-import com.misyshealthcare.connect.net.IConnectionDescription;
-import com.misyshealthcare.connect.net.ConnectionFactory;
-import com.misyshealthcare.connect.net.StandardConnectionDescriptionTest;
-import com.misyshealthcare.connect.net.StringMap;
public class StandardConnectionDescriptionTest extends TestCase {
protected StandardConnectionDescription scd = null;
@@ -206,11 +199,15 @@
public void testAddAssigningAuthority() {
StandardConnectionDescription scd = new StandardConnectionDescription();
Identifier authority = new Identifier("MISYS", "1.2.3.4.5", "ISO");
- scd.addIdentifier("foo", authority);
+ scd.addIdentifier("foo", "test", authority);
assertSame(authority, scd.getIdentifier("foo"));
assertEquals("MISYS", authority.getNamespaceId());
assertEquals("1.2.3.4.5", authority.getUniversalId());
assertEquals("ISO", authority.getUniversalIdType());
+ List<Identifier> ids = scd.getAllIdentifiersByType("test");
+ assertEquals(1, ids.size());
+ assertEquals("MISYS", ids.get(0).getNamespaceId());
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2008-10-21 19:48:31
|
Revision: 47
http://braid.svn.sourceforge.net/braid/?rev=47&view=rev
Author: wenzhi
Date: 2008-10-21 19:48:24 +0000 (Tue, 21 Oct 2008)
Log Message:
-----------
Create Braid 1.1 release branch
Added Paths:
-----------
branches/RB-1.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2008-10-20 22:40:00
|
Revision: 46
http://braid.svn.sourceforge.net/braid/?rev=46&view=rev
Author: wenzhi
Date: 2008-10-20 22:39:52 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
Added license files to distribution
Modified Paths:
--------------
trunk/build-ws.xml
trunk/build.xml
Modified: trunk/build-ws.xml
===================================================================
--- trunk/build-ws.xml 2008-10-20 22:37:25 UTC (rev 45)
+++ trunk/build-ws.xml 2008-10-20 22:39:52 UTC (rev 46)
@@ -1,4 +1,4 @@
-<project name="braid" default="braid-zip-tar" basedir=".">
+<project name="braid-ws" default="braid-zip-tar" basedir=".">
<description>build file for the Braid IHE client libraries</description>
<!-- set global properties for this build -->
@@ -104,6 +104,7 @@
<!-- create target for base & ihe jar -->
<target name="distall" depends="build,service" description="Put all of the code into the appropriate jars">
<mkdir dir="${build}/${final.name}/lib"/>
+ <mkdir dir="${build}/${final.name}/licenses"/>
<mkdir dir="${build}/${final.name}/conf"/>
<jar destfile="${build}/${final.name}/${basejarname}" basedir="${build}/classes/base" />
<jar destfile="${build}/${final.name}/${ihejarname}" basedir="${build}/classes/ihe" />
@@ -111,7 +112,11 @@
<fileset dir="${common.dir}/lib">
</fileset>
</copy>
- <copy todir="${build}/${final.name}/conf">
+ <copy todir="${build}/${final.name}/licenses">
+ <fileset dir="${common.dir}/licenses">
+ </fileset>
+ </copy>
+ <copy todir="${build}/${final.name}/conf">
<fileset dir="${ihe.dir}/src/config">
</fileset>
</copy>
@@ -126,6 +131,7 @@
<zip zipfile="${zipfilename}" >
<zipfileset dir="${build}/${final.name}" prefix="${final.name}">
<include name="lib/**"/>
+ <include name="licenses/**"/>
<include name="conf/**"/>
<include name="**/*.aar"/>
<include name="**/*.jar"/>
@@ -141,7 +147,8 @@
<tar longfile="gnu" compression="gzip" tarfile="${tarfilename}">
<tarfileset dir="${build}/${final.name}" prefix="${final.name}">
<include name="lib/**"/>
- <include name="conf/**"/>
+ <include name="licenses/**"/>
+ <include name="conf/**"/>
<include name="**/*.aar"/>
<include name="**/*.jar"/>
<include name="LICENSE"/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-10-20 22:37:25 UTC (rev 45)
+++ trunk/build.xml 2008-10-20 22:39:52 UTC (rev 46)
@@ -74,13 +74,18 @@
<!-- create target for base & ihe jar -->
<target name="dist" depends="build" description="Put all of the code into the appropriate jars">
<mkdir dir="${build}/${final.name}/lib"/>
- <mkdir dir="${build}/${final.name}/conf"/>
+ <mkdir dir="${build}/${final.name}/licenses"/>
+ <mkdir dir="${build}/${final.name}/conf"/>
<jar destfile="${build}/${final.name}/${basejarname}" basedir="${build}/classes/base" />
<jar destfile="${build}/${final.name}/${ihejarname}" basedir="${build}/classes/ihe" />
<copy todir="${build}/${final.name}/lib">
<fileset dir="${common.dir}/lib">
</fileset>
</copy>
+ <copy todir="${build}/${final.name}/licenses">
+ <fileset dir="${common.dir}/licenses">
+ </fileset>
+ </copy>
<copy todir="${build}/${final.name}/conf">
<fileset dir="${ihe.dir}/src/config">
</fileset>
@@ -97,6 +102,7 @@
<zip zipfile="${zipfilename}" >
<zipfileset dir="${build}/${final.name}" prefix="${final.name}">
<include name="lib/**"/>
+ <include name="licenses/**"/>
<include name="conf/**"/>
<include name="**/*.jar"/>
<include name="LICENSE"/>
@@ -111,6 +117,7 @@
<tar longfile="gnu" compression="gzip" tarfile="${tarfilename}">
<tarfileset dir="${build}/${final.name}" prefix="${final.name}">
<include name="lib/**"/>
+ <include name="licenses/**"/>
<include name="conf/**"/>
<include name="**/*.jar"/>
<include name="LICENSE"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <we...@us...> - 2008-10-20 22:37:36
|
Revision: 45
http://braid.svn.sourceforge.net/braid/?rev=45&view=rev
Author: wenzhi
Date: 2008-10-20 22:37:25 +0000 (Mon, 20 Oct 2008)
Log Message:
-----------
Add all third party open source license files
Added Paths:
-----------
trunk/common/licenses/
trunk/common/licenses/FastInfoset-LICENSE.txt
trunk/common/licenses/XmlSchema-LICENSE.txt
trunk/common/licenses/activation-LICENSE.txt
trunk/common/licenses/annogen-LICENSE.txt
trunk/common/licenses/axiom-api-LICENSE.txt
trunk/common/licenses/axiom-dom-LICENSE.txt
trunk/common/licenses/axiom-impl-LICENSE.txt
trunk/common/licenses/axis2-LICENSE.txt
trunk/common/licenses/backport-util-concurrent-LICENSE.txt
trunk/common/licenses/bcmail-LICENSE.txt
trunk/common/licenses/bcprov-LICENSE.txt
trunk/common/licenses/beepcore-LICENSE.txt
trunk/common/licenses/beepsasl-LICENSE.txt
trunk/common/licenses/beeptls-LICENSE.txt
trunk/common/licenses/commons-codec-LICENSE.txt
trunk/common/licenses/commons-httpclient-LICENSE.txt
trunk/common/licenses/commons-logging-LICENSE.txt
trunk/common/licenses/jaxb-api-LICENSE.txt
trunk/common/licenses/jaxb-impl-LICENSE.txt
trunk/common/licenses/jaxb-libs-LICENSE.txt
trunk/common/licenses/jaxb-xjc-LICENSE.txt
trunk/common/licenses/jaxp-LICENSE.txt
trunk/common/licenses/jaxrpc-LICENSE.txt
trunk/common/licenses/jsr173-1_0-LICENSE.txt
trunk/common/licenses/junit-LICENSE.txt
trunk/common/licenses/log4j-LICENSE.txt
trunk/common/licenses/mail-LICENSE.txt
trunk/common/licenses/neethi-LICENSE.txt
trunk/common/licenses/relaxngDatatype-LICENSE.txt
trunk/common/licenses/saaj-LICENSE.txt
trunk/common/licenses/saaj-imple-LICENSE.txt
trunk/common/licenses/velocity-LICENSE.txt
trunk/common/licenses/wsdl4j-LICENSE.txt
trunk/common/licenses/xalan-LICENSE.txt
trunk/common/licenses/xbean-LICENSE.txt
trunk/common/licenses/xercesImpl-LICENSE.txt
trunk/common/licenses/xml-apis-LICENSE.txt
trunk/common/licenses/xsdlib-LICENSE.txt
Added: trunk/common/licenses/FastInfoset-LICENSE.txt
===================================================================
--- trunk/common/licenses/FastInfoset-LICENSE.txt (rev 0)
+++ trunk/common/licenses/FastInfoset-LICENSE.txt 2008-10-20 22:37:25 UTC (rev 45)
@@ -0,0 +1,202 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Added: trunk/common/licenses/XmlSchema-LICENSE.txt
===================================================================
--- trunk/common/licenses/XmlSchema-LICENSE.txt (rev 0)
+++ trunk/common/licenses/XmlSchema-LICENSE.txt 2008-10-20 22:37:25 UTC (rev 45)
@@ -0,0 +1,202 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Added: trunk/common/licenses/activation-LICENSE.txt
===================================================================
--- trunk/common/licenses/activation-LICENSE.txt (rev 0)
+++ trunk/common/licenses/activation-LICENSE.txt 2008-10-20 22:37:25 UTC (rev 45)
@@ -0,0 +1,119 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications.
+
+1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+
+1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+
+1.4. Executable means the Covered Software in any form other than Source Code.
+
+1.5. Initial Developer means the individual or entity that first makes Original Software available under this License.
+
+1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+
+1.7. License means this document.
+
+1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+
+1.9. Modifications means the Source Code and Executable form of any of the following:
+
+A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
+
+B. Any new file that contains any part of the Original Software or previous Modification; or
+
+C. Any new file that is contributed or otherwise made available under the terms of this License.
+
+1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License.
+
+1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+
+1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+
+1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)�the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)�ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
+(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
+(d) Notwithstanding Section�2.1(b) above, no patent license is granted: (1)�for code that You delete from the Original Software, or (2)�for infringements caused by: (i)�the modification of the Original Software, or (ii)�the combination of the Original Software with other software or devices.
+
+2.2. Contributor Grant.
+Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
+(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
+(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1)�Modifications made by that Contributor (or portions thereof); and (2)�the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+(c) The licenses granted in Sections�2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+(d) Notwithstanding Section�2.2(b) above, no patent license is granted: (1)�for any code that Contributor has deleted from the Contributor Version; (2)�for infringements caused by: (i)�third party modifications of Contributor Version, or (ii)�the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3)�under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+
+Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
+
+3.2. Modifications.
+
+The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
+
+3.3. Required Notices.
+You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms.
+You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+
+3.5. Distribution of Executable Versions.
+You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipients rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+
+3.6. Larger Works.
+You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions.
+Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+
+4.2. Effect of New Versions.
+
+You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
+4.3. Modified Versions.
+
+When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a)�rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b)�otherwise make it clear that the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+
+6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as Participant) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections�2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
+
+6.3. In the event of termination under Sections�6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a commercial item, as that term is defined in 48�C.F.R.�2.101 (Oct. 1995), consisting of commercial computer software (as that term is defined at 48 C.F.R. �252.227-7014(a)(1)) and commercial computer software documentation as such terms are used in 48�C.F.R.�12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdictions conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+
+
Added: trunk/common/licenses/annogen-LICENSE.txt
===================================================================
--- trunk/common/licenses/annogen-LICENSE.txt (rev 0)
+++ trunk/common/licenses/annogen-LICENSE.txt 2008-10-20 22:37:25 UTC (rev 45)
@@ -0,0 +1,202 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
Added: trunk/common/licenses/axiom-api-LICENSE.txt
===================================================================
--- trunk/common/licenses/axiom-api-LICENSE.txt (rev 0)
+++ trunk/common/licenses/axiom-api-LICENSE.txt 2008-10-20 22:37:25 UTC (rev 45)
@@ -0,0 +1,202 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must ...
[truncated message content] |
1 message has been excluded from this view by a project administrator.
