Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[202] trunk/cse-ip/sc-cdmm/src
|
From: <ro...@us...> - 2009-05-04 12:19:15
|
Revision: 202
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=202&view=rev
Author: roekens
Date: 2009-05-04 12:19:09 +0000 (Mon, 04 May 2009)
Log Message:
-----------
refactoring of cdmm (in progress)
- removed old web service interface and bean class
Modified Paths:
--------------
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/ModelManagerTest.java
Added Paths:
-----------
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java
Removed Paths:
-------------
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManager.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManagerBean.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java 2009-05-04 12:07:57 UTC (rev 201)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java 2009-05-04 12:19:09 UTC (rev 202)
@@ -1,37 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.List;
-
-import de.campussource.cse.cdmm.messages.AccountMessage;
-import de.campussource.cse.cdmm.messages.CategoryMessage;
-import de.campussource.cse.cdmm.messages.CourseMessage;
-import de.campussource.cse.cdmm.messages.EventMessage;
-import de.campussource.cse.cdmm.messages.GroupMessage;
-import de.campussource.cse.cdmm.messages.RoleMessage;
-
-/**
- * Service bean for CDMM package
- * @author Sebastian Roekens
- *
- */
-public interface DataModelManager {
- public List<EventMessage> createOrUpdateCourse(CourseMessage courseMessage);
-
- public List<EventMessage> deleteCourse(CourseMessage courseMessage);
-
- public List<EventMessage> createOrUpdateCategory(CategoryMessage categoryMessage);
-
- public List<EventMessage> deleteCategory(CategoryMessage categoryMessage);
-
- public List<EventMessage> createOrUpdateRole(RoleMessage roleMessage);
-
- public List<EventMessage> deleteRole(RoleMessage roleMessage);
-
- public List<EventMessage> createOrUpdateAccount(AccountMessage accountMessage);
-
- public List<EventMessage> deleteAccount(AccountMessage accountMessage);
-
- public List<EventMessage> createOrUpdateGroup(GroupMessage groupMessage);
-
- public List<EventMessage> deleteGroup(GroupMessage groupMessage);
-}
Copied: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java (from rev 200, trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManager.java)
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java 2009-05-04 12:19:09 UTC (rev 202)
@@ -0,0 +1,21 @@
+package de.campussource.cse.cdmm;
+
+import java.util.List;
+
+import de.campussource.cse.cdmm.messages.EventMessage;
+import de.campussource.cse.cdmm.messages.InputMessage;
+
+/**
+ * Canonical Data Model Manager
+ *
+ * @author Ingo Dueppe
+ * @author Sebastian Roekens
+ *
+ */
+public interface DataModelManager {
+
+ public List<EventMessage> createOrUpdate(InputMessage message);
+
+ public List<EventMessage> delete(InputMessage message);
+
+}
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-05-04 12:07:57 UTC (rev 201)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-05-04 12:19:09 UTC (rev 202)
@@ -1,96 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.List;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-
-import org.apache.log4j.Logger;
-
-import de.campussource.cse.cdmm.messages.AccountMessage;
-import de.campussource.cse.cdmm.messages.CategoryMessage;
-import de.campussource.cse.cdmm.messages.CourseMessage;
-import de.campussource.cse.cdmm.messages.EventMessage;
-import de.campussource.cse.cdmm.messages.GroupMessage;
-import de.campussource.cse.cdmm.messages.RoleMessage;
-
-/**
- * Service bean for CDMM package
- *
- * @author Sebastian Roekens
- *
- */
-@Stateless
-@Remote(value = DataModelManager.class)
-@WebService(name = "DataModelManager", targetNamespace = "http://cse.campussource.de/cdmm")
-public class DataModelManagerBean implements DataModelManager {
-
- private static final Logger logger = Logger
- .getLogger(DataModelManagerBean.class);
-
- @Override
- @WebMethod(action = "createOrUpdateCourse")
- @WebResult(name = "EventMessages")
- public List<EventMessage> createOrUpdateCourse(
- @WebParam(name = "CourseMessage") CourseMessage courseMessage) {
- return null;
- }
-
- @Override
- public List<EventMessage> deleteCourse(CourseMessage courseMessage) {
- // init eventMessageList
- return null;
- }
-
- @Override
- public List<EventMessage> createOrUpdateAccount(
- AccountMessage accountMessage) {
- return null;
- }
-
-
- @Override
- public List<EventMessage> createOrUpdateCategory(
- CategoryMessage categoryMessage) {
- return null;
- }
-
- @Override
- public List<EventMessage> createOrUpdateGroup(GroupMessage groupMessage) {
- return null;
- }
-
- @Override
- public List<EventMessage> createOrUpdateRole(RoleMessage roleMessage) {
- return null;
- }
-
- @Override
- public List<EventMessage> deleteAccount(AccountMessage accountMessage) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public List<EventMessage> deleteCategory(CategoryMessage categoryMessage) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public List<EventMessage> deleteGroup(GroupMessage groupMessage) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public List<EventMessage> deleteRole(RoleMessage roleMessage) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
Copied: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java (from rev 200, trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManagerBean.java)
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-05-04 12:19:09 UTC (rev 202)
@@ -0,0 +1,64 @@
+package de.campussource.cse.cdmm;
+
+import java.util.List;
+
+import javax.ejb.EJB;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.log4j.Logger;
+
+import de.campussource.cse.cdmm.dao.EntityDaoJPA;
+import de.campussource.cse.cdmm.domain.Entity;
+import de.campussource.cse.cdmm.messages.EventMessage;
+import de.campussource.cse.cdmm.messages.InputMessage;
+
+/**
+ * Canonical Data Model Manager implementation
+ *
+ *
+ * @author Ingo Dueppe
+ *
+ */
+@Stateless
+@Remote(DataModelManager.class)
+@WebService(name = "DataModelManager", targetNamespace = "http://cse.campussource.de/cdmm")
+public class DataModelManagerBean implements DataModelManager {
+
+ @EJB
+ private EntityDaoJPA entityDao;
+
+ private static final Logger logger = Logger.getLogger(DataModelManagerBean.class);
+
+ @Override
+ public List<EventMessage> createOrUpdate(InputMessage message) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Receive create or update message: "+message);
+ }
+
+ Entity input = message.getEntity();
+ Entity loaded = entityDao.find(input.getClass(), input.getId());
+
+ EventBuilder eventBuilder = new EventBuilderBean();
+ eventBuilder.setEventTime(message.getEventTime());
+ if (loaded.isOlder(input.getDate())) {
+ ModelMergerBean merger = new ModelMergerBean();
+ merger.setEventBuilder(eventBuilder);
+ merger.merge(input);
+
+ entityDao.persist(loaded);
+ }
+
+ return eventBuilder.build();
+ }
+
+
+ @Override
+ public List<EventMessage> delete(InputMessage message) {
+ throw new NotImplementedException();
+ // TODO Auto-generated method stub
+ }
+
+}
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManager.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManager.java 2009-05-04 12:07:57 UTC (rev 201)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManager.java 2009-05-04 12:19:09 UTC (rev 202)
@@ -1,21 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.List;
-
-import de.campussource.cse.cdmm.messages.EventMessage;
-import de.campussource.cse.cdmm.messages.InputMessage;
-
-/**
- * Canonical Data Model Manager
- *
- * @author Ingo Dueppe
- * @author Sebastian Roekens
- *
- */
-public interface ModelManager {
-
- public List<EventMessage> createOrUpdate(InputMessage message);
-
- public List<EventMessage> delete(InputMessage message);
-
-}
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManagerBean.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManagerBean.java 2009-05-04 12:07:57 UTC (rev 201)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManagerBean.java 2009-05-04 12:19:09 UTC (rev 202)
@@ -1,62 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.List;
-
-import javax.ejb.EJB;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.log4j.Logger;
-
-import de.campussource.cse.cdmm.dao.EntityDaoJPA;
-import de.campussource.cse.cdmm.domain.Entity;
-import de.campussource.cse.cdmm.messages.EventMessage;
-import de.campussource.cse.cdmm.messages.InputMessage;
-
-/**
- * Canonical Data Model Manager implementation
- *
- *
- * @author Ingo Dueppe
- *
- */
-@Stateless
-@Remote(ModelManager.class)
-public class ModelManagerBean implements ModelManager {
-
- @EJB
- private EntityDaoJPA entityDao;
-
- private static final Logger logger = Logger.getLogger(ModelManagerBean.class);
-
- @Override
- public List<EventMessage> createOrUpdate(InputMessage message) {
- if (logger.isDebugEnabled()) {
- logger.debug("Receive create or update message: "+message);
- }
-
- Entity input = message.getEntity();
- Entity loaded = entityDao.find(input.getClass(), input.getId());
-
- EventBuilder eventBuilder = new EventBuilderBean();
- eventBuilder.setEventTime(message.getEventTime());
- if (loaded.isOlder(input.getDate())) {
- ModelMergerBean merger = new ModelMergerBean();
- merger.setEventBuilder(eventBuilder);
- merger.merge(input);
-
- entityDao.persist(loaded);
- }
-
- return eventBuilder.build();
- }
-
-
- @Override
- public List<EventMessage> delete(InputMessage message) {
- throw new NotImplementedException();
- // TODO Auto-generated method stub
- }
-
-}
Deleted: trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java 2009-05-04 12:07:57 UTC (rev 201)
+++ trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java 2009-05-04 12:19:09 UTC (rev 202)
@@ -1,73 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import de.campussource.cse.cdmm.domain.Constants;
-import de.campussource.cse.cdmm.domain.Course;
-import de.campussource.cse.cdmm.messages.CourseMessage;
-import de.campussource.cse.cdmm.messages.EventMessage;
-import de.campussource.cse.cdmm.messages.InputEventType;
-import de.campussource.cse.cdmm.messages.OutputEventType;
-import de.campussource.cse.common.test.AbstractPersistentUnitTest;
-
-/**
- *
- * @author Sebastian Roekens
- *
- */
-public class DataModelManagerBeanTest extends AbstractPersistentUnitTest {
-
- private DataModelManagerBean dmm;
-
- @Before
- public void setUp() {
- dmm = new DataModelManagerBean();
- autowireByType(dmm);
- txBegin();
- }
-
- @Test
- public void testConstants(){
- @SuppressWarnings("unused")
- Constants constants = new Constants();
- }
-
- @Test
- @Ignore
- public void testCourseOperations(){
- CourseMessage courseMessage = new CourseMessage();
- courseMessage.setCourse(new Course());
- courseMessage.setEventTime(new Date(1000L));
- courseMessage.setInputEvent(InputEventType.CREATE_UPDATE);
-
- List<EventMessage> events = dmm.createOrUpdateCourse(courseMessage);
-
- assertEquals(1, events.size());
- assertEquals(OutputEventType.CREATE, events.get(0).getOutputEvent());
- assertNotNull(events.get(0).getEntity().getId());
-
- courseMessage.getCourse().setId(events.get(0).getEntity().getId());
-
- events = dmm.createOrUpdateCourse(courseMessage);
- assertEquals(0, events.size());
-
- courseMessage.setEventTime(new Date(2000L));
- events = dmm.createOrUpdateCourse(courseMessage);
- assertEquals(1, events.size());
- assertEquals(OutputEventType.UPDATE, events.get(0).getOutputEvent());
-
-
- courseMessage.setEventTime(new Date(3000L));
- events = dmm.deleteCourse(courseMessage);
- assertEquals(1, events.size());
- assertEquals(OutputEventType.DELETE, events.get(0).getOutputEvent());
- }
-
-
-}
\ No newline at end of file
Modified: trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/ModelManagerTest.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/ModelManagerTest.java 2009-05-04 12:07:57 UTC (rev 201)
+++ trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/ModelManagerTest.java 2009-05-04 12:19:09 UTC (rev 202)
@@ -19,14 +19,14 @@
public class ModelManagerTest extends AbstractPersistentUnitTest {
- private ModelManager manager;
+ private DataModelManager manager;
private EntityDao entityDao;
@Before
public void setUp() {
entityDao = new EntityDaoJPA();
autowireByType(entityDao);
- manager = new ModelManagerBean();
+ manager = new DataModelManagerBean();
autowireByType(manager);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
