reogranized source code

account-ui/pom.xml

@@ -66,6 +66,11 @@
             <artifactId>shared-util</artifactId>
             <version>1.1-SNAPSHOT</version>
         </dependency>        
+        <dependency>
+            <groupId>de.muehlencord.shared</groupId>
+            <artifactId>shared-jeeutil</artifactId>
+            <version>1.1-SNAPSHOT</version>
+        </dependency>                
         <dependency>
             <groupId>de.muehlencord.sf</groupId>
             <artifactId>filter</artifactId>

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/AccountView.java

@@ -1,7 +1,7 @@
 package de.muehlencord.shared.account.web.presentation;
 
-import de.muehlencord.shared.account.business.account.boundary.AccountControl;
+import de.muehlencord.shared.account.business.account.control.AccountControl;
-import de.muehlencord.shared.account.business.account.boundary.ApplicationRoleControl;
+import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
 import de.muehlencord.shared.account.business.account.entity.AccountEntity;
 import de.muehlencord.shared.account.business.account.entity.AccountException;
 import de.muehlencord.shared.account.business.account.entity.AccountLoginEntity;

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/PermissionView.java

@@ -15,9 +15,9 @@
  */
 package de.muehlencord.shared.account.web.presentation;
 
-import de.muehlencord.shared.account.business.account.boundary.ApplicationPermissionControl;
 import de.muehlencord.shared.account.business.account.entity.AccountException;
 import de.muehlencord.shared.account.business.account.entity.ApplicationPermissionEntity;
+import de.muehlencord.shared.account.business.application.control.ApplicationPermissionControl;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import de.muehlencord.shared.jeeutil.FacesUtil;
 import java.io.Serializable;

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/RoleView.java

@@ -15,7 +15,7 @@
  */
 package de.muehlencord.shared.account.web.presentation;
 
-import de.muehlencord.shared.account.business.account.boundary.ApplicationRoleControl;
+import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
 import de.muehlencord.shared.account.business.account.entity.AccountException;
 import de.muehlencord.shared.account.business.account.entity.ApplicationPermissionEntity;
 import de.muehlencord.shared.account.business.account.entity.ApplicationRoleEntity;

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java

@@ -1,8 +1,8 @@
 package de.muehlencord.shared.account.web.presentation;
 
-import de.muehlencord.shared.account.business.account.boundary.ApplicationRoleControl;
+
 import de.muehlencord.shared.account.business.account.entity.ApplicationRoleEntity;
-import de.muehlencord.shared.account.business.application.boundary.ApplicationService;
+import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import java.io.Serializable;
 import javax.ejb.EJB;

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniquePermissionNameValidator.java

@@ -1,7 +1,8 @@
 package de.muehlencord.shared.account.web.presentation;
 
-import de.muehlencord.shared.account.business.account.boundary.ApplicationPermissionControl;
+
 import de.muehlencord.shared.account.business.account.entity.ApplicationPermissionEntity;
+import de.muehlencord.shared.account.business.application.control.ApplicationPermissionControl;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import java.io.Serializable;
 import javax.ejb.EJB;

account/src/main/java/de/muehlencord/shared/account/business/account/boundary/AccountProducer.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.muehlencord.shared.account.web;
+package de.muehlencord.shared.account.business.account.boundary;
 
-import de.muehlencord.shared.account.business.account.boundary.AccountControl;
+import de.muehlencord.shared.account.business.account.control.AccountControl;
 import de.muehlencord.shared.account.business.account.entity.Account;
 import java.io.Serializable;
 import java.util.Locale;

account/src/main/java/de/muehlencord/shared/account/business/account/control/AccountControl.java

@@ -1,4 +1,4 @@
-package de.muehlencord.shared.account.business.account.boundary;
+package de.muehlencord.shared.account.business.account.control;
 
 import de.muehlencord.shared.account.business.account.entity.AccountException;
 import de.muehlencord.shared.account.business.account.entity.AccountStatus;

