Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[130] trunk/sandbox/cse-ip
|
From: <ro...@us...> - 2009-04-21 09:47:07
|
Revision: 130
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=130&view=rev
Author: roekens
Date: 2009-04-21 09:46:52 +0000 (Tue, 21 Apr 2009)
Log Message:
-----------
refactoring of exception structure:
introduced sc-common project which contains a ServiceComponentException and an IDNotFoundException
refactored sc-cdmm and sc-idmapper to use sc-common
Modified Paths:
--------------
trunk/sandbox/cse-ip/pom.xml
trunk/sandbox/cse-ip/sc-cdmm/pom.xml
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MissingAttributeExceptionTest.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MissingParameterExceptionTest.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java
trunk/sandbox/cse-ip/sc-idmapper/pom.xml
trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapper.java
trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperBean.java
trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java
Added Paths:
-----------
trunk/sandbox/cse-ip/sc-common/
trunk/sandbox/cse-ip/sc-common/pom.xml
trunk/sandbox/cse-ip/sc-common/src/
trunk/sandbox/cse-ip/sc-common/src/main/
trunk/sandbox/cse-ip/sc-common/src/main/java/
trunk/sandbox/cse-ip/sc-common/src/main/java/de/
trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/
trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/
trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/
trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/
trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/IdNotFoundException.java
trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/ServiceComponentException.java
trunk/sandbox/cse-ip/sc-common/src/test/
trunk/sandbox/cse-ip/sc-common/src/test/java/
trunk/sandbox/cse-ip/sc-common/src/test/java/de/
trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/
trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/
trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/
trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/
trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/IdNotFoundExceptionTest.java
trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/ServiceComponentExceptionTest.java
trunk/sandbox/cse-ip/sc-common/src/test/resources/
trunk/sandbox/cse-ip/sc-common/src/test/resources/log4j.properties
Removed Paths:
-------------
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerException.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerExceptionTest.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/IdNotFoundExceptionTest.java
trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdNotFoundException.java
trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MapperException.java
trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java
Modified: trunk/sandbox/cse-ip/pom.xml
===================================================================
--- trunk/sandbox/cse-ip/pom.xml 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/pom.xml 2009-04-21 09:46:52 UTC (rev 130)
@@ -112,6 +112,7 @@
<module>ica-his-lsf</module>
<module>sc-idmapper</module>
<module>sc-cdmm</module>
+ <module>sc-common</module>
<module>cse-ip-application</module>
</modules>
Modified: trunk/sandbox/cse-ip/sc-cdmm/pom.xml
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/pom.xml 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/pom.xml 2009-04-21 09:46:52 UTC (rev 130)
@@ -22,6 +22,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>de.campussource.cse</groupId>
+ <artifactId>sc-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
<version>3.0</version>
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -13,6 +13,7 @@
import de.campussource.cse.cdmm.domain.Course;
import de.campussource.cse.cdmm.domain.Role;
import de.campussource.cse.cdmm.domain.State;
+import de.campussource.cse.common.exception.ServiceComponentException;
/**
* Service bean for CDMM package
@@ -45,7 +46,7 @@
try {
loadedCourse = courseDao.find(courseMessage.getCourse().getId());
state=loadedCourse.getState();
- } catch (DataModelManagerException e1) {
+ } catch (ServiceComponentException e1) {
//do nothing
}
@@ -58,7 +59,7 @@
eventMessage.setEntity(course);
try {
courseDao.persist(course);
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//TODO handle me
}
if (state==State.EXISTS){
@@ -99,7 +100,7 @@
private void createByReference(Category category) {
try {
Category loadedCategory = categoryDao.find(category.getId());
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
CategoryMessage cm = new CategoryMessage();
cm.setCategory(category);
cm.setInputEvent(InputEventType.CREATE_BY_REFERENCE);
@@ -111,7 +112,7 @@
private void createByReference(Course course) {
try {
Course loadedCourse = courseDao.find(course.getId());
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
CourseMessage cm = new CourseMessage();
cm.setCourse(course);
cm.setInputEvent(InputEventType.CREATE_BY_REFERENCE);
Deleted: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerException.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerException.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerException.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -1,26 +0,0 @@
-package de.campussource.cse.cdmm;
-
-/**
- * General CDMM exception
- * @author Sebastian Roekens
- */
-public class DataModelManagerException extends Exception {
-
- private static final long serialVersionUID = -2553188081269164041L;
-
- public DataModelManagerException() {
- }
-
- public DataModelManagerException(String message) {
- super(message);
- }
-
- public DataModelManagerException(Throwable cause) {
- super(cause);
- }
-
- public DataModelManagerException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
\ No newline at end of file
Deleted: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -1,26 +0,0 @@
-package de.campussource.cse.cdmm;
-
-/**
- * Exception to represent failed searches for objects
- * e.g. no objetc with given id existing
- * @author Sebastian Roekens
- */
-public class IdNotFoundException extends DataModelManagerException {
-
- private static final long serialVersionUID = 3260263352045745859L;
-
- public IdNotFoundException() {}
-
- public IdNotFoundException(String message) {
- super(message);
- }
-
- public IdNotFoundException(Throwable cause) {
- super(cause);
- }
-
- public IdNotFoundException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -1,10 +1,12 @@
package de.campussource.cse.cdmm;
+import de.campussource.cse.common.exception.ServiceComponentException;
+
/**
* Exception to represent missing attributes in objects which shall be persisted
* @author Sebastian Roekens
*/
-public class MissingAttributeException extends DataModelManagerException {
+public class MissingAttributeException extends ServiceComponentException {
private static final long serialVersionUID = 3260263352045745856L;
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -1,10 +1,12 @@
package de.campussource.cse.cdmm;
+import de.campussource.cse.common.exception.ServiceComponentException;
+
/**
* Exception to represent missing parameters in method calls
* @author Sebastian Roekens
*/
-public class MissingParameterException extends DataModelManagerException {
+public class MissingParameterException extends ServiceComponentException {
private static final long serialVersionUID = 3260263352045745857L;
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -2,7 +2,7 @@
import java.io.Serializable;
-import de.campussource.cse.cdmm.DataModelManagerException;
+import de.campussource.cse.common.exception.ServiceComponentException;
/**
* @author Ingo D\xFCppe
@@ -15,22 +15,22 @@
* Finder method to find persisted entities by id
* @param id id of searched object
* @return entity object with given id
- * @throws DataModelManagerException
+ * @throws ServiceComponentException
*/
- public T find(Serializable id) throws DataModelManagerException;
+ public T find(Serializable id) throws ServiceComponentException;
/**
* DAO method to persist given object
* @param entity object to persist
- * @throws DataModelManagerException
+ * @throws ServiceComponentException
*/
- public void persist(T entity) throws DataModelManagerException;
+ public void persist(T entity) throws ServiceComponentException;
/**
* DAO method to delete entity objects
* @param entity object to delete
- * @throws DataModelManagerException
+ * @throws ServiceComponentException
*/
- public void remove(T entity) throws DataModelManagerException;
+ public void remove(T entity) throws ServiceComponentException;
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -8,8 +8,8 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import de.campussource.cse.cdmm.DataModelManagerException;
-import de.campussource.cse.cdmm.IdNotFoundException;
+import de.campussource.cse.common.exception.ServiceComponentException;
+import de.campussource.cse.common.exception.IdNotFoundException;
import de.campussource.cse.cdmm.MissingParameterException;
@@ -33,7 +33,7 @@
@Override
@TransactionAttribute(TransactionAttributeType.SUPPORTS)
- public E find(Serializable id) throws DataModelManagerException{
+ public E find(Serializable id) throws ServiceComponentException{
E result = entityManager.find(persistentClass, id);
if (result == null){
throw new IdNotFoundException("Id: "+ id + "could not be found.");
@@ -43,12 +43,12 @@
@Override
@TransactionAttribute(TransactionAttributeType.MANDATORY)
- public void persist(E entity) throws DataModelManagerException{
+ public void persist(E entity) throws ServiceComponentException{
entityManager.persist(entity);
}
@Override
- public void remove(E entity) throws DataModelManagerException{
+ public void remove(E entity) throws ServiceComponentException{
if (entity == null){
throw new MissingParameterException("Parameter entity is mandatory!");
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -4,8 +4,8 @@
import javax.persistence.NoResultException;
import javax.persistence.Query;
-import de.campussource.cse.cdmm.DataModelManagerException;
-import de.campussource.cse.cdmm.IdNotFoundException;
+import de.campussource.cse.common.exception.ServiceComponentException;
+import de.campussource.cse.common.exception.IdNotFoundException;
import de.campussource.cse.cdmm.MissingAttributeException;
import de.campussource.cse.cdmm.MissingParameterException;
import de.campussource.cse.cdmm.domain.Role;
@@ -29,7 +29,7 @@
}
@Override
- public void remove(Role role) throws DataModelManagerException{
+ public void remove(Role role) throws ServiceComponentException{
if (role==null){
throw new MissingParameterException("Parameter role is mandatory!");
}
@@ -48,9 +48,9 @@
* @param accountId id of account reference of searched role
* @param courseId id of course reference of searched role
* @return role object with given account and course reference
- * @throws DataModelManagerException Exception is thrown, when no role with given accountId and courseId exists
+ * @throws ServiceComponentException Exception is thrown, when no role with given accountId and courseId exists
*/
- public Role retrieveRole(long accountId, long courseId) throws DataModelManagerException{
+ public Role retrieveRole(long accountId, long courseId) throws ServiceComponentException{
if (accountId == 0){
throw new MissingParameterException("Paramter accountId is mandatory!");
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -10,6 +10,7 @@
import de.campussource.cse.cdmm.dao.AccountDao;
import de.campussource.cse.cdmm.domain.Account;
+import de.campussource.cse.common.exception.ServiceComponentException;
import de.campussource.cse.common.test.AbstractPersistentUnitTest;
public class AccountDaoTest extends AbstractPersistentUnitTest {
@@ -28,8 +29,8 @@
public void testPersistAccount() {
try {
dao.persist(account);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException");
}
assertNotNull(account.getId());
txCommit();
@@ -40,14 +41,14 @@
public void testFindAccount() {
try {
dao.persist(account);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException");
} assertNotNull(account.getId());
commitAndBeginTx();
Account acid = null;
try {
acid = dao.find(account.getId());
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
fail("Created account could not be found");
}
assertEquals(account, acid);
@@ -57,13 +58,13 @@
public void testRemoveAccount() {
try {
dao.persist(account);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException");
} assertNotNull(account.getId());
commitAndBeginTx();
try {
dao.remove(account);
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
fail("Unexpected DataModelMaangerException");
}
commitAndBeginTx();
@@ -71,7 +72,7 @@
@SuppressWarnings("unused")
Account retrievedAccount = dao.find(account.getId());
fail("Deleting of account failed");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
// Exception should occur;
}
@@ -83,7 +84,7 @@
try {
foundAccount = dao.find(0L);
fail("Exception should occur");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//Exception should occur
}
assertNull(foundAccount);
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -13,6 +13,7 @@
import de.campussource.cse.cdmm.dao.CategoryDao;
import de.campussource.cse.cdmm.domain.Category;
+import de.campussource.cse.common.exception.ServiceComponentException;
import de.campussource.cse.common.test.AbstractPersistentUnitTest;
public class CategoryDaoTest extends AbstractPersistentUnitTest {
@@ -46,8 +47,8 @@
public void testPersistCategory() {
try {
dao.persist(category);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException on creation of category");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException on creation of category");
}
assertNotNull(category.getId());
}
@@ -59,14 +60,14 @@
public void testFindCategory() {
try {
dao.persist(category);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException on creation of category");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException on creation of category");
}
assertNotNull(category.getId());
Category coid = null;
try {
coid = dao.find(category.getId());
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
fail("Created category could not be retrieved");
}
assertEquals(category, coid);
@@ -79,20 +80,20 @@
public void testRemoveCategory() {
try {
dao.persist(category);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException on creation of category");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException on creation of category");
}
assertNotNull(category.getId());
try {
dao.remove(category);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException");
}
try {
@SuppressWarnings("unused")
Category retrievedCategory = dao.find(category.getId());
fail("Deleting of category failed");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
// Exception should occur
}
}
@@ -105,8 +106,8 @@
category.addToParentCategory(parentCategory);
try {
dao.persist(category);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException on creation of category");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException on creation of category");
}
assertNotNull(category.getId());
assertNotNull(parentCategory.getId());
@@ -114,21 +115,21 @@
assertEquals(parentCategory.getChildren().get(0), category);
try {
dao.remove(parentCategory);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException");
}
try {
@SuppressWarnings("unused")
Category retrievedParentCategory = dao.find(parentCategory.getId());
fail("Deleting of parent category failed");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
// Exception should occur
}
try {
@SuppressWarnings("unused")
Category retrievedCategory = dao.find(category.getId());
fail("Cascaded deleting of child category failed");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
// Exception should occur
}
}
@@ -142,7 +143,7 @@
try {
foundCategory = dao.find(0L);
fail("Exception should occur");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
// Exception should occur
}
assertNull(foundCategory);
@@ -156,8 +157,8 @@
assertTrue(category.addToParentCategory(parentCategory));
try {
dao.persist(category);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException on creation of category");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException on creation of category");
}
assertFalse(parentCategory.addToParentCategory(category));
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -14,6 +14,7 @@
import de.campussource.cse.cdmm.dao.CourseDao;
import de.campussource.cse.cdmm.domain.Category;
import de.campussource.cse.cdmm.domain.Course;
+import de.campussource.cse.common.exception.ServiceComponentException;
import de.campussource.cse.common.test.AbstractPersistentUnitTest;
public class CourseDaoTest extends AbstractPersistentUnitTest {
@@ -44,8 +45,8 @@
public void testPersistCourse() {
try {
dao.persist(course);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException!");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException!");
}
assertNotNull(course.getId());
}
@@ -59,15 +60,15 @@
public void testFindCourse() {
try {
dao.persist(course);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException!");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException!");
}
assertNotNull(course.getId());
commitAndBeginTx();
Course coid = null;
try {
coid = dao.find(course.getId());
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
fail("Creating or retrieving of course failed!");
}
assertEquals(course, coid);
@@ -80,20 +81,20 @@
public void testRemoveCourse() {
try {
dao.persist(course);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException!");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException!");
}
assertNotNull(course.getId());
try {
dao.remove(course);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException!");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException!");
}
try {
@SuppressWarnings("unused")
Course retrievedCourse = dao.find(course.getId());
fail("Deleting of course failed");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
// Exception should occur
}
}
@@ -107,7 +108,7 @@
try {
foundCourse = dao.find(0L);
fail("Exception should occur");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
// Exception should occur
}
assertNull(foundCourse);
@@ -123,15 +124,15 @@
autowireByType(categoryDao);
try {
categoryDao.persist(category);
- } catch (DataModelManagerException e1) {
- fail("Unexpected DataModelManagerException");
+ } catch (ServiceComponentException e1) {
+ fail("Unexpected ServiceComponentException");
}
assertNotNull(category.getId());
course.addToCategory(category);
try {
dao.persist(course);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException!");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException!");
}
assertNotNull(course.getId());
assertNotNull(course.getCategories());
@@ -151,8 +152,8 @@
workgroup1.addAsWorkgroupTo(course);
try {
dao.persist(workgroup1);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException");
}
assertNotNull(workgroup1.getId());
assertNotNull(course.getId());
@@ -165,21 +166,21 @@
// check correct deleting cascading
try {
dao.remove(course);
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
fail("Unexpected Exception on removing of course");
}
try {
@SuppressWarnings("unused")
Course retrievedCourse = dao.find(course.getId());
fail("Deleting of course failed");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
// Exception should occur
}
try {
@SuppressWarnings("unused")
Course retrievedWorkgroup = dao.find(workgroup1.getId());
fail("Cascaded deleting of workgroup failed");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
// Exception should occur
}
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -6,6 +6,7 @@
import org.junit.Test;
import de.campussource.cse.cdmm.dao.AccountDao;
+import de.campussource.cse.common.exception.ServiceComponentException;
import de.campussource.cse.common.test.AbstractPersistentUnitTest;
public class DaoTest extends AbstractPersistentUnitTest {
@@ -23,7 +24,7 @@
try {
accountDao.remove(null);
fail("Exception should occur");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
}
}
Deleted: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerExceptionTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerExceptionTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerExceptionTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -1,39 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-/**
- * @author Sebastian Roekens
- */
-public class DataModelManagerExceptionTest {
-
- @Test
- public void testDefaultConstructor() {
- Exception e = new IdNotFoundException();
- assertNotNull(e);
- }
-
- @Test
- public void testMessageConstructor() {
- Exception e = new DataModelManagerException("message");
- assertEquals("message", e.getMessage());
- }
-
- @Test
- public void testCauseConstructor() {
- Exception e = new DataModelManagerException("message");
- Exception e2 = new DataModelManagerException(e);
- assertEquals(e,e2.getCause());
- }
-
- @Test
- public void testMessageCauseConstructor() {
- Exception e = new DataModelManagerException("message");
- Exception e2 = new DataModelManagerException("message", e);
- assertEquals(e, e2.getCause());
- assertEquals("message", e2.getMessage());
- }
-
-}
\ No newline at end of file
Deleted: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/IdNotFoundExceptionTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/IdNotFoundExceptionTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/IdNotFoundExceptionTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -1,39 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-/**
- * @author Sebastian Roekens
- */
-public class IdNotFoundExceptionTest {
-
- @Test
- public void testDefaultConstructor() {
- DataModelManagerException dmme = new IdNotFoundException();
- assertNotNull(dmme);
- }
-
- @Test
- public void testMessageConstructor() {
- DataModelManagerException dmme = new IdNotFoundException("message");
- assertEquals("message", dmme.getMessage());
- }
-
- @Test
- public void testCauseConstructor() {
- DataModelManagerException dmme = new IdNotFoundException("message");
- DataModelManagerException dmme2 = new IdNotFoundException(dmme);
- assertEquals(dmme,dmme2.getCause());
- }
-
- @Test
- public void testMessageCauseConstructor() {
- DataModelManagerException dmme = new IdNotFoundException("message");
- DataModelManagerException dmme2 = new IdNotFoundException("message", dmme);
- assertEquals(dmme, dmme2.getCause());
- assertEquals("message", dmme2.getMessage());
- }
-
-}
\ No newline at end of file
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MissingAttributeExceptionTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MissingAttributeExceptionTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MissingAttributeExceptionTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -4,6 +4,8 @@
import org.junit.Test;
+import de.campussource.cse.common.exception.ServiceComponentException;
+
/**
* @author Sebastian Roekens
*/
@@ -11,27 +13,27 @@
@Test
public void testDefaultConstructor() {
- DataModelManagerException dmme = new MissingAttributeException();
+ ServiceComponentException dmme = new MissingAttributeException();
assertNotNull(dmme);
}
@Test
public void testMessageConstructor() {
- DataModelManagerException dmme = new MissingAttributeException("message");
+ ServiceComponentException dmme = new MissingAttributeException("message");
assertEquals("message", dmme.getMessage());
}
@Test
public void testCauseConstructor() {
- DataModelManagerException dmme = new MissingAttributeException("message");
- DataModelManagerException dmme2 = new MissingAttributeException(dmme);
+ ServiceComponentException dmme = new MissingAttributeException("message");
+ ServiceComponentException dmme2 = new MissingAttributeException(dmme);
assertEquals(dmme,dmme2.getCause());
}
@Test
public void testMessageCauseConstructor() {
- DataModelManagerException dmme = new MissingAttributeException("message");
- DataModelManagerException dmme2 = new MissingAttributeException("message", dmme);
+ ServiceComponentException dmme = new MissingAttributeException("message");
+ ServiceComponentException dmme2 = new MissingAttributeException("message", dmme);
assertEquals(dmme, dmme2.getCause());
assertEquals("message", dmme2.getMessage());
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MissingParameterExceptionTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MissingParameterExceptionTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MissingParameterExceptionTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -4,6 +4,8 @@
import org.junit.Test;
+import de.campussource.cse.common.exception.ServiceComponentException;
+
/**
* @author Sebastian Roekens
*/
@@ -11,27 +13,27 @@
@Test
public void testDefaultConstructor() {
- DataModelManagerException dmme = new MissingParameterException();
+ ServiceComponentException dmme = new MissingParameterException();
assertNotNull(dmme);
}
@Test
public void testMessageConstructor() {
- DataModelManagerException dmme = new MissingParameterException("message");
+ ServiceComponentException dmme = new MissingParameterException("message");
assertEquals("message", dmme.getMessage());
}
@Test
public void testCauseConstructor() {
- DataModelManagerException dmme = new MissingParameterException("message");
- DataModelManagerException dmme2 = new MissingParameterException(dmme);
+ ServiceComponentException dmme = new MissingParameterException("message");
+ ServiceComponentException dmme2 = new MissingParameterException(dmme);
assertEquals(dmme,dmme2.getCause());
}
@Test
public void testMessageCauseConstructor() {
- DataModelManagerException dmme = new MissingParameterException("message");
- DataModelManagerException dmme2 = new MissingParameterException("message", dmme);
+ ServiceComponentException dmme = new MissingParameterException("message");
+ ServiceComponentException dmme2 = new MissingParameterException("message", dmme);
assertEquals(dmme, dmme2.getCause());
assertEquals("message", dmme2.getMessage());
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -16,6 +16,7 @@
import de.campussource.cse.cdmm.domain.Role;
import de.campussource.cse.cdmm.domain.RoleType;
import de.campussource.cse.cdmm.domain.State;
+import de.campussource.cse.common.exception.ServiceComponentException;
import de.campussource.cse.common.test.AbstractPersistentUnitTest;
public class RoleDaoTest extends AbstractPersistentUnitTest {
@@ -72,8 +73,8 @@
Role roid = null;
try {
roid = dao.find(role.getId());
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException!");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException!");
}
assertEquals(role, roid);
}
@@ -91,14 +92,14 @@
assertNotNull(role.getId());
try {
dao.remove(role);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException!");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException!");
}
try {
@SuppressWarnings("unused")
Role retrievedRole = dao.find(role.getId());
fail("Deleting failed");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//Exception is correct
}
CourseDao courseDao = new CourseDao();
@@ -106,7 +107,7 @@
try {
Course retrievedCourse = courseDao.find(course.getId());
assertNotNull(retrievedCourse);
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
fail("Account should not be deleted!");
}
}
@@ -120,8 +121,8 @@
Role foundRole;
try {
foundRole = dao.find(0L);
- fail("DataModelManagerException should have been thrown, due to search for an not existing object!");
- } catch (DataModelManagerException e) {
+ fail("ServiceComponentException should have been thrown, due to search for an not existing object!");
+ } catch (ServiceComponentException e) {
//Exception should occur
}
}
@@ -174,21 +175,21 @@
autowireByType(courseDao);
try {
courseDao.remove(course);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException occured!");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException occured!");
}
try{
@SuppressWarnings("unused")
Course retrievedCourse = courseDao.find(course.getId());
fail("Course deleting failed!");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//Exception should occur
}
try {
@SuppressWarnings("unused")
Role retrievedRole = dao.find(role.getId());
fail("Cascaded Role deleting failed!");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//Exception should occur
}
}
@@ -216,21 +217,21 @@
autowireByType(accountDao);
try {
accountDao.remove(account);
- } catch (DataModelManagerException e) {
- fail("Unexpected DataModelManagerException occured!");
+ } catch (ServiceComponentException e) {
+ fail("Unexpected ServiceComponentException occured!");
}
try {
@SuppressWarnings("unused")
Account retrievedAccount = accountDao.find(account.getId());
fail("Account deleting failed!");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//Exception should occur
}
try {
@SuppressWarnings("unused")
Role retrievedRole = dao.find(role.getId());
fail("Cascaded role deleting failed");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//Exception should occur
}
}
@@ -273,24 +274,24 @@
try {
retrievedRole = dao.retrieveRole(0, course.getId());
fail("Retrieved object should not exist");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//Exception should occur
}
try {
retrievedRole = dao.retrieveRole(account.getId(),0);
fail("Retrieved object should not exist");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//Exception should occur
}
try {
retrievedRole = dao.retrieveRole(1l, 1l);
fail("Retrieved object should not exist");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//Exception should occur
}
try {
retrievedRole = dao.retrieveRole(account.getId(), course.getId());
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
fail("Retrieved object should exist");
}
assertNotNull(retrievedRole);
@@ -299,7 +300,7 @@
try {
dao.remove(null);
fail("null can't be removed");
- } catch (DataModelManagerException e) {
+ } catch (ServiceComponentException e) {
//Exception should occur
}
Added: trunk/sandbox/cse-ip/sc-common/pom.xml
===================================================================
--- trunk/sandbox/cse-ip/sc-common/pom.xml (rev 0)
+++ trunk/sandbox/cse-ip/sc-common/pom.xml 2009-04-21 09:46:52 UTC (rev 130)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>cse-ip</artifactId>
+ <groupId>de.campussource.cse</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>de.campussource.cse</groupId>
+ <artifactId>sc-common</artifactId>
+ <packaging>jar</packaging>
+ <name>Service Component Common</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Property changes on: trunk/sandbox/cse-ip/sc-common/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/IdNotFoundException.java
===================================================================
--- trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/IdNotFoundException.java (rev 0)
+++ trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/IdNotFoundException.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -0,0 +1,26 @@
+package de.campussource.cse.common.exception;
+
+/**
+ * Exception to represent failed searches for objects
+ * e.g. no object with given id existing
+ * @author Sebastian Roekens
+ */
+public class IdNotFoundException extends ServiceComponentException {
+
+ private static final long serialVersionUID = 3260263352045745859L;
+
+ public IdNotFoundException() {}
+
+ public IdNotFoundException(String message) {
+ super(message);
+ }
+
+ public IdNotFoundException(Throwable cause) {
+ super(cause);
+ }
+
+ public IdNotFoundException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+}
Property changes on: trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/IdNotFoundException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/ServiceComponentException.java
===================================================================
--- trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/ServiceComponentException.java (rev 0)
+++ trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/ServiceComponentException.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -0,0 +1,25 @@
+package de.campussource.cse.common.exception;
+
+/**
+ * Exception to represent missing attributes in objects which shall be persisted
+ * @author Sebastian Roekens
+ */
+public class ServiceComponentException extends Exception {
+
+ private static final long serialVersionUID = 3260263352045742366L;
+
+ public ServiceComponentException() {}
+
+ public ServiceComponentException(String message) {
+ super(message);
+ }
+
+ public ServiceComponentException(Throwable cause) {
+ super(cause);
+ }
+
+ public ServiceComponentException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+}
Property changes on: trunk/sandbox/cse-ip/sc-common/src/main/java/de/campussource/cse/common/exception/ServiceComponentException.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/IdNotFoundExceptionTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/IdNotFoundExceptionTest.java (rev 0)
+++ trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/IdNotFoundExceptionTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -0,0 +1,39 @@
+package de.campussource.cse.common.exception;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * @author Sebastian Roekens
+ */
+public class IdNotFoundExceptionTest {
+
+ @Test
+ public void testDefaultConstructor() {
+ ServiceComponentException dmme = new IdNotFoundException();
+ assertNotNull(dmme);
+ }
+
+ @Test
+ public void testMessageConstructor() {
+ ServiceComponentException dmme = new IdNotFoundException("message");
+ assertEquals("message", dmme.getMessage());
+ }
+
+ @Test
+ public void testCauseConstructor() {
+ ServiceComponentException dmme = new IdNotFoundException("message");
+ ServiceComponentException dmme2 = new IdNotFoundException(dmme);
+ assertEquals(dmme,dmme2.getCause());
+ }
+
+ @Test
+ public void testMessageCauseConstructor() {
+ ServiceComponentException dmme = new IdNotFoundException("message");
+ ServiceComponentException dmme2 = new IdNotFoundException("message", dmme);
+ assertEquals(dmme, dmme2.getCause());
+ assertEquals("message", dmme2.getMessage());
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/IdNotFoundExceptionTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/ServiceComponentExceptionTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/ServiceComponentExceptionTest.java (rev 0)
+++ trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/ServiceComponentExceptionTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -0,0 +1,39 @@
+package de.campussource.cse.common.exception;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * @author Sebastian Roekens
+ */
+public class ServiceComponentExceptionTest {
+
+ @Test
+ public void testDefaultConstructor() {
+ Exception e = new IdNotFoundException();
+ assertNotNull(e);
+ }
+
+ @Test
+ public void testMessageConstructor() {
+ Exception e = new ServiceComponentException("message");
+ assertEquals("message", e.getMessage());
+ }
+
+ @Test
+ public void testCauseConstructor() {
+ Exception e = new ServiceComponentException("message");
+ Exception e2 = new ServiceComponentException(e);
+ assertEquals(e,e2.getCause());
+ }
+
+ @Test
+ public void testMessageCauseConstructor() {
+ Exception e = new ServiceComponentException("message");
+ Exception e2 = new ServiceComponentException("message", e);
+ assertEquals(e, e2.getCause());
+ assertEquals("message", e2.getMessage());
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/sandbox/cse-ip/sc-common/src/test/java/de/campussource/cse/common/exception/ServiceComponentExceptionTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sandbox/cse-ip/sc-common/src/test/resources/log4j.properties
===================================================================
--- trunk/sandbox/cse-ip/sc-common/src/test/resources/log4j.properties (rev 0)
+++ trunk/sandbox/cse-ip/sc-common/src/test/resources/log4j.properties 2009-04-21 09:46:52 UTC (rev 130)
@@ -0,0 +1,15 @@
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+
+log4j.rootCategory=debug, stdout
+
+log4j.logger.org.hibernate=info
+
+log4j.logger.oracle.toplink=debug
+
+log4j.logger.org.hibernate.SQL=debug
+log4j.logger.org.hibernate.type=debug
+log4j.logger.org.hibernate.id=debug
+log4j.logger.org.hibernate.cache=debug
\ No newline at end of file
Property changes on: trunk/sandbox/cse-ip/sc-common/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/sandbox/cse-ip/sc-idmapper/pom.xml
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/pom.xml 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-idmapper/pom.xml 2009-04-21 09:46:52 UTC (rev 130)
@@ -22,6 +22,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>de.campussource.cse</groupId>
+ <artifactId>sc-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.ejb</groupId>
<artifactId>ejb-api</artifactId>
<version>3.0</version>
Deleted: trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdNotFoundException.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdNotFoundException.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdNotFoundException.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -1,26 +0,0 @@
-package de.campussource.cse.mapper;
-
-
-/**
- *
- * @author Ingo Dueppe
- */
-public class IdNotFoundException extends MapperException {
-
- private static final long serialVersionUID = 3260263352045745855L;
-
- public IdNotFoundException() {}
-
- public IdNotFoundException(String message) {
- super(message);
- }
-
- public IdNotFoundException(Throwable cause) {
- super(cause);
- }
-
- public IdNotFoundException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
Modified: trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapper.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapper.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapper.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -2,6 +2,8 @@
import javax.ejb.Remote;
+import de.campussource.cse.common.exception.IdNotFoundException;
+
/**
* IdentityMapper manage the administration of mappings between the global
* unique busId and client specific object ids. Each mapping exists of three
Modified: trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperBean.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperBean.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperBean.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -11,6 +11,8 @@
import org.apache.commons.lang.Validate;
+import de.campussource.cse.common.exception.IdNotFoundException;
+
/**
* Standard IdentityMapper implementation
* @author Ingo Dueppe
Deleted: trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MapperException.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MapperException.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MapperException.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -1,26 +0,0 @@
-package de.campussource.cse.mapper;
-
-/**
- * General mapper exception
- * @author Ingo Dueppe
- */
-public class MapperException extends Exception {
-
- private static final long serialVersionUID = -2553188081269164040L;
-
- public MapperException() {
- }
-
- public MapperException(String message) {
- super(message);
- }
-
- public MapperException(Throwable cause) {
- super(cause);
- }
-
- public MapperException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
Deleted: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -1,39 +0,0 @@
-package de.campussource.cse.mapper;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-/**
- * @author Ingo Dueppe
- */
-public class IdNotFoundExceptionTest {
-
- @Test
- public void testDefaultConstructor() {
- MapperException me = new IdNotFoundException();
- assertNotNull(me);
- }
-
- @Test
- public void testMessageConstructor() {
- MapperException me = new IdNotFoundException("message");
- assertEquals("message", me.getMessage());
- }
-
- @Test
- public void testCauseConstructor() {
- MapperException me = new IdNotFoundException("message");
- MapperException me2 = new IdNotFoundException(me);
- assertEquals(me,me2.getCause());
- }
-
- @Test
- public void testMessageCauseConstructor() {
- MapperException me = new IdNotFoundException("message");
- MapperException me2 = new IdNotFoundException("message", me);
- assertEquals(me, me2.getCause());
- assertEquals("message", me2.getMessage());
- }
-
-}
Modified: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java 2009-04-20 15:42:24 UTC (rev 129)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java 2009-04-21 09:46:52 UTC (rev 130)
@@ -8,6 +8,8 @@
import org.junit.Before;
import org.junit.Test;
+import de.campussource.cse.common.exception.IdNotFoundException;
+import de.campussource.cse.common.exception.ServiceComponentException;
import de.campussource.cse.common.test.AbstractPersistentUnitTest;
/**
@@ -33,14 +35,14 @@
}
@Test
- public void testBusToClientMapping() throws MapperException {
+ public void testBusToClientMapping() throws ServiceComponentException {
Long busId = mapper.toBusId(CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
String clientId = mapper.toClientObjectId(busId, CLIENT_INSTANCE_ID);
assertEquals(CLIENT_OBJECT_ID, clientId);
}
@Test
- public void testMultiBusToMapping() throws MapperException {
+ public void testMultiBusToMapping() throws ServiceComponentException {
for (int i = 0; i < 10; i++) {
Long busId = mapper.toBusId(CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
String clientId = mapper.toClientObjectId(busId, CLIENT_INSTANCE_ID);
@@ -62,7 +64,7 @@
}
@Test
- public void testPersistClientObjectId() throws MapperException {
+ public void testPersistClientObjectId() throws ServiceComponentException {
// Persist a new mapping of client object id to a given bus id and
// verify the results
mapper.persistClientObjectId(BUS_ID, CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
@@ -77,7 +79,7 @@
}
@Test(expected=RollbackException.class)
- public void testErrorPersistClientObjectId() throws MapperException {
+ public void testErrorPersistClientObjectId() throws ServiceComponentException {
mapper.persistClientObjectId(1L, CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
mapper.persistClientObjectId(2L, CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
commitAndBeginTx();
@@ -104,17 +106,17 @@
}
@Test(expected = IllegalArgumentException.class)
- public void testPersistNoBusIdParameter() throws MapperException {
+ public void testPersistNoBusIdParameter() throws ServiceComponentException {
mapper.persistClientObjectId(null, CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
}
@Test(expected = IllegalArgumentException.class)
- public void testPersistNoInstanceIdParameter() throws MapperException {
+ public void testPersistNoInstanceIdParameter() throws ServiceComponentException {
mapper.persistClientObjectId(BUS_ID, null, CLIENT_OBJECT_ID);
}
@Test(expected = IllegalArgumentException.class)
- public void testPersistNoObjectIdParameter() throws MapperException {
+ public void testPersistNoObjectIdParameter() throws ServiceComponentException {
mapper.persistClientObjectId(BUS_ID, CLIENT_INSTANCE_ID, "");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
