[jboss-svn-commits] JBL Code SVN: r18661 - in labs/jbosslabs/labs-3.0-build: core/core-api/src/main/java/org/jboss/labs/events/service and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 3 11:28:16 EST 2008
Author: wrzep
Date: 2008-03-03 11:28:16 -0500 (Mon, 03 Mar 2008)
New Revision: 18661
Removed:
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/events/service/ProjectEventsGenerator.java
labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/events/ProjectEventsGeneratorBean.java
Modified:
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/events/ProjectEvents.java
labs/jbosslabs/labs-3.0-build/services/events-service/src/main/java/org/jboss/labs/events/ProjectEventsConsumer.java
labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceEventListenerBean.java
labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/events/ProjectEventsGenerator.java
Log:
JBLAB-904 one less SLSB to make life easier ;)
Modified: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/events/ProjectEvents.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/events/ProjectEvents.java 2008-03-03 16:01:03 UTC (rev 18660)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/events/ProjectEvents.java 2008-03-03 16:28:16 UTC (rev 18661)
@@ -40,8 +40,6 @@
public void projectCreated( String projectId );
public void projectLeadAdded( String username, String projectId);
-
- public void updated ( Class clazz , Integer id );
-
+
public void projectContributorAdded(String username, String projectId);
}
Deleted: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/events/service/ProjectEventsGenerator.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/events/service/ProjectEventsGenerator.java 2008-03-03 16:01:03 UTC (rev 18660)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/events/service/ProjectEventsGenerator.java 2008-03-03 16:28:16 UTC (rev 18661)
@@ -1,44 +0,0 @@
-/*
-* JBoss Labs. http://labs.jboss.com/jbosslabs
-*
-* Copyright © 2008 Red Hat Middleware, LLC. All rights reserved.
-*
-* This copyrighted material is made available to anyone wishing to use,
-* modify, copy, or redistribute it subject to the terms and conditions
-* of the GNU Lesser General Public License, v. 2.1.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT A WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License, v.2.1 along with this distribution; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-* 02110-1301, USA.
-*
-* Red Hat Author(s): Bob McWhirter, Przemyslaw Dej, Ryszard Kozmik,
-* Tomasz Szymanski, Adam Warski, Pawel Wrzeszcz
-*/
-
-package org.jboss.labs.events.service;
-
-import javax.ejb.Local;
-import javax.naming.NamingException;
-import javax.jms.JMSException;
-import java.util.EventListener;
-
-/**
- * @author Pawel Wrzeszcz
- */
- at Local
-public interface ProjectEventsGenerator {
-
- public void send () throws Exception;
-
- public void projectCreated(String projectId) throws NamingException, JMSException;
-
- public void projectLeadAdded(String username, String projectId) throws NamingException, JMSException;
-
- public void contributorAdded(String username, String projectId) throws NamingException, JMSException;
-}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/services/events-service/src/main/java/org/jboss/labs/events/ProjectEventsConsumer.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/events-service/src/main/java/org/jboss/labs/events/ProjectEventsConsumer.java 2008-03-03 16:01:03 UTC (rev 18660)
+++ labs/jbosslabs/labs-3.0-build/services/events-service/src/main/java/org/jboss/labs/events/ProjectEventsConsumer.java 2008-03-03 16:28:16 UTC (rev 18661)
@@ -52,7 +52,6 @@
public void projectCreated(String projectId) {
@SuppressWarnings("unchecked")
List<ProjectEvents> list = storage.findAllListeners (this.getClass().getInterfaces()[0]);
- System.out.println("project created " + list.size());
for ( ProjectEvents listener : list ) {
listener.projectCreated( projectId );
}
@@ -66,14 +65,6 @@
}
}
- public void updated(Class clazz, Integer id) {
- @SuppressWarnings("unchecked")
- List<ProjectEvents> list = storage.findAllListeners (this.getClass().getInterfaces()[0]);
- for ( ProjectEvents listener : list ) {
- listener.updated( clazz , id );
- }
- }
-
@SuppressWarnings("unchecked")
public void projectContributorAdded(String username, String projectId) {
List<ProjectEvents> list = storage.findAllListeners (this.getClass().getInterfaces()[0]);
Modified: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-03-03 16:01:03 UTC (rev 18660)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-03-03 16:28:16 UTC (rev 18661)
@@ -8,31 +8,32 @@
import org.jboss.labs.exception.admin.ProjectNotFoundException;
import org.jboss.labs.exception.auth.NoSuchUserException;
import org.jboss.labs.exception.LabsRollbackException;
-import org.jboss.labs.events.service.ProjectEventsGenerator;
+import org.jboss.labs.events.ProjectEventsGenerator;
import org.jboss.labs.injection.ejb3.LabsInjectionInterceptor;
import javax.ejb.Stateful;
-import javax.ejb.EJB;
import javax.jws.WebService;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
-import javax.interceptor.Interceptors;
import javax.naming.NamingException;
import javax.jms.JMSException;
+import javax.interceptor.Interceptors;
import java.util.*;
+import com.google.inject.Inject;
+
@Stateful(name="ProjectService")
@WebService(endpointInterface="org.jboss.labs.core.service.ProjectWebService")
-//@Interceptors({LabsInjectionInterceptor.class})
+ at Interceptors({LabsInjectionInterceptor.class})
public class ProjectServiceBean implements ProjectService {
// ProjectServiceWebService {
@PersistenceContext(unitName = "core_model", type = PersistenceContextType.EXTENDED)
private EntityManager em;
- @EJB private ProjectEventsGenerator projectEventsGenerator;
+ private ProjectEventsGenerator projectEventsGenerator = ProjectEventsGenerator.getInstance();
public ProjectServiceBean() {
}
Modified: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceEventListenerBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceEventListenerBean.java 2008-03-03 16:01:03 UTC (rev 18660)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceEventListenerBean.java 2008-03-03 16:28:16 UTC (rev 18661)
@@ -71,11 +71,11 @@
private static final long serialVersionUID = -2472280200806077548L;
public void projectCreated(String projectId) {
- log.debug("Project projectCreated: " + projectId);
+ log.info("Project projectCreated: " + projectId);
}
public void projectLeadAdded(String username, String projectId) {
- log.debug("Added project lead: " + username + " project: " + projectId);
+ log.info("Added project lead: " + username + " project: " + projectId);
// TODO uncomment when auth start working properly
try {
@@ -90,7 +90,7 @@
}
public void projectContributorAdded(String username, String projectId) {
- log.debug("Project contributor added: " + username + " project: " + projectId);
+ log.info("Project contributor added: " + username + " project: " + projectId);
try {
userService.addUserRoleToUser(userService.getUserByLogin(username),
userService.getCommonRoleForProject(projectId));
@@ -102,9 +102,6 @@
throw new IllegalStateException(e);
}
}
-
- public void updated(Class clazz, Integer id) {
- }
}
Modified: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/events/ProjectEventsGenerator.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/events/ProjectEventsGenerator.java 2008-03-03 16:01:03 UTC (rev 18660)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/events/ProjectEventsGenerator.java 2008-03-03 16:28:16 UTC (rev 18661)
@@ -24,41 +24,88 @@
package org.jboss.labs.events;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.ejb.Stateless;
+import javax.jms.JMSException;
+
import org.jboss.ejb3.mdb.ProducerObject;
import org.jboss.ejb3.mdb.ProducerManager;
+import org.jboss.labs.events.ProjectEvents;
/**
* This class generates project's events by executing asynchronous methods of ProjectEvents producer.
*
* @author <a href="mailto:rkozmik at redhat.com">Ryszard Kozmik</a>
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
public class ProjectEventsGenerator {
- /**
- * Just an example of how to send an event.
- *
- * TODO: This is just a dummy implementation for tests.
- *
- * @throws Exception
- */
- public void send () throws Exception {
-
+ private static ProjectEventsGenerator projectEventsGenerator = null;
+
+ public void projectCreated(String projectId) throws NamingException, JMSException {
+
InitialContext ctx = new InitialContext();
- ProjectEvents tester = (ProjectEvents)ctx.lookup(ProjectEvents.class.getName());
-
- ProducerObject po = (ProducerObject)tester;
+ ProjectEvents projectEvents = (ProjectEvents)ctx.lookup(ProjectEvents.class.getName());
+
+ ProducerObject po = (ProducerObject)projectEvents;
ProducerManager manager = po.getProducerManager();
-
+
manager.connect(); // internally create a JMS connection
try
{
- tester.updated( getClass() , new Integer(1));
+ projectEvents.projectCreated(projectId);
}
finally
{
manager.close(); // clean up the JMS connection
}
-
}
+
+ public void projectLeadAdded(String username, String projectId) throws NamingException, JMSException {
+
+ InitialContext ctx = new InitialContext();
+ ProjectEvents projectEvents = (ProjectEvents)ctx.lookup(ProjectEvents.class.getName());
+
+ ProducerObject po = (ProducerObject)projectEvents;
+ ProducerManager manager = po.getProducerManager();
+
+ manager.connect(); // internally create a JMS connection
+ try
+ {
+ projectEvents.projectLeadAdded(username, projectId);
+ }
+ finally
+ {
+ manager.close(); // clean up the JMS connection
+ }
+
+ }
+
+ public void contributorAdded(String username, String projectId) throws NamingException, JMSException {
+
+ InitialContext ctx = new InitialContext();
+ ProjectEvents projectEvents = (ProjectEvents)ctx.lookup(ProjectEvents.class.getName());
+
+ ProducerObject po = (ProducerObject)projectEvents;
+ ProducerManager manager = po.getProducerManager();
+
+ manager.connect(); // internally create a JMS connection
+ try
+ {
+ projectEvents.projectContributorAdded(username, projectId);
+ }
+ finally
+ {
+ manager.close(); // clean up the JMS connection
+ }
+
+ }
+
+ public static ProjectEventsGenerator getInstance() {
+ if (projectEventsGenerator == null) {
+ projectEventsGenerator = new ProjectEventsGenerator();
+ }
+ return projectEventsGenerator;
+ }
}
Deleted: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/events/ProjectEventsGeneratorBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/events/ProjectEventsGeneratorBean.java 2008-03-03 16:01:03 UTC (rev 18660)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/events/ProjectEventsGeneratorBean.java 2008-03-03 16:28:16 UTC (rev 18661)
@@ -1,130 +0,0 @@
-/*
-* JBoss Labs. http://labs.jboss.com/jbosslabs
-*
-* Copyright © 2008 Red Hat Middleware, LLC. All rights reserved.
-*
-* This copyrighted material is made available to anyone wishing to use,
-* modify, copy, or redistribute it subject to the terms and conditions
-* of the GNU Lesser General Public License, v. 2.1.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT A WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License, v.2.1 along with this distribution; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-* 02110-1301, USA.
-*
-* Red Hat Author(s): Bob McWhirter, Przemyslaw Dej, Ryszard Kozmik,
-* Tomasz Szymanski, Adam Warski, Pawel Wrzeszcz
-*/
-
-package org.jboss.labs.events;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.ejb.Stateless;
-import javax.jms.JMSException;
-
-import org.jboss.ejb3.mdb.ProducerObject;
-import org.jboss.ejb3.mdb.ProducerManager;
-import org.jboss.labs.events.service.ProjectEventsGenerator;
-
-
-/**
- * This class generates project's events by executing asynchronous methods of ProjectEvents producer.
- *
- * @author <a href="mailto:rkozmik at redhat.com">Ryszard Kozmik</a>
- * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
- */
- at Stateless
-public class ProjectEventsGeneratorBean implements ProjectEventsGenerator {
-
- /**
- * Just an example of how to send an event.
- *
- * TODO: This is just a dummy implementation for tests.
- *
- * @throws Exception
- */
- public void send () throws Exception {
-
- InitialContext ctx = new InitialContext();
- ProjectEvents tester = (ProjectEvents)ctx.lookup(ProjectEvents.class.getName());
-
- ProducerObject po = (ProducerObject)tester;
- ProducerManager manager = po.getProducerManager();
-
- manager.connect(); // internally create a JMS connection
- try
- {
- tester.updated( getClass() , new Integer(1));
- }
- finally
- {
- manager.close(); // clean up the JMS connection
- }
- }
-
- public void projectCreated(String projectId) throws NamingException, JMSException {
-
- InitialContext ctx = new InitialContext();
- ProjectEvents projectEvents = (ProjectEvents)ctx.lookup(ProjectEvents.class.getName());
-
- ProducerObject po = (ProducerObject)projectEvents;
- ProducerManager manager = po.getProducerManager();
-
- manager.connect(); // internally create a JMS connection
- try
- {
- projectEvents.projectCreated(projectId);
- }
- finally
- {
- manager.close(); // clean up the JMS connection
- }
- }
-
- public void projectLeadAdded(String username, String projectId) throws NamingException, JMSException {
-
- InitialContext ctx = new InitialContext();
- ProjectEvents projectEvents = (ProjectEvents)ctx.lookup(ProjectEvents.class.getName());
-
- ProducerObject po = (ProducerObject)projectEvents;
- ProducerManager manager = po.getProducerManager();
-
- manager.connect(); // internally create a JMS connection
- try
- {
- projectEvents.projectLeadAdded(username, projectId);
- }
- finally
- {
- manager.close(); // clean up the JMS connection
- }
-
- }
-
- public void contributorAdded(String username, String projectId) throws NamingException, JMSException {
-
- InitialContext ctx = new InitialContext();
- ProjectEvents projectEvents = (ProjectEvents)ctx.lookup(ProjectEvents.class.getName());
-
- ProducerObject po = (ProducerObject)projectEvents;
- ProducerManager manager = po.getProducerManager();
-
- manager.connect(); // internally create a JMS connection
- try
- {
- projectEvents.projectContributorAdded(username, projectId);
- }
- finally
- {
- manager.close(); // clean up the JMS connection
- }
-
- }
-
-}
More information about the jboss-svn-commits
mailing list