account/src/main/java/de/muehlencord/shared/account/business/application/boundary/StartupBean.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.muehlencord.shared.account.web.business.application.boundary;
+package de.muehlencord.shared.account.business.application.boundary;
 
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import de.muehlencord.shared.account.business.config.boundary.ConfigService;

account/src/main/java/de/muehlencord/shared/account/business/application/control/ApplicationController.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.muehlencord.shared.account.web.business.application.control;
+package de.muehlencord.shared.account.business.application.control;
 
 import de.muehlencord.shared.account.business.application.boundary.ApplicationService;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;

account/src/main/java/de/muehlencord/shared/account/business/application/control/ApplicationPermissionControl.java

@@ -1,4 +1,4 @@
-package de.muehlencord.shared.account.business.account.boundary;
+package de.muehlencord.shared.account.business.application.control;
 
 import de.muehlencord.shared.account.business.account.entity.AccountException;
 import de.muehlencord.shared.account.business.account.entity.ApplicationPermissionEntity;

account/src/main/java/de/muehlencord/shared/account/business/application/control/ApplicationRoleControl.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package de.muehlencord.shared.account.business.account.boundary;
+package de.muehlencord.shared.account.business.application.control;
 
 import de.muehlencord.shared.account.business.account.entity.AccountException;
 import de.muehlencord.shared.account.business.account.entity.ApplicationPermissionEntity;

account/src/main/java/de/muehlencord/shared/account/business/config/boundary/ConfigurationProducer.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package de.muehlencord.shared.account.web;
+package de.muehlencord.shared.account.business.config.boundary;
 
 import de.muehlencord.shared.account.business.config.boundary.ConfigService;
 import de.muehlencord.shared.account.business.accountconfig.entity.AccountConfigurationKey;

account/src/main/java/de/muehlencord/shared/account/presentation/LoginView.java

@@ -1,6 +1,6 @@
 package de.muehlencord.shared.account.presentation;
 
-import de.muehlencord.shared.account.business.account.boundary.AccountControl;
+import de.muehlencord.shared.account.business.account.control.AccountControl;
 import de.muehlencord.shared.account.business.account.entity.AccountEntity;
 import de.muehlencord.shared.jeeutil.FacesUtil;
 import java.io.IOException;

account/src/main/java/de/muehlencord/shared/account/presentation/LostPasswordView.java

@@ -1,6 +1,6 @@
 package de.muehlencord.shared.account.presentation;
 
-import de.muehlencord.shared.account.business.account.boundary.AccountControl;
+import de.muehlencord.shared.account.business.account.control.AccountControl;
 import de.muehlencord.shared.jeeutil.FacesUtil;
 import java.io.Serializable;
 import javax.ejb.EJB;

jeeutil/pom.xml

@@ -10,7 +10,7 @@
     <groupId>de.muehlencord.shared</groupId>
     <artifactId>shared-jeeutil</artifactId>
     <version>1.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
+    <packaging>ejb</packaging>
 
     <name>shared-jeeutil</name>
 

jeeutil/src/main/java/de/muehlencord/shared/jeeutil/TransactionJoinInterceptor.java

@@ -1,4 +1,4 @@
-package de.muehlencord.shared.account.web;
+package de.muehlencord.shared.jeeutil;
 
 import javax.annotation.Priority;
 import javax.inject.Inject;
@@ -38,9 +38,9 @@ public class TransactionJoinInterceptor {
     @AroundInvoke 
     public Object joinTransaction(InvocationContext context) throws Exception {
         if (em.isJoinedToTransaction()) {
-            LOGGER.info("transaction already joined"); 
+            LOGGER.trace("transaction already joined"); 
         } else {
-            LOGGER.info("joining transaction");
+            LOGGER.trace("joining transaction");
             em.joinTransaction();
         }
         return context.proceed();