The usages of new Query General module

nimbusproject · Jun 10, 2011 · ade5d7b · ade5d7b
1 parent ffa4e20
commit ade5d7b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 3 deletions.
diff --git a/ctx-broker/src/org/nimbustools/ctxbroker/rest/BrokerResource.java b/ctx-broker/src/org/nimbustools/ctxbroker/rest/BrokerResource.java
@@ -30,7 +30,7 @@
 import org.nimbustools.ctxbroker.service.ContextBrokerHomeImpl;
 import org.nimbustools.ctxbroker.service.ContextBrokerResourceImpl;
 import org.nimbustools.ctxbroker.service.ContextBrokerServiceImpl;
-import org.nimbustools.messaging.query.security.QueryUser;
+import org.nimbustools.querygeneral.security.QueryUser;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;

diff --git a/messaging/query/java/source/build.properties b/messaging/query/java/source/build.properties
@@ -13,6 +13,7 @@ nimbus.messaging.gt4_0.common.dist.dir=../../../gt4.0/java/common/dist/
 nimbus.messaging.gt4_0-elastic.dist.dir=../../../gt4.0-elastic/java/msgbridge/dist/
 nimbus.service.api.dist.dir=../../../../service-api/java/source/dist/
 nimbus.authzdb.dist.dir=../../../../authzdb/dist/
+nimbus.querygen.dist.dir=../../../../query/dist
 nimbus.service.dist.dir=../../../../service/service/java/source/dist/
 
 # (gar is the 'dist' of stubs but we only want the jars... will be better later)

diff --git a/messaging/query/java/source/build.xml b/messaging/query/java/source/build.xml
@@ -74,13 +74,14 @@
               <include name="*.jar"/>
         </fileset>
 
-        <fileset dir="${nimbus.service.dist.dir}">
+        <fileset dir="${nimbus.authzdb.dist.dir}">
               <include name="*.jar"/>
         </fileset>
 
-        <fileset dir="${nimbus.authzdb.dist.dir}">
+        <fileset dir="${nimbus.querygen.dist.dir}">
               <include name="*.jar"/>
         </fileset>
+
     </path>
 
     <target name="compile" depends="init">

diff --git a/...va/source/src/org/nimbustools/messaging/query/security/NimbusAuthzUserDetailsService.java b/...va/source/src/org/nimbustools/messaging/query/security/NimbusAuthzUserDetailsService.java
@@ -20,6 +20,8 @@
 import org.nimbus.authz.AuthzDBAdapter;
 import org.nimbus.authz.AuthzDBException;
 import org.nimbus.authz.UserAlias;
+import org.nimbustools.querygeneral.security.QueryUser;
+import org.nimbustools.querygeneral.security.QueryUserDetailsService;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;

diff --git a/...y/java/source/src/org/nimbustools/messaging/query/security/QueryAuthenticationFilter.java b/...y/java/source/src/org/nimbustools/messaging/query/security/QueryAuthenticationFilter.java
@@ -18,6 +18,8 @@
 import org.apache.commons.codec.binary.Base64;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
+import org.nimbustools.querygeneral.security.QueryUser;
+import org.nimbustools.querygeneral.security.QueryUserDetailsService;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.web.filter.GenericFilterBean;

diff --git a/...ry/java/source/src/org/nimbustools/messaging/query/security/QueryAuthenticationToken.java b/...ry/java/source/src/org/nimbustools/messaging/query/security/QueryAuthenticationToken.java
@@ -15,6 +15,7 @@
  */
 package org.nimbustools.messaging.query.security;
 
+import org.nimbustools.querygeneral.security.QueryUser;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.Authentication;
 

diff --git a/...ery/java/source/src/org/nimbustools/messaging/query/security/QueryContainerInterface.java b/...ery/java/source/src/org/nimbustools/messaging/query/security/QueryContainerInterface.java
@@ -15,6 +15,8 @@
  */
 package org.nimbustools.messaging.query.security;
 
+import org.nimbustools.querygeneral.security.QueryUser;
+import org.nimbustools.querygeneral.security.QueryUserDetailsService;
 import org.nimbustools.api._repr._Caller;
 import org.nimbustools.api.brain.ModuleLocator;
 import org.nimbustools.api.repr.Caller;