Permalink
Browse files

changed packages for users

  • Loading branch information...
1 parent f39da72 commit 40ec3c5f71299d964f432295633da89baa43312e @jettro jettro committed Feb 16, 2012
Showing with 33 additions and 30 deletions.
  1. +1 −1 ...ain/java/org/axonframework/samples/trader/{app/api/user → users/api}/AuthenticateUserCommand.java
  2. +1 −1 .../src/main/java/org/axonframework/samples/trader/{app/api/user → users/api}/CreateUserCommand.java
  3. +1 −1 users-api/src/main/java/org/axonframework/samples/trader/{app/api/user → users/api}/UserAccount.java
  4. +1 −1 ...main/java/org/axonframework/samples/trader/{app/api/user → users/api}/UserAuthenticatedEvent.java
  5. +1 −1 ...i/src/main/java/org/axonframework/samples/trader/{app/api/user → users/api}/UserCreatedEvent.java
  6. +1 −1 users-query/src/main/java/org/axonframework/samples/trader/query/users/UserEntry.java
  7. +1 −1 users-query/src/main/java/org/axonframework/samples/trader/query/users/UserListener.java
  8. +2 −2 ...nframework/samples/trader/{app/command/user → users/command}/PortfolioManagementUserListener.java
  9. +4 −4 users/src/main/java/org/axonframework/samples/trader/{app/command/user → users/command}/User.java
  10. +4 −4 .../java/org/axonframework/samples/trader/{app/command/user → users/command}/UserCommandHandler.java
  11. +1 −1 users/src/main/java/org/axonframework/samples/trader/{app → users}/util/DigestUtils.java
  12. +2 −2 users/src/main/resources/META-INF/spring/users-context.xml
  13. +2 −1 ...t/java/org/axonframework/samples/trader/app/command/user/PortfolioManagementUserListenerTest.java
  14. +7 −5 users/src/test/java/org/axonframework/samples/trader/app/command/user/UserCommandHandlerTest.java
  15. +1 −1 web-ui/src/main/java/org/axonframework/samples/trader/webui/init/DBInit.java
  16. +2 −2 ...i/src/main/java/org/axonframework/samples/trader/webui/security/TraderAuthenticationProvider.java
  17. +1 −1 web-ui/src/main/java/org/axonframework/samples/trader/webui/util/SecurityUtil.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.app.api.user;
