You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/06/19 17:37:12 UTC
svn commit: r1603926 - in /tomee/tomee/trunk/examples: deltaspike-fullstack/
deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/
deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/
deltaspike-fullstack/src/main/java/org/superbiz/...
Author: andygumbrecht
Date: Thu Jun 19 15:37:11 2014
New Revision: 1603926
URL: http://svn.apache.org/r1603926
Log:
Refactor and add
Added:
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/CustomProjectStage.java
- copied, changed from r1603889, tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/CustomProjectStage.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/DebugPhaseListener.java
- copied, changed from r1603889, tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/DebugPhaseListener.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/WebappMessageBundle.java
- copied, changed from r1603889, tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/WebappMessageBundle.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/
- copied from r1603889, tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/
- copied from r1603889, tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/repository/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/DomainService.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/UserService.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/startup/
- copied from r1603889, tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/startup/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/
- copied from r1603889, tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/beans.xml
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/org/superbiz/deltaspike/service/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/org/superbiz/deltaspike/service/i18n/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/org/superbiz/deltaspike/service/i18n/messages.properties
tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/MockedPageBeanTest.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/PageBeanTest.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/resources/META-INF/beans.xml
Removed:
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/CustomProjectStage.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/DebugPhaseListener.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/WebappMessageBundle.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/domain/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/repository/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/startup/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/view/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/org/superbiz/deltaspike/i18n/
tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/test/
Modified:
tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/AbstractDomainObject.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/Comment.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/Feedback.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/User.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/DifferentName.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/DifferentNameValidator.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Full.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Name.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Partial.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UniqueUserName.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UniqueUserNameValidator.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UserName.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/FeedbackRepository.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/GenericRepository.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/Repository.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/UserRepository.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/AbstractGenericJpaRepository.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/EntityManagerProducer.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/JpaFeedbackRepository.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/JpaUserRepository.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/startup/ModuleStartupObserver.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/FeedbackPage.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/InfoPage.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/MenuBean.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/RegistrationPage.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/UserHolder.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/config/Pages.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/security/LoginAccessDecisionVoter.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/util/InfoBean.java
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/persistence.xml
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/services/org.apache.deltaspike.core.api.projectstage.ProjectStageHolder
tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/webapp/WEB-INF/faces-config.xml
tomee/tomee/trunk/examples/jsf-cdi-and-ejb/ (props changed)
tomee/tomee/trunk/examples/rest-example-with-application/ (props changed)
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml?rev=1603926&r1=1603925&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml Thu Jun 19 15:37:11 2014
@@ -20,6 +20,7 @@
<packaging>war</packaging>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<myfaces2.version>2.2.3</myfaces2.version>
<ds.version>1.0.0</ds.version>
<extval.version>2.0.8</extval.version>
Copied: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/CustomProjectStage.java (from r1603889, tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/CustomProjectStage.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/CustomProjectStage.java?p2=tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/CustomProjectStage.java&p1=tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/CustomProjectStage.java&r1=1603889&r2=1603926&rev=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/CustomProjectStage.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/CustomProjectStage.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike;
+package org.superbiz.deltaspike.service;
import org.apache.deltaspike.core.api.projectstage.ProjectStage;
import org.apache.deltaspike.core.api.projectstage.ProjectStageHolder;
Copied: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/DebugPhaseListener.java (from r1603889, tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/DebugPhaseListener.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/DebugPhaseListener.java?p2=tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/DebugPhaseListener.java&p1=tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/DebugPhaseListener.java&r1=1603889&r2=1603926&rev=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/DebugPhaseListener.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/DebugPhaseListener.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike;
+package org.superbiz.deltaspike.service;
import org.apache.deltaspike.core.api.exclude.Exclude;
import org.apache.deltaspike.core.api.projectstage.ProjectStage;
Copied: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/WebappMessageBundle.java (from r1603889, tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/WebappMessageBundle.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/WebappMessageBundle.java?p2=tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/WebappMessageBundle.java&p1=tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/WebappMessageBundle.java&r1=1603889&r2=1603926&rev=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/WebappMessageBundle.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/WebappMessageBundle.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike;
+package org.superbiz.deltaspike.service;
import org.apache.deltaspike.core.api.message.MessageBundle;
import org.apache.deltaspike.core.api.message.MessageContextConfig;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/AbstractDomainObject.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/AbstractDomainObject.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/AbstractDomainObject.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/AbstractDomainObject.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain;
+package org.superbiz.deltaspike.service.domain;
import javax.persistence.*;
import java.io.Serializable;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/Comment.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/Comment.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/Comment.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/Comment.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain;
+package org.superbiz.deltaspike.service.domain;
import javax.persistence.Column;
import javax.persistence.Entity;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/Feedback.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/Feedback.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/Feedback.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/Feedback.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain;
+package org.superbiz.deltaspike.service.domain;
import javax.persistence.CascadeType;
import javax.persistence.Column;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/User.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/User.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/User.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/User.java Thu Jun 19 15:37:11 2014
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain;
+package org.superbiz.deltaspike.service.domain;
-import org.superbiz.deltaspike.domain.validation.*;
+import org.superbiz.deltaspike.service.domain.validation.*;
import javax.enterprise.inject.Typed;
import javax.persistence.Column;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/DifferentName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/DifferentName.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/DifferentName.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/DifferentName.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain.validation;
+package org.superbiz.deltaspike.service.domain.validation;
import javax.validation.Constraint;
import javax.validation.Payload;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/DifferentNameValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/DifferentNameValidator.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/DifferentNameValidator.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/DifferentNameValidator.java Thu Jun 19 15:37:11 2014
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain.validation;
+package org.superbiz.deltaspike.service.domain.validation;
-import org.superbiz.deltaspike.domain.User;
+import org.superbiz.deltaspike.service.domain.User;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Full.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Full.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Full.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Full.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain.validation;
+package org.superbiz.deltaspike.service.domain.validation;
import javax.validation.GroupSequence;
import javax.validation.groups.Default;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Name.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Name.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Name.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Name.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain.validation;
+package org.superbiz.deltaspike.service.domain.validation;
import javax.validation.Constraint;
import javax.validation.Payload;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Partial.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Partial.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Partial.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/Partial.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain.validation;
+package org.superbiz.deltaspike.service.domain.validation;
public interface Partial
{
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UniqueUserName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UniqueUserName.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UniqueUserName.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UniqueUserName.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain.validation;
+package org.superbiz.deltaspike.service.domain.validation;
public interface UniqueUserName
{
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UniqueUserNameValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UniqueUserNameValidator.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UniqueUserNameValidator.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UniqueUserNameValidator.java Thu Jun 19 15:37:11 2014
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain.validation;
+package org.superbiz.deltaspike.service.domain.validation;
-import org.superbiz.deltaspike.repository.UserRepository;
+import org.superbiz.deltaspike.service.repository.UserRepository;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UserName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UserName.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UserName.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/domain/validation/UserName.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.domain.validation;
+package org.superbiz.deltaspike.service.domain.validation;
import javax.validation.Constraint;
import javax.validation.Payload;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/FeedbackRepository.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/FeedbackRepository.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/FeedbackRepository.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/FeedbackRepository.java Thu Jun 19 15:37:11 2014
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.repository;
+package org.superbiz.deltaspike.service.repository;
-import org.superbiz.deltaspike.domain.Feedback;
+import org.superbiz.deltaspike.service.domain.Feedback;
public interface FeedbackRepository extends GenericRepository<Feedback>
{
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/GenericRepository.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/GenericRepository.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/GenericRepository.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/GenericRepository.java Thu Jun 19 15:37:11 2014
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.repository;
+package org.superbiz.deltaspike.service.repository;
-import org.superbiz.deltaspike.domain.AbstractDomainObject;
+import org.superbiz.deltaspike.service.domain.AbstractDomainObject;
import java.io.Serializable;
import java.util.List;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/Repository.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/Repository.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/Repository.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/Repository.java Thu Jun 19 15:37:11 2014
@@ -16,9 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.repository;
-
-import org.apache.deltaspike.jpa.api.transaction.Transactional;
+package org.superbiz.deltaspike.service.repository;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Stereotype;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/UserRepository.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/UserRepository.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/UserRepository.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/UserRepository.java Thu Jun 19 15:37:11 2014
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.repository;
+package org.superbiz.deltaspike.service.repository;
-import org.superbiz.deltaspike.domain.User;
+import org.superbiz.deltaspike.service.domain.User;
public interface UserRepository extends GenericRepository<User>
{
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/AbstractGenericJpaRepository.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/AbstractGenericJpaRepository.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/AbstractGenericJpaRepository.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/AbstractGenericJpaRepository.java Thu Jun 19 15:37:11 2014
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.repository.jpa;
+package org.superbiz.deltaspike.service.repository.jpa;
-import org.superbiz.deltaspike.domain.AbstractDomainObject;
-import org.superbiz.deltaspike.repository.GenericRepository;
+import org.superbiz.deltaspike.service.domain.AbstractDomainObject;
+import org.superbiz.deltaspike.service.repository.GenericRepository;
import javax.inject.Inject;
import javax.persistence.EntityManager;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/EntityManagerProducer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/EntityManagerProducer.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/EntityManagerProducer.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/EntityManagerProducer.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.repository.jpa;
+package org.superbiz.deltaspike.service.repository.jpa;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.RequestScoped;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/JpaFeedbackRepository.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/JpaFeedbackRepository.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/JpaFeedbackRepository.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/JpaFeedbackRepository.java Thu Jun 19 15:37:11 2014
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.repository.jpa;
+package org.superbiz.deltaspike.service.repository.jpa;
import org.apache.deltaspike.jpa.api.transaction.Transactional;
-import org.superbiz.deltaspike.domain.Feedback;
-import org.superbiz.deltaspike.repository.FeedbackRepository;
-import org.superbiz.deltaspike.repository.Repository;
+import org.superbiz.deltaspike.service.domain.Feedback;
+import org.superbiz.deltaspike.service.repository.FeedbackRepository;
+import org.superbiz.deltaspike.service.repository.Repository;
@Transactional
@Repository
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/JpaUserRepository.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/JpaUserRepository.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/JpaUserRepository.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/jpa/JpaUserRepository.java Thu Jun 19 15:37:11 2014
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.repository.jpa;
+package org.superbiz.deltaspike.service.repository.jpa;
-import org.superbiz.deltaspike.domain.User;
-import org.superbiz.deltaspike.repository.Repository;
-import org.superbiz.deltaspike.repository.UserRepository;
+import org.superbiz.deltaspike.service.domain.User;
+import org.superbiz.deltaspike.service.repository.Repository;
+import org.superbiz.deltaspike.service.repository.UserRepository;
import javax.persistence.Query;
import java.util.List;
Added: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/DomainService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/DomainService.java?rev=1603926&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/DomainService.java (added)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/DomainService.java Thu Jun 19 15:37:11 2014
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.superbiz.deltaspike.service.repository.service;
+
+import org.apache.deltaspike.jpa.api.transaction.Transactional;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Stereotype
+
+@Target({TYPE})
+@Retention(RUNTIME)
+@Documented
+
+@RequestScoped
+@Transactional
+public @interface DomainService
+{
+}
Added: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/UserService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/UserService.java?rev=1603926&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/UserService.java (added)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/repository/service/UserService.java Thu Jun 19 15:37:11 2014
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.superbiz.deltaspike.service.repository.service;
+
+import org.superbiz.deltaspike.service.domain.User;
+import org.superbiz.deltaspike.service.repository.UserRepository;
+
+import javax.enterprise.inject.Typed;
+import javax.inject.Inject;
+import java.util.List;
+
+//usually services contain additional logic or delegate to multiple repositories.
+//here the service just delegates to one repository to allow tests which use a mocked user-repository.
+//currently it isn't supported to mock intercepted beans (see DELTASPIKE-605)
+//-> @Repository as well as JpaUserRepository can't use an interceptor like @Transactional
+@DomainService
+@Typed(UserService.class)
+public class UserService implements UserRepository
+{
+ @Inject
+ private UserRepository userRepository;
+
+ /*
+ * generated
+ */
+
+ @Override
+ public User loadUser(String userName)
+ {
+ return userRepository.loadUser(userName);
+ }
+
+ @Override
+ public void save(User entity)
+ {
+ userRepository.save(entity);
+ }
+
+ @Override
+ public void remove(User entity)
+ {
+ userRepository.remove(entity);
+ }
+
+ @Override
+ public List<User> loadAll()
+ {
+ return userRepository.loadAll();
+ }
+
+ @Override
+ public User loadById(Long id)
+ {
+ return userRepository.loadById(id);
+ }
+
+ @Override
+ public User createNewEntity()
+ {
+ return userRepository.createNewEntity();
+ }
+}
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/startup/ModuleStartupObserver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/startup/ModuleStartupObserver.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/startup/ModuleStartupObserver.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/startup/ModuleStartupObserver.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.startup;
+package org.superbiz.deltaspike.service.startup;
import javax.annotation.PostConstruct;
import javax.ejb.Singleton;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/FeedbackPage.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/FeedbackPage.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/FeedbackPage.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/FeedbackPage.java Thu Jun 19 15:37:11 2014
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.view;
+package org.superbiz.deltaspike.service.view;
import org.apache.deltaspike.core.api.config.view.controller.PreRenderView;
import org.apache.deltaspike.core.api.scope.GroupedConversation;
import org.apache.deltaspike.core.api.scope.GroupedConversationScoped;
-import org.superbiz.deltaspike.domain.Feedback;
-import org.superbiz.deltaspike.repository.FeedbackRepository;
+import org.superbiz.deltaspike.service.domain.Feedback;
+import org.superbiz.deltaspike.service.repository.FeedbackRepository;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/InfoPage.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/InfoPage.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/InfoPage.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/InfoPage.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.view;
+package org.superbiz.deltaspike.service.view;
import org.apache.deltaspike.core.api.config.view.metadata.ViewMetaData;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/MenuBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/MenuBean.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/MenuBean.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/MenuBean.java Thu Jun 19 15:37:11 2014
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.view;
+package org.superbiz.deltaspike.service.view;
import org.apache.deltaspike.core.spi.scope.conversation.GroupedConversationManager;
-import org.superbiz.deltaspike.view.config.Pages;
+import org.superbiz.deltaspike.service.view.config.Pages;
import javax.enterprise.inject.Model;
import javax.inject.Inject;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/RegistrationPage.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/RegistrationPage.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/RegistrationPage.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/RegistrationPage.java Thu Jun 19 15:37:11 2014
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.view;
+package org.superbiz.deltaspike.service.view;
import org.apache.deltaspike.core.api.scope.GroupedConversation;
import org.apache.deltaspike.core.api.scope.GroupedConversationScoped;
import org.apache.deltaspike.jsf.api.message.JsfMessage;
import org.apache.myfaces.extensions.validator.beanval.annotation.BeanValidation;
import org.apache.myfaces.extensions.validator.crossval.annotation.Equals;
-import org.superbiz.deltaspike.WebappMessageBundle;
-import org.superbiz.deltaspike.domain.User;
-import org.superbiz.deltaspike.domain.validation.Full;
-import org.superbiz.deltaspike.repository.service.UserService;
-import org.superbiz.deltaspike.view.config.Pages;
+import org.superbiz.deltaspike.service.WebappMessageBundle;
+import org.superbiz.deltaspike.service.domain.User;
+import org.superbiz.deltaspike.service.domain.validation.Full;
+import org.superbiz.deltaspike.service.repository.service.UserService;
+import org.superbiz.deltaspike.service.view.config.Pages;
import javax.inject.Inject;
import javax.inject.Named;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/UserHolder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/UserHolder.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/UserHolder.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/UserHolder.java Thu Jun 19 15:37:11 2014
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.view;
+package org.superbiz.deltaspike.service.view;
import org.apache.deltaspike.core.api.scope.WindowScoped;
-import org.superbiz.deltaspike.domain.User;
+import org.superbiz.deltaspike.service.domain.User;
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.New;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/config/Pages.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/config/Pages.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/config/Pages.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/config/Pages.java Thu Jun 19 15:37:11 2014
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.view.config;
+package org.superbiz.deltaspike.service.view.config;
import org.apache.deltaspike.core.api.config.view.DefaultErrorView;
import org.apache.deltaspike.core.api.config.view.ViewConfig;
import org.apache.deltaspike.core.api.config.view.controller.ViewControllerRef;
import org.apache.deltaspike.jsf.api.config.view.View;
import org.apache.deltaspike.security.api.authorization.Secured;
-import org.superbiz.deltaspike.view.FeedbackPage;
-import org.superbiz.deltaspike.view.InfoPage;
-import org.superbiz.deltaspike.view.security.LoginAccessDecisionVoter;
+import org.superbiz.deltaspike.service.view.FeedbackPage;
+import org.superbiz.deltaspike.service.view.InfoPage;
+import org.superbiz.deltaspike.service.view.security.LoginAccessDecisionVoter;
import static org.apache.deltaspike.jsf.api.config.view.View.NavigationMode.REDIRECT;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/security/LoginAccessDecisionVoter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/security/LoginAccessDecisionVoter.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/security/LoginAccessDecisionVoter.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/security/LoginAccessDecisionVoter.java Thu Jun 19 15:37:11 2014
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.view.security;
+package org.superbiz.deltaspike.service.view.security;
import org.apache.deltaspike.security.api.authorization.AbstractAccessDecisionVoter;
import org.apache.deltaspike.security.api.authorization.AccessDecisionVoterContext;
import org.apache.deltaspike.security.api.authorization.SecurityViolation;
-import org.superbiz.deltaspike.WebappMessageBundle;
-import org.superbiz.deltaspike.view.UserHolder;
+import org.superbiz.deltaspike.service.WebappMessageBundle;
+import org.superbiz.deltaspike.service.view.UserHolder;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/util/InfoBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/util/InfoBean.java?rev=1603926&r1=1603889&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/util/InfoBean.java (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/java/org/superbiz/deltaspike/service/view/util/InfoBean.java Thu Jun 19 15:37:11 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.superbiz.deltaspike.view.util;
+package org.superbiz.deltaspike.service.view.util;
import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigDescriptor;
import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
@@ -26,8 +26,8 @@ import org.apache.deltaspike.core.spi.sc
import org.apache.deltaspike.jsf.api.message.JsfMessage;
import org.apache.myfaces.extensions.validator.ExtValInformation;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.superbiz.deltaspike.WebappMessageBundle;
-import org.superbiz.deltaspike.view.InfoPage;
+import org.superbiz.deltaspike.service.WebappMessageBundle;
+import org.superbiz.deltaspike.service.view.InfoPage;
import javax.annotation.PostConstruct;
import javax.enterprise.context.SessionScoped;
Added: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/beans.xml?rev=1603926&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/beans.xml (added)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/beans.xml Thu Jun 19 15:37:11 2014
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+-->
+
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
\ No newline at end of file
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/persistence.xml?rev=1603926&r1=1603925&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/persistence.xml (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/persistence.xml Thu Jun 19 15:37:11 2014
@@ -30,12 +30,12 @@ http://java.sun.com/xml/ns/persistence/p
<!-- config of (non-)jta-data-source isn't needed if there is just one -->
<!-- @MappedSuperclass classes - see OPENJPA-1926 -->
- <class>org.superbiz.deltaspike.domain.AbstractDomainObject</class>
+ <class>org.superbiz.deltaspike.service.domain.AbstractDomainObject</class>
<!-- entities -->
- <class>org.superbiz.deltaspike.domain.User</class>
- <class>org.superbiz.deltaspike.domain.Feedback</class>
- <class>org.superbiz.deltaspike.domain.Comment</class>
+ <class>org.superbiz.deltaspike.service.domain.User</class>
+ <class>org.superbiz.deltaspike.service.domain.Feedback</class>
+ <class>org.superbiz.deltaspike.service.domain.Comment</class>
<properties>
<property name="openjpa.DataCache" value="true"/>
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/services/org.apache.deltaspike.core.api.projectstage.ProjectStageHolder
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/services/org.apache.deltaspike.core.api.projectstage.ProjectStageHolder?rev=1603926&r1=1603925&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/services/org.apache.deltaspike.core.api.projectstage.ProjectStageHolder (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/META-INF/services/org.apache.deltaspike.core.api.projectstage.ProjectStageHolder Thu Jun 19 15:37:11 2014
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.superbiz.deltaspike.CustomProjectStage
\ No newline at end of file
+org.superbiz.deltaspike.service.CustomProjectStage
\ No newline at end of file
Added: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/org/superbiz/deltaspike/service/i18n/messages.properties
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/org/superbiz/deltaspike/service/i18n/messages.properties?rev=1603926&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/org/superbiz/deltaspike/service/i18n/messages.properties (added)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/resources/org/superbiz/deltaspike/service/i18n/messages.properties Thu Jun 19 15:37:11 2014
@@ -0,0 +1,62 @@
+#Licensed to the Apache Software Foundation (ASF) under one
+#or more contributor license agreements. See the NOTICE file
+#distributed with this work for additional information
+#regarding copyright ownership. The ASF licenses this file
+#to you 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.
+
+
+
+#overrule the default format {1}: {0} to ignore the labels
+#javax.faces.validator.BeanValidator.MESSAGE={0}
+#javax.faces.validator.BeanValidator.MESSAGE_detail={0}
+
+btnRegisterAndRestart=save and restart
+btnLogin=login
+lnkLogin=Login
+btnRegister=register
+
+lblLoginName=Login-name
+lblFirstName=First-name
+lblLastName=Last-name
+lblPassword=Password
+lblRepeatedPassword=Repeated password
+lblFinish=finish
+
+lblLeftMenuTitle=Menu
+lblHome=Home
+lblFeedback=Feedback
+
+lblWiki=Wiki
+lblExternalExamples=External examples
+
+menuDocumentation=Documentation
+menuMisc=Misc
+menuAbout=About
+
+welcome=Welcome
+msgWelcome=Welcome to the Apache TomEE/DeltaSpike-Stack Demo
+
+msgUserRegistered=User %s registered successfully!
+msgUserNotRegistered=Failed to register user %s!
+
+msgLoginSuccessful=Login successful!
+msgLoginFailed=Login failed!
+msgAccessDenied=Access denied!
+tblFeedbackTopic=Topic
+tblFeedbackDescription=Description
+lblTopic=Topic
+lblDescription=Feedback Text
+btnSave=save
+
+msgError=Error %s
\ No newline at end of file
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/webapp/WEB-INF/faces-config.xml?rev=1603926&r1=1603925&r2=1603926&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/main/webapp/WEB-INF/faces-config.xml Thu Jun 19 15:37:11 2014
@@ -27,9 +27,9 @@
<default-locale>en</default-locale>
<supported-locale>en</supported-locale>
</locale-config>
- <message-bundle>org.superbiz.deltaspike.i18n.messages</message-bundle>
+ <message-bundle>org.superbiz.deltaspike.service.i18n.messages</message-bundle>
<resource-bundle>
- <base-name>org.superbiz.deltaspike.i18n.messages</base-name>
+ <base-name>org.superbiz.deltaspike.service.i18n.messages</base-name>
<var>i18n</var>
</resource-bundle>
</application>
Added: tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/MockedPageBeanTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/MockedPageBeanTest.java?rev=1603926&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/MockedPageBeanTest.java (added)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/MockedPageBeanTest.java Thu Jun 19 15:37:11 2014
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.superbiz.deltaspike.service.test;
+
+import junit.framework.Assert;
+import org.apache.deltaspike.core.spi.scope.window.WindowContext;
+import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
+import org.apache.deltaspike.testcontrol.api.mock.DynamicMockManager;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.superbiz.deltaspike.service.WebappMessageBundle;
+import org.superbiz.deltaspike.service.domain.User;
+import org.superbiz.deltaspike.service.repository.UserRepository;
+import org.superbiz.deltaspike.service.repository.jpa.JpaUserRepository;
+import org.superbiz.deltaspike.service.view.RegistrationPage;
+import org.superbiz.deltaspike.service.view.config.Pages;
+
+import javax.faces.context.FacesContext;
+import javax.inject.Inject;
+
+import static org.mockito.Mockito.*;
+
+@RunWith(CdiTestRunner.class)
+public class MockedPageBeanTest
+{
+ @Inject
+ private RegistrationPage registrationPage; //will use a the mocked UserRepository
+
+ @Inject
+ private WindowContext windowContext;
+
+ @Inject
+ private WebappMessageBundle webappMessageBundle;
+
+ @Inject
+ private DynamicMockManager mockManager;
+
+ @Inject
+ private UserRepository userRepository; //will inject the mocked instance
+
+ @Test
+ public void saveUserWithMockedBean()
+ {
+ final String userName = "gp";
+ final String firstName = "Gerhard";
+ final String lastName = "Petracek";
+
+ UserRepository mockedUserRepository = mock(JpaUserRepository.class); //don't use the interface here to avoid issues with mockito and cdi proxies
+ when(mockedUserRepository.loadUser(userName)).thenReturn(new User(userName, firstName, lastName.toUpperCase() /*just to illustrate that the mock-instance is used*/));
+ mockManager.addMock(mockedUserRepository);
+
+
+ this.windowContext.activateWindow("testWindow");
+
+ this.registrationPage.getUser().setUserName(userName);
+ this.registrationPage.getUser().setFirstName(firstName);
+ this.registrationPage.getUser().setLastName(lastName);
+ this.registrationPage.getUser().setPassword("123");
+
+ Class<? extends Pages> targetPage = this.registrationPage.register();
+
+ Assert.assertEquals(Pages.Login.class, targetPage);
+ Assert.assertFalse(FacesContext.getCurrentInstance().getMessageList().isEmpty());
+ Assert.assertEquals(webappMessageBundle.msgUserRegistered(userName), FacesContext.getCurrentInstance().getMessageList().iterator().next().getSummary());
+
+ User user = this.userRepository.loadUser(userName);
+ Assert.assertNotNull(user);
+ Assert.assertEquals(firstName, user.getFirstName());
+ Assert.assertEquals(lastName.toUpperCase(), user.getLastName());
+ }
+}
Added: tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/PageBeanTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/PageBeanTest.java?rev=1603926&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/PageBeanTest.java (added)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/java/org/superbiz/deltaspike/service/test/PageBeanTest.java Thu Jun 19 15:37:11 2014
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.superbiz.deltaspike.service.test;
+
+import junit.framework.Assert;
+import org.apache.deltaspike.cdise.api.ContextControl;
+import org.apache.deltaspike.core.spi.scope.window.WindowContext;
+import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.superbiz.deltaspike.service.WebappMessageBundle;
+import org.superbiz.deltaspike.service.domain.User;
+import org.superbiz.deltaspike.service.repository.UserRepository;
+import org.superbiz.deltaspike.service.view.RegistrationPage;
+import org.superbiz.deltaspike.service.view.config.Pages;
+
+import javax.faces.context.FacesContext;
+import javax.inject.Inject;
+
+@RunWith(CdiTestRunner.class)
+public class PageBeanTest
+{
+ @Inject
+ private RegistrationPage registrationPage;
+
+ @Inject
+ private WindowContext windowContext;
+
+ @Inject
+ private WebappMessageBundle webappMessageBundle;
+
+ @Inject
+ private UserRepository userRepository;
+
+ @Inject
+ private ContextControl contextControl;
+
+ @Test
+ public void saveUser()
+ {
+ final String userName = "gp";
+ final String firstName = "Gerhard";
+ final String lastName = "Petracek";
+ this.windowContext.activateWindow("testWindow");
+
+ this.registrationPage.getUser().setUserName(userName);
+ this.registrationPage.getUser().setFirstName(firstName);
+ this.registrationPage.getUser().setLastName(lastName);
+ this.registrationPage.getUser().setPassword("123");
+
+ Class<? extends Pages> targetPage = this.registrationPage.register();
+
+ Assert.assertEquals(Pages.Login.class, targetPage);
+ Assert.assertFalse(FacesContext.getCurrentInstance().getMessageList().isEmpty());
+ Assert.assertEquals(webappMessageBundle.msgUserRegistered(userName), FacesContext.getCurrentInstance().getMessageList().iterator().next().getSummary());
+
+ User user = this.userRepository.loadUser(userName);
+ Assert.assertNotNull(user);
+ Assert.assertEquals(firstName, user.getFirstName());
+ Assert.assertEquals(lastName, user.getLastName());
+ }
+
+ @Test
+ public void saveUserAndLogin()
+ {
+ final String userName = "tt";
+ final String firstName = "Tom";
+ final String lastName = "Tester";
+ this.windowContext.activateWindow("testWindow");
+
+ Assert.assertTrue(FacesContext.getCurrentInstance().getMessageList().isEmpty());
+
+ this.registrationPage.getUser().setUserName(userName);
+ this.registrationPage.getUser().setFirstName(firstName);
+ this.registrationPage.getUser().setLastName(lastName);
+ this.registrationPage.getUser().setPassword("123");
+
+ Class<? extends Pages> targetPage = this.registrationPage.register();
+
+ Assert.assertEquals(Pages.Login.class, targetPage);
+ Assert.assertFalse(FacesContext.getCurrentInstance().getMessageList().isEmpty());
+ Assert.assertEquals(webappMessageBundle.msgUserRegistered(userName), FacesContext.getCurrentInstance().getMessageList().iterator().next().getSummary());
+
+ User user = this.userRepository.loadUser(userName);
+ Assert.assertNotNull(user);
+ Assert.assertEquals(firstName, user.getFirstName());
+ Assert.assertEquals(lastName, user.getLastName());
+
+ this.contextControl.stopContexts();
+ this.contextControl.startContexts();
+ this.windowContext.activateWindow("testWindow");
+
+ Assert.assertTrue(FacesContext.getCurrentInstance().getMessageList().isEmpty());
+
+ this.registrationPage.getUser().setUserName(userName);
+ this.registrationPage.getUser().setFirstName(firstName);
+ this.registrationPage.getUser().setLastName(lastName);
+ this.registrationPage.getUser().setPassword("123");
+
+ targetPage = this.registrationPage.login();
+ Assert.assertEquals(Pages.About.class, targetPage);
+ }
+}
Added: tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/resources/META-INF/beans.xml?rev=1603926&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/resources/META-INF/beans.xml (added)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/src/test/resources/META-INF/beans.xml Thu Jun 19 15:37:11 2014
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
Propchange: tomee/tomee/trunk/examples/jsf-cdi-and-ejb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 19 15:37:11 2014
@@ -1,2 +1,3 @@
target
*.iml
+.idea
Propchange: tomee/tomee/trunk/examples/rest-example-with-application/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 19 15:37:11 2014
@@ -1,2 +1,3 @@
target
*.iml
+trunk