[openempi~source-repository:16] Updates for the 2.0.2 release

» Back to List Archive
« Previous Message Next »
« Previous Thread Next »
  • From: odysseas@kenai.com
  • To: commits@openempi.kenai.com
  • Subject: [openempi~source-repository:16] Updates for the 2.0.2 release
  • Date: Tue, 12 Jan 2010 22:34:35 +0000
Project:    openempi
Repository: source-repository
Revision:   16
Author:     odysseas
Date:       2010-01-12 22:34:32 UTC
Link:       

Log Message:
------------
Updates for the 2.0.2 release


Revisions:
----------
16


Modified Paths:
---------------
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonManagerService.java
trunk/openempi/pom.xml
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonQueryService.java
trunk/openempi/ear/pom.xml
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonManagerServiceBean.java
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonQueryServiceBean.java


Diffs:
------
Index: 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonManagerService.java
===================================================================
--- 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonManagerService.java
  (revision 15)
+++ 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonManagerService.java
  (revision 16)
@@ -41,19 +41,10 @@
        public void mergePersons(String sessionKey, PersonIdentifier 
retiredIdentifier, PersonIdentifier survivingIdentifier) throws 
ApplicationException;
        
        public Person getPerson(String sessionKey, List<PersonIdentifier> 
personIdentifiers);
-       
-       public List<IdentifierDomain> getIdentifierDomains(String sessionKey);
-       
-       public List<String> getIdentifierDomainTypeCodes(String sessionKey);
-       
        public IdentifierDomain obtainUniqueIdentifierDomain(String 
sessionKey, String universalIdentifierTypeCode);
        
        public IdentifierDomainAttribute addIdentifierDomainAttribute(String 
sessionKey, IdentifierDomain identifierDomain, String attributeName, String 
attributeValue);
        
-       public IdentifierDomainAttribute getIdentifierDomainAttribute(String 
sessionKey, IdentifierDomain identifierDomain, String attributeName);
-       
-       public List<IdentifierDomainAttribute> 
getIdentifierDomainAttributes(String sessionKey, IdentifierDomain 
identifierDomain);
-       
        public void updateIdentifierDomainAttribute(String sessionKey, 
IdentifierDomainAttribute identifierDomainAttribute);
 
        public void removeIdentifierDomainAttribute(String sessionKey, 
IdentifierDomainAttribute identifierDomainAttribute);    
Index: 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonQueryServiceBean.java
===================================================================
--- 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonQueryServiceBean.java
        (revision 15)
+++ 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonQueryServiceBean.java
        (revision 16)
@@ -25,6 +25,8 @@
 import org.openhie.openempi.context.Context;
 import org.openhie.openempi.ejb.BaseSpringInjectableBean;
 import org.openhie.openempi.ejb.SpringInjectionInterceptor;
+import org.openhie.openempi.model.IdentifierDomain;
+import org.openhie.openempi.model.IdentifierDomainAttribute;
 import org.openhie.openempi.model.Person;
 import org.openhie.openempi.model.PersonIdentifier;
 
@@ -41,6 +43,13 @@
                return personService.findPersonById(identifier);
        }
 
+       public List<Person> findPersonsById(String sessionKey, 
PersonIdentifier identifier) {
+               log.trace("In findPersonsById method.");
+               Context.authenticate(sessionKey);
+               org.openhie.openempi.service.PersonQueryService personService 
= Context.getPersonQueryService();
+               return personService.findPersonsById(identifier);
+       }
+
        public List<Person> findPersonsByAttributes(String sessionKey, Person 
person) {
                log.trace("In findPersonsByAttributes method.");
                Context.authenticate(sessionKey);
@@ -54,4 +63,33 @@
                org.openhie.openempi.service.PersonQueryService personService 
= Context.getPersonQueryService();
                return personService.findLinkedPersons(identifier);           
  
        }
