Menu
▾
▴
cse-ip-svn-commits
|
From: <ro...@us...> - 2009-04-22 14:26:54
|
Revision: 157
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=157&view=rev
Author: roekens
Date: 2009-04-22 14:26:49 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
initial commit of oca for openuss
breaks maven install at the moment
to build project first call mvn jaxws:wsimport then mvn install (can this be configured?)
passing parameters to stub service does not seem to work - bugfixing needed
Added Paths:
-----------
trunk/cse-ip/oca-openuss/
trunk/cse-ip/oca-openuss/build.xml
trunk/cse-ip/oca-openuss/pom.xml
trunk/cse-ip/oca-openuss/src/
trunk/cse-ip/oca-openuss/src/main/
trunk/cse-ip/oca-openuss/src/main/java/
trunk/cse-ip/oca-openuss/src/main/java/de/
trunk/cse-ip/oca-openuss/src/main/java/de/campussource/
trunk/cse-ip/oca-openuss/src/main/java/de/campussource/cse/
trunk/cse-ip/oca-openuss/src/main/java/de/campussource/cse/oca/
trunk/cse-ip/oca-openuss/src/main/java/de/campussource/cse/oca/openuss/
trunk/cse-ip/oca-openuss/src/main/java/de/campussource/cse/oca/openuss/OpenUSS.java
trunk/cse-ip/oca-openuss/src/main/resources/
trunk/cse-ip/oca-openuss/src/main/resources/META-INF/
trunk/cse-ip/oca-openuss/src/test/
trunk/cse-ip/oca-openuss/src/test/java/
trunk/cse-ip/oca-openuss/src/test/java/de/
trunk/cse-ip/oca-openuss/src/test/java/de/campussource/
trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/
trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/
trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/
trunk/cse-ip/oca-openuss/src/test/resources/
trunk/cse-ip/oca-openuss/src/test/resources/LectureWebService.wsdl
trunk/cse-ip/oca-openuss/src/test/resources/META-INF/
trunk/cse-ip/oca-openuss/src/test/resources/log4j.properties
Added: trunk/cse-ip/oca-openuss/build.xml
===================================================================
--- trunk/cse-ip/oca-openuss/build.xml (rev 0)
+++ trunk/cse-ip/oca-openuss/build.xml 2009-04-22 14:26:49 UTC (rev 157)
@@ -0,0 +1,34 @@
+<project name="cse-ip :: oca :: openuss :: build" default="install" basedir=".">
+ <condition property="maven.executable" value="mvn.bat" else="mvn"><os family="windows" /></condition>
+
+ <target name="compile">
+ <exec executable="${maven.executable}">
+ <arg line="install"/>
+ </exec>
+ </target>
+
+ <target name="clean">
+ <exec executable="${maven.executable}">
+ <arg line="clean"/>
+ </exec>
+ </target>
+
+ <target name="install" depends="clean">
+ <exec executable="${maven.executable}">
+ <arg line="install"/>
+ </exec>
+ </target>
+
+ <target name="eclipse">
+ <exec executable="${maven.executable}">
+ <arg line="eclipse:clean eclipse:eclipse"/>
+ </exec>
+ </target>
+
+ <target name="wsimport">
+ <exec executable="${maven.executable}">
+ <arg line="jaxws:wsimport"/>
+ </exec>
+ </target>
+
+</project>
Property changes on: trunk/cse-ip/oca-openuss/build.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/oca-openuss/pom.xml
===================================================================
--- trunk/cse-ip/oca-openuss/pom.xml (rev 0)
+++ trunk/cse-ip/oca-openuss/pom.xml 2009-04-22 14:26:49 UTC (rev 157)
@@ -0,0 +1,117 @@
+<?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>oca-openuss</artifactId>
+ <packaging>ejb</packaging>
+ <name>Outbound Client Adapter for OpenUSS</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.campussource.cse</groupId>
+ <artifactId>test-utilities</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <!-- <scope>provided</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/sources-generated</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxws-maven-plugin</artifactId>
+ <version>1.10</version>
+ <executions>
+ <execution>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>wsimport</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <staleFile>${project.build.directory}/jaxws/stale/wsdl.LectureWebService.done</staleFile>
+ <packageName>de.campussource.cse.oca.openuss</packageName>
+ <keep>true</keep>
+ <verbose>true</verbose>
+ <wsdlDirectory>${basedir}/src/test/resources</wsdlDirectory>
+ <sourceDestDir>${project.build.directory}/sources-generated</sourceDestDir>
+ <wsdlLocation>http://localhost:12345/openuss?wsdl</wsdlLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Property changes on: trunk/cse-ip/oca-openuss/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/oca-openuss/src/main/java/de/campussource/cse/oca/openuss/OpenUSS.java
===================================================================
--- trunk/cse-ip/oca-openuss/src/main/java/de/campussource/cse/oca/openuss/OpenUSS.java (rev 0)
+++ trunk/cse-ip/oca-openuss/src/main/java/de/campussource/cse/oca/openuss/OpenUSS.java 2009-04-22 14:26:49 UTC (rev 157)
@@ -0,0 +1,117 @@
+package de.campussource.cse.oca.openuss;
+
+import java.util.List;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+@Stateless
+@WebService(
+ name="LectureWebService",
+ targetNamespace="http://www.openuss.org/services",
+ endpointInterface="")
+public class OpenUSS implements LectureWebService{
+
+ @Override
+ public boolean assignCourseMember(long courseId, long userId, Role role)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public Long createCourse(Course course)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Long createInstitute(Institute institute)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Long createUser(User user) throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean deleteCourse(long courseId)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean deleteUser(long userId)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public Long findUser(String username)
+ throws LectureLogicException_Exception {
+ System.out.println("Username: "+username);
+ return 1L;
+ }
+
+ @Override
+ public Course getCourse(long courseId)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Institute getInstitute(long instituteId)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Role isCourseMember(long courseId, long userId)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public List<Institute> listInstitute(long departmentId)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean removeCourseMember(long courseId, long userId)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean updateCourse(Course course)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean updateInstitute(Institute insitute)
+ throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean updateUser(User user) throws LectureLogicException_Exception {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+}
Property changes on: trunk/cse-ip/oca-openuss/src/main/java/de/campussource/cse/oca/openuss/OpenUSS.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/oca-openuss/src/test/resources/LectureWebService.wsdl
===================================================================
--- trunk/cse-ip/oca-openuss/src/test/resources/LectureWebService.wsdl (rev 0)
+++ trunk/cse-ip/oca-openuss/src/test/resources/LectureWebService.wsdl 2009-04-22 14:26:49 UTC (rev 157)
@@ -0,0 +1,684 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="OpenUSSService" targetNamespace="http://www.openuss.org/services" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.openuss.org/services" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:types>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.openuss.org/services/DataTypes" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.openuss.org/services/DataTypes">
+ <xs:complexType name="Institute">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="id" type="xs:long"/>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="shortcut" type="xs:string"/>
+ <xs:element name="departmentId" type="xs:long"/>
+ <xs:element minOccurs="0" name="description" type="xs:string"/>
+ <xs:element minOccurs="0" name="address" type="xs:string"/>
+ <xs:element minOccurs="0" name="postCode" type="xs:string"/>
+ <xs:element minOccurs="0" name="city" type="xs:string"/>
+ <xs:element minOccurs="0" name="telephone" type="xs:string"/>
+ <xs:element minOccurs="0" name="telefax" type="xs:string"/>
+ <xs:element minOccurs="0" name="website" type="xs:string"/>
+ <xs:element name="email" type="xs:string"/>
+ <xs:element name="ownerName" type="xs:string"/>
+ <xs:element name="ownerId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Course">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="id" type="xs:long"/>
+ <xs:element name="name" type="xs:token"/>
+ <xs:element minOccurs="0" name="shortcut" type="xs:token"/>
+ <xs:element minOccurs="0" name="description" type="xs:string"/>
+ <xs:element name="instituteId" type="xs:long"/>
+ <xs:element name="startDate" type="xs:dateTime"/>
+ <xs:element minOccurs="0" name="endDate" type="xs:dateTime"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="User">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="id" type="xs:long"/>
+ <xs:element name="username" type="xs:token"/>
+ <xs:element name="password" type="xs:token"/>
+ <xs:element name="email" type="xs:token"/>
+ <xs:element name="firstName" type="xs:token"/>
+ <xs:element name="lastName" type="xs:token"/>
+ <xs:element minOccurs="0" name="title" type="xs:string"/>
+ <xs:element minOccurs="0" name="address" type="xs:string"/>
+ <xs:element minOccurs="0" name="postCode" type="xs:string"/>
+ <xs:element minOccurs="0" name="city" type="xs:string"/>
+ <xs:element minOccurs="0" name="locale" type="xs:string"/>
+ <xs:element minOccurs="0" name="matriculation" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:simpleType name="Role">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="NONE"/>
+ <xs:enumeration value="PARTICIPANT"/>
+ <xs:enumeration value="ASSISTANT"/>
+ </xs:restriction>
+ </xs:simpleType>
+</xs:schema>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.openuss.org/services/DataTypes" xmlns:tns="http://www.openuss.org/services" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.openuss.org/services">
+ <xs:import namespace="http://www.openuss.org/services/DataTypes"/>
+ <xs:element name="assignCourseMember" type="tns:assignCourseMember"/>
+ <xs:element name="assignCourseMemberResponse" type="tns:assignCourseMemberResponse"/>
+ <xs:element name="createCourse" type="tns:createCourse"/>
+ <xs:element name="createCourseResponse" type="tns:createCourseResponse"/>
+ <xs:element name="createInstitute" type="tns:createInstitute"/>
+ <xs:element name="createInstituteResponse" type="tns:createInstituteResponse"/>
+ <xs:element name="createUser" type="tns:createUser"/>
+ <xs:element name="createUserResponse" type="tns:createUserResponse"/>
+ <xs:element name="deleteCourse" type="tns:deleteCourse"/>
+ <xs:element name="deleteCourseResponse" type="tns:deleteCourseResponse"/>
+ <xs:element name="deleteUser" type="tns:deleteUser"/>
+ <xs:element name="deleteUserResponse" type="tns:deleteUserResponse"/>
+ <xs:element name="findUser" type="tns:findUser"/>
+ <xs:element name="findUserResponse" type="tns:findUserResponse"/>
+ <xs:element name="getCourse" type="tns:getCourse"/>
+ <xs:element name="getCourseResponse" type="tns:getCourseResponse"/>
+ <xs:element name="getInstitute" type="tns:getInstitute"/>
+ <xs:element name="getInstituteResponse" type="tns:getInstituteResponse"/>
+ <xs:element name="isCourseMember" type="tns:isCourseMember"/>
+ <xs:element name="isCourseMemberResponse" type="tns:isCourseMemberResponse"/>
+ <xs:element name="listInstitute" type="tns:listInstitute"/>
+ <xs:element name="listInstituteResponse" type="tns:listInstituteResponse"/>
+ <xs:element name="removeCourseMember" type="tns:removeCourseMember"/>
+ <xs:element name="removeCourseMemberResponse" type="tns:removeCourseMemberResponse"/>
+ <xs:element name="updateCourse" type="tns:updateCourse"/>
+ <xs:element name="updateCourseResponse" type="tns:updateCourseResponse"/>
+ <xs:element name="updateInstitute" type="tns:updateInstitute"/>
+ <xs:element name="updateInstituteResponse" type="tns:updateInstituteResponse"/>
+ <xs:element name="updateUser" type="tns:updateUser"/>
+ <xs:element name="updateUserResponse" type="tns:updateUserResponse"/>
+ <xs:complexType name="createInstitute">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="institute" type="ns1:Institute"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="createInstituteResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="instituteId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="updateInstitute">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="insitute" type="ns1:Institute"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="updateInstituteResponse">
+ <xs:sequence>
+ <xs:element name="success" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="removeCourseMember">
+ <xs:sequence>
+ <xs:element name="courseId" type="xs:long"/>
+ <xs:element name="userId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="removeCourseMemberResponse">
+ <xs:sequence>
+ <xs:element name="success" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="isCourseMember">
+ <xs:sequence>
+ <xs:element name="courseId" type="xs:long"/>
+ <xs:element name="userId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="isCourseMemberResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="roleType" type="ns1:Role"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="findUser">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="username" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="findUserResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="userId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="deleteCourse">
+ <xs:sequence>
+ <xs:element name="courseId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="deleteCourseResponse">
+ <xs:sequence>
+ <xs:element name="boolean" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="getCourse">
+ <xs:sequence>
+ <xs:element name="courseId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="getCourseResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="courseId" type="ns1:Course"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="updateUser">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="user" type="ns1:User"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="updateUserResponse">
+ <xs:sequence>
+ <xs:element name="success" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="createUser">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="user" type="ns1:User"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="createUserResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="userId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="updateCourse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="course" type="ns1:Course"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="updateCourseResponse">
+ <xs:sequence>
+ <xs:element name="succcess" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="listInstitute">
+ <xs:sequence>
+ <xs:element name="departmentId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="listInstituteResponse">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="instituteList" type="ns1:Institute"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="createCourse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="course" type="ns1:Course"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="createCourseResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="courseId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="getInstitute">
+ <xs:sequence>
+ <xs:element name="instituteId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="getInstituteResponse">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="institute" type="ns1:Institute"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="deleteUser">
+ <xs:sequence>
+ <xs:element name="userId" type="xs:long"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="deleteUserResponse">
+ <xs:sequence>
+ <xs:element name="success" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="assignCourseMember">
+ <xs:sequence>
+ <xs:element name="courseId" type="xs:long"/>
+ <xs:element name="userId" type="xs:long"/>
+ <xs:element minOccurs="0" name="role" type="ns1:Role"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="assignCourseMemberResponse">
+ <xs:sequence>
+ <xs:element name="success" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="LectureLogicException" type="tns:LectureLogicException"/>
+ <xs:complexType name="LectureLogicException">
+ <xs:sequence/>
+ </xs:complexType>
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="deleteCourse">
+ <wsdl:part name="parameters" element="tns:deleteCourse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="getCourseResponse">
+ <wsdl:part name="parameters" element="tns:getCourseResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="updateCourseResponse">
+ <wsdl:part name="parameters" element="tns:updateCourseResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="deleteCourseResponse">
+ <wsdl:part name="parameters" element="tns:deleteCourseResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="assignCourseMember">
+ <wsdl:part name="parameters" element="tns:assignCourseMember">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="createUser">
+ <wsdl:part name="parameters" element="tns:createUser">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="removeCourseMemberResponse">
+ <wsdl:part name="parameters" element="tns:removeCourseMemberResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="updateUserResponse">
+ <wsdl:part name="parameters" element="tns:updateUserResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="assignCourseMemberResponse">
+ <wsdl:part name="parameters" element="tns:assignCourseMemberResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="deleteUser">
+ <wsdl:part name="parameters" element="tns:deleteUser">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="findUserResponse">
+ <wsdl:part name="parameters" element="tns:findUserResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="updateUser">
+ <wsdl:part name="parameters" element="tns:updateUser">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="createInstituteResponse">
+ <wsdl:part name="parameters" element="tns:createInstituteResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="createInstitute">
+ <wsdl:part name="parameters" element="tns:createInstitute">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="updateInstituteResponse">
+ <wsdl:part name="parameters" element="tns:updateInstituteResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="listInstituteResponse">
+ <wsdl:part name="parameters" element="tns:listInstituteResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="isCourseMember">
+ <wsdl:part name="parameters" element="tns:isCourseMember">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="createCourse">
+ <wsdl:part name="parameters" element="tns:createCourse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="getCourse">
+ <wsdl:part name="parameters" element="tns:getCourse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="isCourseMemberResponse">
+ <wsdl:part name="parameters" element="tns:isCourseMemberResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="createUserResponse">
+ <wsdl:part name="parameters" element="tns:createUserResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="getInstituteResponse">
+ <wsdl:part name="parameters" element="tns:getInstituteResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="updateCourse">
+ <wsdl:part name="parameters" element="tns:updateCourse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="listInstitute">
+ <wsdl:part name="parameters" element="tns:listInstitute">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="updateInstitute">
+ <wsdl:part name="parameters" element="tns:updateInstitute">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="deleteUserResponse">
+ <wsdl:part name="parameters" element="tns:deleteUserResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="removeCourseMember">
+ <wsdl:part name="parameters" element="tns:removeCourseMember">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="LectureLogicException">
+ <wsdl:part name="LectureLogicException" element="tns:LectureLogicException">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="getInstitute">
+ <wsdl:part name="parameters" element="tns:getInstitute">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="findUser">
+ <wsdl:part name="parameters" element="tns:findUser">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="createCourseResponse">
+ <wsdl:part name="parameters" element="tns:createCourseResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="LectureWebService">
+ <wsdl:operation name="createInstitute">
+ <wsdl:input name="createInstitute" message="tns:createInstitute">
+ </wsdl:input>
+ <wsdl:output name="createInstituteResponse" message="tns:createInstituteResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="updateInstitute">
+ <wsdl:input name="updateInstitute" message="tns:updateInstitute">
+ </wsdl:input>
+ <wsdl:output name="updateInstituteResponse" message="tns:updateInstituteResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="removeCourseMember">
+ <wsdl:input name="removeCourseMember" message="tns:removeCourseMember">
+ </wsdl:input>
+ <wsdl:output name="removeCourseMemberResponse" message="tns:removeCourseMemberResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="isCourseMember">
+ <wsdl:input name="isCourseMember" message="tns:isCourseMember">
+ </wsdl:input>
+ <wsdl:output name="isCourseMemberResponse" message="tns:isCourseMemberResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="findUser">
+ <wsdl:input name="findUser" message="tns:findUser">
+ </wsdl:input>
+ <wsdl:output name="findUserResponse" message="tns:findUserResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="deleteCourse">
+ <wsdl:input name="deleteCourse" message="tns:deleteCourse">
+ </wsdl:input>
+ <wsdl:output name="deleteCourseResponse" message="tns:deleteCourseResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="getCourse">
+ <wsdl:input name="getCourse" message="tns:getCourse">
+ </wsdl:input>
+ <wsdl:output name="getCourseResponse" message="tns:getCourseResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="updateUser">
+ <wsdl:input name="updateUser" message="tns:updateUser">
+ </wsdl:input>
+ <wsdl:output name="updateUserResponse" message="tns:updateUserResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="createUser">
+ <wsdl:input name="createUser" message="tns:createUser">
+ </wsdl:input>
+ <wsdl:output name="createUserResponse" message="tns:createUserResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="updateCourse">
+ <wsdl:input name="updateCourse" message="tns:updateCourse">
+ </wsdl:input>
+ <wsdl:output name="updateCourseResponse" message="tns:updateCourseResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="listInstitute">
+ <wsdl:input name="listInstitute" message="tns:listInstitute">
+ </wsdl:input>
+ <wsdl:output name="listInstituteResponse" message="tns:listInstituteResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="createCourse">
+ <wsdl:input name="createCourse" message="tns:createCourse">
+ </wsdl:input>
+ <wsdl:output name="createCourseResponse" message="tns:createCourseResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="getInstitute">
+ <wsdl:input name="getInstitute" message="tns:getInstitute">
+ </wsdl:input>
+ <wsdl:output name="getInstituteResponse" message="tns:getInstituteResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="deleteUser">
+ <wsdl:input name="deleteUser" message="tns:deleteUser">
+ </wsdl:input>
+ <wsdl:output name="deleteUserResponse" message="tns:deleteUserResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="assignCourseMember">
+ <wsdl:input name="assignCourseMember" message="tns:assignCourseMember">
+ </wsdl:input>
+ <wsdl:output name="assignCourseMemberResponse" message="tns:assignCourseMemberResponse">
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException" message="tns:LectureLogicException">
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="OpenUSSServiceSoapBinding" type="tns:LectureWebService">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="createInstitute">
+ <soap:operation soapAction="createInstitute" style="document"/>
+ <wsdl:input name="createInstitute">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="createInstituteResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="updateInstitute">
+ <soap:operation soapAction="updateInstitute" style="document"/>
+ <wsdl:input name="updateInstitute">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="updateInstituteResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="removeCourseMember">
+ <soap:operation soapAction="removeCourseMember" style="document"/>
+ <wsdl:input name="removeCourseMember">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="removeCourseMemberResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="findUser">
+ <soap:operation soapAction="findUser" style="document"/>
+ <wsdl:input name="findUser">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="findUserResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="isCourseMember">
+ <soap:operation soapAction="isCourseMember" style="document"/>
+ <wsdl:input name="isCourseMember">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="isCourseMemberResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="deleteCourse">
+ <soap:operation soapAction="deleteCourse" style="document"/>
+ <wsdl:input name="deleteCourse">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="deleteCourseResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="getCourse">
+ <soap:operation soapAction="getCourse" style="document"/>
+ <wsdl:input name="getCourse">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getCourseResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="updateUser">
+ <soap:operation soapAction="updateUser" style="document"/>
+ <wsdl:input name="updateUser">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="updateUserResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="createUser">
+ <soap:operation soapAction="createUser" style="document"/>
+ <wsdl:input name="createUser">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="createUserResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="updateCourse">
+ <soap:operation soapAction="updateCourse" style="document"/>
+ <wsdl:input name="updateCourse">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="updateCourseResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="listInstitute">
+ <soap:operation soapAction="listInstitute" style="document"/>
+ <wsdl:input name="listInstitute">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="listInstituteResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="createCourse">
+ <soap:operation soapAction="createCourse" style="document"/>
+ <wsdl:input name="createCourse">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="createCourseResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="getInstitute">
+ <soap:operation soapAction="getInstitute" style="document"/>
+ <wsdl:input name="getInstitute">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getInstituteResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="deleteUser">
+ <soap:operation soapAction="deleteUser" style="document"/>
+ <wsdl:input name="deleteUser">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="deleteUserResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="assignCourseMember">
+ <soap:operation soapAction="assignCourseMember" style="document"/>
+ <wsdl:input name="assignCourseMember">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="assignCourseMemberResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="LectureLogicException">
+ <soap:fault name="LectureLogicException" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="OpenUSSService">
+ <wsdl:port name="LectureWebServicePort" binding="tns:OpenUSSServiceSoapBinding">
+ <soap:address location="http://localhost:9090/LectureWebServicePort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Property changes on: trunk/cse-ip/oca-openuss/src/test/resources/LectureWebService.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/oca-openuss/src/test/resources/log4j.properties
===================================================================
--- trunk/cse-ip/oca-openuss/src/test/resources/log4j.properties (rev 0)
+++ trunk/cse-ip/oca-openuss/src/test/resources/log4j.properties 2009-04-22 14:26:49 UTC (rev 157)
@@ -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/cse-ip/oca-openuss/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <id...@us...> - 2009-04-22 19:08:59
|
Revision: 162
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=162&view=rev
Author: idueppe
Date: 2009-04-22 19:08:03 +0000 (Wed, 22 Apr 2009)
Log Message:
-----------
add initial project structure for oca-ilias
Modified Paths:
--------------
trunk/cse-ip/pom.xml
Added Paths:
-----------
trunk/cse-ip/oca-ilias/
trunk/cse-ip/oca-ilias/build.xml
trunk/cse-ip/oca-ilias/pom.xml
trunk/cse-ip/oca-ilias/src/
trunk/cse-ip/oca-ilias/src/main/
trunk/cse-ip/oca-ilias/src/main/java/
trunk/cse-ip/oca-ilias/src/main/resources/
trunk/cse-ip/oca-ilias/src/main/resources/META-INF/
trunk/cse-ip/oca-ilias/src/test/
trunk/cse-ip/oca-ilias/src/test/java/
trunk/cse-ip/oca-ilias/src/test/java/de/
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/Ilias.java
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasDummyWebServiceServer.java
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/LectureWebServiceTest.java
trunk/cse-ip/oca-ilias/src/test/resources/
trunk/cse-ip/oca-ilias/src/test/resources/META-INF/
trunk/cse-ip/oca-ilias/src/test/resources/log4j.properties
Added: trunk/cse-ip/oca-ilias/build.xml
===================================================================
--- trunk/cse-ip/oca-ilias/build.xml (rev 0)
+++ trunk/cse-ip/oca-ilias/build.xml 2009-04-22 19:08:03 UTC (rev 162)
@@ -0,0 +1,34 @@
+<project name="cse-ip :: oca :: ilias :: build" default="install" basedir=".">
+ <condition property="maven.executable" value="mvn.bat" else="mvn"><os family="windows" /></condition>
+
+ <target name="compile">
+ <exec executable="${maven.executable}">
+ <arg line="install"/>
+ </exec>
+ </target>
+
+ <target name="clean">
+ <exec executable="${maven.executable}">
+ <arg line="clean"/>
+ </exec>
+ </target>
+
+ <target name="install" depends="clean">
+ <exec executable="${maven.executable}">
+ <arg line="install"/>
+ </exec>
+ </target>
+
+ <target name="eclipse">
+ <exec executable="${maven.executable}">
+ <arg line="eclipse:clean eclipse:eclipse"/>
+ </exec>
+ </target>
+
+ <target name="wsimport">
+ <exec executable="${maven.executable}">
+ <arg line="jaxws:wsimport"/>
+ </exec>
+ </target>
+
+</project>
Property changes on: trunk/cse-ip/oca-ilias/build.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/oca-ilias/pom.xml
===================================================================
--- trunk/cse-ip/oca-ilias/pom.xml (rev 0)
+++ trunk/cse-ip/oca-ilias/pom.xml 2009-04-22 19:08:03 UTC (rev 162)
@@ -0,0 +1,117 @@
+<?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>oca-ilias</artifactId>
+ <packaging>ejb</packaging>
+ <name>Outbound Client Adapter for Ilias</name>
+ <version>1.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.campussource.cse</groupId>
+ <artifactId>test-utilities</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <!-- <scope>provided</scope>-->
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/sources-generated</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxws-maven-plugin</artifactId>
+ <version>1.10</version>
+ <executions>
+ <execution>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>wsimport</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <staleFile>${project.build.directory}/jaxws/stale/wsdl.IliasWebService.done</staleFile>
+ <packageName>de.campussource.cse.oca.ilias</packageName>
+ <keep>true</keep>
+ <verbose>true</verbose>
+ <wsdlDirectory>${basedir}/src/test/resources</wsdlDirectory>
+ <sourceDestDir>${project.build.directory}/sources-generated</sourceDestDir>
+ <wsdlLocation>http://localhost:12345/ilias?wsdl</wsdlLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Property changes on: trunk/cse-ip/oca-ilias/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/Ilias.java
===================================================================
--- trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/Ilias.java (rev 0)
+++ trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/Ilias.java 2009-04-22 19:08:03 UTC (rev 162)
@@ -0,0 +1,10 @@
+package de.campussource.cse.oca.ilias;
+
+import javax.jws.WebService;
+
+// FIXME
+@WebService(name = "LectureWebService", targetNamespace = "http://www.openuss.org/services", endpointInterface = "de.campussource.cse.oca.openuss.LectureWebService")
+public class Ilias {
+
+
+}
Property changes on: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/Ilias.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasDummyWebServiceServer.java
===================================================================
--- trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasDummyWebServiceServer.java (rev 0)
+++ trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasDummyWebServiceServer.java 2009-04-22 19:08:03 UTC (rev 162)
@@ -0,0 +1,14 @@
+package de.campussource.cse.oca.ilias;
+
+import javax.swing.JOptionPane;
+import javax.xml.ws.Endpoint;
+
+public class IliasDummyWebServiceServer {
+
+ public static void main(String[] args) {
+ Endpoint endpoint = Endpoint.publish("http://localhost:8080/openuss", new Ilias());
+ JOptionPane.showMessageDialog(null,"OpenUSS Dumy Server running.");
+ endpoint.stop();
+ }
+
+}
Property changes on: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasDummyWebServiceServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/LectureWebServiceTest.java
===================================================================
--- trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/LectureWebServiceTest.java (rev 0)
+++ trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/LectureWebServiceTest.java 2009-04-22 19:08:03 UTC (rev 162)
@@ -0,0 +1,47 @@
+package de.campussource.cse.oca.ilias;
+
+import javax.xml.ws.Endpoint;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+public class LectureWebServiceTest {
+
+ private static Endpoint endpoint;
+// private LectureWebService service;
+
+ @BeforeClass
+ public static void setupClass() {
+// OpenUSS eis = new OpenUSS();
+// endpoint = Endpoint.publish("http://localhost:12345/openuss", eis);
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ if (endpoint != null) {
+ endpoint.stop();
+ }
+ }
+
+ @Before
+ public void setUp() {
+// service = new OpenUSSService().getLectureWebServicePort();
+ }
+
+ @Test
+ public void testFindUser() {
+ // FIXME Test logic is not correct. User that doesn't exist should return null.
+// assertNotNull(service.findUser("test"));
+ }
+
+ @Test
+ public void testGetInstitute() {
+// Institute institute = service.getInstitute(12345L);
+// assertNotNull(institute);
+// assertEquals(Long.valueOf(12345L), institute.getId());
+ }
+
+}
Property changes on: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/LectureWebServiceTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/oca-ilias/src/test/resources/log4j.properties
===================================================================
--- trunk/cse-ip/oca-ilias/src/test/resources/log4j.properties (rev 0)
+++ trunk/cse-ip/oca-ilias/src/test/resources/log4j.properties 2009-04-22 19:08:03 UTC (rev 162)
@@ -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/cse-ip/oca-ilias/src/test/resources/log4j.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cse-ip/pom.xml
===================================================================
--- trunk/cse-ip/pom.xml 2009-04-22 18:56:27 UTC (rev 161)
+++ trunk/cse-ip/pom.xml 2009-04-22 19:08:03 UTC (rev 162)
@@ -106,6 +106,8 @@
<modules>
<module>framework</module>
<module>ica-his-lsf</module>
+ <module>oca-openuss</module>
+ <module>oca-ilias</module>
<module>sc-common</module>
<module>sc-mapper</module>
<module>sc-cdmm</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-04-23 09:42:18
|
Revision: 163
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=163&view=rev
Author: roekens
Date: 2009-04-23 09:41:48 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
- added simple logic to openuss web service stub for testing purposes
- fixed existing tests
- added few web service annotations to DataModelManagerBean
Modified Paths:
--------------
trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/LectureWebServiceTest.java
trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSS.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java
Modified: trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/LectureWebServiceTest.java
===================================================================
--- trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/LectureWebServiceTest.java 2009-04-22 19:08:03 UTC (rev 162)
+++ trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/LectureWebServiceTest.java 2009-04-23 09:41:48 UTC (rev 163)
@@ -2,6 +2,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import javax.xml.ws.Endpoint;
@@ -35,15 +36,14 @@
@Test
public void testFindUser() throws LectureLogicException_Exception {
- // FIXME Test logic is not correct. User that doesn't exist should return null.
- assertNotNull(service.findUser("test"));
+ assertNull(service.findUser("test"));
}
@Test
public void testGetInstitute() throws LectureLogicException_Exception {
- Institute institute = service.getInstitute(12345L);
- assertNotNull(institute);
- assertEquals(Long.valueOf(12345L), institute.getId());
+ Institute institute = new Institute();
+ institute.setId(service.createInstitute(institute));
+ assertEquals(institute.getId(), service.getInstitute(institute.getId()).getId());
}
}
Modified: trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSS.java
===================================================================
--- trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSS.java 2009-04-22 19:08:03 UTC (rev 162)
+++ trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSS.java 2009-04-23 09:41:48 UTC (rev 163)
@@ -1,102 +1,199 @@
package de.campussource.cse.oca.openuss;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import javax.jws.WebService;
+import org.apache.log4j.Logger;
+
@WebService(name = "LectureWebService", targetNamespace = "http://www.openuss.org/services", endpointInterface = "de.campussource.cse.oca.openuss.LectureWebService")
public class OpenUSS implements LectureWebService {
+ public static final Logger logger = Logger.getLogger(OpenUSS.class);
+
+ public static HashMap<Long, Course> courses = new HashMap<Long, Course>();
+ public static HashMap<Long, Institute> institutes= new HashMap<Long, Institute>();
+ public static HashMap<Long, User> users = new HashMap<Long, User>();
+
+ private class CourseMember{
+ public Course course;
+ public User user;
+ public Role role;
+ }
+
+ public static ArrayList<CourseMember> courseMembers = new ArrayList<CourseMember>();
+
@Override
public boolean assignCourseMember(long courseId, long userId, Role role) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return false;
+ logger.debug("Adding CourseMember with courseId: "+ courseId + " userId: "+ userId + " and Role: "+ role.value());
+ Course course = courses.get(courseId);
+ User user = users.get(userId);
+ if (role == null || course == null || user == null){
+ throw new LectureLogicException_Exception("Parameters not valid", null);
+ }
+ CourseMember courseMember = new CourseMember();
+ courseMember.course = course;
+ courseMember.role = role;
+ courseMember.user = user;
+ courseMembers.add(courseMember);
+ return true;
}
@Override
public Long createCourse(Course course) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return null;
+ logger.debug("Creating course: "+ course);
+ if (course==null){
+ throw new LectureLogicException_Exception("course == null", null);
+ }
+ course.setId(System.currentTimeMillis());
+ courses.put(course.getId(), course);
+ return course.getId();
}
@Override
public Long createInstitute(Institute institute) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return null;
+ logger.debug("Creating institute"+ institute);
+ if (institute == null){
+ throw new LectureLogicException_Exception("institute == null", null);
+ }
+ institute.setId(System.currentTimeMillis());
+ institutes.put(institute.getId(), institute);
+ return institute.getId();
}
@Override
public Long createUser(User user) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return null;
+ logger.debug("Creating user: "+ user);
+ if (user == null){
+ throw new LectureLogicException_Exception("user == null", null);
+ }
+ user.setId(System.currentTimeMillis());
+ users.put(user.getId(), user);
+ return user.getId();
}
@Override
public boolean deleteCourse(long courseId) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return false;
+ logger.debug("Deleting course with id: "+ courseId);
+ Course course = courses.get(courseId);
+ if (course == null){
+ throw new LectureLogicException_Exception("course does not exist", null);
+ }
+ courses.remove(courseId);
+ return true;
}
@Override
public boolean deleteUser(long userId) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return false;
+ logger.debug("Deleting user with id: "+ userId);
+ User user = users.get(userId);
+ if (user == null){
+ throw new LectureLogicException_Exception("user does not exists", null);
+ }
+ users.remove(userId);
+ return true;
}
@Override
public Long findUser(String username) throws LectureLogicException_Exception {
- System.out.println("Username: " + username);
- return 1L;
+ logger.debug("Trying to find user with username" + username);
+ for (User user : users.values()){
+ if (user.getUsername()!=null && user.getUsername().equals(username)){
+ return user.getId();
+ }
+ }
+ return null;
}
@Override
public Course getCourse(long courseId) throws LectureLogicException_Exception {
- Course course = new Course();
- course.setId(courseId);
+ logger.debug("Trying to find course with id: "+ courseId);
+ Course course = courses.get(courseId);
+ if (course == null){
+ throw new LectureLogicException_Exception("course does not exists", null);
+ }
return course;
}
@Override
public Institute getInstitute(long instituteId) throws LectureLogicException_Exception {
- Institute institute = new Institute();
- institute.setId(instituteId);
+ logger.debug("Trying to find institute with id: "+ instituteId);
+ Institute institute = institutes.get(instituteId);
+ if (institute==null){
+ throw new LectureLogicException_Exception("institute does not exist", null);
+ }
return institute;
}
@Override
public Role isCourseMember(long courseId, long userId) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return null;
+ logger.debug("Checking if user with id: "+ userId + " is member of course with id: "+ courseId);
+ for (CourseMember courseMember : courseMembers){
+ if (courseMember.course.getId()==courseId && courseMember.user.getId() == userId){
+ return courseMember.role;
+ }
+ }
+ return Role.NONE;
}
@Override
public List<Institute> listInstitute(long departmentId) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return null;
+ logger.debug("Retrieving institute list with " + institutes.size() + "entries");
+ if (departmentId==0){
+ return null;
+ }
+ return new ArrayList<Institute>(institutes.values());
}
@Override
public boolean removeCourseMember(long courseId, long userId) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
+ logger.debug("Trying to remove user with id "+ userId + " from course with id: "+ courseId);
+ for (CourseMember courseMember : courseMembers){
+ if (courseMember.course.getId()==courseId && courseMember.user.getId() == userId){
+ courseMembers.remove(courseMember);
+ return true;
+ }
+ }
return false;
}
@Override
public boolean updateCourse(Course course) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return false;
+ logger.debug("Updating course with id: " + course.getId());
+ Course oldCourse = courses.get(course.getId());
+ if (oldCourse==null){
+ return false;
+ }
+ courses.remove(oldCourse.getId());
+ courses.put(course.getId(), course);
+ return true;
}
@Override
- public boolean updateInstitute(Institute insitute) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return false;
+ public boolean updateInstitute(Institute institute) throws LectureLogicException_Exception {
+ logger.debug("Updating institute with id: "+ institute.getId());
+ Institute oldInstitute = institutes.get(institute.getId());
+ if (oldInstitute==null){
+ return false;
+ }
+ institutes.remove(oldInstitute.getId());
+ institutes.put(institute.getId(), institute);
+ return true;
}
@Override
public boolean updateUser(User user) throws LectureLogicException_Exception {
- // TODO Auto-generated method stub
- return false;
+ logger.debug("Updating user with id: "+ user.getId());
+ User oldUser= users.get(user.getId());
+ if (oldUser==null){
+ return false;
+ }
+ users.remove(oldUser.getId());
+ users.put(user.getId(), user);
+ return true;
+
}
}
Modified: 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-04-22 19:08:03 UTC (rev 162)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-04-23 09:41:48 UTC (rev 163)
@@ -7,6 +7,9 @@
import javax.ejb.EJB;
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 de.campussource.cse.cdmm.dao.*;
@@ -39,7 +42,10 @@
}
@Override
- public List<EventMessage> createOrUpdateCourse(CourseMessage courseMessage) {
+ @WebMethod(action="createOrUpdateCourse")
+ @WebResult(name="EventMessages")
+ public List<EventMessage> createOrUpdateCourse(
+ @WebParam(name="CourseMessage") CourseMessage courseMessage) {
//init eventMessageList
List<EventMessage> events = new ArrayList<EventMessage>();
//get state of given object in persistence
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <id...@us...> - 2009-04-24 09:39:18
|
Revision: 170
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=170&view=rev
Author: idueppe
Date: 2009-04-24 09:38:36 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
code polishing
Added Paths:
-----------
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasMockupWebServiceServer.java
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasWebServiceTest.java
trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSSMockupWebServiceServer.java
Removed Paths:
-------------
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasDummyWebServiceServer.java
trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/LectureWebServiceTest.java
trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSSDummyWebServiceServer.java
Deleted: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasDummyWebServiceServer.java
===================================================================
--- trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasDummyWebServiceServer.java 2009-04-23 17:20:19 UTC (rev 169)
+++ trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasDummyWebServiceServer.java 2009-04-24 09:38:36 UTC (rev 170)
@@ -1,14 +0,0 @@
-package de.campussource.cse.oca.ilias;
-
-import javax.swing.JOptionPane;
-import javax.xml.ws.Endpoint;
-
-public class IliasDummyWebServiceServer {
-
- public static void main(String[] args) {
- Endpoint endpoint = Endpoint.publish("http://localhost:8080/openuss", new Ilias());
- JOptionPane.showMessageDialog(null,"OpenUSS Dumy Server running.");
- endpoint.stop();
- }
-
-}
Copied: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasMockupWebServiceServer.java (from rev 165, trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasDummyWebServiceServer.java)
===================================================================
--- trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasMockupWebServiceServer.java (rev 0)
+++ trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasMockupWebServiceServer.java 2009-04-24 09:38:36 UTC (rev 170)
@@ -0,0 +1,14 @@
+package de.campussource.cse.oca.ilias;
+
+import javax.swing.JOptionPane;
+import javax.xml.ws.Endpoint;
+
+public class IliasMockupWebServiceServer {
+
+ public static void main(String[] args) {
+ Endpoint endpoint = Endpoint.publish("http://localhost:8080/ilias", new Ilias());
+ JOptionPane.showMessageDialog(null,"Ilias Mockup Server is running.");
+ endpoint.stop();
+ }
+
+}
Property changes on: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasMockupWebServiceServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasWebServiceTest.java (from rev 165, trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/LectureWebServiceTest.java)
===================================================================
--- trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasWebServiceTest.java (rev 0)
+++ trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasWebServiceTest.java 2009-04-24 09:38:36 UTC (rev 170)
@@ -0,0 +1,47 @@
+package de.campussource.cse.oca.ilias;
+
+import javax.xml.ws.Endpoint;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+public class IliasWebServiceTest {
+
+ private static Endpoint endpoint;
+// private LectureWebService service;
+
+ @BeforeClass
+ public static void setupClass() {
+// OpenUSS eis = new OpenUSS();
+// endpoint = Endpoint.publish("http://localhost:12345/openuss", eis);
+ }
+
+ @AfterClass
+ public static void tearDownClass() {
+ if (endpoint != null) {
+ endpoint.stop();
+ }
+ }
+
+ @Before
+ public void setUp() {
+// service = new OpenUSSService().getLectureWebServicePort();
+ }
+
+ @Test
+ public void testFindUser() {
+ // FIXME Test logic is not correct. User that doesn't exist should return null.
+// assertNotNull(service.findUser("test"));
+ }
+
+ @Test
+ public void testGetInstitute() {
+// Institute institute = service.getInstitute(12345L);
+// assertNotNull(institute);
+// assertEquals(Long.valueOf(12345L), institute.getId());
+ }
+
+}
Property changes on: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/IliasWebServiceTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/LectureWebServiceTest.java
===================================================================
--- trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/LectureWebServiceTest.java 2009-04-23 17:20:19 UTC (rev 169)
+++ trunk/cse-ip/oca-ilias/src/test/java/de/campussource/cse/oca/ilias/LectureWebServiceTest.java 2009-04-24 09:38:36 UTC (rev 170)
@@ -1,47 +0,0 @@
-package de.campussource.cse.oca.ilias;
-
-import javax.xml.ws.Endpoint;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-public class LectureWebServiceTest {
-
- private static Endpoint endpoint;
-// private LectureWebService service;
-
- @BeforeClass
- public static void setupClass() {
-// OpenUSS eis = new OpenUSS();
-// endpoint = Endpoint.publish("http://localhost:12345/openuss", eis);
- }
-
- @AfterClass
- public static void tearDownClass() {
- if (endpoint != null) {
- endpoint.stop();
- }
- }
-
- @Before
- public void setUp() {
-// service = new OpenUSSService().getLectureWebServicePort();
- }
-
- @Test
- public void testFindUser() {
- // FIXME Test logic is not correct. User that doesn't exist should return null.
-// assertNotNull(service.findUser("test"));
- }
-
- @Test
- public void testGetInstitute() {
-// Institute institute = service.getInstitute(12345L);
-// assertNotNull(institute);
-// assertEquals(Long.valueOf(12345L), institute.getId());
- }
-
-}
Deleted: trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSSDummyWebServiceServer.java
===================================================================
--- trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSSDummyWebServiceServer.java 2009-04-23 17:20:19 UTC (rev 169)
+++ trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSSDummyWebServiceServer.java 2009-04-24 09:38:36 UTC (rev 170)
@@ -1,14 +0,0 @@
-package de.campussource.cse.oca.openuss;
-
-import javax.swing.JOptionPane;
-import javax.xml.ws.Endpoint;
-
-public class OpenUSSDummyWebServiceServer {
-
- public static void main(String[] args) {
- Endpoint endpoint = Endpoint.publish("http://localhost:8080/openuss", new OpenUSS());
- JOptionPane.showMessageDialog(null,"OpenUSS Dumy Server running.");
- endpoint.stop();
- }
-
-}
Copied: trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSSMockupWebServiceServer.java (from rev 165, trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSSDummyWebServiceServer.java)
===================================================================
--- trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSSMockupWebServiceServer.java (rev 0)
+++ trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSSMockupWebServiceServer.java 2009-04-24 09:38:36 UTC (rev 170)
@@ -0,0 +1,14 @@
+package de.campussource.cse.oca.openuss;
+
+import javax.swing.JOptionPane;
+import javax.xml.ws.Endpoint;
+
+public class OpenUSSMockupWebServiceServer {
+
+ public static void main(String[] args) {
+ Endpoint endpoint = Endpoint.publish("http://localhost:8080/openuss", new OpenUSS());
+ JOptionPane.showMessageDialog(null,"OpenUSS Mockup Server is running.");
+ endpoint.stop();
+ }
+
+}
Property changes on: trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/OpenUSSMockupWebServiceServer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <id...@us...> - 2009-04-24 10:15:29
|
Revision: 171
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=171&view=rev
Author: idueppe
Date: 2009-04-24 10:14:36 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
Fixed some problems within the pom.xml
- Log4j must be in product not in test classpath etc.
Modified Paths:
--------------
trunk/cse-ip/oca-ilias/pom.xml
trunk/cse-ip/oca-openuss/pom.xml
trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/LectureWebServiceTest.java
trunk/cse-ip/sc-cdmm/pom.xml
Modified: trunk/cse-ip/oca-ilias/pom.xml
===================================================================
--- trunk/cse-ip/oca-ilias/pom.xml 2009-04-24 09:38:36 UTC (rev 170)
+++ trunk/cse-ip/oca-ilias/pom.xml 2009-04-24 10:14:36 UTC (rev 171)
@@ -75,7 +75,7 @@
</goals>
<configuration>
<sources>
- <source>${project.build.directory}/sources-generated</source>
+ <source>${project.build.directory}/test-sources-generated</source>
</sources>
</configuration>
</execution>
@@ -107,7 +107,7 @@
<keep>true</keep>
<verbose>true</verbose>
<wsdlDirectory>${basedir}/src/test/resources</wsdlDirectory>
- <sourceDestDir>${project.build.directory}/sources-generated</sourceDestDir>
+ <sourceDestDir>${project.build.directory}/test-sources-generated</sourceDestDir>
<wsdlLocation>http://localhost:12345/ilias?wsdl</wsdlLocation>
</configuration>
</plugin>
Modified: trunk/cse-ip/oca-openuss/pom.xml
===================================================================
--- trunk/cse-ip/oca-openuss/pom.xml 2009-04-24 09:38:36 UTC (rev 170)
+++ trunk/cse-ip/oca-openuss/pom.xml 2009-04-24 10:14:36 UTC (rev 171)
@@ -75,7 +75,7 @@
</goals>
<configuration>
<sources>
- <source>${project.build.directory}/sources-generated</source>
+ <source>${project.build.directory}/test-sources-generated</source>
</sources>
</configuration>
</execution>
@@ -107,7 +107,7 @@
<keep>true</keep>
<verbose>true</verbose>
<wsdlDirectory>${basedir}/src/test/resources</wsdlDirectory>
- <sourceDestDir>${project.build.directory}/sources-generated</sourceDestDir>
+ <sourceDestDir>${project.build.directory}/test-sources-generated</sourceDestDir>
<wsdlLocation>http://localhost:12345/openuss?wsdl</wsdlLocation>
</configuration>
</plugin>
Modified: trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/LectureWebServiceTest.java
===================================================================
--- trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/LectureWebServiceTest.java 2009-04-24 09:38:36 UTC (rev 170)
+++ trunk/cse-ip/oca-openuss/src/test/java/de/campussource/cse/oca/openuss/LectureWebServiceTest.java 2009-04-24 10:14:36 UTC (rev 171)
@@ -1,7 +1,6 @@
package de.campussource.cse.oca.openuss;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import javax.xml.ws.Endpoint;
Modified: trunk/cse-ip/sc-cdmm/pom.xml
===================================================================
--- trunk/cse-ip/sc-cdmm/pom.xml 2009-04-24 09:38:36 UTC (rev 170)
+++ trunk/cse-ip/sc-cdmm/pom.xml 2009-04-24 10:14:36 UTC (rev 171)
@@ -57,7 +57,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <id...@us...> - 2009-04-24 20:07:23
|
Revision: 173
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=173&view=rev
Author: idueppe
Date: 2009-04-24 20:07:11 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
IN PROGRESS: Refactoring of cdmm...
Should be compilable and tests are green
Modified Paths:
--------------
trunk/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java
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/domain/Account.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/State.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Visitor.java
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/webservice/DataModelManagerWebServiceTest.java
Added Paths:
-----------
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityMerger.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityMergerBean.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilder.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.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/main/java/de/campussource/cse/cdmm/ModelMerger.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMergerBean.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDaoJPA.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AddReferenceVisitor.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AttributeAdapter.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Constants.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/IdAdapter.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/ReferenceType.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/ReferencesVisitor.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/AccountMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/CategoryMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/CourseMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/EventMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/GroupMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/InputEventType.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/InputMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/OutputEventType.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/messages/RoleMessage.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/EventBuilderBeanTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MessageSchemaTest.java
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/ModelMergerTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/dao/
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/dao/AccountDaoTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/dao/CategoryDaoTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/dao/CourseDaoTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/dao/DaoTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/dao/EntityDaoTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/dao/RoleDaoTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/domain/
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/domain/AddReferenceVisitorTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/domain/DomainTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/domain/ReferencesVisitorTest.java
Removed Paths:
-------------
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AccountMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CategoryMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CourseMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/GroupMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/InputEventType.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/InputMessage.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/OutputEventType.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleMessage.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DomainTest.java
trunk/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java
Modified: trunk/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java
===================================================================
--- trunk/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -95,6 +95,5 @@
protected Long uniqueId() {
return currentTimeMillis++;
}
-
-
+
}
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AccountMessage.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AccountMessage.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AccountMessage.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,30 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import de.campussource.cse.cdmm.Constants;
-import de.campussource.cse.cdmm.domain.Account;
-
-/**
- * Account message object
- * @author Sebastian Roekens
- *
- */
-@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(name=Constants.ACCOUNT_MESSAGE_TYPE, propOrder={})
-public class AccountMessage extends InputMessage{
-
- private Account account;
-
- @XmlElement(name=Constants.ACCOUNT)
- public Account getAccount() {
- return account;
- }
-
- public void setAccount(Account account) {
- this.account = account;
- }
-
-}
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,32 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import de.campussource.cse.cdmm.domain.Attribute;
-import de.campussource.cse.cdmm.domain.PersistentAttribute;
-import de.campussource.cse.cdmm.domain.TransientAttribute;
-
-/**
- * Attribute Adapter to map transient and persistent attributes
- * @author Sebastian Roekens
- *
- */
-public class AttributeAdapter extends XmlAdapter<Attribute, Attribute>{
-
-
-
- @Override
- public Attribute unmarshal(Attribute v) throws Exception {
- if (v.isTransient()){
- return new TransientAttribute(v.getName(), v.getValue());
- }
- return new PersistentAttribute(v.getName(), v.getValue());
- }
-
- @Override
- public Attribute marshal(Attribute v) throws Exception {
- return v;
- }
-
-
-}
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CategoryMessage.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CategoryMessage.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CategoryMessage.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,30 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import de.campussource.cse.cdmm.Constants;
-import de.campussource.cse.cdmm.domain.Category;
-
-/**
- * Category message object
- * @author Sebastian Roekens
- *
- */
-@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(name=Constants.CATEGORY_MESSAGE_TYPE, propOrder={})
-public class CategoryMessage extends InputMessage{
-
- private Category category;
-
- @XmlElement(name=Constants.CATEGORY)
- public Category getCategory() {
- return category;
- }
-
- public void setCategory(Category category) {
- this.category = category;
- }
-
-}
\ No newline at end of file
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,100 +0,0 @@
-package de.campussource.cse.cdmm;
-
-/**
- *
- * Class containing all String of package to prevent multiple definitions of same Strings
- * @author Sebastian Roekens
- *
- */
-public class Constants{
- //namespace
- public static final String NAMESPACE_DATATYPES="http://cse.campussource.de/DataTypes";
-
- //xml structure elements
- public static final String COURSE = "course";
- public static final String COURSES = "courses";
- public static final String CATEGORY = "category";
- public static final String CATEGORIES = "categories";
- public static final String WORKGROUP = "workgroup";
- public static final String WORKGROUPS = "workgroups";
- public static final String ROLE = "role";
- public static final String ROLES = "roles";
- public static final String ACCOUNT = "account";
- public static final String ACCOUNTS = "accounts";
- public static final String GROUP = "group";
- public static final String GROUPS = "groups";
- public static final String PARENT = "parent";
- public static final String PARENTS = "parents";
- public static final String MEMBERS = "members";
- public static final String TYPE = "type";
- public static final String ENTITY = "entity";
-
- //entity ids
- public static final String COURSE_ID = "courseId";
- public static final String CATEGORY_ID = "categoryId";
- public static final String ROLE_ID = "roleId";
- public static final String ACCOUNT_ID = "accountId";
- public static final String GROUP_ID = "groupId";
- public static final String MEMBER = "member";
- public static final String ATTRIBUTE = "attribute";
- public static final String ATTRIBUTES = "attributes";
-
- //entity property names
- public static final String PROPERTY_ATTRIBUTES = "attributes";
- public static final String PROPERTY_PARENTS = "parents";
- public static final String PROPERTY_PARENT = "parent";
- public static final String PROPERTY_CHILDREN = "children";
- public static final String PROPERTY_COURSES = "courses";
- public static final String PROPERTY_NAME = "name";
- public static final String PROPERTY_VALUE = "value";
- public static final String PROPERTY_TRANSIENT = "transient";
- public static final String PROPERTY_STATE = "state";
-
- //table names
- public static final String TABLENAME_ACCOUNT = "CDMM_ACCOUNT";
- public static final String TABLENAME_CATEGORY = "CDMM_CATEGORY";
- public static final String TABLENAME_COURSE = "CDMM_COURSE";
- public static final String TABLENAME_ENTITY = "CDMM_ENTITY";
- public static final String TABLENAME_GROUP = "CDMM_GROUP";
- public static final String TABLENAME_ROLE = "CDMM_ROLE";
- public static final String TABLENAME_GROUP2ACCOUNT = "CDMM_GROUP2ACCOUNT";
- public static final String TABLENAME_COURSE2CATEGORY = "CDMM_COURSE2CAT";
-
- //column names
- public static final String COLUMNNAME_CATEGORY2CATEGORY = "PARENT_CAT_ID";
- public static final String COLUMNNAME_ROLE_TYPE="ROLE_TYPE";
- public static final String COLUMNNAME_CHILD_ID="CHILD_ID";
- public static final String COLUMNNAME_PARENT_ID="PARENT_ID";
- public static final String COLUMNNAME_GROUP_ID="GROUP_ID";
- public static final String COLUMNNAME_ACCOUNT_ID = "ACCOUNT_ID";
- public static final String COLUMNNAME_CATEGORY_ID = "CATEGORY_ID";
- public static final String COLUMNNAME_COURSE_ID = "COURSE_ID";
- public static final String COLUMNNAME_NAME = "NAME";
- public static final String COLUMNNAME_VALUE = "VALUE";
- public static final String COLUMNNAME_ENTITY_ID = "ENTITY_ID";
- public static final String COLUMNNAME_STATE = "STATE";
-
- public static final String ID = "busId";
-
- public static final String ENTITY_TYPE = "entityType";
- public static final String ACCOUNT_TYPE = "accountType";
- public static final String CATEGORY_TYPE = "categoryType";
- public static final String COURSE_TYPE = "courseType";
- public static final String GROUP_TYPE = "groupType";
- public static final String ATTRIBUTE_TYPE = "attributeType";
- public static final String ROLE_TYPE = "roleType";
- public static final String ENTITYCONTAINER_TYPE = "entityContainerType";
- public static final String ROLE_TYPE_TYPE = "roleTypeType";
-
- public static final String OUTPUT_EVENT_TYPE = "outputEventType";
- public static final String INPUT_EVENT_TYPE = "inputEventType";
- public static final String COURSE_MESSAGE_TYPE = "courseMessageType";
- public static final String GROUP_MESSAGE_TYPE = "groupMessageType";
- public static final String ACCOUNT_MESSAGE_TYPE = "accountMessageType";
- public static final String ROLE_MESSAGE_TYPE = "roleMessageType";
- public static final String CATEGORY_MESSAGE_TYPE = "categoryMessageType";
- public static final String EVENT_MESSAGE_TYPE = "eventMessageType";
- public static final String INPUT_EVENT = "inputEvent";
- public static final String OUTPUT_EVENT = "outputEvent";
- public static final String EVENT_TIME = "eventTime";
-}
\ No newline at end of file
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CourseMessage.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CourseMessage.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CourseMessage.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,30 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import de.campussource.cse.cdmm.Constants;
-import de.campussource.cse.cdmm.domain.Course;
-
-/**
- * Course message object
- * @author Sebastian Roekens
- *
- */
-@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(name=Constants.COURSE_MESSAGE_TYPE, propOrder={})
-public class CourseMessage extends InputMessage{
-
- private Course course;
-
- @XmlElement(name=Constants.COURSE)
- public Course getCourse() {
- return course;
- }
-
- public void setCourse(Course course) {
- this.course = course;
- }
-
-}
Modified: 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-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -2,6 +2,13 @@
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
Modified: 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-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -21,6 +21,14 @@
import de.campussource.cse.cdmm.domain.Group;
import de.campussource.cse.cdmm.domain.Role;
import de.campussource.cse.cdmm.domain.State;
+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.InputEventType;
+import de.campussource.cse.cdmm.messages.OutputEventType;
+import de.campussource.cse.cdmm.messages.RoleMessage;
import de.campussource.cse.common.exception.ServiceComponentException;
/**
Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityMerger.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityMerger.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityMerger.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,5 @@
+package de.campussource.cse.cdmm;
+
+public interface EntityMerger {
+
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityMerger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityMergerBean.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityMergerBean.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityMergerBean.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,5 @@
+package de.campussource.cse.cdmm;
+
+public class EntityMergerBean implements EntityMerger {
+
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EntityMergerBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilder.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilder.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilder.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,46 @@
+package de.campussource.cse.cdmm;
+
+import java.util.Date;
+import java.util.List;
+
+import de.campussource.cse.cdmm.domain.Entity;
+import de.campussource.cse.cdmm.messages.EventMessage;
+
+/**
+ * Builder to create events lists during entity merge analyse.
+ *
+ * @author Ingo Dueppe
+ *
+ */
+public interface EventBuilder {
+
+ /**
+ * Add createEvent to the event list.
+ * @param source instance of a Entity
+ */
+ public void addCreateEvent(Entity source);
+
+ /**
+ * Add update event to the event list.
+ * @param source instance of a Entity
+ */
+ public void addUpdateEvent(Entity source);
+
+ /**
+ * Add delete event to the event list.
+ * @param source instance of a Entity
+ */
+ public void addDeleteEvent(Entity source);
+
+ /**
+ * Retrieve List of EventMessage created by the builder
+ * @return List of Events. If no events were added the list is empty.
+ */
+ public List<EventMessage> build();
+
+ /**
+ * Define the Event time
+ * @param date
+ */
+ public void setEventTime(Date date);
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilder.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,75 @@
+package de.campussource.cse.cdmm;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import de.campussource.cse.cdmm.domain.Entity;
+import de.campussource.cse.cdmm.messages.EventMessage;
+import de.campussource.cse.cdmm.messages.OutputEventType;
+
+/**
+ *
+ * @author Ingo Dueppe
+ *
+ */
+public class EventBuilderBean implements EventBuilder {
+
+ private List<EventMessage> events;
+
+ private Date eventTime;
+
+ private static final Logger logger = Logger.getLogger(EventBuilderBean.class);
+
+ public EventBuilderBean() {
+ events = new ArrayList<EventMessage>();
+ }
+
+ @Override
+ public List<EventMessage> build(){
+ // FIXME Strategy to create events structure must be implemented here
+ return events;
+ }
+
+ @Override
+ public void addCreateEvent(Entity source) {
+ addEvent(source, OutputEventType.CREATE);
+ }
+
+ @Override
+ public void addDeleteEvent(Entity source) {
+ addEvent(source, OutputEventType.DELETE);
+ }
+
+ @Override
+ public void addUpdateEvent(Entity source) {
+ addEvent(source, OutputEventType.UPDATE);
+ }
+
+ private void addEvent(Entity entity, OutputEventType type) {
+ assert type != null;
+ if (eventTime == null) {
+ throw new IllegalStateException("EventTime must be defined first!");
+ }
+ if (entity == null) {
+ throw new IllegalArgumentException("Parameter source must not be null!");
+ }
+
+ EventMessage event = new EventMessage();
+
+ event.setEventTime(eventTime);
+ event.setEntity(entity);
+ event.setOutputEvent(type);
+
+ events.add(event);
+ if (logger.isDebugEnabled())
+ logger.debug("Created output event message "+event);
+ }
+
+ @Override
+ public void setEventTime(Date eventTime) {
+ this.eventTime = eventTime;
+ }
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventMessage.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventMessage.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventMessage.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,54 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.Date;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import de.campussource.cse.cdmm.Constants;
-import de.campussource.cse.cdmm.domain.Entity;
-
-/**
- * Event message object
- * @author Sebastian Roekens
- *
- */
-@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(name=Constants.EVENT_MESSAGE_TYPE, propOrder={})
-public class EventMessage{
-
- private Entity entity;
-
- private Date eventTime;
-
- private OutputEventType outputEvent;
-
- @XmlElement(name=Constants.ENTITY)
- public Entity getEntity() {
- return entity;
- }
-
- public void setEntity(Entity entity) {
- this.entity = entity;
- }
-
- @XmlElement(name=Constants.OUTPUT_EVENT)
- public OutputEventType getOutputEvent() {
- return outputEvent;
- }
-
- public void setOutputEvent(OutputEventType outputEvent) {
- this.outputEvent = outputEvent;
- }
-
- @XmlElement(name=Constants.EVENT_TIME)
- public Date getEventTime() {
- return eventTime;
- }
-
- public void setEventTime(Date eventTime) {
- this.eventTime = eventTime;
- }
-
-}
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/GroupMessage.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/GroupMessage.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/GroupMessage.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,30 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import de.campussource.cse.cdmm.Constants;
-import de.campussource.cse.cdmm.domain.Group;
-
-/**
- * Group message object
- * @author Sebastian Roekens
- *
- */
-@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(name=Constants.GROUP_MESSAGE_TYPE, propOrder={})
-public class GroupMessage extends InputMessage{
-
- private Group group;
-
- @XmlElement(name=Constants.ROLE)
- public Group getGroup() {
- return group;
- }
-
- public void setGroup(Group group) {
- this.group = group;
- }
-
-}
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,25 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-/**
- * Adapter class to convert ids from String to Long and back
- * @author Sebastian Roekens
- *
- */
-public class IdAdapter extends XmlAdapter<String, Long>{
-
-
-
- @Override
- public Long unmarshal(String v) throws Exception {
- return Long.parseLong(v);
- }
-
- @Override
- public String marshal(Long v) throws Exception {
- return String.valueOf(v);
- }
-
-
-}
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/InputEventType.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/InputEventType.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/InputEventType.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,24 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import de.campussource.cse.cdmm.Constants;
-
-/**
- *
- * @author Sebastian Roekens
- *
- */
-@XmlEnum
-@XmlType(name=Constants.INPUT_EVENT_TYPE, namespace=Constants.NAMESPACE_DATATYPES)
-public enum InputEventType{
- @XmlEnumValue(value="CREATE_UPDATE")
- CREATE_UPDATE,
- @XmlEnumValue(value="DELETE")
- DELETE,
- @XmlTransient
- CREATE_BY_REFERENCE
-}
\ No newline at end of file
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/InputMessage.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/InputMessage.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/InputMessage.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,29 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import java.util.Date;
-
-import javax.xml.bind.annotation.XmlElement;
-
-public abstract class InputMessage {
- private Date eventTime;
-
- private InputEventType inputEvent;
-
- @XmlElement(name=Constants.EVENT_TIME)
- public Date getEventTime() {
- return eventTime;
- }
-
- public void setEventTime(Date eventTime) {
- this.eventTime = eventTime;
- }
-
- @XmlElement(name=Constants.INPUT_EVENT)
- public InputEventType getInputEvent() {
- return inputEvent;
- }
-
- public void setInputEvent(InputEventType inputEvent) {
- this.inputEvent = inputEvent;
- }
-}
Added: 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 (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManager.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,14 @@
+package de.campussource.cse.cdmm;
+
+import java.util.List;
+
+import de.campussource.cse.cdmm.messages.EventMessage;
+import de.campussource.cse.cdmm.messages.InputMessage;
+
+public interface ModelManager {
+
+ public List<EventMessage> createOrUpdate(InputMessage message);
+
+ public List<EventMessage> delete(InputMessage message);
+
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManagerBean.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,84 @@
+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.domain.State;
+import de.campussource.cse.cdmm.messages.EventMessage;
+import de.campussource.cse.cdmm.messages.InputMessage;
+
+@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) {
+ 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())) {
+ mergeEntities(input, loaded, eventBuilder);
+
+ entityDao.persist(loaded);
+ }
+
+ return eventBuilder.build();
+ }
+
+ private void mergeEntities(Entity input, Entity loaded, EventBuilder eventBuilder) {
+ switch(loaded.getState()) {
+ case NOT_EXISTS:
+ eventBuilder.addCreateEvent(loaded);
+ loaded.setId(input.getId());
+ loaded.setAttributes(input.getAttributes());
+ loaded.setDate(input.getDate());
+ loaded.setState(State.EXISTS);
+
+
+ break;
+ case EXISTS:
+ eventBuilder.addUpdateEvent(loaded);
+ loaded.setAttributes(input.getAttributes());
+ loaded.setDate(input.getDate());
+ break;
+ case KNOWN:
+ eventBuilder.addCreateEvent(loaded);
+ // create references
+ loaded.setAttributes(input.getAttributes());
+ loaded.setDate(input.getDate());
+ loaded.setState(State.EXISTS);
+
+ break;
+ case DELETED:
+ eventBuilder.addDeleteEvent(loaded);
+
+ loaded.setAttributes(input.getAttributes());
+ loaded.setDate(input.getDate());
+ loaded.setState(State.DELETED);
+
+ break;
+ }
+ }
+
+ @Override
+ public List<EventMessage> delete(InputMessage message) {
+ throw new NotImplementedException();
+ // TODO Auto-generated method stub
+ }
+
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelManagerBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMerger.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMerger.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMerger.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,15 @@
+package de.campussource.cse.cdmm;
+
+import de.campussource.cse.cdmm.domain.Entity;
+
+/**
+ * Merge the input domain entity model to the existing domain model
+ *
+ * @author Ingo Dueppe
+ *
+ */
+public interface ModelMerger {
+
+ public <E extends Entity> E merge(E input);
+
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMerger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMergerBean.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMergerBean.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMergerBean.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,90 @@
+package de.campussource.cse.cdmm;
+
+import de.campussource.cse.cdmm.dao.EntityDao;
+import de.campussource.cse.cdmm.domain.AddReferenceVisitor;
+import de.campussource.cse.cdmm.domain.Entity;
+import de.campussource.cse.cdmm.domain.ReferenceType;
+import de.campussource.cse.cdmm.domain.ReferencesVisitor;
+import de.campussource.cse.cdmm.domain.State;
+import de.campussource.cse.cdmm.domain.Visitor;
+
+/**
+ *
+ * @author Ingo Dueppe
+ *
+ */
+public class ModelMergerBean implements ModelMerger {
+
+ private EntityDao dao;
+
+ private EventBuilder eventBuilder;
+
+ public <E extends Entity> E merge(E input) {
+ E entity = (E) dao.find(input.getClass(), input.getId());
+ mergeEntities(input, entity);
+ return entity;
+ }
+
+ private <E extends Entity> void mergeEntities(E input, E loaded) {
+ switch (loaded.getState()) {
+ case NOT_EXISTS:
+ eventBuilder.addCreateEvent(loaded);
+ loaded.setId(input.getId());
+ loaded.setAttributes(input.getAttributes());
+ loaded.setDate(input.getDate());
+ loaded.setState(State.EXISTS);
+
+ checkReferences(input, loaded);
+
+ break;
+ case EXISTS:
+ eventBuilder.addUpdateEvent(loaded);
+ loaded.setAttributes(input.getAttributes());
+ loaded.setDate(input.getDate());
+ break;
+ case KNOWN:
+ eventBuilder.addCreateEvent(loaded);
+ // create references
+ loaded.setAttributes(input.getAttributes());
+ loaded.setDate(input.getDate());
+ loaded.setState(State.EXISTS);
+
+ break;
+ case DELETED:
+ eventBuilder.addDeleteEvent(loaded);
+
+ loaded.setAttributes(input.getAttributes());
+ loaded.setDate(input.getDate());
+ loaded.setState(State.DELETED);
+
+ break;
+ }
+ }
+
+ public <E extends Entity> void checkReferences(final E input, final E loaded) {
+ Visitor visitor = new ReferencesVisitor() {
+ @Override
+ public void foundReference(Entity target, Entity source, ReferenceType type) {
+ Entity entity = dao.find(target.getClass(), target.getId());
+ if (entity.getState() == State.NOT_EXISTS) {
+ entity.setState(State.KNOWN);
+ entity.setDate(input.getDate());
+ }
+ loaded.accept(new AddReferenceVisitor(entity, type));
+ }
+
+
+ };
+ input.accept(visitor);
+ }
+
+ public void setEntityDao(EntityDao dao) {
+ this.dao = dao;
+ }
+
+ public void setEventBuilder(EventBuilder eventBuilder) {
+ this.eventBuilder = eventBuilder;
+ }
+
+
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMergerBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/OutputEventType.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/OutputEventType.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/OutputEventType.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,27 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-import de.campussource.cse.cdmm.Constants;
-
-/**
- * Role Type to differentiate 3 types of roles:
- * UNDEFINED - if role type cannot be defined
- * PARTICIPANT - if account participates in a course
- * ASSISTANT - if account is an assistant in a course
- *
- * @author Sebastian Roekens
- *
- */
-@XmlEnum
-@XmlType(name=Constants.OUTPUT_EVENT_TYPE, namespace=Constants.NAMESPACE_DATATYPES)
-public enum OutputEventType{
- @XmlEnumValue(value="CREATE")
- CREATE,
- @XmlEnumValue(value="UPDATE")
- UPDATE,
- @XmlEnumValue(value="DELETE")
- DELETE
-}
\ No newline at end of file
Deleted: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleMessage.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleMessage.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/RoleMessage.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,30 +0,0 @@
-package de.campussource.cse.cdmm;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import de.campussource.cse.cdmm.Constants;
-import de.campussource.cse.cdmm.domain.Role;
-
-/**
- * Role message object
- * @author Sebastian Roekens
- *
- */
-@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(name=Constants.ROLE_MESSAGE_TYPE, propOrder={})
-public class RoleMessage extends InputMessage{
-
- private Role role;
-
- @XmlElement(name=Constants.ROLE)
- public Role getRole() {
- return role;
- }
-
- public void setRole(Role role) {
- this.role = role;
- }
-
-}
\ No newline at end of file
Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,13 @@
+package de.campussource.cse.cdmm.dao;
+
+import de.campussource.cse.cdmm.domain.Entity;
+
+public interface EntityDao {
+
+ public abstract <E extends Entity> E find(Class<E> clazz, Long primaryKey);
+
+ public abstract void persist(Entity entity);
+
+ public abstract void delete(Entity entity);
+
+}
\ No newline at end of file
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDaoJPA.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDaoJPA.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDaoJPA.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,60 @@
+package de.campussource.cse.cdmm.dao;
+
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import de.campussource.cse.cdmm.domain.Entity;
+import de.campussource.cse.cdmm.domain.State;
+
+/**
+ *
+ * @author Ingo Dueppe
+ *
+ */
+@Stateless
+public class EntityDaoJPA implements EntityDao {
+
+ @PersistenceContext
+ private EntityManager entityManager;
+
+ /**
+ * {@inheritDoc}
+ */
+ public <E extends Entity> E find(Class<E> clazz, Long primaryKey) {
+ E entity = entityManager.find(clazz, primaryKey);
+ if (entity == null) {
+ entity = createEntity(clazz, primaryKey, entity);
+ }
+ return entity;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void persist(Entity entity) {
+ entityManager.persist(entity);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void delete(Entity entity) {
+ entity.setState(State.DELETED);
+ entityManager.persist(entity);
+ }
+
+ private <E extends Entity> E createEntity(Class<E> clazz, Long primaryKey, E entity) {
+ try {
+ entity = clazz.newInstance();
+ entity.setId(primaryKey);
+ } catch (InstantiationException e) {
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ return entity;
+ }
+
+
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDaoJPA.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -21,7 +21,6 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import de.campussource.cse.cdmm.Constants;
/**
* Account entity object
@@ -163,4 +162,8 @@
public void setGroups(List<Group> groups) {
this.groups = groups;
}
+
+ public void accept(Visitor visitor) {
+ visitor.visit(this);
+ }
}
Added: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AddReferenceVisitor.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AddReferenceVisitor.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AddReferenceVisitor.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,68 @@
+package de.campussource.cse.cdmm.domain;
+
+import org.apache.commons.lang.NotImplementedException;
+
+/**
+ * Visitor to add Reference to an entity object.
+ * @author Ingo Dueppe
+ *
+ */
+public class AddReferenceVisitor implements Visitor {
+
+ private ReferenceType type;
+
+ private Entity target;
+
+ /**
+ *
+ * @param target entity object to be add as reference
+ * @param type of reference that will be added
+ */
+ public AddReferenceVisitor(Entity target, ReferenceType type) {
+ this.type = type;
+ this.target = target;
+ }
+
+ @Override
+ public void visit(Account account) {
+ // TODO Auto-generated method stub
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public void visit(Category category) {
+ // TODO Auto-generated method stub
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public void visit(Course course) {
+ switch (type) {
+ case CATEGORY:
+ course.addToCategory((Category) target);
+ break;
+ case WORKGROUP:
+ ((Course) target).addAsWorkgroupTo(course);
+ break;
+ case PARENT:
+ course.setParent((Course) target);
+ break;
+ case ROLE:
+ course.addRole((Role)target);
+ break;
+ }
+ }
+
+ @Override
+ public void visit(Group group) {
+ // TODO Auto-generated method stub
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public void visit(Role role) {
+ // TODO Auto-generated method stub
+ throw new NotImplementedException();
+ }
+
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AddReferenceVisitor.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -6,8 +6,6 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import de.campussource.cse.cdmm.AttributeAdapter;
-import de.campussource.cse.cdmm.Constants;
/**
* Attribute entity object
Copied: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AttributeAdapter.java (from rev 168, trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java)
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AttributeAdapter.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AttributeAdapter.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,27 @@
+package de.campussource.cse.cdmm.domain;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+
+/**
+ * Attribute Adapter to map transient and persistent attributes
+ * @author Sebastian Roekens
+ *
+ */
+public class AttributeAdapter extends XmlAdapter<Attribute, Attribute>{
+
+ @Override
+ public Attribute unmarshal(Attribute v) throws Exception {
+ if (v.isTransient()){
+ return new TransientAttribute(v.getName(), v.getValue());
+ }
+ return new PersistentAttribute(v.getName(), v.getValue());
+ }
+
+ @Override
+ public Attribute marshal(Attribute v) throws Exception {
+ return v;
+ }
+
+
+}
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/AttributeAdapter.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -19,7 +19,6 @@
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import de.campussource.cse.cdmm.Constants;
/**
* Category entity object
@@ -40,10 +39,10 @@
private Category parent;
@OneToMany(mappedBy = Constants.PARENT, cascade = { CascadeType.REMOVE })
- private List<Category> children;
+ private List<Category> children = new ArrayList<Category>();
@ManyToMany(mappedBy = Constants.CATEGORIES)
- private List<Course> courses;
+ private List<Course> courses = new ArrayList<Course>();
public Category() {
}
@@ -146,5 +145,10 @@
public boolean isRoot() {
return (parent == null);
}
+
+ public void accept(Visitor visitor) {
+ visitor.visit(this);
+ }
+
}
Copied: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Constants.java (from rev 168, trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java)
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Constants.java (rev 0)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Constants.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -0,0 +1,100 @@
+package de.campussource.cse.cdmm.domain;
+
+/**
+ *
+ * Class containing all String of package to prevent multiple definitions of same Strings
+ * @author Sebastian Roekens
+ *
+ */
+public class Constants{
+ //namespace
+ public static final String NAMESPACE_DATATYPES="http://cse.campussource.de/DataTypes";
+
+ //xml structure elements
+ public static final String COURSE = "course";
+ public static final String COURSES = "courses";
+ public static final String CATEGORY = "category";
+ public static final String CATEGORIES = "categories";
+ public static final String WORKGROUP = "workgroup";
+ public static final String WORKGROUPS = "workgroups";
+ public static final String ROLE = "role";
+ public static final String ROLES = "roles";
+ public static final String ACCOUNT = "account";
+ public static final String ACCOUNTS = "accounts";
+ public static final String GROUP = "group";
+ public static final String GROUPS = "groups";
+ public static final String PARENT = "parent";
+ public static final String PARENTS = "parents";
+ public static final String MEMBERS = "members";
+ public static final String TYPE = "type";
+ public static final String ENTITY = "entity";
+
+ //entity ids
+ public static final String COURSE_ID = "courseId";
+ public static final String CATEGORY_ID = "categoryId";
+ public static final String ROLE_ID = "roleId";
+ public static final String ACCOUNT_ID = "accountId";
+ public static final String GROUP_ID = "groupId";
+ public static final String MEMBER = "member";
+ public static final String ATTRIBUTE = "attribute";
+ public static final String ATTRIBUTES = "attributes";
+
+ //entity property names
+ public static final String PROPERTY_ATTRIBUTES = "attributes";
+ public static final String PROPERTY_PARENTS = "parents";
+ public static final String PROPERTY_PARENT = "parent";
+ public static final String PROPERTY_CHILDREN = "children";
+ public static final String PROPERTY_COURSES = "courses";
+ public static final String PROPERTY_NAME = "name";
+ public static final String PROPERTY_VALUE = "value";
+ public static final String PROPERTY_TRANSIENT = "transient";
+ public static final String PROPERTY_STATE = "state";
+
+ //table names
+ public static final String TABLENAME_ACCOUNT = "CDMM_ACCOUNT";
+ public static final String TABLENAME_CATEGORY = "CDMM_CATEGORY";
+ public static final String TABLENAME_COURSE = "CDMM_COURSE";
+ public static final String TABLENAME_ENTITY = "CDMM_ENTITY";
+ public static final String TABLENAME_GROUP = "CDMM_GROUP";
+ public static final String TABLENAME_ROLE = "CDMM_ROLE";
+ public static final String TABLENAME_GROUP2ACCOUNT = "CDMM_GROUP2ACCOUNT";
+ public static final String TABLENAME_COURSE2CATEGORY = "CDMM_COURSE2CAT";
+
+ //column names
+ public static final String COLUMNNAME_CATEGORY2CATEGORY = "PARENT_CAT_ID";
+ public static final String COLUMNNAME_ROLE_TYPE="ROLE_TYPE";
+ public static final String COLUMNNAME_CHILD_ID="CHILD_ID";
+ public static final String COLUMNNAME_PARENT_ID="PARENT_ID";
+ public static final String COLUMNNAME_GROUP_ID="GROUP_ID";
+ public static final String COLUMNNAME_ACCOUNT_ID = "ACCOUNT_ID";
+ public static final String COLUMNNAME_CATEGORY_ID = "CATEGORY_ID";
+ public static final String COLUMNNAME_COURSE_ID = "COURSE_ID";
+ public static final String COLUMNNAME_NAME = "NAME";
+ public static final String COLUMNNAME_VALUE = "VALUE";
+ public static final String COLUMNNAME_ENTITY_ID = "ENTITY_ID";
+ public static final String COLUMNNAME_STATE = "STATE";
+
+ public static final String ID = "busId";
+
+ public static final String ENTITY_TYPE = "entityType";
+ public static final String ACCOUNT_TYPE = "accountType";
+ public static final String CATEGORY_TYPE = "categoryType";
+ public static final String COURSE_TYPE = "courseType";
+ public static final String GROUP_TYPE = "groupType";
+ public static final String ATTRIBUTE_TYPE = "attributeType";
+ public static final String ROLE_TYPE = "roleType";
+ public static final String ENTITYCONTAINER_TYPE = "entityContainerType";
+ public static final String ROLE_TYPE_TYPE = "roleTypeType";
+
+ public static final String OUTPUT_EVENT_TYPE = "outputEventType";
+ public static final String INPUT_EVENT_TYPE = "inputEventType";
+ public static final String COURSE_MESSAGE_TYPE = "courseMessageType";
+ public static final String GROUP_MESSAGE_TYPE = "groupMessageType";
+ public static final String ACCOUNT_MESSAGE_TYPE = "accountMessageType";
+ public static final String ROLE_MESSAGE_TYPE = "roleMessageType";
+ public static final String CATEGORY_MESSAGE_TYPE = "categoryMessageType";
+ public static final String EVENT_MESSAGE_TYPE = "eventMessageType";
+ public static final String INPUT_EVENT = "inputEvent";
+ public static final String OUTPUT_EVENT = "outputEvent";
+ public static final String EVENT_TIME = "eventTime";
+}
\ No newline at end of file
Property changes on: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Constants.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -22,7 +22,6 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import de.campussource.cse.cdmm.Constants;
/**
* Course entity object
@@ -41,17 +40,17 @@
private Course parent;
@OneToMany(mappedBy=Constants.PARENT, cascade=CascadeType.REMOVE)
- private List<Course> workgroups;
+ private List<Course> workgroups = new ArrayList<Course>(3);
@ManyToMany(cascade={CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH})
@JoinTable(
name = Constants.TABLENAME_COURSE2CATEGORY,
joinColumns={@JoinColumn(name=Constants.COLUMNNAME_CATEGORY_ID)},
inverseJoinColumns={@JoinColumn(name=Constants.COLUMNNAME_COURSE_ID)})
- private List<Category> categories;
+ private List<Category> categories = new ArrayList<Category>(2);
@OneToMany(mappedBy=Constants.COURSE, cascade = {CascadeType.REMOVE})
- private List<Role> roles;
+ private List<Role> roles = new ArrayList<Role>();
public Course(){
}
@@ -159,5 +158,17 @@
public void setRoles(List<Role> roles) {
this.roles = roles;
}
+
+ public void accept(Visitor visitor) {
+ visitor.visit(this);
+ }
+ public void addRole(Role role) {
+ if (role != null) {
+ roles.add(role);
+ role.setCourse(this);
+ }
+ }
+
+
}
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-04-24 10:15:25 UTC (rev 172)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-04-24 20:07:11 UTC (rev 173)
@@ -1,6 +1,5 @@
package de.campussource.cse.cdmm.domain;
-
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -8,8 +7,6 @@
import javax.persistence.Column;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
@@ -29,77 +26,67 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-import de.campussource.cse.cdmm.Constants;
-import de.campussource.cse.cdmm.IdAdapter;
-
/**
* Entity object - super class of other entity types
+ *
+ * @author Ingo Dueppe
* @author Sebastian Roekens
- *
+ *
*/
-...@ja...rsistence.Entity(name=Constants.ENTITY)
+...@ja...rsistence.Entity(name = Constants.ENTITY)
@Table(name = Constants.TABLENAME_ENTITY)
-@Inheritance(strategy=InheritanceType.JOINED)
-@XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES)
-@XmlType(name=Constants.ENTITY_TYPE,propOrder={"id", Constants.PROPERTY_STATE, Constants.PROPERTY_ATTRIBUTES}, namespace=Constants.NAMESPACE_DATATYPES)
-public class Entity{
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
+@Inheritance(strategy = InheritanceType.JOINED)
+@XmlRootElement(namespace = Constants.NAMESPACE_DATATYPES)
+@XmlType(name = Constants.ENTITY_TYPE, propOrder = { "id", Constants.PROPERTY_STATE, Constants.PROPERTY_ATTRIBUTES }, namespace = Constants.NAMESPACE_DATATYPES)
+public abstract class Entity {
+
+ @Id
private Long id;
-
+
@Transient
private List<Attribute> attributes;
-
- @Column(name=Constants.COLUMNNAME_STATE, nullable=false, insertable=true, updatable=true)
+
+ @Column(name = Constants.COLUMNNAME_STATE, nullable = false, insertable = true, updatable = true)
@Enumerated(EnumType.STRING)
- private State state = State.EXISTS;
-
+ private State state = State.NOT_EXISTS;
+
@Version
@SuppressWarnings("unused")
private long version;
-
- @Column(name="LAST_UPDATE")
+
+ @Column(name = "LAST_UPDATE")
@Temporal(TemporalType.TIMESTAMP)
private Date date;
-
- public Entity(){
+
+ public Entity() {
}
-
- public Entity(Long id){
+
+ public Entity(Long id) {
this.id = id;
}
- private TransientAttribute attribute2TransientAttribute(Attribute attribute){
- return new TransientAttribute(attribute.getName(), attribute.getValue());
- }
-
- private PersistentAttribute attribute2PersistentAttribute(Attribute attribute){
- return new PersistentAttribute(attribute.getName(), attribute.getValue());
- }
-
public State getState() {
return state;
}
- @XmlElement(name=Constants.PROPERTY_STATE)
+ @XmlElement(name = Constants.PROPERTY_STATE)
public void setState(State state) {
this.state = state;
}
-
+
public void setId(Long id) {
this.id = id;
}
@XmlID
- @XmlJavaTypeAdapter(value=IdAdapter.class)
- @XmlElement(name=Constants.ID)
+ @XmlJavaTypeAdapter(value = IdAdapter.class)
+ @XmlElement(name = Constants.ID)
public Long getId() {
return id;
}
- @XmlElementWrapper(name=Constants.ATTRIBUTES)
- @XmlElement(name=Constants.ATTRIBUTE)
+ @XmlElementWrapper(name = Constants.ATTRIBUTES)
+ @XmlElement(name = Constants.ATTRIBUTE)
public List<Attribute> getAttributes() {
return attributes;
}
@@ -107,23 +94,19 @@
// TODO Check if this is correct
public void setAttributes(List<Attribute> attributes) {
List<Attribute> newAttributeList = new ArrayList<Attribute>();
- for (Attribute att : attributes){
- if (!att.isTransient()){
- newAttributeList.add(attribute2PersistentAttribute(att));
- } else{
- newAtt...
[truncated message content] |
|
From: <ro...@us...> - 2009-05-14 11:22:15
|
Revision: 211
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=211&view=rev
Author: roekens
Date: 2009-05-14 11:22:07 +0000 (Thu, 14 May 2009)
Log Message:
-----------
- fixed pom to get site generation to work
(scope of added cobertura dependency has to be checked)
- fixed PMD violations
Modified Paths:
--------------
trunk/cse-ip/pom.xml
trunk/cse-ip/sc-cdmm/pom.xml
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/ModelMergerBean.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java
Modified: trunk/cse-ip/pom.xml
===================================================================
--- trunk/cse-ip/pom.xml 2009-05-13 12:07:28 UTC (rev 210)
+++ trunk/cse-ip/pom.xml 2009-05-14 11:22:07 UTC (rev 211)
@@ -351,6 +351,11 @@
<version>${jaxws-rt.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9rc1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: trunk/cse-ip/sc-cdmm/pom.xml
===================================================================
--- trunk/cse-ip/sc-cdmm/pom.xml 2009-05-13 12:07:28 UTC (rev 210)
+++ trunk/cse-ip/sc-cdmm/pom.xml 2009-05-14 11:22:07 UTC (rev 211)
@@ -84,6 +84,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: 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-13 12:07:28 UTC (rev 210)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-05-14 11:22:07 UTC (rev 211)
@@ -7,7 +7,6 @@
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;
@@ -61,8 +60,8 @@
logger.debug("Received delete message: "+message);
}
- Entity input = message.getEntity();
- Entity loaded = entityDao.find(input.getClass(), input.getId());
+// Entity input = message.getEntity();
+// Entity loaded = entityDao.find(input.getClass(), input.getId());
EventBuilder eventBuilder = new EventBuilderBean();
eventBuilder.setEventTime(message.getEventTime());
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMergerBean.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMergerBean.java 2009-05-13 12:07:28 UTC (rev 210)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/ModelMergerBean.java 2009-05-14 11:22:07 UTC (rev 211)
@@ -1,10 +1,6 @@
package de.campussource.cse.cdmm;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import javax.ejb.EJB;
import javax.ejb.Local;
@@ -17,7 +13,6 @@
import de.campussource.cse.cdmm.domain.ReferenceType;
import de.campussource.cse.cdmm.domain.ReferencesVisitor;
import de.campussource.cse.cdmm.domain.State;
-import de.campussource.cse.cdmm.domain.Visitor;
import de.campussource.cse.cdmm.messages.OutputEventType;
/**
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java 2009-05-13 12:07:28 UTC (rev 210)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java 2009-05-14 11:22:07 UTC (rev 211)
@@ -1,9 +1,6 @@
package de.campussource.cse.cdmm.domain;
-import javax.management.remote.TargetedNotification;
-import org.apache.commons.lang.NotImplementedException;
-
/**
* Visitor to remove Reference to an entity object.
*
@@ -22,7 +19,8 @@
/**
* represents associated target entity in given object structure
*/
- private Entity associatedTarget;
+ //FIXME check if needed
+// private Entity associatedTarget;
/**
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ro...@us...> - 2009-05-14 11:54:15
|
Revision: 212
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=212&view=rev
Author: roekens
Date: 2009-05-14 11:54:08 +0000 (Thu, 14 May 2009)
Log Message:
-----------
- added cobertura dependencies to enable site generation
- bugfixing and code polishing
Modified Paths:
--------------
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java
trunk/cse-ip/sc-mapper/pom.xml
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java 2009-05-14 11:22:07 UTC (rev 211)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/EventBuilderBean.java 2009-05-14 11:54:08 UTC (rev 212)
@@ -73,7 +73,7 @@
@Override
public void setEventTime(Date eventTime) {
- this.eventTime = eventTime;
+ this.eventTime = new Date(eventTime.getTime());
}
@Override
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-05-14 11:22:07 UTC (rev 211)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-05-14 11:54:08 UTC (rev 212)
@@ -155,22 +155,23 @@
visitor.visit(this);
}
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+ if (!(other instanceof Account)) {
+ return false;
+ }
+ if (this.getId() == null) {
+ return super.equals( other );
+ }
+ else {
+ return this.getId().equals(((Account)other).getId());
+ }
+ }
+
@Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof Account)) {
- return false;
- }
- if (this.getId() == null) {
- return false;
- } else {
- return this.getId().equals(((Account) obj).getId());
- }
- }
-
- @Override
public int hashCode() {
if (this.getId() == null) {
return super.hashCode();
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-05-14 11:22:07 UTC (rev 211)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-05-14 11:54:08 UTC (rev 212)
@@ -167,5 +167,20 @@
visitor.visit(this);
}
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) {
+ return true;
+ }
+ if (!(other instanceof Category)) {
+ return false;
+ }
+ if (this.getId() == null) {
+ return super.equals( other );
+ }
+ else {
+ return this.getId().equals(((Category)other).getId());
+ }
+ }
}
Modified: trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java
===================================================================
--- trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java 2009-05-14 11:22:07 UTC (rev 211)
+++ trunk/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/DeleteReferenceVisitor.java 2009-05-14 11:54:08 UTC (rev 212)
@@ -32,7 +32,8 @@
public DeleteReferenceVisitor(Entity persistentTarget, Entity associatedTarget, ReferenceType type) {
this.type = type;
this.persistentTarget = persistentTarget;
- this.associatedTarget = associatedTarget;
+ //FIXME check if needed
+// this.associatedTarget = associatedTarget;
}
@Override
Modified: trunk/cse-ip/sc-mapper/pom.xml
===================================================================
--- trunk/cse-ip/sc-mapper/pom.xml 2009-05-14 11:22:07 UTC (rev 211)
+++ trunk/cse-ip/sc-mapper/pom.xml 2009-05-14 11:54:08 UTC (rev 212)
@@ -83,6 +83,10 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ </dependency>
</dependencies>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X