Author: rmannibucau
Date: Fri Apr 12 11:11:03 2013
New Revision: 1467239
URL: http://svn.apache.org/r1467239
Log:
TOMEE-894 rest-example was weird because using CDI api not correctly + without
beans.xml
Added:
tomee/tomee/trunk/examples/rest-example/src/main/webapp/WEB-INF/beans.xml
Modified:
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/batcher/SampleDataManager.java
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/CommentDAO.java
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/DAO.java
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/PostDAO.java
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/UserDAO.java
Modified:
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/batcher/SampleDataManager.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/batcher/SampleDataManager.java?rev=1467239&r1=1467238&r2=1467239&view=diff
==============================================================================
---
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/batcher/SampleDataManager.java
(original)
+++
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/batcher/SampleDataManager.java
Fri Apr 12 11:11:03 2013
@@ -16,7 +16,12 @@
*/
package org.superbiz.rest.batcher;
-import java.util.logging.Logger;
+import org.superbiz.rest.dao.CommentDAO;
+import org.superbiz.rest.dao.PostDAO;
+import org.superbiz.rest.dao.UserDAO;
+import org.superbiz.rest.model.Post;
+import org.superbiz.rest.model.User;
+
import javax.annotation.PostConstruct;
import javax.ejb.DependsOn;
import javax.ejb.Lock;
@@ -27,11 +32,7 @@ import javax.ejb.Startup;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.superbiz.rest.dao.CommentDAO;
-import org.superbiz.rest.dao.PostDAO;
-import org.superbiz.rest.dao.UserDAO;
-import org.superbiz.rest.model.Post;
-import org.superbiz.rest.model.User;
+import java.util.logging.Logger;
@Startup
@DependsOn({ "CommentDAO", "PostDAO", "UserDAO" })
Modified:
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/CommentDAO.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/CommentDAO.java?rev=1467239&r1=1467238&r2=1467239&view=diff
==============================================================================
---
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/CommentDAO.java
(original)
+++
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/CommentDAO.java
Fri Apr 12 11:11:03 2013
@@ -16,20 +16,16 @@
*/
package org.superbiz.rest.dao;
+import org.superbiz.rest.model.Comment;
+import org.superbiz.rest.model.Post;
+
import javax.ejb.Lock;
import javax.ejb.LockType;
import javax.ejb.Singleton;
-import javax.enterprise.inject.Typed;
import javax.inject.Inject;
-import org.superbiz.rest.model.Comment;
-import org.superbiz.rest.model.Post;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
import java.util.Collections;
import java.util.List;
-@Typed
@Singleton
@Lock(LockType.READ)
public class CommentDAO {
Modified:
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/DAO.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/DAO.java?rev=1467239&r1=1467238&r2=1467239&view=diff
==============================================================================
---
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/DAO.java
(original)
+++
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/DAO.java
Fri Apr 12 11:11:03 2013
@@ -16,21 +16,19 @@
*/
package org.superbiz.rest.dao;
-import java.util.List;
import javax.ejb.Lock;
import javax.ejb.LockType;
import javax.ejb.Singleton;
-import javax.enterprise.inject.Typed;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
+import java.util.List;
/**
* Simply maps the entitymanager.
* It simplifies refactoring (unitName change) and wraps some logic (limited
queries).
*
*/
-@Typed
@Singleton
@Lock(LockType.READ)
public class DAO {
Modified:
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/PostDAO.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/PostDAO.java?rev=1467239&r1=1467238&r2=1467239&view=diff
==============================================================================
---
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/PostDAO.java
(original)
+++
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/PostDAO.java
Fri Apr 12 11:11:03 2013
@@ -16,19 +16,15 @@
*/
package org.superbiz.rest.dao;
-import javax.ejb.Lock;
-import javax.ejb.LockType;
-import javax.ejb.Singleton;
-import javax.enterprise.inject.Typed;
-import javax.inject.Inject;
import org.superbiz.rest.model.Post;
import org.superbiz.rest.model.User;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import javax.inject.Inject;
+import javax.ejb.Lock;
+import javax.ejb.LockType;
+import javax.ejb.Singleton;
import java.util.List;
-@Typed
@Singleton
@Lock(LockType.READ)
public class PostDAO {
Modified:
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/UserDAO.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/UserDAO.java?rev=1467239&r1=1467238&r2=1467239&view=diff
==============================================================================
---
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/UserDAO.java
(original)
+++
tomee/tomee/trunk/examples/rest-example/src/main/java/org/superbiz/rest/dao/UserDAO.java
Fri Apr 12 11:11:03 2013
@@ -16,18 +16,14 @@
*/
package org.superbiz.rest.dao;
+import org.superbiz.rest.model.User;
+
import javax.ejb.Lock;
import javax.ejb.LockType;
import javax.ejb.Singleton;
-import javax.enterprise.inject.Typed;
import javax.inject.Inject;
-import org.superbiz.rest.model.User;
-
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
import java.util.List;
-@Typed
@Singleton
@Lock(LockType.READ)
public class UserDAO {
Added: tomee/tomee/trunk/examples/rest-example/src/main/webapp/WEB-INF/beans.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/src/main/webapp/WEB-INF/beans.xml?rev=1467239&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/rest-example/src/main/webapp/WEB-INF/beans.xml
(added)
+++ tomee/tomee/trunk/examples/rest-example/src/main/webapp/WEB-INF/beans.xml
Fri Apr 12 11:11:03 2013
@@ -0,0 +1,17 @@
+<!--
+ 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 />