+       
+       
+       public List<IdentifierDomain> getIdentifierDomains(String sessionKey) 
{
+               log.trace("In getIdentifierDomains method.");
+               Context.authenticate(sessionKey);
+               org.openhie.openempi.service.PersonQueryService personService 
= Context.getPersonQueryService();
+               return personService.getIdentifierDomains();
+       }
+       
+       public List<String> getIdentifierDomainTypeCodes(String sessionKey) {
+               log.trace("In getIdentifierDomainTypeCodes method.");
+               Context.authenticate(sessionKey);
+               org.openhie.openempi.service.PersonQueryService personService 
= Context.getPersonQueryService();
+               return personService.getIdentifierDomainTypeCodes();
+       }
+       
+       public IdentifierDomainAttribute getIdentifierDomainAttribute(String 
sessionKey, IdentifierDomain identifierDomain, String attributeName) {
+               log.trace("In getIdentifierDomainAttribute method.");
+               Context.authenticate(sessionKey);
+               org.openhie.openempi.service.PersonQueryService personService 
= Context.getPersonQueryService();
+               return 
personService.getIdentifierDomainAttribute(identifierDomain, attributeName);
+       }
+       
+       public List<IdentifierDomainAttribute> 
getIdentifierDomainAttributes(String sessionKey, IdentifierDomain 
identifierDomain) {
+               log.trace("In getIdentifierDomainAttributes method.");
+               Context.authenticate(sessionKey);
+               org.openhie.openempi.service.PersonQueryService personService 
= Context.getPersonQueryService();
+               return 
personService.getIdentifierDomainAttributes(identifierDomain);
+       }
 }
Index: 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonManagerServiceBean.java
===================================================================
--- 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonManagerServiceBean.java
      (revision 15)
+++ 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonManagerServiceBean.java
      (revision 16)
@@ -77,21 +77,6 @@
                org.openhie.openempi.service.PersonManagerService 
personService = Context.getPersonManagerService();
                return personService.getPerson(personIdentifiers);
        }
-       
-       public List<IdentifierDomain> getIdentifierDomains(String sessionKey) 
{
-               log.trace("In getIdentifierDomains method.");
-               Context.authenticate(sessionKey);
-               org.openhie.openempi.service.PersonManagerService 
personService = Context.getPersonManagerService();
-               return personService.getIdentifierDomains();
-       }
-       
-       public List<String> getIdentifierDomainTypeCodes(String sessionKey) {
-               log.trace("In getIdentifierDomainTypeCodes method.");
-               Context.authenticate(sessionKey);
-               org.openhie.openempi.service.PersonManagerService 
personService = Context.getPersonManagerService();
-               return personService.getIdentifierDomainTypeCodes();
-       }
-       
        public IdentifierDomain obtainUniqueIdentifierDomain(String 
sessionKey, String universalIdentifierTypeCode) {
                log.trace("In obtainUniqueIdentifierDomain method.");
                Context.authenticate(sessionKey);
@@ -106,20 +91,6 @@
                return 
personService.addIdentifierDomainAttribute(identifierDomain, attributeName, 
attributeValue);
        }
        