+package org.axonframework.samples.trader.users.api;
/**
* @author Jettro Coenradie
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.app.api.user;
+package org.axonframework.samples.trader.users.api;
/**
* @author Jettro Coenradie
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.app.api.user;
+package org.axonframework.samples.trader.users.api;
/**
* Object used to obtain information about an available UserAccount
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.app.api.user;
+package org.axonframework.samples.trader.users.api;
import org.axonframework.domain.AggregateIdentifier;
import org.axonframework.domain.DomainEvent;
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.app.api.user;
+package org.axonframework.samples.trader.users.api;
import org.axonframework.domain.AggregateIdentifier;
import org.axonframework.domain.DomainEvent;
@@ -15,7 +15,7 @@
package org.axonframework.samples.trader.query.users;
-import org.axonframework.samples.trader.app.api.user.UserAccount;
+import org.axonframework.samples.trader.users.api.UserAccount;
/**
* @author Jettro Coenradie
@@ -16,8 +16,8 @@
package org.axonframework.samples.trader.query.users;
import org.axonframework.eventhandling.annotation.EventHandler;
-import org.axonframework.samples.trader.app.api.user.UserCreatedEvent;
import org.axonframework.samples.trader.query.users.repositories.UserQueryRepository;
+import org.axonframework.samples.trader.users.api.UserCreatedEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -13,12 +13,12 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.app.command.user;
+package org.axonframework.samples.trader.users.command;
import org.axonframework.commandhandling.CommandBus;
import org.axonframework.eventhandling.annotation.EventHandler;
-import org.axonframework.samples.trader.app.api.user.UserCreatedEvent;
import org.axonframework.samples.trader.orders.api.portfolio.CreatePortfolioCommand;
+import org.axonframework.samples.trader.users.api.UserCreatedEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,14 +13,14 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.app.command.user;
+package org.axonframework.samples.trader.users.command;
import org.axonframework.domain.AggregateIdentifier;
import org.axonframework.eventhandling.annotation.EventHandler;
import org.axonframework.eventsourcing.annotation.AbstractAnnotatedAggregateRoot;
-import org.axonframework.samples.trader.app.api.user.UserAuthenticatedEvent;
-import org.axonframework.samples.trader.app.api.user.UserCreatedEvent;
-import org.axonframework.samples.trader.app.util.DigestUtils;
+import org.axonframework.samples.trader.users.api.UserAuthenticatedEvent;
+import org.axonframework.samples.trader.users.api.UserCreatedEvent;
+import org.axonframework.samples.trader.users.util.DigestUtils;
/**
* @author Jettro Coenradie
@@ -13,17 +13,17 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.app.command.user;
+package org.axonframework.samples.trader.users.command;
import org.axonframework.commandhandling.annotation.CommandHandler;
import org.axonframework.domain.AggregateIdentifier;
import org.axonframework.domain.StringAggregateIdentifier;
import org.axonframework.domain.UUIDAggregateIdentifier;
import org.axonframework.repository.Repository;
-import org.axonframework.samples.trader.app.api.user.AuthenticateUserCommand;
-import org.axonframework.samples.trader.app.api.user.CreateUserCommand;
-import org.axonframework.samples.trader.app.api.user.UserAccount;
import org.axonframework.samples.trader.query.users.repositories.UserQueryRepository;
+import org.axonframework.samples.trader.users.api.AuthenticateUserCommand;
+import org.axonframework.samples.trader.users.api.CreateUserCommand;
+import org.axonframework.samples.trader.users.api.UserAccount;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-package org.axonframework.samples.trader.app.util;
+package org.axonframework.samples.trader.users.util;
import org.springframework.util.Assert;
@@ -19,12 +19,12 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.axonframework.org/schema/core http://www.axonframework.org/schema/axon-core-1.2.xsd">
- <bean class="org.axonframework.samples.trader.app.command.user.UserCommandHandler">
+ <bean class="org.axonframework.samples.trader.users.command.UserCommandHandler">
<property name="repository" ref="userRepository"/>
</bean>
<axon:event-sourcing-repository id="userRepository"
- aggregate-type="org.axonframework.samples.trader.app.command.user.User"
+ aggregate-type="org.axonframework.samples.trader.users.command.User"
cache-ref="ehcache"
event-bus="eventBus"
event-store="eventStore">
@@ -18,8 +18,9 @@
import org.axonframework.commandhandling.CommandBus;
import org.axonframework.domain.AggregateIdentifier;
import org.axonframework.domain.UUIDAggregateIdentifier;
-import org.axonframework.samples.trader.app.api.user.UserCreatedEvent;
import org.axonframework.samples.trader.orders.api.portfolio.CreatePortfolioCommand;
+import org.axonframework.samples.trader.users.api.UserCreatedEvent;
+import org.axonframework.samples.trader.users.command.PortfolioManagementUserListener;
import org.axonframework.test.utils.DomainEventUtils;
import org.junit.Test;
import org.mockito.ArgumentMatcher;
@@ -15,13 +15,15 @@
package org.axonframework.samples.trader.app.command.user;
-import org.axonframework.samples.trader.app.api.user.AuthenticateUserCommand;
-import org.axonframework.samples.trader.app.api.user.CreateUserCommand;
-import org.axonframework.samples.trader.app.api.user.UserAuthenticatedEvent;
-import org.axonframework.samples.trader.app.api.user.UserCreatedEvent;
-import org.axonframework.samples.trader.app.util.DigestUtils;
import org.axonframework.samples.trader.query.users.UserEntry;
import org.axonframework.samples.trader.query.users.repositories.UserQueryRepository;
+import org.axonframework.samples.trader.users.api.AuthenticateUserCommand;
+import org.axonframework.samples.trader.users.api.CreateUserCommand;
+import org.axonframework.samples.trader.users.api.UserAuthenticatedEvent;
+import org.axonframework.samples.trader.users.api.UserCreatedEvent;
+import org.axonframework.samples.trader.users.command.User;
+import org.axonframework.samples.trader.users.command.UserCommandHandler;
+import org.axonframework.samples.trader.users.util.DigestUtils;
import org.axonframework.test.FixtureConfiguration;
import org.axonframework.test.Fixtures;
import org.junit.Before;
@@ -22,7 +22,6 @@
import org.axonframework.domain.UUIDAggregateIdentifier;
import org.axonframework.eventstore.mongo.MongoEventStore;
import org.axonframework.saga.repository.mongo.MongoTemplate;
-import org.axonframework.samples.trader.app.api.user.CreateUserCommand;
import org.axonframework.samples.trader.company.api.CreateCompanyCommand;
import org.axonframework.samples.trader.orders.api.portfolio.item.AddItemsToPortfolioCommand;
import org.axonframework.samples.trader.orders.api.portfolio.money.DepositMoneyToPortfolioCommand;
@@ -37,6 +36,7 @@
import org.axonframework.samples.trader.query.transaction.TransactionEntry;
import org.axonframework.samples.trader.query.users.UserEntry;
import org.axonframework.samples.trader.tradeengine.api.order.CreateOrderBookCommand;
+import org.axonframework.samples.trader.users.api.CreateUserCommand;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -17,8 +17,8 @@
import org.axonframework.commandhandling.CommandBus;
import org.axonframework.commandhandling.callbacks.FutureCallback;
-import org.axonframework.samples.trader.app.api.user.AuthenticateUserCommand;
-import org.axonframework.samples.trader.app.api.user.UserAccount;
+import org.axonframework.samples.trader.users.api.AuthenticateUserCommand;
+import org.axonframework.samples.trader.users.api.UserAccount;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.AuthenticationServiceException;
@@ -15,7 +15,7 @@
package org.axonframework.samples.trader.webui.util;
-import org.axonframework.samples.trader.app.api.user.UserAccount;
+import org.axonframework.samples.trader.users.api.UserAccount;
import org.springframework.security.core.context.SecurityContextHolder;
/**

0 comments on commit 40ec3c5

Please sign in to comment.