-       public IdentifierDomainAttribute getIdentifierDomainAttribute(String 
sessionKey, IdentifierDomain identifierDomain, String attributeName) {
-               log.trace("In getIdentifierDomainAttribute method.");
-               Context.authenticate(sessionKey);
-               org.openhie.openempi.service.PersonManagerService 
personService = Context.getPersonManagerService();
-               return 
personService.getIdentifierDomainAttribute(identifierDomain, attributeName);
-       }
-       
-       public List<IdentifierDomainAttribute> 
getIdentifierDomainAttributes(String sessionKey, IdentifierDomain 
identifierDomain) {
-               log.trace("In getIdentifierDomainAttributes method.");
-               Context.authenticate(sessionKey);
-               org.openhie.openempi.service.PersonManagerService 
personService = Context.getPersonManagerService();
-               return 
personService.getIdentifierDomainAttributes(identifierDomain);
-       }
-       
        public void updateIdentifierDomainAttribute(String sessionKey, 
IdentifierDomainAttribute identifierDomainAttribute) {
                log.trace("In updateIdentifierDomainAttribute method.");
                Context.authenticate(sessionKey);
Index: 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonQueryService.java
===================================================================
--- 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonQueryService.java
    (revision 15)
+++ 
trunk/openempi/ejb/src/main/java/org/openhie/openempi/ejb/person/PersonQueryService.java
    (revision 16)
@@ -21,6 +21,8 @@
 
 import javax.ejb.Remote;
 
+import org.openhie.openempi.model.IdentifierDomain;
+import org.openhie.openempi.model.IdentifierDomainAttribute;
 import org.openhie.openempi.model.Person;
 import org.openhie.openempi.model.PersonIdentifier;
 
@@ -29,7 +31,18 @@
 {
        public Person findPersonById(String seessionKey, PersonIdentifier 
identifier);
 
+       public List<Person> findPersonsById(String sessionKey, 
PersonIdentifier identifier);
+       
        public List<Person> findLinkedPersons(String sessionKey, 
PersonIdentifier identifier);
 
-       public List<Person> findPersonsByAttributes(String seessionKey, 
Person person);
+       public List<Person> findPersonsByAttributes(String seessionKey, 
Person person); 
+       
+       public List<IdentifierDomain> getIdentifierDomains(String sessionKey);
+       
+       public List<String> getIdentifierDomainTypeCodes(String sessionKey);
+               
+       public IdentifierDomainAttribute getIdentifierDomainAttribute(String 
sessionKey, IdentifierDomain identifierDomain, String attributeName);
+       
+       public List<IdentifierDomainAttribute> 
getIdentifierDomainAttributes(String sessionKey, IdentifierDomain 
identifierDomain);
+       
 }
Index: trunk/openempi/ear/pom.xml
===================================================================
--- trunk/openempi/ear/pom.xml  (revision 15)
+++ trunk/openempi/ear/pom.xml  (revision 16)
@@ -37,6 +37,12 @@
                        <version>${release.version}</version>
                        <type>war</type>
                </dependency>
+               <dependency>
+                       <groupId>org.openhie.openempi</groupId>
+                       <artifactId>openempi-webapp-web</artifactId>
+                       <version>${release.version}</version>
+                       <type>war</type>
+               </dependency>           
        </dependencies>
 
        <build>
@@ -62,6 +68,11 @@
                                                        
<artifactId>openempi-webapp</artifactId>
                                                        
<bundleDir>/</bundleDir>
                                                </webModule>
+                                               <webModule>
+                                                       
<groupId>org.openhie.openempi</groupId>
+                                                       
<artifactId>openempi-webapp-web</artifactId>
+                                                       
<bundleDir>/</bundleDir>
+                                               </webModule>
                                        </modules>
 <!--                                   
                                        <jboss>
Index: trunk/openempi/pom.xml
===================================================================
--- trunk/openempi/pom.xml      (revision 15)
+++ trunk/openempi/pom.xml      (revision 16)
@@ -71,6 +71,14 @@
                 </configuration>
             </plugin>
             <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptors>
+                        
<descriptor>src/main/assembly/assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+            <plugin>
                 <artifactId>maven-eclipse-plugin</artifactId>
                 <version>2.5.1</version>
                 <configuration>
@@ -95,6 +103,11 @@
                     <useFullNames>false</useFullNames>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-eclipse-plugin</artifactId>
+                <version>2.7</version>
+            </plugin>
             <!-- Use mvn license:check  or  mvn license:format -->
             <plugin>
                 <groupId>com.google.code.maven-license-plugin</groupId>
@@ -155,7 +168,15 @@
            <id>com.eaio</id>
            <name>eaio.com repository</name>
            <url>http://eaio.com/maven2</url>
-       </repository>        
+       </repository>
+       <repository>
+           <id>gwt-maven</id>
+           <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url>
+       </repository>
+       <repository>
+           <id>for-gwt-incubator</id>
+           <url>http://dist.codehaus.org/mule/dependencies/maven2/</url>
+       </repository>
     </repositories>
 
     <pluginRepositories>
@@ -170,6 +191,10 @@
                        <enabled>true</enabled>
                </releases>
        </pluginRepository>
+       <pluginRepository>
+               <id>gwt-maven-plugins</id>
+               
<url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url>
+       </pluginRepository>
         <pluginRepository>
             <id>appfuse</id>
             <url>http://static.appfuse.org/repository</url>
@@ -274,6 +299,8 @@
         <module>ejb</module>
         <module>pixpdq-adapter</module>
         <module>web</module>
+        <module>webapp-server</module>
+       <module>webapp-web</module>
         <module>ear</module>
     </modules>
 
@@ -432,8 +459,11 @@
     </profiles>
 
     <properties>
-       <release.version>2.0.1</release.version>
+       <release.version>2.0.2</release.version>
        
+       <maven.compiler.source>5</maven.compiler.source>
+       <maven.compiler.target>5</maven.compiler.target>
+       
         <!-- Application settings -->
         <copyright.year>2008</copyright.year>
         <dao.framework>hibernate</dao.framework>
@@ -445,6 +475,12 @@
         <appfuse.version>2.0.2</appfuse.version>
         <spring.version>2.5.4</spring.version>
 
+       <!-- GWT dependency -->
+       <gwt.version>1.7.1</gwt.version>
+       <gxt.version>2.0.1</gxt.version>
+       <platform>windows</platform>
+       <dozer.version>5.1</dozer.version>
+       
         <!-- Testing dependency versions -->
         <jmock.version>2.4.0</jmock.version>
         <jsp.version>2.0</jsp.version>




[openempi~source-repository:16] Updates for the 2.0.2 release

odysseas 01/12/2010
  • Mysql
  • Glassfish
  • Jruby
  • Rails
  • Nblogo
Terms of Use; Privacy Policy;
© 2010, Oracle Corporation and/or its affiliates
(revision 20120518.3c65429)
 
 
Close
loading
Please Confirm
Close